Author: tyrell
Date: Mon Apr 21 23:22:47 2008
New Revision: 15911
Log:
Fixing MASHUP-746 on Windows. Refer JIRA comments for more info.
Modified:
trunk/mashup/java/modules/distribution/bin/shutdown.bat
trunk/mashup/java/modules/distribution/bin/startup.bat
trunk/mashup/java/modules/distribution/bin/wso2mashup.bat
Modified: trunk/mashup/java/modules/distribution/bin/shutdown.bat
==============================================================================
--- trunk/mashup/java/modules/distribution/bin/shutdown.bat (original)
+++ trunk/mashup/java/modules/distribution/bin/shutdown.bat Mon Apr 21
23:22:47 2008
@@ -15,118 +15,4 @@
REM See the License for the specific language governing permissions and
REM limitations under the License.
-rem ---------------------------------------------------------------------------
-rem Start Script for the WSO2 Mashup Server
-rem
-rem Environment Variable Prequisites
-rem
-rem WSO2MASHUP_HOME Home of WSO2 MASHUP installation. If not set I will
try
-rem to figure it out.
-rem
-rem JAVA_HOME Must point at your Java Development Kit installation.
-rem
-rem ---------------------------------------------------------------------------
-
-rem ----- if JAVA_HOME is not set we're not happy
------------------------------
-:checkJava
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-goto checkServer
-
-:noJavaHome
-echo "You must set the JAVA_HOME variable before running WSO2 Mashup Server."
-goto end
-
-rem ----- Only set WSO2MASHUP_HOME if not already set
----------------------------
-:checkServer
-rem %~sdp0 is expanded pathname of the current script under NT with spaces in
the path removed
-if "%WSO2MASHUP_HOME%"=="" set WSO2MASHUP_HOME=%~sdp0..
-
-rem find WSO2MASHUP_HOME if it does not exist due to either an invalid value
passed
-rem by the user or the %0 problem on Windows 9x
-rem if not exist "%WSO2MASHUP_HOME%\scripts\version.resources\version.xml"
goto noServerHome
-
-rem SET curDrive=%cd:~0,1%
-rem SET wsasDrive=%WSO2MASHUP_HOME:~0,1%
-rem if not "%curDrive%" == "%wsasDrive%" %wsasDrive%:
-
-set AXIS2_HOME=%WSO2MASHUP_HOME%
-goto updateClasspath
-
-:noServerHome
-echo WSO2MASHUP_HOME is set incorrectly or WSO2 Mashup Server could not be
located. Please set WSO2MASHUP_HOME.
-goto end
-
-rem ----- update classpath
-----------------------------------------------------
-:updateClasspath
-
-setlocal EnableDelayedExpansion
-cd %WSO2MASHUP_HOME%
-set WSO2MASHUP_CLASSPATH=%WSO2MASHUP_HOME%\conf
-FOR %%C in (%WSO2MASHUP_HOME%\lib\*.jar) DO set
WSO2MASHUP_CLASSPATH=!WSO2MASHUP_CLASSPATH!;.\lib\%%~nC%%~xC
-
-set
WSO2MASHUP_CLASSPATH="%JAVA_HOME%\lib\tools.jar";"%WSO2MASHUP_HOME%\lib";%WSO2MASHUP_CLASSPATH%;
-
-rem ----- Process the input command -------------------------------------------
-
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of arguments (up to the command line limit, anyway).
-
-set CMD=STOP
-
-:doneStart
-if "%OS%"=="Windows_NT" @setlocal
-if "%OS%"=="WINNT" @setlocal
-
-rem ---------- Handle the SSL Issue with proper JDK version
--------------------
-rem find the version of the jdk
-:findJdk
-
-"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.4" >NUL
-IF ERRORLEVEL 1 goto checkJdk15
-goto jdk14
-
-:checkJdk15
-"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.5" >NUL
-IF ERRORLEVEL 1 goto checkJdk16
-goto jdk15
-
-:checkJdk16
-"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.6" >NUL
-IF ERRORLEVEL 1 goto unknownJdk
-goto jdk16
-
-:unknownJdk
-echo Starting WSO2 Mashup Server [EMAIL PROTECTED]@ (in unsupported JDK)
-echo [ERROR] WSO2 Mashup Server is supported only on JDK 1.5 and higher
-goto runServer
-
-:jdk14
-echo [ERROR] WSO2 Mashup Server is supported only on JDK 1.5 and higher
-goto end
-
-:jdk15
-echo Starting WSO2 Mashup Server [EMAIL PROTECTED]@ (in JDK 1.5)
-set
WSO2MASHUP_CLASSPATH=%WSO2MASHUP_HOME%\lib\bcprov-jdk15-132.jar;%WSO2MASHUP_CLASSPATH%
-goto runServer
-
-:jdk16
-echo Starting WSO2 Mashup Server [EMAIL PROTECTED]@ (in JDK 1.6)
-echo [WARNING] WSO2 Mashup Server has not been fully tested on JDK 1.6
-set
WSO2MASHUP_CLASSPATH=%WSO2MASHUP_HOME%\lib\bcprov-jdk15-132.jar;%WSO2MASHUP_CLASSPATH%
-goto runServer
-
-rem ----------------- Execute The Requested Command
----------------------------
-:runServer
-set
WSO2MASHUP_CLASSPATH="%WSO2MASHUP_HOME%\lib\patches";"%WSO2MASHUP_HOME%\conf";%WSO2MASHUP_CLASSPATH%
-
-echo Using WSO2MASHUP_HOME: %WSO2MASHUP_HOME%
-echo Using JAVA_HOME: %JAVA_HOME%
-
-set JAVA_ENDORSED =
"%WSO2MASHUP_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
-
-start "WSO2 Mashup server" "%JAVA_HOME%\bin\java" -classpath
%WSO2MASHUP_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED%
-Dwso2wsas.home="%WSO2MASHUP_HOME%" -Dwso2mashup.home="%WSO2MASHUP_HOME%"
-Dwso2wsas.server.xml="%WSO2MASHUP_HOME%/conf/server.xml" org.wso2.wsas.Main
%CMD%
-:end
-endlocal
-
+wso2mashup.bat -stop
Modified: trunk/mashup/java/modules/distribution/bin/startup.bat
==============================================================================
--- trunk/mashup/java/modules/distribution/bin/startup.bat (original)
+++ trunk/mashup/java/modules/distribution/bin/startup.bat Mon Apr 21
23:22:47 2008
@@ -15,118 +15,4 @@
REM See the License for the specific language governing permissions and
REM limitations under the License.
-rem ---------------------------------------------------------------------------
-rem Start Script for the WSO2 Mashup Server
-rem
-rem Environment Variable Prequisites
-rem
-rem WSO2MASHUP_HOME Home of WSO2 MASHUP installation. If not set I will
try
-rem to figure it out.
-rem
-rem JAVA_HOME Must point at your Java Development Kit installation.
-rem
-rem ---------------------------------------------------------------------------
-
-rem ----- if JAVA_HOME is not set we're not happy
------------------------------
-:checkJava
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-goto checkServer
-
-:noJavaHome
-echo "You must set the JAVA_HOME variable before running WSO2 Mashup Server."
-goto end
-
-rem ----- Only set WSO2MASHUP_HOME if not already set
----------------------------
-:checkServer
-rem %~sdp0 is expanded pathname of the current script under NT with spaces in
the path removed
-if "%WSO2MASHUP_HOME%"=="" set WSO2MASHUP_HOME=%~sdp0..
-
-rem find WSO2MASHUP_HOME if it does not exist due to either an invalid value
passed
-rem by the user or the %0 problem on Windows 9x
-rem if not exist "%WSO2MASHUP_HOME%\scripts\version.resources\version.xml"
goto noServerHome
-
-rem SET curDrive=%cd:~0,1%
-rem SET wsasDrive=%WSO2MASHUP_HOME:~0,1%
-rem if not "%curDrive%" == "%wsasDrive%" %wsasDrive%:
-
-set AXIS2_HOME=%WSO2MASHUP_HOME%
-goto updateClasspath
-
-:noServerHome
-echo WSO2MASHUP_HOME is set incorrectly or WSO2 Mashup Server could not be
located. Please set WSO2MASHUP_HOME.
-goto end
-
-rem ----- update classpath
-----------------------------------------------------
-:updateClasspath
-
-setlocal EnableDelayedExpansion
-cd %WSO2MASHUP_HOME%
-set WSO2MASHUP_CLASSPATH=%WSO2MASHUP_HOME%\conf
-FOR %%C in (%WSO2MASHUP_HOME%\lib\*.jar) DO set
WSO2MASHUP_CLASSPATH=!WSO2MASHUP_CLASSPATH!;.\lib\%%~nC%%~xC
-
-set
WSO2MASHUP_CLASSPATH="%JAVA_HOME%\lib\tools.jar";"%WSO2MASHUP_HOME%\lib";%WSO2MASHUP_CLASSPATH%;
-
-rem ----- Process the input command -------------------------------------------
-
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of arguments (up to the command line limit, anyway).
-
-set CMD=START
-
-:doneStart
-if "%OS%"=="Windows_NT" @setlocal
-if "%OS%"=="WINNT" @setlocal
-
-rem ---------- Handle the SSL Issue with proper JDK version
--------------------
-rem find the version of the jdk
-:findJdk
-
-"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.4" >NUL
-IF ERRORLEVEL 1 goto checkJdk15
-goto jdk14
-
-:checkJdk15
-"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.5" >NUL
-IF ERRORLEVEL 1 goto checkJdk16
-goto jdk15
-
-:checkJdk16
-"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.6" >NUL
-IF ERRORLEVEL 1 goto unknownJdk
-goto jdk16
-
-:unknownJdk
-echo Starting WSO2 Mashup Server [EMAIL PROTECTED]@ (in unsupported JDK)
-echo [ERROR] WSO2 Mashup Server is supported only on JDK 1.5 and higher
-goto runServer
-
-:jdk14
-echo [ERROR] WSO2 Mashup Server is supported only on JDK 1.5 and higher
-goto end
-
-:jdk15
-echo Starting WSO2 Mashup Server [EMAIL PROTECTED]@ (in JDK 1.5)
-set
WSO2MASHUP_CLASSPATH=%WSO2MASHUP_HOME%\lib\bcprov-jdk15-132.jar;%WSO2MASHUP_CLASSPATH%
-goto runServer
-
-:jdk16
-echo Starting WSO2 Mashup Server [EMAIL PROTECTED]@ (in JDK 1.6)
-echo [WARNING] WSO2 Mashup Server has not been fully tested on JDK 1.6
-set
WSO2MASHUP_CLASSPATH=%WSO2MASHUP_HOME%\lib\bcprov-jdk15-132.jar;%WSO2MASHUP_CLASSPATH%
-goto runServer
-
-rem ----------------- Execute The Requested Command
----------------------------
-:runServer
-set
WSO2MASHUP_CLASSPATH="%WSO2MASHUP_HOME%\lib\patches";"%WSO2MASHUP_HOME%\conf";%WSO2MASHUP_CLASSPATH%
-
-echo Using WSO2MASHUP_HOME: %WSO2MASHUP_HOME%
-echo Using JAVA_HOME: %JAVA_HOME%
-
-set JAVA_ENDORSED =
"%WSO2MASHUP_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
-
-start "WSO2 Mashup server" "%JAVA_HOME%\bin\java" -server -Xms128m -Xmx1024m
-classpath %WSO2MASHUP_CLASSPATH% %JAVA_OPTS%
-Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2wsas.home="%WSO2MASHUP_HOME%"
-Dwso2mashup.home="%WSO2MASHUP_HOME%"
-Dwso2wsas.server.xml="%WSO2MASHUP_HOME%/conf/server.xml" org.wso2.wsas.Main
%CMD%
-:end
-endlocal
-
+wso2mashup.bat -start
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 Apr 21
23:22:47 2008
@@ -16,7 +16,7 @@
REM limitations under the License.
rem ---------------------------------------------------------------------------
-rem Main Script for the WSO2 Web Services Application Server [EMAIL PROTECTED]@
+rem Main Script for the WSO2 Mashup Server vSNAPSHOT
rem
rem Environment Variable Prequisites
rem
@@ -111,7 +111,7 @@
rem ----- commandVersion
-------------------------------------------------------
:commandVersion
shift
-echo WSO2 Mashup Server [EMAIL PROTECTED]@
+echo WSO2 Mashup Server vSNAPSHOT
goto end
rem ----- commandDebug
---------------------------------------------------------
@@ -170,7 +170,7 @@
goto jdk16
:unknownJdk
-echo Starting WSO2 Mashup Server [EMAIL PROTECTED]@ (in unsupported JDK)
+echo Starting WSO2 Mashup Server vSNAPSHOT (in unsupported JDK)
echo [ERROR] WSO2 Mashup Server is supported only on JDK 1.5 and higher
goto runServer
@@ -190,8 +190,11 @@
:runServer
cd %WSO2MASHUP_HOME%
-set WSO2MASHUP_CLASSPATH=%WSO2MASHUP_HOME%\conf;%WSO2MASHUP_CLASSPATH%
-set
WSO2MASHUP_CLASSPATH=%WSO2MASHUP_HOME%\lib\patches;%WSO2MASHUP_HOME%\conf;%WSO2MASHUP_CLASSPATH%
+
+rem ---------- Add jar files inside patches folder to classpath
----------------
+FOR %%C in ("%WSO2MASHUP_HOME%\lib\patches\*.jar") DO set
WSO2MASHUP_PATCH_CLASSPATH=!WSO2MASHUP_PATCH_CLASSPATH!;".\lib\patches\%%~nC%%~xC"
+
+set
WSO2MASHUP_CLASSPATH=.\lib\patches;%WSO2MASHUP_PATCH_CLASSPATH%;.\conf;%WSO2MASHUP_CLASSPATH%
set JAVA_ENDORSED =
"%WSO2MASHUP_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
@@ -199,14 +202,22 @@
if ""%1""==""--start"" goto startNewPrompt
if ""%1""==""start"" goto startNewPrompt
-"%JAVA_HOME%\bin\java" -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%
+if ""%1""==""-stop"" goto stopServer
+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%
:end
goto endlocal
+:stopServer
+"%JAVA_HOME%\bin\java" -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 stop
+goto endlocal
+
:startNewPrompt
rem start "WSO2 Mashup Server"
-"%JAVA_HOME%\bin\java" -server -Xms128m -Xmx1024m -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 -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%
:endlocal
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
