From 94366b596c4c45427b1b9641609f98155e68d60c Mon Sep 17 00:00:00 2001 From: GuangrongFu Date: Thu, 29 Mar 2018 19:15:40 +0800 Subject: Fixed the Instantiation Problem of Engine Change-Id: I771d72f3b1f244fae4f303f15c40ebd322a24de1 Issue-ID: HOLMES-106 Signed-off-by: GuangrongFu --- engine-d-standalone/pom.xml | 34 ------------------ engine-d-standalone/src/main/assembly/bin/run.sh | 4 +-- engine-d/pom.xml | 44 ++++++++++++++++++------ 3 files changed, 35 insertions(+), 47 deletions(-) diff --git a/engine-d-standalone/pom.xml b/engine-d-standalone/pom.xml index bfa5ac6..84a3970 100644 --- a/engine-d-standalone/pom.xml +++ b/engine-d-standalone/pom.xml @@ -68,23 +68,6 @@ true - - copy-lib-${linux64id} - process-resources - - copy-resources - - - ${linux64outputdir}/lib - - - ${project.parent.basedir}/engine-d/target/lib - false - - - true - - copy-resources-${win64id} process-resources @@ -112,23 +95,6 @@ true - - copy-lib-${win64id} - process-resources - - copy-resources - - - ${win64outputdir}/lib - - - ${project.parent.basedir}/engine-d/target/lib - false - - - true - - copy-dockerfile process-resources diff --git a/engine-d-standalone/src/main/assembly/bin/run.sh b/engine-d-standalone/src/main/assembly/bin/run.sh index 3f3c662..f682ed7 100644 --- a/engine-d-standalone/src/main/assembly/bin/run.sh +++ b/engine-d-standalone/src/main/assembly/bin/run.sh @@ -25,12 +25,12 @@ JAVA="$JAVA_HOME/bin/java" echo @JAVA@ $JAVA main_path=$RUNHOME/.. cd $main_path -JAVA_OPTS="-Xms50m -Xmx128m" +JAVA_OPTS="-Xms50m -Xmx128m -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=9202,server=y,suspend=n" port=8312 #JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n" echo @JAVA_OPTS@ $JAVA_OPTS -class_path="$main_path/*:$main_path/lib/*:$main_path/holmes-engine-d.jar" +class_path="$main_path/:$main_path/holmes-engine-d.jar" echo @class_path@ $class_path sed -i "s/activemq.username=.*/activemq.username=activemq/" /home/activemq/apache-activemq-5.9.0/conf/credentials.properties diff --git a/engine-d/pom.xml b/engine-d/pom.xml index 967fa0b..27c76ef 100644 --- a/engine-d/pom.xml +++ b/engine-d/pom.xml @@ -290,8 +290,7 @@ com.thoughtworks.xstream xstream - 1.4.10 - test + 1.4.9 org.apache.httpcomponents @@ -316,27 +315,50 @@ true - org.onap.holmes.engine.EngineDActiveApp - lib/ - org.apache.maven.plugins - maven-dependency-plugin + maven-shade-plugin + + true + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + org.onap.holmes.dsa:dmaap-dsa + + org/onap/holmes/common/** + com/fasterxml/jackson/core/jackson-databind/** + org/slf4j/** + + + + - copy package - copy-dependencies + shade - - ${project.build.directory}/lib - + + + + org.onap.holmes.engine.EngineDActiveApp + + + -- cgit 1.2.3-korg