diff --git a/datagear-webembd/pom.xml b/datagear-webembd/pom.xml index 39edb7f5..5ef17af2 100644 --- a/datagear-webembd/pom.xml +++ b/datagear-webembd/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.aggregate jetty-all - 8.2.0.v20160908 + 8.1.22.v20160922 org.slf4j diff --git a/datagear-webembd/src/main/dist/startup.bat b/datagear-webembd/src/main/dist/startup.bat index b9860071..1ab0c78b 100644 --- a/datagear-webembd/src/main/dist/startup.bat +++ b/datagear-webembd/src/main/dist/startup.bat @@ -1 +1 @@ -java -cp lib/* org.datagear.webembd.App \ No newline at end of file +java -cp lib\datagear-webembd-1.2.0.jar;lib\hamcrest-core-1.3.jar;lib\javax.servlet-3.0.0.v201112011016.jar;lib\jetty-all-8.1.22.v20160922.jar;lib\junit-4.11.jar;;lib\log4j-1.2.17.jar;lib\slf4j-api-1.7.9.jar;lib\slf4j-log4j12-1.7.9.jar org.datagear.webembd.App \ No newline at end of file diff --git a/datagear-webembd/src/main/dist/startup.sh b/datagear-webembd/src/main/dist/startup.sh index e679ecc3..1a3efc07 100644 --- a/datagear-webembd/src/main/dist/startup.sh +++ b/datagear-webembd/src/main/dist/startup.sh @@ -3,6 +3,8 @@ JAVA_HOME=$JAVA_HOME JAVA_OPTS=$JAVA_OPTS +APP_CLASSPATH=.:lib/datagear-webembd-1.2.0.jar:lib/hamcrest-core-1.3.jar:lib/javax.servlet-3.0.0.v201112011016.jar:lib/jetty-all-8.1.22.v20160922.jar:lib/junit-4.11.jar::lib/log4j-1.2.17.jar:lib/slf4j-api-1.7.9.jar:lib/slf4j-log4j12-1.7.9.jar + APP_NAME="Data Gear" ECHO_PREFIX="[$APP_NAME] :" BORDER="=========================================" @@ -31,7 +33,7 @@ if [ $APP_PID -ne 0 ]; then echo "$ECHO_PREFIX starting [Failed]" else echo "$ECHO_PREFIX starting..." - nohup $JAVA_HOME/bin/java $JAVA_OPTS -cp .:lib/* $APP_MAIN >/dev/null 2>&1 & + nohup $JAVA_HOME/bin/java $JAVA_OPTS -cp $APP_CLASSPATH $APP_MAIN >/dev/null 2>&1 & readAppPID if [ $APP_PID -ne 0 ]; then echo "$ECHO_PREFIX PID is $APP_PID"