Author: asankha
Date: Fri May 16 00:54:24 2008
New Revision: 17102
Log:
update svn externals from synapse codebase
fix ESBJAVA-472
make startup better
Modified:
branches/esb/java/1.7/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusConfiguration.java
branches/esb/java/1.7/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
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/conf/web.xml
branches/esb/java/1.7/esb/java/modules/samples/ (props changed)
branches/esb/java/1.7/esb/java/modules/samples/src/ (props changed)
branches/esb/java/1.7/esb/java/modules/samples/src/main/ (props changed)
branches/esb/java/1.7/esb/java/modules/startup/src/main/java/org/wso2/esb/ServiceBusConstants.java
Modified:
branches/esb/java/1.7/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusConfiguration.java
==============================================================================
---
branches/esb/java/1.7/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusConfiguration.java
(original)
+++
branches/esb/java/1.7/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusConfiguration.java
Fri May 16 00:54:24 2008
@@ -22,6 +22,8 @@
import org.wso2.utils.ServerConfiguration;
import org.wso2.utils.ServerConfigurationException;
+import java.io.File;
+
/**
* Loads the service bus configuration from the config file server.xml and
manages it
*/
@@ -40,6 +42,7 @@
private String axis2Xml = null;
private String axis2Repo = null;
private String resolveRoot = null;
+ private String serverName = null;
private String jmxAgentName = ServiceBusConstants.DEFAULT_JMX_AGENT_NAME;
private int rmiPort = 1099;
@@ -116,7 +119,11 @@
}
public void setEsbHome(String esbHome) {
- this.esbHome = esbHome;
+ if (!new File(esbHome).isAbsolute()) {
+ this.esbHome = new File(esbHome).getAbsolutePath();
+ } else {
+ this.esbHome = esbHome;
+ }
}
public String getServerXml() {
@@ -194,4 +201,12 @@
public String getContextPath() {
return getFirstProperty("ContextPath");
}
+
+ public String getServerName() {
+ return serverName;
+ }
+
+ public void setServerName(String serverName) {
+ this.serverName = serverName;
+ }
}
Modified:
branches/esb/java/1.7/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
==============================================================================
---
branches/esb/java/1.7/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
(original)
+++
branches/esb/java/1.7/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
Fri May 16 00:54:24 2008
@@ -175,11 +175,12 @@
}
// start Synapse
- ServerManager.getInstance().setAxis2Repolocation(sbc.getAxis2Repo());
- ServerManager.getInstance().setAxis2Xml(sbc.getAxis2Xml());
ServerManager.getInstance().setSynapseHome(sbc.getEsbHome());
+ ServerManager.getInstance().setAxis2Repolocation(sbc.getAxis2Repo());
+ ServerManager.getInstance().setAxis2Xml(sbc.getAxis2Xml());
ServerManager.getInstance().setSynapseXMLPath(sbc.getSynapseXml());
ServerManager.getInstance().setResolveRoot(sbc.getResolveRoot());
+ ServerManager.getInstance().setServerName(sbc.getServerName());
ServerManager.getInstance().start();
configurationContext =
ServerManager.getInstance().getConfigurationContext();
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 00:54:24 2008
@@ -65,6 +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));
ServiceBusManager serviceBusManager = ServiceBusManager.getInstance();
try {
Modified:
branches/esb/java/1.7/esb/java/modules/distribution/src/main/conf/web.xml
==============================================================================
--- branches/esb/java/1.7/esb/java/modules/distribution/src/main/conf/web.xml
(original)
+++ branches/esb/java/1.7/esb/java/modules/distribution/src/main/conf/web.xml
Fri May 16 00:54:24 2008
@@ -61,6 +61,10 @@
<param-name>resolve.root</param-name>
<param-value>repository</param-value>
</init-param>
+ <!--<init-param>
+ <param-name>serverName</param-name>
+ <param-value>localhost</param-value>
+ </init-param>-->
<load-on-startup>1</load-on-startup>
</servlet>
Modified:
branches/esb/java/1.7/esb/java/modules/startup/src/main/java/org/wso2/esb/ServiceBusConstants.java
==============================================================================
---
branches/esb/java/1.7/esb/java/modules/startup/src/main/java/org/wso2/esb/ServiceBusConstants.java
(original)
+++
branches/esb/java/1.7/esb/java/modules/startup/src/main/java/org/wso2/esb/ServiceBusConstants.java
Fri May 16 00:54:24 2008
@@ -61,6 +61,7 @@
public static final String LOG4J_PROPS = "log4j.properties";
public static final String SERVER_XML = "server.xml";
+ public static final String SERVER_NAME = "serverName";
public static final String SYNAPSE_XML = "synapse.xml";
public static final String RESOLVE_ROOT = "resolve.root";
public static final String AXIS2_XML = "axis2.xml";
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
