Author: tyrell
Date: Mon May 5 05:48:13 2008
New Revision: 16533
Log:
Fixing MASHUP-783
Added:
trunk/mashup/java/modules/distribution/bin/append.bat
trunk/mashup/java/modules/distribution/bin/mashup.vmoptions
Modified:
trunk/mashup/java/modules/distribution/bin/wso2mashup.bat
trunk/mashup/java/modules/distribution/bin/wso2mashup.sh
trunk/mashup/java/modules/distribution/pom.xml
Added: trunk/mashup/java/modules/distribution/bin/append.bat
==============================================================================
--- (empty file)
+++ trunk/mashup/java/modules/distribution/bin/append.bat Mon May 5
05:48:13 2008
@@ -0,0 +1,14 @@
+if not defined VM_OPTIONS goto emptyvmo
+if "%SEPARATOR%" == "" goto noseparator
+set VM_OPTIONS=%VM_OPTIONS%%SEPARATOR%%1
+goto end
+
+:noseparator
+set VM_OPTIONS=%VM_OPTIONS% %1
+goto end
+
+:emptyvmo
+set VM_OPTIONS=%1
+goto end
+
+:end
Added: trunk/mashup/java/modules/distribution/bin/mashup.vmoptions
==============================================================================
--- (empty file)
+++ trunk/mashup/java/modules/distribution/bin/mashup.vmoptions Mon May 5
05:48:13 2008
@@ -0,0 +1,4 @@
+-Xms128m
+-Xmx1024m
+-XX:PermSize=128m
+-XX:MaxPermSize=128m
Modified: trunk/mashup/java/modules/distribution/bin/wso2mashup.bat
==============================================================================
--- trunk/mashup/java/modules/distribution/bin/wso2mashup.bat (original)
+++ trunk/mashup/java/modules/distribution/bin/wso2mashup.bat Mon May 5
05:48:13 2008
@@ -186,6 +186,14 @@
set
WSO2MASHUP_CLASSPATH="%WSO2MASHUP_HOME%\lib\bcprov-jdk15-132.jar";%WSO2MASHUP_CLASSPATH%
goto runServer
+
+rem ----------- Loading the Java VM Options
-------------------------------------
+rem ----------- from file bin/mashup.vmoptions (one option per line)
------------
+
+SET VM_OPTIONS=
+FOR /F "delims=" %%i in (%MASHUP_HOME%\bin\mashup.vmoptions) DO call
%MASHUP_HOME%\bin\append.bat "%%i"
+
+
rem ----------------- Execute The Requested Command
----------------------------
:runServer
@@ -206,7 +214,7 @@
if ""%1""==""--stop"" goto stopServer
if ""%1""==""stop"" goto stopServer
-"%JAVA_HOME%\bin\java" -server -Xms1024m -Xmx1024m -XX:PermSize=256m
-XX:MaxPermSize=256m -classpath %WSO2MASHUP_CLASSPATH% %JAVA_OPTS%
-Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2mashup.home="%WSO2MASHUP_HOME%"
-Dwso2wsas.home="%WSO2MASHUP_HOME%"
-Dwso2wsas.server.xml=%WSO2MASHUP_HOME%\conf\server.xml org.wso2.wsas.Main %CMD%
+"%JAVA_HOME%\bin\java" -server %VM_OPTIONS% -classpath %WSO2MASHUP_CLASSPATH%
%JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED%
-Dwso2mashup.home="%WSO2MASHUP_HOME%" -Dwso2wsas.home="%WSO2MASHUP_HOME%"
-Dwso2wsas.server.xml=%WSO2MASHUP_HOME%\conf\server.xml org.wso2.wsas.Main %CMD%
:end
goto endlocal
@@ -217,7 +225,7 @@
:startNewPrompt
rem start "WSO2 Mashup Server"
-"%JAVA_HOME%\bin\java" -server -Xms128m -Xmx1024m -XX:PermSize=128m
-XX:MaxPermSize=128m -classpath %WSO2MASHUP_CLASSPATH% %JAVA_OPTS%
-Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2mashup.home="%WSO2MASHUP_HOME%"
-Dwso2wsas.home="%WSO2MASHUP_HOME%"
-Dwso2wsas.server.xml=%WSO2MASHUP_HOME%\conf\server.xml org.wso2.wsas.Main %CMD%
+"%JAVA_HOME%\bin\java" -server %VM_OPTIONS% -classpath %WSO2MASHUP_CLASSPATH%
%JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED%
-Dwso2mashup.home="%WSO2MASHUP_HOME%" -Dwso2wsas.home="%WSO2MASHUP_HOME%"
-Dwso2wsas.server.xml=%WSO2MASHUP_HOME%\conf\server.xml org.wso2.wsas.Main %CMD%
:endlocal
Modified: trunk/mashup/java/modules/distribution/bin/wso2mashup.sh
==============================================================================
--- trunk/mashup/java/modules/distribution/bin/wso2mashup.sh (original)
+++ trunk/mashup/java/modules/distribution/bin/wso2mashup.sh Mon May 5
05:48:13 2008
@@ -234,7 +234,7 @@
fi
-#---------- Add jar files inside patches folder to classpath ------------------
+# ---------- Add jar files inside patches folder to classpath
------------------
WSO2MASHUP_PATCH_CLASSPATH=""
for f in "$WSO2MASHUP_HOME"/lib/patches/*.jar
@@ -245,6 +245,12 @@
WSO2MASHUP_CLASSPATH="$WSO2MASHUP_HOME/lib/patches":"$WSO2MASHUP_PATCH_CLASSPATH":"$WSO2MASHUP_HOME/conf":"$WSO2MASHUP_CLASSPATH"
+# ----------- Loading the Java VM Options -------------------------------------
+# ----------- from file bin/mashup.vmoptions (one option per line) ------------
+
+VM_OPTIONS=`tr '\n' ' ' < "$WSO2MASHUP_HOME/bin/mashup.vmoptions"`
+
+
# ----- Execute The Requested Command -----------------------------------------
cd "$WSO2MASHUP_HOME"
@@ -262,23 +268,23 @@
-Dwso2mashup.home="$WSO2MASHUP_HOME" -Dwso2wsas.home="$WSO2MASHUP_HOME"
-Dwso2wsas.server.xml="$WSO2MASHUP_HOME/conf/server.xml" -Dserver.script=$0 \
org.wso2.wsas.Main stop >> /dev/null 2>&1 &
else
-if [ "$CMD" = "run" ]; then
- exec "$JAVACMD" \
- -server \
- -Xms128m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=128m \
- $JAVA_OPTS \
- -classpath "$WSO2MASHUP_CLASSPATH" \
-
-Djava.endorsed.dirs="$WSO2MASHUP_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
- -Dwso2mashup.home="$WSO2MASHUP_HOME" -Dwso2wsas.home="$WSO2MASHUP_HOME"
-Dwso2wsas.server.xml="$WSO2MASHUP_HOME/conf/server.xml" -Dserver.script=$0 \
- org.wso2.wsas.Main run
-else
- exec "$JAVACMD" \
- -server \
- -Xms128m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=128m \
- $JAVA_OPTS \
- -classpath "$WSO2MASHUP_CLASSPATH" \
-
-Djava.endorsed.dirs="$WSO2MASHUP_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
- -Dwso2mashup.home="$WSO2MASHUP_HOME" -Dwso2wsas.home="$WSO2MASHUP_HOME"
-Dwso2wsas.server.xml="$WSO2MASHUP_HOME/conf/server.xml" -Dserver.script=$0 \
- org.wso2.wsas.Main $CMD >> /dev/null 2>&1 &
-fi
+ if [ "$CMD" = "run" ]; then
+ exec "$JAVACMD" \
+ -server \
+ $VM_OPTIONS \
+ $JAVA_OPTS \
+ -classpath "$WSO2MASHUP_CLASSPATH" \
+
-Djava.endorsed.dirs="$WSO2MASHUP_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
+ -Dwso2mashup.home="$WSO2MASHUP_HOME"
-Dwso2wsas.home="$WSO2MASHUP_HOME"
-Dwso2wsas.server.xml="$WSO2MASHUP_HOME/conf/server.xml" -Dserver.script=$0 \
+ org.wso2.wsas.Main run
+ else
+ exec "$JAVACMD" \
+ -server \
+ $VM_OPTIONS \
+ $JAVA_OPTS \
+ -classpath "$WSO2MASHUP_CLASSPATH" \
+
-Djava.endorsed.dirs="$WSO2MASHUP_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
+ -Dwso2mashup.home="$WSO2MASHUP_HOME"
-Dwso2wsas.home="$WSO2MASHUP_HOME"
-Dwso2wsas.server.xml="$WSO2MASHUP_HOME/conf/server.xml" -Dserver.script=$0 \
+ org.wso2.wsas.Main $CMD >> /dev/null 2>&1 &
+ fi
fi
\ No newline at end of file
Modified: trunk/mashup/java/modules/distribution/pom.xml
==============================================================================
--- trunk/mashup/java/modules/distribution/pom.xml (original)
+++ trunk/mashup/java/modules/distribution/pom.xml Mon May 5 05:48:13 2008
@@ -189,6 +189,7 @@
<fileset dir="bin">
<include name="*.sh"/>
<include name="*.bat"/>
+ <include name="*.vmoptions"/>
</fileset>
</copy>
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
