Author: saminda
Date: Thu Jun 1 21:47:10 2006
New Revision: 411035
URL: http://svn.apache.org/viewvc?rev=411035&view=rev
Log:
cleaning up the code
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContextFinder.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContextFinder.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContextFinder.java?rev=411035&r1=411034&r2=411035&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContextFinder.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContextFinder.java
Thu Jun 1 21:47:10 2006
@@ -28,7 +28,7 @@
import org.apache.synapse.config.SynapseConfigurationBuilder;
import org.apache.synapse.config.SynapseConfiguration;
-import java.io.InputStream;
+import java.util.Iterator;
/**
* <p/>
@@ -39,13 +39,15 @@
private static Log log =
LogFactory.getLog(Axis2MessageContextFinder.class);
- public static MessageContext
getSynapseMessageContext(org.apache.axis2.context.MessageContext axisMsgCtx) {
+ public static MessageContext getSynapseMessageContext(
+ org.apache.axis2.context.MessageContext axisMsgCtx)
+ throws AxisFault {
// we get the configuration on each message from the Axis2
configuration since the Synapse configuration
// may be updated externally and thus should not be cached.
SynapseConfiguration synCfg = getSynapseConfig(axisMsgCtx);
- SynapseEnvironment synEnv = getSynapseEnvironment(axisMsgCtx);
+ SynapseEnvironment synEnv = getSynapseEnvironment(axisMsgCtx);
if (synCfg == null || synEnv == null) {
initializeSynapse(axisMsgCtx);
@@ -56,22 +58,8 @@
return new Axis2MessageContext(axisMsgCtx, synCfg, synEnv);
}
- /**
- * Create the SynapseConfiguration and SynapseEnvironment objects and set
them into the Axis2 configuration
- * for reuse
- * @param mc the current Axis2 message context
- */
- private static synchronized void
initializeSynapse(org.apache.axis2.context.MessageContext mc) {
-
- if (getSynapseConfig(mc) != null && getSynapseEnvironment(mc) != null)
{
- // is this a second thread which came in just after initialization?
- return;
- }
-
- log.info("Initializing Synapse...");
- SynapseConfiguration synCfg;
- AxisConfiguration axisCfg =
mc.getConfigurationContext().getAxisConfiguration();
-
+ public static SynapseConfiguration initializeSynapseConfigurationBuilder(
+ AxisConfiguration axisConfiguration) {
/*
First Check, if synapse.xml is provided as an system property, use it..
else
@@ -81,40 +69,84 @@
Priorty will be given to the System property.
*/
-
- Parameter configParam = axisCfg.getParameter(SYNAPSE_CONFIGURATION);
+ SynapseConfiguration synapseConfiguration;
+ Parameter configParam =
+ axisConfiguration.getParameter(SYNAPSE_CONFIGURATION);
String config = System.getProperty(Constants.SYNAPSE_XML);
if (config != null) {
log.info("System property '" + Constants.SYNAPSE_XML +
- "' specifies synapse configuration as " + config);
- synCfg = SynapseConfigurationBuilder.getConfiguration(config);
- }else if (configParam != null) {
- log.info("Synapse.xml is available via SynapseConfiguration in
Axis2.xml");
- synCfg =
SynapseConfigurationBuilder.getConfiguration(configParam.getValue().toString().trim());
- }else {
- log.warn("System property '" + Constants.SYNAPSE_XML + "' is not
specified or SynapseConfiguration" +
+ "' specifies synapse configuration as " + config);
+ synapseConfiguration =
+ SynapseConfigurationBuilder.getConfiguration(config);
+ } else if (configParam != null) {
+ log.info(
+ "Synapse.xml is available via SynapseConfiguration in
Axis2.xml");
+ synapseConfiguration = SynapseConfigurationBuilder
+
.getConfiguration(configParam.getValue().toString().trim());
+ } else {
+ log.warn("System property '" + Constants.SYNAPSE_XML +
+ "' is not specified or SynapseConfiguration" +
"is not available via Axis2.xml.Thus, Using default
configuration");
- synCfg = SynapseConfigurationBuilder.getDefaultConfiguration();
+ synapseConfiguration =
+ SynapseConfigurationBuilder.getDefaultConfiguration();
}
// set the Synapse configuration and environment into the Axis2
configuration
Parameter synapseCtxParam = new Parameter(SYNAPSE_CONFIG, null);
- synapseCtxParam.setValue(synCfg);
+ synapseCtxParam.setValue(synapseConfiguration);
Parameter synapseEnvParam = new Parameter(SYNAPSE_ENV, null);
- synapseEnvParam.setValue(new Axis2SynapseEnvironment(axisCfg));
+ synapseEnvParam
+ .setValue(new Axis2SynapseEnvironment(axisConfiguration));
try {
- axisCfg.addParameter(synapseCtxParam);
- axisCfg.addParameter(synapseEnvParam);
+ axisConfiguration.addParameter(synapseCtxParam);
+ axisConfiguration.addParameter(synapseEnvParam);
} catch (AxisFault e) {
handleException(
- "Could not set parameters '" + SYNAPSE_CONFIG + "' and/or '" +
SYNAPSE_ENV +
- "'to the Axis2 configuration : " + e.getMessage(), e);
+ "Could not set parameters '" + SYNAPSE_CONFIG +
+ "' and/or '" + SYNAPSE_ENV +
+ "'to the Axis2 configuration : " + e.getMessage(), e);
}
+ return synapseConfiguration;
+
+ }
+
+ /**
+ * Create the SynapseConfiguration and SynapseEnvironment objects and set
them into the Axis2 configuration
+ * for reuse
+ *
+ * @param mc the current Axis2 message context
+ */
+ private static synchronized void initializeSynapse(
+ org.apache.axis2.context.MessageContext mc) throws AxisFault {
+
+ if (getSynapseConfig(mc) != null && getSynapseEnvironment(mc) != null)
{
+ // is this a second thread which came in just after initialization?
+ return;
+ }
+
+ log.info("Initializing Synapse...");
+ AxisConfiguration axisCfg =
+ mc.getConfigurationContext().getAxisConfiguration();
+
+ SynapseConfiguration synCfg =
+ initializeSynapseConfigurationBuilder(axisCfg);
+
+ log.info("Initializing Proxy services...");
+ if (synCfg == null) {
+ handleException("SynapseConfiguration wouldn't initialize");
+ } else {
+ Iterator iter = synCfg.getProxyServices().iterator();
+ while (iter.hasNext()) {
+ ProxyService proxy = (ProxyService) iter.next();
+ axisCfg.addService(proxy.buildAxisService());
+ }
+ }
+
log.info("Synapse initialized...");
}
@@ -124,8 +156,15 @@
throw new SynapseException(msg, e);
}
- private static SynapseConfiguration
getSynapseConfig(org.apache.axis2.context.MessageContext mc) {
- AxisConfiguration ac =
mc.getConfigurationContext().getAxisConfiguration();
+ private static void handleException(String msg) {
+ log.error(msg);
+ throw new SynapseException(msg);
+ }
+
+ private static SynapseConfiguration getSynapseConfig(
+ org.apache.axis2.context.MessageContext mc) {
+ AxisConfiguration ac =
+ mc.getConfigurationContext().getAxisConfiguration();
Parameter synConfigParam = ac.getParameter(SYNAPSE_CONFIG);
if (synConfigParam != null) {
return (SynapseConfiguration) synConfigParam.getValue();
@@ -133,8 +172,10 @@
return null;
}
- private static SynapseEnvironment
getSynapseEnvironment(org.apache.axis2.context.MessageContext mc) {
- AxisConfiguration ac =
mc.getConfigurationContext().getAxisConfiguration();
+ private static SynapseEnvironment getSynapseEnvironment(
+ org.apache.axis2.context.MessageContext mc) {
+ AxisConfiguration ac =
+ mc.getConfigurationContext().getAxisConfiguration();
Parameter synEnvParam = ac.getParameter(SYNAPSE_ENV);
if (synEnvParam != null) {
return (SynapseEnvironment) synEnvParam.getValue();
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java?rev=411035&r1=411034&r2=411035&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
Thu Jun 1 21:47:10 2006
@@ -53,58 +53,18 @@
log.info("Initializing Synapse Environment ...");
- SynapseConfiguration synCfg;
-
- /*
- First Check, if synapse.xml is provided as an system property, use it..
- else
- check if the synapse.xml is available via Axis2.xml
SynapseConfiguration
- else
- default config [which is only the passthrow case]
-
- Priorty will be given to the System property.
- */
-
- Parameter configParam = axisCfg.getParameter(SYNAPSE_CONFIGURATION);
-
- String config = System.getProperty(Constants.SYNAPSE_XML);
-
- if (config != null) {
- log.info("System property '" + Constants.SYNAPSE_XML +
- "' specifies synapse configuration as " + config);
- synCfg = SynapseConfigurationBuilder.getConfiguration(config);
- }else if (configParam != null) {
- log.info("Synapse.xml is available via SynapseConfiguration in
Axis2.xml");
- synCfg =
SynapseConfigurationBuilder.getConfiguration(configParam.getValue().toString().trim());
- }else {
- log.warn("System property '" + Constants.SYNAPSE_XML + "' is not
specified or SynapseConfiguration" +
- "is not available via Axis2.xml.Thus, Using default
configuration");
- synCfg = SynapseConfigurationBuilder.getDefaultConfiguration();
- }
-
- // set the Synapse configuration and environment into the Axis2
configuration
- Parameter synapseCtxParam = new Parameter(SYNAPSE_CONFIG, null);
- synapseCtxParam.setValue(synCfg);
-
- Parameter synapseEnvParam = new Parameter(SYNAPSE_ENV, null);
- synapseEnvParam.setValue(new Axis2SynapseEnvironment(axisCfg));
-
- try {
- axisCfg.addParameter(synapseCtxParam);
- axisCfg.addParameter(synapseEnvParam);
-
- } catch (AxisFault e) {
- handleException(
- "Could not set parameters '" + SYNAPSE_CONFIG +
- "' and/or '" + SYNAPSE_ENV +
- "'to the Axis2 configuration : " + e.getMessage(), e);
- }
+ SynapseConfiguration synCfg = Axis2MessageContextFinder
+ .initializeSynapseConfigurationBuilder(axisCfg);
log.info("Initializing Proxy services...");
- Iterator iter = synCfg.getProxyServices().iterator();
- while (iter.hasNext()) {
- ProxyService proxy = (ProxyService) iter.next();
- axisCfg.addService(proxy.buildAxisService());
+ if (synCfg == null) {
+ handleException("SynapseConfiguration wouldn't initialize");
+ } else {
+ Iterator iter = synCfg.getProxyServices().iterator();
+ while (iter.hasNext()) {
+ ProxyService proxy = (ProxyService) iter.next();
+ axisCfg.addService(proxy.buildAxisService());
+ }
}
log.info("Synapse Environment initialized...");
@@ -119,8 +79,8 @@
// FixMe
}
- private void handleException(String msg, Exception e) {
- log.error(msg, e);
- throw new SynapseException(msg, e);
+ private void handleException(String msg) {
+ log.error(msg);
+ throw new SynapseException(msg);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
