Author: asankha
Date: Sat May 10 14:58:47 2008
New Revision: 16783
Log:
update the ESB for corresponding Synapse enhancements to reduce synapses'
dependence on system properties
Added:
trunk/esb/java/modules/distribution/src/main/conf/tomcat/tomcat.properties
- copied, changed from r16775,
/trunk/esb/java/modules/startup/src/main/resources/tomcat.properties
Removed:
trunk/esb/java/modules/startup/src/main/resources/tomcat.properties
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.bat
trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.sh
trunk/esb/java/modules/distribution/src/main/conf/wrapper.conf
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
Sat May 10 14:58:47 2008
@@ -175,6 +175,9 @@
// start Synapse
ServerManager.getInstance().setAxis2Repolocation(sbc.getAxis2Repo());
ServerManager.getInstance().setAxis2Xml(sbc.getAxis2Xml());
+ ServerManager.getInstance().setSynapseHome(sbc.getEsbHome());
+ ServerManager.getInstance().setSynapseXMLPath(sbc.getSynapseXml());
+ ServerManager.getInstance().setResolveRoot(sbc.getResolveRoot());
ServerManager.getInstance().start();
configurationContext =
ServerManager.getInstance().getConfigurationContext();
Modified: trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.bat
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.bat
(original)
+++ trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.bat Sat May
10 14:58:47 2008
@@ -20,7 +20,7 @@
rem %~dp0 is expanded pathname of the current script under NT
set ESB_HOME=%~dps0..
-set
_SYNAPSE_XML=-Dsynapse.xml="%ESB_HOME%\webapp\WEB-INF\classes\conf\synapse.xml"
+set _SYNAPSE_XML=
set _XDEBUG=
rem Slurp the command line arguments. This loop allows for an unlimited number
Modified: trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.sh
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.sh
(original)
+++ trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.sh Sat May
10 14:58:47 2008
@@ -75,7 +75,7 @@
fi
# update classpath with Tomcat JARs
-ESB_CLASSPATH="$ESB_HOME/tomcat/lib"
+ESB_CLASSPATH="$ESB_HOME/tomcat/conf":"$ESB_HOME/tomcat/lib"
for f in $ESB_HOME/tomcat/lib/*.jar
do
ESB_CLASSPATH=$ESB_CLASSPATH:$f
@@ -110,7 +110,7 @@
ESB_ENDORSED=$ESB_HOME/webapp/WEB-INF/lib/endorsed:$JAVA_HOME/jre/lib/endorsed
# synapse.xml
-SYNAPSE_XML=-Dsynapse.xml=$ESB_HOME/webapp/WEB-INF/classes/conf/synapse.xml
+SYNAPSE_XML=
if [ "$1" = "-xdebug" ]; then
XDEBUG="-Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,server=y,address=8000"
@@ -144,7 +144,6 @@
-Djava.io.tmpdir=$ESB_HOME/work/temp/esb \
-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration
\
-Dcom.sun.management.jmxremote \
- -Desb.home=$ESB_HOME \
-Djava.endorsed.dirs=$ESB_ENDORSED \
-classpath $ESB_CLASSPATH \
org.wso2.esb.ServiceBus
\ No newline at end of file
Copied:
trunk/esb/java/modules/distribution/src/main/conf/tomcat/tomcat.properties
(from r16775,
/trunk/esb/java/modules/startup/src/main/resources/tomcat.properties)
==============================================================================
--- /trunk/esb/java/modules/startup/src/main/resources/tomcat.properties
(original)
+++ trunk/esb/java/modules/distribution/src/main/conf/tomcat/tomcat.properties
Sat May 10 14:58:47 2008
@@ -8,4 +8,15 @@
KeyStore.KeyPassword=password
TrustStore.Location=webapp/WEB-INF/classes/conf/trust.jks
TrustStore.Type=JKS
-TrustStore.Password=password
\ No newline at end of file
+TrustStore.Password=password
+
+# tune these only if you require.. the defaults should be generally sufficient
+#SslProtocol=TLS
+#MaxHttpHeaderSize=8192
+#MaxThreads=150
+#MinSpareThreads=25
+#MaxSpareThreads=75
+#EnableLookups=false
+#DisableUploadTimeout=false
+#ClientAuth=false
+#AcceptCount=100
\ No newline at end of file
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 Sat May
10 14:58:47 2008
@@ -17,18 +17,19 @@
# needed starting from 1
wrapper.java.classpath.1=%CLASSPATH%
wrapper.java.classpath.2=webapp/WEB-INF/lib/wrapper-3.2.3.jar
-wrapper.java.classpath.3=tomcat/lib
-wrapper.java.classpath.4=tomcat/lib/*.jar
-wrapper.java.classpath.5=webapp/WEB-INF/lib/patches
-wrapper.java.classpath.6=webapp/WEB-INF/lib/patches/*.jar
-wrapper.java.classpath.7=webapp/WEB-INF/lib/extensions
-wrapper.java.classpath.8=webapp/WEB-INF/lib/extensions/*.jar
+wrapper.java.classpath.3=tomcat/conf
+wrapper.java.classpath.4=tomcat/lib
+wrapper.java.classpath.5=tomcat/lib/*.jar
+wrapper.java.classpath.6=webapp/WEB-INF/lib/patches
+wrapper.java.classpath.7=webapp/WEB-INF/lib/patches/*.jar
+wrapper.java.classpath.8=webapp/WEB-INF/lib/extensions
+wrapper.java.classpath.9=webapp/WEB-INF/lib/extensions/*.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=tomcat/lib
# Java Additional Parameters
-wrapper.java.additional.1=-Dsynapse.xml=webapp/WEB-INF/classes/conf/synapse.xml
+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
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
