Author: ruwan
Date: Wed Nov 12 11:52:14 2008
New Revision: 713477
URL: http://svn.apache.org/viewvc?rev=713477&view=rev
Log:
renaming the util package names to meaning full names,
Reason :- if there are more than one jars which provides the same package name,
it conflicts under an OSGi invironment
Added:
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/util/
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/
Removed:
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/util/
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseInHandler.java
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseOutHandler.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java?rev=713477&r1=713476&r2=713477&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
Wed Nov 12 11:52:14 2008
@@ -162,8 +162,6 @@
}
}
- synConfig.init(configctx);
-
log.info("Ready for processing");
} catch (Throwable t) {
@@ -172,15 +170,6 @@
}
}
- 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
*/
@@ -208,17 +197,6 @@
listenerManager.stop();
listenerManager.destroy();
}
-
- // clear session information used for SA load balancing
- try {
- RMIRegistryController.getInstance().removeLocalRegistry();
- SALSessions.getInstance().reset();
- InMemoryDataSourceRegistry.getInstance().clear();
- JNDIBasedDataSourceRegistry registry =
JNDIBasedDataSourceRegistry.getInstance();
- if (registry.isInitialized()) {
- registry.clear();
- }
- } catch (Throwable ignored) {}
// we need to call this method to clean the temp files we created.
if (configctx != null) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=713477&r1=713476&r2=713477&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
Wed Nov 12 11:52:14 2008
@@ -25,6 +25,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.*;
+import org.apache.synapse.util.RMIRegistryController;
+import org.apache.synapse.util.datasource.InMemoryDataSourceRegistry;
+import org.apache.synapse.util.datasource.JNDIBasedDataSourceRegistry;
import org.apache.synapse.task.TaskDescriptionRepository;
import org.apache.synapse.task.TaskDescriptionRepositoryFactory;
import org.apache.synapse.config.xml.MediatorFactoryFinder;
@@ -33,6 +36,7 @@
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.core.axis2.ProxyService;
import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.endpoints.dispatch.SALSessions;
import org.apache.synapse.mediators.base.SequenceMediator;
import org.apache.synapse.mediators.ListMediator;
import org.apache.synapse.mediators.AbstractMediator;
@@ -812,6 +816,17 @@
}
}
}
+
+ // clear session information used for SA load balancing
+ try {
+ RMIRegistryController.getInstance().removeLocalRegistry();
+ SALSessions.getInstance().reset();
+ InMemoryDataSourceRegistry.getInstance().clear();
+ JNDIBasedDataSourceRegistry registry =
JNDIBasedDataSourceRegistry.getInstance();
+ if (registry.isInitialized()) {
+ registry.clear();
+ }
+ } catch (Throwable ignored) {}
}
/**
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java?rev=713477&r1=713476&r2=713477&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java
Wed Nov 12 11:52:14 2008
@@ -80,6 +80,8 @@
ServerManager.getInstance().setConfigurationContext(configurationContext);
}
+
addDefaultBuildersAndFormatters(configurationContext.getAxisConfiguration());
+
// this will deploy the mediators in the mediator extensions folder
log.info("Loading mediator extensions...");
configurationContext.getAxisConfiguration().getConfigurator().loadServices();
@@ -142,6 +144,8 @@
proxy.stop(synCfg);
}
}
+
+ synCfg.init(configurationContext);
log.info("Synapse initialized successfully...!");
}
@@ -192,6 +196,15 @@
return synapseConfiguration;
}
+ 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());
+ }
+ }
+
public void engageNotify(AxisDescription axisDescription) throws AxisFault
{
// ignore
}
Modified:
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseInHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseInHandler.java?rev=713477&r1=713476&r2=713477&view=diff
==============================================================================
---
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseInHandler.java
(original)
+++
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseInHandler.java
Wed Nov 12 11:52:14 2008
@@ -28,7 +28,7 @@
import org.apache.synapse.SynapseException;
import org.apache.synapse.FaultHandler;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.util.HandlerUtil;
+import org.apache.synapse.handler.util.HandlerUtil;
/**
* This is the InHandler which injects the Axis2MC in to Synapse after
converting the message
Modified:
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseOutHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseOutHandler.java?rev=713477&r1=713476&r2=713477&view=diff
==============================================================================
---
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseOutHandler.java
(original)
+++
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseOutHandler.java
Wed Nov 12 11:52:14 2008
@@ -22,7 +22,7 @@
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.AxisFault;
-import org.apache.synapse.util.HandlerUtil;
+import org.apache.synapse.handler.util.HandlerUtil;
import org.apache.synapse.core.axis2.MessageContextCreatorForAxis2;
import org.apache.synapse.SynapseException;
import org.apache.synapse.FaultHandler;
