[wsas-java-dev] svn commit r6151 - in trunk/wsas/java/modules/core: bin src/org/wso2/wsas

[svn at wso2.org]

Author: azeez
Date: Tue Aug  7 04:04:06 2007
New Revision: 6151

Modified:
   trunk/wsas/java/modules/core/bin/wso2wsas.bat
   trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
Log:
Adding back ListenerManager.defaultConfigurationContext since Deepal says that heis may cause failures
Reverting wso2wsas.bat



Modified: trunk/wsas/java/modules/core/bin/wso2wsas.bat
==============================================================================
--- trunk/wsas/java/modules/core/bin/wso2wsas.bat	(original)
+++ trunk/wsas/java/modules/core/bin/wso2wsas.bat	Tue Aug  7 04:04:06 2007
@@ -82,6 +82,14 @@
 if ""%1""==""--start""   goto commandLifecycle
 if ""%1""==""start""   goto commandLifecycle
 
+if ""%1""==""-run""     goto commandLifecycle
+if ""%1""==""--run""     goto commandLifecycle
+if ""%1""==""run""     goto commandLifecycle
+
+if ""%1""==""-restart"" goto commandLifecycle
+if ""%1""==""--restart"" goto commandLifecycle
+if ""%1""==""restart"" goto commandLifecycle
+
 if ""%1""==""-stop""    goto commandLifecycle
 if ""%1""==""--stop""    goto commandLifecycle
 if ""%1""==""stop""    goto commandLifecycle
@@ -90,31 +98,30 @@
 if ""%1""==""-debug""   goto commandDebug
 if ""%1""==""--debug""  goto commandDebug
 
-for %%c in (%*)
-do
-    if [ "$c" = "--debug" ] || [ "$c" = "-debug" ] || [ "$c" = "debug" ]; then
-          CMD="--debug"
-    fi
-    if [ "$CMD" = "--debug" ]; then
-          PORT=$c
-    fi
-    if [ "$c" = "--stop" ] || [ "$c" = "-stop" ] || [ "$c" = "stop" ]; then
-          CMD="--stop"
-    fi
-    if [ "$c" = "--start" ] || [ "$c" = "-start" ] || [ "$c" = "start" ]; then
-          CMD="--start"
-    fi
-done
+if ""%1""==""version"" goto commandVersion
+if ""%1""==""-version"" goto commandVersion
+if ""%1""==""--version"" goto commandVersion
+
+if ""%1""==""help""     goto getHelp
+if ""%1""==""-help""    goto getHelp
+if ""%1""==""--help""   goto getHelp
+if ""%1""==""?""        goto getHelp
+if ""%1""==""-?""       goto getHelp
 
 shift
 goto setupArgs
 
+rem ----- commandVersion -------------------------------------------------------
+:commandVersion
+shift
+echo WSO2 WSAS v at wso2wsas_version@
+goto end
+
 rem ----- commandDebug ---------------------------------------------------------
 :commandDebug
 shift
 set DEBUG_PORT=%1
 if "%DEBUG_PORT%"=="" goto noDebugPort
-echo Starting WSO2 Web Services Application Server v at wso2wsas_version@ in debug mode
 set JAVA_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=%DEBUG_PORT%
 goto findJdk
 
@@ -124,10 +131,21 @@
 
 rem ----- commandLifecycle -----------------------------------------------------
 :commandLifecycle
-
 set CMD=%1
 goto findJdk
 
+rem ----- getHelp --------------------------------------------------------------
+:getHelp
+  echo Usage: wso2wsas.bat [command]
+  echo command:
+  echo   --start        Start WSO2 WSAS as a background process
+  echo   --run          Run WSO2 WSAS
+  echo   --restart      Restart WSO2 WSAS
+  echo   --stop         Stop WSO2 WSAS
+  echo   --debug        Start WSO2 WSAS in remote debugging mode. You need to specify the debugging port after this argument.
+  echo   --version      What version of WSO2 WSAS are you running?
+goto end
+
 rem ----- doneStart ------------------------------------------------------------
 rem This label provides a place for the argument list loop to break out
 rem and for NT handling to skip to.
@@ -155,6 +173,7 @@
 goto jdk16
 
 :unknownJdk
+echo Starting WSO2 Web Services Application Server v at wso2wsas_version@ (in unsupported JDK)
 echo [ERROR] WSO2 WSAS is supported only on JDK 1.4 and higher
 goto end
 
@@ -175,24 +194,22 @@
 cd %WSO2WSAS_HOME%
 set WSO2WSAS_CLASSPATH=.\lib\patches;.\conf;%WSO2WSAS_CLASSPATH%
 
-echo  Using WSO2WSAS_HOME:   %WSO2WSAS_HOME%
-echo  Using JAVA_HOME:       %JAVA_HOME%
-
 set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
 
 if ""%1""==""-start""   goto startNewPrompt
 if ""%1""==""--start""   goto startNewPrompt
 if ""%1""==""start""   goto startNewPrompt
 
-"%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2wsas.home="%WSO2WSAS_HOME%" -Dwso2wsas.server.xml=%WSO2WSAS_HOME%\conf\server.xml -Dserver.script=wso2wsas.bat org.wso2.wsas.Main %CMD%
+"%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2wsas.home="%WSO2WSAS_HOME%" -Dwso2wsas.server.xml=%WSO2WSAS_HOME%\conf\server.xml org.wso2.wsas.Main %CMD%
 
 :end
-endlocal
+goto endlocal
 
 :startNewPrompt
 rem start "Web Services Application Server" 
-"%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2wsas.home="%WSO2WSAS_HOME%" -Dwso2wsas.server.xml=%WSO2WSAS_HOME%\conf\server.xml -Dserver.script=wso2wsas.bat org.wso2.wsas.Main %CMD%
+"%JAVA_HOME%\bin\java" -classpath %WSO2WSAS_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dwso2wsas.home="%WSO2WSAS_HOME%" -Dwso2wsas.server.xml=%WSO2WSAS_HOME%\conf\server.xml org.wso2.wsas.Main %CMD%
 if not "%curDrive%" == "%wsasDrive%" %curDrive%:
-endlocal
+
+:endlocal
 
 

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java	Tue Aug  7 04:04:06 2007
@@ -181,7 +181,7 @@
     public void startListenerManager() {
         listenerManager = new ListenerManager();
         listenerManager.startSystem(configContext);
-//        ListenerManager.defaultConfigurationContext = configContext;  //TODO: This is a misuse of a static field
+        ListenerManager.defaultConfigurationContext = configContext;  
     }
 
     public void stopListenerManager() throws AxisFault {