Merge pull request #11 from RAVEENSR/master

Remove setting siddhi class path files as Xbootclasspath
siddhi-io · Apr 4, 2018 · d78de89 · d78de89
2 parents 886bfa5 + 810e48d
commit d78de89
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/modules/siddhi-launcher/bin/siddhi b/modules/siddhi-launcher/bin/siddhi
@@ -145,15 +145,6 @@ if [ "$CMD" = "--debug" ]; then
   echo "Please start the remote debugging client to continue..."
 fi
 
-SIDDHI_XBOOTCLASSPATH=""
-for f in "$SIDDHI_HOME"/lib/*.jar
-do
-    if [ "$f" != "$SIDDHI_HOME/lib/*.jar" ];then
-        SIDDHI_XBOOTCLASSPATH="$SIDDHI_XBOOTCLASSPATH":$f
-    fi
-done
-
-
 SIDDHI_CLASSPATH=""
 for f in "$SIDDHI_HOME"/lib/*.jar
 do
@@ -178,7 +169,6 @@ fi
 #   cd "$SIDDHI_HOME"
 
 $JAVACMD \
-	-Xbootclasspath/a:"$SIDDHI_XBOOTCLASSPATH" \
 	-Xms256m -Xmx1024m \
 	-XX:+HeapDumpOnOutOfMemoryError \
 	-XX:HeapDumpPath="$SIDDHI_HOME/heap-dump.hprof" \

diff --git a/modules/siddhi-launcher/bin/siddhi.bat b/modules/siddhi-launcher/bin/siddhi.bat
@@ -105,7 +105,7 @@ rem ---------- Add jars to classpath ----------------
 
 set JAVA_ENDORSED="%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
 
-set CMD_LINE_ARGS=-Xbootclasspath/a:%SIDDHI_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%SIDDHI_HOME%\heap-dump.hprof" -Dcom.sun.management.jmxremote %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dsiddhi.home=%SIDDHI_HOME% -classpath %SIDDHI_CLASSPATH% -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%SIDDHI_HOME%\tmp" -Denable.nonblocking=false -Dfile.encoding=UTF8 -Dlog4j.configuration=file:"%SIDDHI_HOME%\conf\log4j.properties"
+set CMD_LINE_ARGS=-Xms256m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%SIDDHI_HOME%\heap-dump.hprof" -Dcom.sun.management.jmxremote %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dsiddhi.home=%SIDDHI_HOME% -classpath %SIDDHI_CLASSPATH% -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%SIDDHI_HOME%\tmp" -Denable.nonblocking=false -Dfile.encoding=UTF8 -Dlog4j.configuration=file:"%SIDDHI_HOME%\conf\log4j.properties"
 
 :runJava
 "%JAVA_HOME%\bin\java" %CMD_LINE_ARGS% org.wso2.siddhi.sdk.launcher.Main %CMD%