Script modifications for debugging

Change-Id: Ic47b34ab1cc267e4e0a39bb4a38f993a40544c19
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-125

diff --git a/.gitignore b/.gitignore
index a4e4ce4..0483f20 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,8 @@
 target/
 last*
+/build/
+.classpath
+.project
+.settings/
+dependency-reduced-pom.xml
+/logs/

diff --git a/misc/dmaapbc b/misc/dmaapbc
index 6b337db..b26952c 100644 (file)
--- a/misc/dmaapbc
+++ b/misc/dmaapbc
@@ -14,6 +14,7 @@ CONTAINER_CONFIG=/opt/app/config/conf
 MAIN=org.onap.dmaap.dbcapi.server.Main 
 
 
+
 pids() {
        set -x
        ps -ef | grep java | grep $MAIN | sed -e 's/[^ ]* *//' -e 's/ .*//'
@@ -34,6 +35,14 @@ config() {
        fi
        cd $APP_ROOT
        source $CONTAINER_CONFIG
+
+       if [ "$DMAAPBC_WAIT_TO_EXIT" != "Y" ]
+       then
+               echo "Creating $APP_ROOT/ok_to_exit so no waiting..."
+               > $APP_ROOT/ok_to_exit
+       else
+               echo "Not creating $APP_ROOT/ok_to_exit"
+       fi      
        # comment out till certs are available
        #if [ ! -f $APP_ROOT/misc/cert-client-init.sh ]
        #then
@@ -157,4 +166,11 @@ esac
                tail -100  $APP_ROOT/logs/EELF/server.log
                echo "------------ tail -100 application.log ---------------"
                tail -100 $APP_ROOT/logs/EELF/application.log
+
+               echo "Check $APP_ROOT/ok_to_exit"
+               while [ ! -f $APP_ROOT/ok_to_exit ]
+               do
+                       echo "$APP_ROOT/ok_to_exit does not exist.  Sticking around for debugging..."
+                       sleep 10
+               done
 exit 0

diff --git a/pom.xml b/pom.xml
index 25adb7d..6eab0f8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M1</version>
         <executions>
           <execution>
             <id>enforce-no-snapshots</id>
@@ -89,7 +88,6 @@
       <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ecomp-staging</serverId>
@@ -103,7 +101,6 @@
                <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-site-plugin</artifactId>
-                 <version>3.6</version>
                  <dependencies>
                        <dependency>
                          <groupId>org.apache.maven.wagon</groupId>
@@ -305,7 +302,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jettyVersion>9.3.7.v20160115</jettyVersion>
     <eelf.version>0.0.1</eelf.version>
-    <artifact.version>1.0.2</artifact.version>
+    <artifact.version>1.0.3</artifact.version>
                <!--  SONAR  -->
                 <jacoco.version>0.7.7.201606060606</jacoco.version>
            <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>