[esb-java-dev] svn commit r6734 - in trunk/esb/java/modules:
core/src/main/java/org/wso2/esb
distribution/src/main/assembly distribution/src/main/bin
distribution/src/main/bin/native distribution/src/main/conf
svn at wso2.org
svn at wso2.org
Thu Aug 30 06:57:22 PDT 2007
Author: indika
Date: Thu Aug 30 06:50:01 2007
New Revision: 6734
Added:
trunk/esb/java/modules/distribution/src/main/bin/native/
trunk/esb/java/modules/distribution/src/main/bin/native/wrapper-linux-x86-32 (contents, props changed)
trunk/esb/java/modules/distribution/src/main/bin/native/wrapper-linux-x86-64 (contents, props changed)
trunk/esb/java/modules/distribution/src/main/bin/native/wrapper-solaris-sparc-32 (contents, props changed)
trunk/esb/java/modules/distribution/src/main/bin/native/wrapper-solaris-sparc-64 (contents, props changed)
trunk/esb/java/modules/distribution/src/main/bin/native/wrapper-solaris-x86-32 (contents, props changed)
trunk/esb/java/modules/distribution/src/main/bin/native/wrapper-windows-x86-32.exe (contents, props changed)
Removed:
trunk/esb/java/modules/distribution/src/main/bin/wrapper
trunk/esb/java/modules/distribution/src/main/bin/wrapper.exe
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
trunk/esb/java/modules/distribution/src/main/bin/install-wso2-esb-service.bat
trunk/esb/java/modules/distribution/src/main/bin/uninstall-wso2-esb-service.bat
trunk/esb/java/modules/distribution/src/main/bin/wso2-esb-daemon.sh
trunk/esb/java/modules/distribution/src/main/conf/wrapper.conf
Log:
enable the wso2-esb running as a deamon in Linux,Solaris(sparc ,x84)
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java Thu Aug 30 06:50:01 2007
@@ -227,12 +227,12 @@
Hashtable fileContents = new Hashtable();
try {
- UIProcessor.createPages(System.getProperty(ServiceBusConstants.ESB_HOME) + File.separator +
- XmlConfigurationFactory.
- getXmlConfiguration(
- ServiceBusConstants.ESB_WEB_XML_KEY).
- getUniqueValue(
- "//ns:Mapping[@name=\"admin\"]/ns:ResourceBase")
+ UIProcessor.createPages(System.getProperty(ServiceBusConstants.ESB_HOME) + File.separator
+ + XmlConfigurationFactory.
+ getXmlConfiguration(
+ ServiceBusConstants.ESB_WEB_XML_KEY).
+ getUniqueValue(
+ "//ns:Mapping[@name=\"admin\"]/ns:ResourceBase")
+ File.separator,
System.getProperty(ServiceBusConstants.
ESB_UI_EXTENSIONS_CONFIG_XML),
Modified: trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/assembly/bin.xml (original)
+++ trunk/esb/java/modules/distribution/src/main/assembly/bin.xml Thu Aug 30 06:50:01 2007
@@ -47,7 +47,6 @@
<includes>
<include>install-wso2-esb-service.bat</include>
</includes>
- <fileMode>755</fileMode>
</fileSet>
<fileSet>
<directory>src/main/bin</directory>
@@ -62,6 +61,7 @@
<includes>
<include>wso2-esb-daemon.sh</include>
</includes>
+ <fileMode>755</fileMode>
</fileSet>
<fileSet>
<directory>src/main/bin</directory>
@@ -71,12 +71,9 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/bin</directory>
- <outputDirectory>wso2esb-${wso2.esb.version}</outputDirectory>
- <includes>
- <include>wrapper.exe</include>
- <include>wrapper</include>
- </includes>
+ <directory>src/main/bin/native</directory>
+ <outputDirectory>wso2esb-${wso2.esb.version}/bin/native</outputDirectory>
+ <fileMode>755</fileMode>
</fileSet>
<fileSet>
<directory>../../repository</directory>
Modified: trunk/esb/java/modules/distribution/src/main/bin/install-wso2-esb-service.bat
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/bin/install-wso2-esb-service.bat (original)
+++ trunk/esb/java/modules/distribution/src/main/bin/install-wso2-esb-service.bat Thu Aug 30 06:50:01 2007
@@ -19,16 +19,17 @@
rem Decide on the wrapper binary.
set _WRAPPER_BASE=wrapper
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+set _WRAPPER_DIR=%_REALPATH%bin\native\
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-32.exe
if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-64.exe
if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%.exe
if exist "%_WRAPPER_EXE%" goto conf
echo Unable to locate a Wrapper executable using any of the following names:
-echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-echo %_REALPATH%%_WRAPPER_BASE%.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%.exe
pause
goto :eof
Added: trunk/esb/java/modules/distribution/src/main/bin/native/wrapper-linux-x86-32
==============================================================================
Binary file. No diff available.
Added: trunk/esb/java/modules/distribution/src/main/bin/native/wrapper-linux-x86-64
==============================================================================
Binary file. No diff available.
Added: trunk/esb/java/modules/distribution/src/main/bin/native/wrapper-solaris-sparc-32
==============================================================================
Binary file. No diff available.
Added: trunk/esb/java/modules/distribution/src/main/bin/native/wrapper-solaris-sparc-64
==============================================================================
Binary file. No diff available.
Added: trunk/esb/java/modules/distribution/src/main/bin/native/wrapper-solaris-x86-32
==============================================================================
Binary file. No diff available.
Added: trunk/esb/java/modules/distribution/src/main/bin/native/wrapper-windows-x86-32.exe
==============================================================================
Binary file. No diff available.
Modified: trunk/esb/java/modules/distribution/src/main/bin/uninstall-wso2-esb-service.bat
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/bin/uninstall-wso2-esb-service.bat (original)
+++ trunk/esb/java/modules/distribution/src/main/bin/uninstall-wso2-esb-service.bat Thu Aug 30 06:50:01 2007
@@ -19,16 +19,17 @@
rem Decide on the wrapper binary.
set _WRAPPER_BASE=wrapper
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+set _WRAPPER_DIR=%_REALPATH%bin\native\
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-32.exe
if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-64.exe
if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%.exe
if exist "%_WRAPPER_EXE%" goto conf
echo Unable to locate a Wrapper executable using any of the following names:
-echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-echo %_REALPATH%%_WRAPPER_BASE%.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%.exe
pause
goto :eof
Modified: trunk/esb/java/modules/distribution/src/main/bin/wso2-esb-daemon.sh
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/bin/wso2-esb-daemon.sh (original)
+++ trunk/esb/java/modules/distribution/src/main/bin/wso2-esb-daemon.sh Thu Aug 30 06:50:01 2007
@@ -15,7 +15,7 @@
APP_LONG_NAME="WSO2 Enterprise Service Bus (ESB)"
# Wrapper
-WRAPPER_CMD="./wrapper"
+WRAPPER_CMD="./bin/native/wrapper"
WRAPPER_CONF="./webapp/WEB-INF/classes/conf/wrapper.conf"
# Priority at which to run the wrapper. See "man nice" for valid priorities.
Modified: trunk/esb/java/modules/distribution/src/main/conf/wrapper.conf
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/conf/wrapper.conf (original)
+++ trunk/esb/java/modules/distribution/src/main/conf/wrapper.conf Thu Aug 30 06:50:01 2007
@@ -13,27 +13,27 @@
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=%CLASSPATH%
-wrapper.java.classpath.2=./webapp/WEB-INF/lib/wrapper.jar
-wrapper.java.classpath.3=./webapp/WEB-INF/lib
-wrapper.java.classpath.4=./webapp/WEB-INF/lib/*.jar
-wrapper.java.classpath.5=./tomcat/lib
-wrapper.java.classpath.6=./tomcat/lib/*.jar
-wrapper.java.classpath.7=./webapp/WEB-INF/classes/conf
+wrapper.java.classpath.2=../../webapp/WEB-INF/lib/wrapper.jar
+wrapper.java.classpath.3=../../webapp/WEB-INF/lib
+wrapper.java.classpath.4=../../webapp/WEB-INF/lib/*.jar
+wrapper.java.classpath.5=../../tomcat/lib
+wrapper.java.classpath.6=../../tomcat/lib/*.jar
+wrapper.java.classpath.7=../../webapp/WEB-INF/classes/conf
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
-wrapper.java.library.path.1=./webapp/WEB-INF/lib
-wrapper.java.library.path.2=./tomcat/lib
+wrapper.java.library.path.1=../../webapp/WEB-INF/lib
+wrapper.java.library.path.2=../../tomcat/lib
# Java Additional Parameters
-wrapper.java.additional.1=-Desb.xml=./webapp/WEB-INF/classes/conf/server.xml
-wrapper.java.additional.2=-Dsynapse.xml=./webapp/WEB-INF/classes/conf/synapse.xml
-wrapper.java.additional.3=-Daxis2.xml=./webapp/WEB-INF/classes/conf/axis2.xml
-wrapper.java.additional.4=-Daxis2.repo=./repository
-wrapper.java.additional.5=-Djava.endorsed.dirs=../tomcat/lib/endorsed
-wrapper.java.additional.6=-Desb.home=.
-wrapper.java.additional.7=-Dserver-web.xml=./webapp/WEB-INF/classes/conf/server-web.xml
-wrapper.java.additional.8=-Dmime-mappings.xml=./webapp/WEB-INF/classes/conf/mime-mappings.xml
+wrapper.java.additional.1=-Desb.xml=../../webapp/WEB-INF/classes/conf/server.xml
+wrapper.java.additional.2=-Dsynapse.xml=../../webapp/WEB-INF/classes/conf/synapse.xml
+wrapper.java.additional.3=-Daxis2.xml=../../webapp/WEB-INF/classes/conf/axis2.xml
+wrapper.java.additional.4=-Daxis2.repo=../../repository
+wrapper.java.additional.5=-Djava.endorsed.dirs=../../tomcat/lib/endorsed
+wrapper.java.additional.6=-Desb.home=../../
+wrapper.java.additional.7=-Dserver-web.xml=../../webapp/WEB-INF/classes/conf/server-web.xml
+wrapper.java.additional.8=-Dmime-mappings.xml=../../webapp/WEB-INF/classes/conf/mime-mappings.xml
wrapper.java.additional.9=-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration
-wrapper.java.additional.10=-Dlog4j.configuration=file:./webapp/WEB-INF/classes/conf/log4j.properties
+wrapper.java.additional.10=-Dlog4j.configuration=file:../../webapp/WEB-INF/classes/conf/log4j.properties
# Initial Java Heap Size (in MB)
#wrapper.java.initmemory=3
@@ -44,7 +44,6 @@
# Application parameters. Add parameters as needed starting from 1
wrapper.app.parameter.1=org.wso2.esb.Main
wrapper.app.parameter.2=START
-#wrapper.app.parameter.3=-sample=8
#********************************************************************
# Wrapper Logging Properties
@@ -56,7 +55,7 @@
wrapper.console.loglevel=INFO
# Log file to use for wrapper output logging.
-wrapper.logfile=./logs/wrapper.log
+wrapper.logfile=../../logs/wrapper.log
# Format of output for the log file. (See docs for formats)
wrapper.logfile.format=LPTM
More information about the Esb-java-dev
mailing list