Author: asankha
Date: Fri May 16 02:54:08 2008
New Revision: 17114
Log:
fix ESBJAVA-472
fixed with a parameter -serverName <name> support for the .sh and .bat scripts
this can also be set in the web.xml as an init property (or on wrapper.conf as
a system property)
Modified:
branches/esb/java/1.7/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java
branches/esb/java/1.7/esb/java/modules/distribution/src/main/bin/wso2-esb.bat
branches/esb/java/1.7/esb/java/modules/distribution/src/main/bin/wso2-esb.sh
branches/esb/java/1.7/esb/java/modules/distribution/src/main/conf/wrapper.conf
Modified:
branches/esb/java/1.7/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java
==============================================================================
---
branches/esb/java/1.7/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java
(original)
+++
branches/esb/java/1.7/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java
Fri May 16 02:54:08 2008
@@ -65,7 +65,7 @@
sbc.setResolveRoot(loadParameter(servletConfig,
ServiceBusConstants.RESOLVE_ROOT));
sbc.setAxis2Repo(loadParameter(servletConfig,
ServiceBusConstants.AXIS2_REPO));
sbc.setAxis2Xml(loadParameter(servletConfig,
ServiceBusConstants.AXIS2_XML));
- sbc.setServerName(loadParameter(servletConfig,
ServiceBusConstants.SERVER_NAME));
+ sbc.setServerName(loadParameter(servletConfig,
ServiceBusConstants.SERVER_NAME, true));
ServiceBusManager serviceBusManager = ServiceBusManager.getInstance();
try {
@@ -117,7 +117,7 @@
throw new ServletException(message, e);
}
- private String loadParameter(ServletConfig servletConfig, String name)
+ private String loadParameter(ServletConfig servletConfig, String name,
boolean optional)
throws ServletException {
if (System.getProperty(name) == null) {
@@ -126,7 +126,9 @@
log.debug("Init parameter '" + name + "' : " + value);
if (value == null || value.trim().length() == 0) {
- handleException("A valid system property or init parameter '"
+ name + "' is required");
+ if (!optional) {
+ handleException("A valid system property or init parameter
'" + name + "' is required");
+ }
} else {
return value;
}
@@ -135,4 +137,8 @@
}
return null;
}
+
+ private String loadParameter(ServletConfig servletConfig, String name)
throws ServletException {
+ return loadParameter(servletConfig, name, true);
+ }
}
Modified:
branches/esb/java/1.7/esb/java/modules/distribution/src/main/bin/wso2-esb.bat
==============================================================================
---
branches/esb/java/1.7/esb/java/modules/distribution/src/main/bin/wso2-esb.bat
(original)
+++
branches/esb/java/1.7/esb/java/modules/distribution/src/main/bin/wso2-esb.bat
Fri May 16 02:54:08 2008
@@ -22,6 +22,7 @@
set _SYNAPSE_XML=
set _XDEBUG=
+set _SERVER_NAME=
rem Slurp the command line arguments. This loop allows for an unlimited number
rem of arguments (up to the command line limit, anyway).
@@ -30,6 +31,7 @@
if ""%1""=="""" goto doneStart
if ""%1""==""-sample"" goto esbSample
if ""%1""==""-xdebug"" goto xdebug
+if ""%1""==""-serverName"" goto serverName
shift
goto setupArgs
@@ -47,6 +49,12 @@
shift
goto setupArgs
+:serverName
+shift
+set _SERVER_NAME=-DserverName=%1
+shift
+goto setupArgs
+
:doneStart
rem find ESB_HOME if it does not exist due to either an invalid value passed
rem by the user or the %0 problem on Windows 9x
@@ -102,7 +110,7 @@
rem Start the Wrapper
rem
:startup
-"%_WRAPPER_EXE%" -c %_WRAPPER_CONF% wrapper.java.additional.2=%_SYNAPSE_XML%
%_XDEBUG%
+"%_WRAPPER_EXE%" -c %_WRAPPER_CONF% wrapper.java.additional.5=%_SYNAPSE_XML%
wrapper.java.additional.6=%_SERVER_NAME% %_XDEBUG%
if not errorlevel 1 goto :eof
pause
Modified:
branches/esb/java/1.7/esb/java/modules/distribution/src/main/bin/wso2-esb.sh
==============================================================================
---
branches/esb/java/1.7/esb/java/modules/distribution/src/main/bin/wso2-esb.sh
(original)
+++
branches/esb/java/1.7/esb/java/modules/distribution/src/main/bin/wso2-esb.sh
Fri May 16 02:54:08 2008
@@ -111,6 +111,8 @@
# synapse.xml
SYNAPSE_XML=
+# serverName
+SERVER_NAME=
if [ "$1" = "-xdebug" ]; then
XDEBUG="-Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,server=y,address=8000"
@@ -120,6 +122,10 @@
SYNAPSE_XML=-Dsynapse.xml=$ESB_HOME/repository/conf/sample/synapse_sample_$2.xml
fi
+if [ "$1" = "-serverName" ]; then
+ SERVER_NAME="-DserverName=$2"
+fi
+
if [ "$3" = "-xdebug" ]; then
XDEBUG="-Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,server=y,address=8000"
fi
@@ -128,6 +134,23 @@
SYNAPSE_XML=-Dsynapse.xml=$ESB_HOME/repository/conf/sample/synapse_sample_$4.xml
fi
+if [ "$3" = "-serverName" ]; then
+ SERVER_NAME="-DserverName=$4"
+fi
+
+if [ "$5" = "-xdebug" ]; then
+ XDEBUG="-Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,server=y,address=8000"
+fi
+
+if [ "$5" = "-sample" ]; then
+
SYNAPSE_XML=-Dsynapse.xml=$ESB_HOME/repository/conf/sample/synapse_sample_$6.xml
+fi
+
+if [ "$5" = "-serverName" ]; then
+ SERVER_NAME="-DserverName=$6"
+fi
+
+
# ----- Execute The Requested Command -----------------------------------------
cd $ESB_HOME
@@ -141,6 +164,7 @@
$JAVA_HOME/bin/java -server -Xms128M -Xmx128M \
$XDEBUG \
$SYNAPSE_XML \
+ $SERVER_NAME \
-Djava.io.tmpdir=$ESB_HOME/work/temp/esb \
-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration
\
-Dcom.sun.management.jmxremote \
Modified:
branches/esb/java/1.7/esb/java/modules/distribution/src/main/conf/wrapper.conf
==============================================================================
---
branches/esb/java/1.7/esb/java/modules/distribution/src/main/conf/wrapper.conf
(original)
+++
branches/esb/java/1.7/esb/java/modules/distribution/src/main/conf/wrapper.conf
Fri May 16 02:54:08 2008
@@ -29,11 +29,12 @@
wrapper.java.library.path.1=tomcat/lib
# Java Additional Parameters
-wrapper.java.additional.1=
-wrapper.java.additional.2=-Djava.endorsed.dirs=webapp/WEB-INF/lib/endorsed
-wrapper.java.additional.3=-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration
-wrapper.java.additional.4=-Djava.io.tmpdir=work/temp/esb
-wrapper.java.additional.5=-Dcom.sun.management.jmxremote
+wrapper.java.additional.1=-Djava.endorsed.dirs=webapp/WEB-INF/lib/endorsed
+wrapper.java.additional.2=-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration
+wrapper.java.additional.3=-Djava.io.tmpdir=work/temp/esb
+wrapper.java.additional.4=-Dcom.sun.management.jmxremote
+wrapper.java.additional.5= # leave blank - used to run samples in Windows
+wrapper.java.additional.6= # e.g. -DserverName=localhost
# Initial Java Heap Size (in MB) - compute according to system
wrapper.java.initmemory=128
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
