summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMurali Mohan Murthy Potham <murali.p@huawei.com>2017-02-01 08:39:56 +0000
committerGerrit Code Review <gerrit@open-o.org>2017-02-01 08:39:56 +0000
commit2738d74a073b4370858f077d9e34d58a72d9800a (patch)
tree336411fd737242633dba323a973e15548fb9ded6
parent8b3ed010c5ce27d71280b122f1b21111e3536360 (diff)
parent761fdf1bf575762bc157b03a7239529c3a8bbf84 (diff)
Merge "Modify config files"
-rw-r--r--distribution/standalone/src/main/assembly/conf/vnfsdkfunctest.yml2
-rw-r--r--distribution/standalone/src/main/assembly/run.sh13
2 files changed, 5 insertions, 10 deletions
diff --git a/distribution/standalone/src/main/assembly/conf/vnfsdkfunctest.yml b/distribution/standalone/src/main/assembly/conf/vnfsdkfunctest.yml
index e4e00d0..3e1a439 100644
--- a/distribution/standalone/src/main/assembly/conf/vnfsdkfunctest.yml
+++ b/distribution/standalone/src/main/assembly/conf/vnfsdkfunctest.yml
@@ -32,7 +32,7 @@ server:
adminContextPath: /admin
connector:
type: http
- port: 8100
+ port: 8701
# Logging settings.
logging:
diff --git a/distribution/standalone/src/main/assembly/run.sh b/distribution/standalone/src/main/assembly/run.sh
index b20c252..c556580 100644
--- a/distribution/standalone/src/main/assembly/run.sh
+++ b/distribution/standalone/src/main/assembly/run.sh
@@ -1,19 +1,14 @@
-
DIRNAME=`dirname $0`
RUNHOME=`cd $DIRNAME/; pwd`
echo @RUNHOME@ $RUNHOME
-
echo @JAVA_HOME@ $JAVA_HOME
JAVA="$JAVA_HOME/bin/java"
echo @JAVA@ $JAVA
-
JAVA_OPTS="-Xms50m -Xmx128m"
-port=8312
+port=8701
#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/org.openo.vnfsdk.functest.jar"
-echo @class_path@ $class_path
-
-"$JAVA" $JAVA_OPTS -classpath "$class_path" org.openo.vnfsdk.functest.VnfSdkFuncTestApp server "$RUNHOME/conf/vnfsdkfunctest.yml"
+export CLASSPATH=CLASSPATH:"$JAVA_HOME/jre/lib"
+echo @CLASSPATH@ $CLASSPATH
+"$JAVA" $JAVA_OPTS -cp $RUNHOME/vnf-sdk-function-test.jar org.openo.vnfsdk.functest.VnfSdkFuncTestApp server "$RUNHOME/conf/vnfsdkfunctest.yml"