You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2008/05/11 13:28:27 UTC
svn commit: r655305 - in
/synapse/branches/1.2/modules/core/src/main/java/org/apache/synapse:
ServerManager.java SynapseServer.java
Author: veithen
Date: Sun May 11 04:28:27 2008
New Revision: 655305
URL: http://svn.apache.org/viewvc?rev=655305&view=rev
Log:
SYNAPSE-302: Make sure that the old way of running SynapseServer is still supported.
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
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=655305&r1=655304&r2=655305&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 Sun May 11 04:28:27 2008
@@ -24,11 +24,14 @@
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.ListenerManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
+import org.apache.synapse.format.BinaryBuilder;
+import org.apache.synapse.format.PlainTextBuilder;
import org.apache.synapse.transport.nhttp.NhttpConstants;
import org.apache.synapse.util.ClasspathURLStreamHandler;
import org.apache.synapse.util.RMIRegistryController;
@@ -103,6 +106,8 @@
configctx = ConfigurationContextFactory.
createConfigurationContextFromFileSystem(axis2Repolocation, axis2Xml);
+ addDefaultBuildersAndFormatters(configctx.getAxisConfiguration());
+
listenerManager = configctx.getListenerManager();
if (listenerManager == null) {
listenerManager = new ListenerManager();
@@ -163,6 +168,15 @@
}
}
+ private void addDefaultBuildersAndFormatters(AxisConfiguration axisConf) {
+ if (axisConf.getMessageBuilder("text/plain") == null) {
+ axisConf.addMessageBuilder("text/plain", new PlainTextBuilder());
+ }
+ if (axisConf.getMessageBuilder("application/octet-stream") == null) {
+ axisConf.addMessageBuilder("application/octet-stream", new BinaryBuilder());
+ }
+ }
+
/**
* stop all the listeners
*/
@@ -254,11 +268,11 @@
handleFatal("synapse.xml path");
}
- if (resolveRoot == null) {
- handleFatal("resolve root");
- } else {
- log.info("Using resolve.root as : " + resolveRoot);
- }
+// if (resolveRoot == null) {
+// handleFatal("resolve root");
+// } else {
+// log.info("Using resolve.root as : " + resolveRoot);
+// }
if (serverName == null) {
try {
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=655305&r1=655304&r2=655305&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 Sun May 11 04:28:27 2008
@@ -19,6 +19,7 @@
package org.apache.synapse;
+import org.apache.axis2.Constants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,16 +45,24 @@
public static void main(String[] args) throws Exception {
// first check if we should print usage
- if (args.length != 5) {
+ if (args.length != 1 && args.length != 5) {
printUsage();
}
ServerManager serverManager = ServerManager.getInstance();
serverManager.setAxis2Repolocation(args[0]);
- serverManager.setAxis2Xml(args[1]);
- serverManager.setSynapseHome(args[2]);
- serverManager.setSynapseXMLPath(args[3]);
- serverManager.setResolveRoot(args[4]);
+ if (args.length == 1) {
+ log.warn("Configuring server manager using deprecated system properties; please update your configuration");
+ serverManager.setAxis2Xml(System.getProperty(Constants.AXIS2_CONF));
+ serverManager.setSynapseHome(System.getProperty(SynapseConstants.SYNAPSE_HOME));
+ serverManager.setSynapseXMLPath(System.getProperty(SynapseConstants.SYNAPSE_XML));
+ serverManager.setResolveRoot(System.getProperty(SynapseConstants.RESOLVE_ROOT));
+ } else {
+ serverManager.setAxis2Xml(args[1]);
+ serverManager.setSynapseHome(args[2]);
+ serverManager.setSynapseXMLPath(args[3]);
+ serverManager.setResolveRoot(args[4]);
+ }
serverManager.start();
addShutdownHook();