From: yangyan <yangyanyj@chinamobile.com>
Date: Fri, 23 Mar 2018 07:55:28 +0000 (+0800)
Subject: Fix emsdriver startup bug
X-Git-Tag: v1.1.0~10
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F37999%2F1;p=vfc%2Fnfvo%2Fdriver%2Fems.git

Fix emsdriver startup bug

Issue-ID: VFC-842
Change-Id: I33760e63d3b046ae0e55cc29011631095fd15a19
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
---

diff --git a/ems/boco/pom.xml b/ems/boco/pom.xml
index d8bbf57..d5168b9 100644
--- a/ems/boco/pom.xml
+++ b/ems/boco/pom.xml
@@ -255,7 +255,7 @@
 	<dependency>
 	    <groupId>com.fasterxml.jackson.core</groupId>
 	    <artifactId>jackson-databind</artifactId>
-	    <version>2.8.11.1</version>
+	    <version>2.9.1</version>
 	</dependency>
 	<dependency>
 	    <groupId>io.netty</groupId>
diff --git a/ems/microservice-standalone/src/main/assembly/conf/spring.xml b/ems/microservice-standalone/src/main/assembly/conf/spring.xml
index 64f4ec9..c3a2254 100644
--- a/ems/microservice-standalone/src/main/assembly/conf/spring.xml
+++ b/ems/microservice-standalone/src/main/assembly/conf/spring.xml
@@ -28,7 +28,7 @@
     </bean>
     <bean id="collectMsgReceiverThread" class="org.onap.vfc.nfvo.emsdriver.collector.CollectMsgReceiverThread">
 		<property name="run" value="true" />
-		<property name="thread_max_num" value="100" />
+		<property name="threadMaxNum" value="100" />
     </bean>
     
     <bean id="configurationImp" class="org.onap.vfc.nfvo.emsdriver.configmgr.ConfigurationImp">
diff --git a/ems/microservice-standalone/src/main/assembly/run.bat b/ems/microservice-standalone/src/main/assembly/run.bat
index 3c052ab..255400a 100755
--- a/ems/microservice-standalone/src/main/assembly/run.bat
+++ b/ems/microservice-standalone/src/main/assembly/run.bat
@@ -47,7 +47,7 @@ set date_time_string=%date_time_string:|=-%
 
 set jvm_opts=%jvm_opts% -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=%RUNHOME%logs\dump-dac-%date_time_string%.hprof
 
-set class_path=%RUNHOME%;%RUNHOME%boco-driver.jar;%RUNHOME%/3rdParty/evel_javalib2-0.0.1-SNAPSHOT.jar
+set class_path=%RUNHOME%;%RUNHOME%boco-driver.jar;%RUNHOME%/3rdParty/evel_javalib2-0.0.1.jar
 echo ### jvm_opts: %jvm_opts%
 echo ### class_path: %class_path%
 
diff --git a/ems/microservice-standalone/src/main/assembly/run.sh b/ems/microservice-standalone/src/main/assembly/run.sh
index 6e16518..44e204f 100755
--- a/ems/microservice-standalone/src/main/assembly/run.sh
+++ b/ems/microservice-standalone/src/main/assembly/run.sh
@@ -88,7 +88,7 @@ fi
 # 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="$RUNHOME/:$RUNHOME/boco-driver.jar:$RUNHOME/3rdParty/evel_javalib2-0.0.1-SNAPSHOT.jar"
+class_path="$RUNHOME/:$RUNHOME/boco-driver.jar:$RUNHOME/3rdParty/evel_javalib2-0.0.1.jar"
 echo @class_path@ $class_path
 # Start
 "$JAVA" $JAVA_OPTS -classpath "$class_path" org.onap.vfc.nfvo.emsdriver.EmsDriverApplication server "$RUNHOME/conf/emsdriver.yml"