You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by as...@apache.org on 2008/05/15 10:21:28 UTC
svn commit: r656541 - in /synapse/branches/1.2:
modules/core/src/main/java/org/apache/synapse/ServerManager.java
modules/core/src/main/java/org/apache/synapse/SynapseServer.java
repository/conf/wrapper.conf src/main/bin/synapse.bat src/main/bin/synapse.sh
Author: asankha
Date: Thu May 15 01:21:27 2008
New Revision: 656541
URL: http://svn.apache.org/viewvc?rev=656541&view=rev
Log:
fix SYNAPSE-316
Modified:
synapse/branches/1.2/modules/core/src/main/java/org/apache/synapse/ServerManager.java
synapse/branches/1.2/modules/core/src/main/java/org/apache/synapse/SynapseServer.java
synapse/branches/1.2/repository/conf/wrapper.conf
synapse/branches/1.2/src/main/bin/synapse.bat
synapse/branches/1.2/src/main/bin/synapse.sh
Modified: synapse/branches/1.2/modules/core/src/main/java/org/apache/synapse/ServerManager.java
URL: http://svn.apache.org/viewvc/synapse/branches/1.2/modules/core/src/main/java/org/apache/synapse/ServerManager.java?rev=656541&r1=656540&r2=656541&view=diff
==============================================================================
--- synapse/branches/1.2/modules/core/src/main/java/org/apache/synapse/ServerManager.java (original)
+++ synapse/branches/1.2/modules/core/src/main/java/org/apache/synapse/ServerManager.java Thu May 15 01:21:27 2008
@@ -279,6 +279,8 @@
serverName = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException ignore) {}
log.info("The server name was not specified, defaulting to : " + serverName);
+ } else {
+ log.info("Using server name : " + serverName);
}
log.info("The timeout handler will run every : " + (getTimeoutHandlerInterval()/1000) + "s");
Modified: synapse/branches/1.2/modules/core/src/main/java/org/apache/synapse/SynapseServer.java
URL: http://svn.apache.org/viewvc/synapse/branches/1.2/modules/core/src/main/java/org/apache/synapse/SynapseServer.java?rev=656541&r1=656540&r2=656541&view=diff
==============================================================================
--- synapse/branches/1.2/modules/core/src/main/java/org/apache/synapse/SynapseServer.java (original)
+++ synapse/branches/1.2/modules/core/src/main/java/org/apache/synapse/SynapseServer.java Thu May 15 01:21:27 2008
@@ -28,6 +28,9 @@
/**
* This is the class invoked by the command line scripts synapse.sh and synapse-daemon.sh to
* start an instance of Synapse. This class calls on the ServerManager to start up the instance
+ *
+ * TODO Switch to using commons-cli and move all command line parameter processing etc from the
+ * .sh and .bat into this.. for 1.3 release :)
*/
public class SynapseServer {
@@ -45,7 +48,7 @@
public static void main(String[] args) throws Exception {
// first check if we should print usage
- if (args.length != 1 && args.length != 4 && args.length != 5) {
+ if (args.length != 1 && args.length != 4 && args.length != 5 && args.length != 6) {
printUsage();
}
@@ -67,6 +70,12 @@
serverManager.setSynapseHome(args[2]);
serverManager.setSynapseXMLPath(args[3]);
serverManager.setResolveRoot(args[4]);
+ } else if(args.length == 6) {
+ serverManager.setAxis2Xml(args[1]);
+ serverManager.setSynapseHome(args[2]);
+ serverManager.setSynapseXMLPath(args[3]);
+ serverManager.setResolveRoot(args[4]);
+ serverManager.setServerName(args[5]);
}
serverManager.start();
Modified: synapse/branches/1.2/repository/conf/wrapper.conf
URL: http://svn.apache.org/viewvc/synapse/branches/1.2/repository/conf/wrapper.conf?rev=656541&r1=656540&r2=656541&view=diff
==============================================================================
--- synapse/branches/1.2/repository/conf/wrapper.conf (original)
+++ synapse/branches/1.2/repository/conf/wrapper.conf Thu May 15 01:21:27 2008
@@ -44,7 +44,7 @@
wrapper.app.parameter.4=.
wrapper.app.parameter.5=repository/conf/synapse.xml
wrapper.app.parameter.6=repository
-
+wrapper.app.parameter.7=
#********************************************************************
# Wrapper Logging Properties
Modified: synapse/branches/1.2/src/main/bin/synapse.bat
URL: http://svn.apache.org/viewvc/synapse/branches/1.2/src/main/bin/synapse.bat?rev=656541&r1=656540&r2=656541&view=diff
==============================================================================
--- synapse/branches/1.2/src/main/bin/synapse.bat (original)
+++ synapse/branches/1.2/src/main/bin/synapse.bat Thu May 15 01:21:27 2008
@@ -22,6 +22,7 @@
set _SYNAPSE_XML="%SYNAPSE_HOME%\repository\conf\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).
@@ -29,6 +30,7 @@
:setupArgs
if ""%1""=="""" goto doneStart
if ""%1""==""-sample"" goto SYNAPSESample
+if ""%1""==""-serverName"" goto serverName
if ""%1""==""-xdebug"" goto xdebug
shift
goto setupArgs
@@ -46,6 +48,12 @@
shift
goto setupArgs
+:serverName
+shift
+set _SERVER_NAME=%1
+shift
+goto setupArgs
+
:doneStart
rem find SYNAPSE_HOME if it does not exist due to either an invalid value passed
rem by the user or the %0 problem on Windows 9x
@@ -100,7 +108,7 @@
rem Start the Wrapper
rem
:startup
-"%_WRAPPER_EXE%" -c %_WRAPPER_CONF% wrapper.app.parameter.5=%_SYNAPSE_XML% %_XDEBUG%
+"%_WRAPPER_EXE%" -c %_WRAPPER_CONF% wrapper.app.parameter.5=%_SYNAPSE_XML% wrapper.app.parameter.7=%_SERVER_NAME% %_XDEBUG%
if not errorlevel 1 goto :eof
pause
Modified: synapse/branches/1.2/src/main/bin/synapse.sh
URL: http://svn.apache.org/viewvc/synapse/branches/1.2/src/main/bin/synapse.sh?rev=656541&r1=656540&r2=656541&view=diff
==============================================================================
--- synapse/branches/1.2/src/main/bin/synapse.sh (original)
+++ synapse/branches/1.2/src/main/bin/synapse.sh Thu May 15 01:21:27 2008
@@ -124,6 +124,9 @@
# synapse.xml
SYNAPSE_XML=$SYNAPSE_HOME/repository/conf/synapse.xml
+# server name
+SERVER_NAME=
+
while [ $# -ge 1 ]; do
if [ "$1" = "-xdebug" ]; then
@@ -134,11 +137,16 @@
SYNAPSE_XML=$SYNAPSE_HOME/repository/conf/sample/synapse_sample_$2.xml
shift 2 # -sample and sample number
+ elif [ "$1" = "-serverName" ]; then
+ SERVER_NAME=$2
+ shift 2 # -serverName and actual name
+
elif [ "$1" = "-h" ]; then
echo "Usage: synapse.sh ( commands ... )"
echo "commands:"
- echo " -xdebug Start Synapse under JPDA debugger"
- echo " -sample (number) Start with sample Synapse configuration of given number"
+ echo " -xdebug Start Synapse under JPDA debugger"
+ echo " -sample (number) Start with sample Synapse configuration of given number"
+ echo " -serverName <name> Name of the Synapse server instance"
shift
exit 0
@@ -170,4 +178,5 @@
$SYNAPSE_HOME/repository/conf/axis2.xml \
$SYNAPSE_HOME \
$SYNAPSE_XML \
- $SYNAPSE_HOME/repository
+ $SYNAPSE_HOME/repository \
+ $SERVER_NAME
\ No newline at end of file