Author: ruwan
Date: Sat Apr 25 19:02:08 2009
New Revision: 768583
URL: http://svn.apache.org/viewvc?rev=768583&view=rev
Log:
ServerContextInformation should contain the SynapseConfiguration and the
SynapseEnvironment
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerContextInformation.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java?rev=768583&r1=768582&r2=768583&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
Sat Apr 25 19:02:08 2009
@@ -84,9 +84,9 @@
/**
* Initiates the Axis2 Based Server Environment
*
- * @param configurationInformation ServerConfigurationInformation Instance
- * @param contextInformation Server Context if the Axis2 Based Server
- * Environment has been already set up.
+ * @param serverConfigurationInformation ServerConfigurationInformation
Instance
+ * @param contextInformation Server Context if the Axis2 Based Server
Environment has been
+ * already set up.
*/
public void init(ServerConfigurationInformation
serverConfigurationInformation,
ServerContextInformation contextInformation) {
@@ -189,7 +189,7 @@
listenerManager.start();
} else {
handleFatal("Couldn't start Synapse, ListenerManager not
found");
- }
+ }
/* if JMX Adapter has been configured and started, output usage
information rather
at the end of the startup process to make it more obvious */
if (jmxAdapter != null && jmxAdapter.isRunning()) {
@@ -277,13 +277,12 @@
throw new SynapseException("Synapse startup failed", axisFault);
}
- Parameter synapseEnvironmentParameter = new
Parameter(SynapseConstants.SYNAPSE_ENV, null);
synapseEnvironment = new Axis2SynapseEnvironment(
configurationContext, synapseConfiguration);
- synapseEnvironmentParameter.setValue(synapseEnvironment);
-
MessageContextCreatorForAxis2.setSynEnv(synapseEnvironment);
-
+
+ Parameter synapseEnvironmentParameter = new Parameter(
+ SynapseConstants.SYNAPSE_ENV, synapseEnvironment);
try {
configurationContext.getAxisConfiguration().addParameter(synapseEnvironmentParameter);
} catch (AxisFault e) {
@@ -318,13 +317,11 @@
// Set the Axis2 ConfigurationContext to the SynapseConfiguration
synapseConfiguration.setAxisConfiguration(configurationContext.getAxisConfiguration());
-
- // set the Synapse configuration and environment into the Axis2
configuration
- Parameter synapseConfigurationParameter = new Parameter(
- SynapseConstants.SYNAPSE_CONFIG, null);
- synapseConfigurationParameter.setValue(synapseConfiguration);
MessageContextCreatorForAxis2.setSynConfig(synapseConfiguration);
+ // set the Synapse configuration into the Axis2 configuration
+ Parameter synapseConfigurationParameter = new Parameter(
+ SynapseConstants.SYNAPSE_CONFIG, synapseConfiguration);
try {
configurationContext.getAxisConfiguration().addParameter(synapseConfigurationParameter);
} catch (AxisFault e) {
@@ -533,6 +530,8 @@
if (taskHelper.isInitialized()) {
taskHelper.cleanup();
}
+
+ stopJmxAdapter();
}
private void addDefaultBuildersAndFormatters(AxisConfiguration axisConf) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerContextInformation.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerContextInformation.java?rev=768583&r1=768582&r2=768583&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerContextInformation.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerContextInformation.java
Sat Apr 25 19:02:08 2009
@@ -18,6 +18,9 @@
*/
package org.apache.synapse;
+import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.core.SynapseEnvironment;
+
import java.util.HashMap;
import java.util.Map;
@@ -30,6 +33,10 @@
private Object serverContext;
/* A map to hold any context information*/
private final Map<String, Object> properties = new HashMap<String,
Object>();
+ /* Keeps the SynapseConfiguration */
+ private SynapseConfiguration synapseConfiguration;
+ /* Keeps the SynapseEnvironment */
+ private SynapseEnvironment synapseEnvironment;
private ServerState serverState = ServerState.UNDETERMINED;
@@ -63,4 +70,20 @@
public void setServerState(ServerState serverState) {
this.serverState = serverState;
}
+
+ public SynapseConfiguration getSynapseConfiguration() {
+ return synapseConfiguration;
+ }
+
+ public void setSynapseConfiguration(SynapseConfiguration
synapseConfiguration) {
+ this.synapseConfiguration = synapseConfiguration;
+ }
+
+ public SynapseEnvironment getSynapseEnvironment() {
+ return synapseEnvironment;
+ }
+
+ public void setSynapseEnvironment(SynapseEnvironment synapseEnvironment) {
+ this.synapseEnvironment = synapseEnvironment;
+ }
}
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=768583&r1=768582&r2=768583&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
Sat Apr 25 19:02:08 2009
@@ -273,9 +273,11 @@
if (serverState == ServerState.INITIALIZED || serverState ==
ServerState.STOPPED) {
// creates the Synapse Configuration using the SynapseController
- synapseController.createSynapseConfiguration();
+ contextInformation.setSynapseConfiguration(
+ synapseController.createSynapseConfiguration());
// creates the Synapse Environment using the SynapseController
- synapseController.createSynapseEnvironment();
+ contextInformation.setSynapseEnvironment(
+ synapseController.createSynapseEnvironment());
// starts the SynapseController
synapseController.start();
@@ -301,8 +303,10 @@
synapseController.stop();
// destroy the created Synapse Configuration
synapseController.destroySynapseConfiguration();
+ contextInformation.setSynapseConfiguration(null);
// destroy the created Synapse Environment
synapseController.destroySynapseEnvironment();
+ contextInformation.setSynapseEnvironment(null);
chanageState(ServerState.STOPPED);
} else {
