You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/09/19 11:09:14 UTC
svn commit: r577213 [3/5] - in /webservices/synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/
core/src/main/java/org/apache/synapse/config/
core/src/main/java/org/apache/synapse/config/xml/
core/src/main/java/org/apache/synapse/config/...
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/LoadbalanceAlgorithmFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/LoadbalanceAlgorithmFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/LoadbalanceAlgorithmFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/LoadbalanceAlgorithmFactory.java Wed Sep 19 02:09:01 2007
@@ -23,7 +23,7 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.synapse.endpoints.algorithms.LoadbalanceAlgorithm;
import org.apache.synapse.endpoints.algorithms.RoundRobin;
-import org.apache.synapse.config.xml.Constants;
+import org.apache.synapse.config.xml.XMLConfigConstants;
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -39,7 +39,7 @@
LoadbalanceAlgorithm algorithm = null;
String algorithmName = "roundRobin";
- OMAttribute algoAttribute = loadbalanceElement.getAttribute(new QName(null, Constants.ALGORITHM_NAME));
+ OMAttribute algoAttribute = loadbalanceElement.getAttribute(new QName(null, XMLConfigConstants.ALGORITHM_NAME));
if(algoAttribute != null) {
algorithmName = algoAttribute.getAttributeValue();
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java Wed Sep 19 02:09:01 2007
@@ -27,7 +27,7 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.SynapseConfiguration;
@@ -95,15 +95,15 @@
if (wsAddrOn) {
service.engageModule(axisCfg.getModule(
- Constants.ADDRESSING_MODULE_NAME), axisCfg);
+ SynapseConstants.ADDRESSING_MODULE_NAME), axisCfg);
if (wsRMOn) {
service.engageModule(axisCfg.getModule(
- Constants.SANDESHA2_MODULE_NAME), axisCfg);
+ SynapseConstants.SANDESHA2_MODULE_NAME), axisCfg);
}
if (wsSecOn) {
service.engageModule(axisCfg.getModule(
- Constants.RAMPART_MODULE_NAME), axisCfg);
+ SynapseConstants.RAMPART_MODULE_NAME), axisCfg);
}
}
// if WS-A is off, WS-Sec and WS-RM should be too
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java Wed Sep 19 02:09:01 2007
@@ -22,7 +22,7 @@
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.client.async.AsyncResult;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
/**
* This class only "holds" the Synapse out message context for the Synapse callback message
@@ -40,7 +40,7 @@
/**
* Action to perform when timeout occurs.
*/
- private int timeOutAction = Constants.NONE;
+ private int timeOutAction = SynapseConstants.NONE;
public AsyncCallback(org.apache.synapse.MessageContext synapseOutMsgCtx) {
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java Wed Sep 19 02:09:01 2007
@@ -51,7 +51,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.endpoints.utils.EndpointDefinition;
import org.apache.sandesha2.client.SandeshaClientConstants;
@@ -150,7 +150,7 @@
}
if (endpoint.isUseSeparateListener()) {
- axisOutMsgCtx.setProperty(Constants.OUTFLOW_USE_SEPARATE_LISTENER, Boolean.TRUE);
+ axisOutMsgCtx.getOptions().setUseSeparateListener(true);
}
axisOutMsgCtx.setTo(new EndpointReference(eprAddress));
@@ -176,7 +176,7 @@
ServiceContext serviceCtx = sgc.getServiceContext(anoymousService);
boolean outOnlyMessage = "true".equals(
- synapseOutMessageContext.getProperty(Constants.OUT_ONLY));
+ synapseOutMessageContext.getProperty(SynapseConstants.OUT_ONLY));
// get a reference to the DYNAMIC operation of the Anonymous Axis2 service
AxisOperation axisAnonymousOperation = anoymousService.getOperation(
@@ -191,7 +191,7 @@
// if a WS-RM policy is specified, use it
if (wsRMPolicyKey != null) {
clientOptions.setProperty(
- org.apache.synapse.config.xml.Constants.SANDESHA_POLICY,
+ SynapseConstants.SANDESHA_POLICY,
getPolicy(synapseOutMessageContext, wsRMPolicyKey));
}
copyRMOptions(originalInMsgCtx, clientOptions);
@@ -205,7 +205,7 @@
// if a WS-Sec policy is specified, use it
if (wsSecPolicyKey != null) {
clientOptions.setProperty(
- org.apache.synapse.config.xml.Constants.RAMPART_POLICY,
+ SynapseConstants.RAMPART_POLICY,
getPolicy(synapseOutMessageContext, wsSecPolicyKey));
}
// temporary workaround for https://issues.apache.org/jira/browse/WSCOMMONS-197
@@ -298,17 +298,17 @@
private static void copyRMOptions(MessageContext oriContext, Options targetOptions) {
Options oriOptions = oriContext.getOptions();
- if(oriOptions.getProperty(Constants.SANDESHA_LAST_MESSAGE) != null) {
- targetOptions.setProperty(Constants.SANDESHA_LAST_MESSAGE,
- oriOptions.getProperty(Constants.SANDESHA_LAST_MESSAGE));
- }
- if(oriOptions.getProperty(Constants.SANDESHA_SPEC_VERSION) != null) {
- targetOptions.setProperty(Constants.SANDESHA_SPEC_VERSION,
- oriOptions.getProperty(Constants.SANDESHA_SPEC_VERSION));
- }
- if(oriOptions.getProperty(Constants.SANDESHA_SEQUENCE_KEY) != null) {
- targetOptions.setProperty(Constants.SANDESHA_SEQUENCE_KEY,
- oriOptions.getProperty(Constants.SANDESHA_SEQUENCE_KEY));
+ if(oriOptions.getProperty(SynapseConstants.SANDESHA_LAST_MESSAGE) != null) {
+ targetOptions.setProperty(SynapseConstants.SANDESHA_LAST_MESSAGE,
+ oriOptions.getProperty(SynapseConstants.SANDESHA_LAST_MESSAGE));
+ }
+ if(oriOptions.getProperty(SynapseConstants.SANDESHA_SPEC_VERSION) != null) {
+ targetOptions.setProperty(SynapseConstants.SANDESHA_SPEC_VERSION,
+ oriOptions.getProperty(SynapseConstants.SANDESHA_SPEC_VERSION));
+ }
+ if(oriOptions.getProperty(SynapseConstants.SANDESHA_SEQUENCE_KEY) != null) {
+ targetOptions.setProperty(SynapseConstants.SANDESHA_SEQUENCE_KEY,
+ oriOptions.getProperty(SynapseConstants.SANDESHA_SEQUENCE_KEY));
}
if(oriOptions.getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID) != null) {
targetOptions.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java Wed Sep 19 02:09:01 2007
@@ -80,7 +80,7 @@
private boolean faultResponse = false;
/** Attribute of MC stating the tracing state of the message */
- private int tracingState = Constants.TRACING_UNSET;
+ private int tracingState = SynapseConstants.TRACING_UNSET;
public SynapseConfiguration getConfiguration() {
return synCfg;
@@ -99,23 +99,23 @@
}
public Mediator getMainSequence() {
- Object o = localEntries.get(Constants.MAIN_SEQUENCE_KEY);
+ Object o = localEntries.get(SynapseConstants.MAIN_SEQUENCE_KEY);
if (o != null && o instanceof Mediator) {
return (Mediator) o;
} else {
Mediator main = getConfiguration().getMainSequence();
- localEntries.put(Constants.MAIN_SEQUENCE_KEY, main);
+ localEntries.put(SynapseConstants.MAIN_SEQUENCE_KEY, main);
return main;
}
}
public Mediator getFaultSequence() {
- Object o = localEntries.get(Constants.FAULT_SEQUENCE_KEY);
+ Object o = localEntries.get(SynapseConstants.FAULT_SEQUENCE_KEY);
if (o != null && o instanceof Mediator) {
return (Mediator) o;
} else {
Mediator fault = getConfiguration().getFaultSequence();
- localEntries.put(Constants.FAULT_SEQUENCE_KEY, fault);
+ localEntries.put(SynapseConstants.FAULT_SEQUENCE_KEY, fault);
return fault;
}
}
@@ -166,7 +166,7 @@
properties.put(key, value);
// do not commit response by default in the server process
- if (Constants.RESPONSE.equals(key) &&
+ if (SynapseConstants.RESPONSE.equals(key) &&
getAxis2MessageContext().getOperationContext() != null) {
getAxis2MessageContext().getOperationContext().setProperty(
org.apache.axis2.Constants.RESPONSE_WRITTEN, "SKIP");
@@ -302,11 +302,11 @@
public void setResponse(boolean b) {
response = b;
- axis2MessageContext.setProperty(Constants.ISRESPONSE_PROPERTY, Boolean.valueOf(b));
+ axis2MessageContext.setProperty(SynapseConstants.ISRESPONSE_PROPERTY, Boolean.valueOf(b));
}
public boolean isResponse() {
- Object o = properties.get(Constants.RESPONSE);
+ Object o = properties.get(SynapseConstants.RESPONSE);
if (o != null && o instanceof String && ((String) o).equalsIgnoreCase("true")) {
return true;
}
@@ -343,7 +343,7 @@
public void setAxis2MessageContext(org.apache.axis2.context.MessageContext axisMsgCtx) {
this.axis2MessageContext = axisMsgCtx;
- Boolean resp = (Boolean) axisMsgCtx.getProperty(Constants.ISRESPONSE_PROPERTY);
+ Boolean resp = (Boolean) axisMsgCtx.getProperty(SynapseConstants.ISRESPONSE_PROPERTY);
if (resp != null)
response = resp.booleanValue();
}
@@ -381,13 +381,13 @@
// set function context into XPath
SimpleFunctionContext fc = new XPathFunctionContext();
- fc.registerFunction(Constants.SYNAPSE_NAMESPACE, "get-property", getPropertyFunc);
+ fc.registerFunction(SynapseConstants.SYNAPSE_NAMESPACE, "get-property", getPropertyFunc);
fc.registerFunction(null, "get-property", getPropertyFunc);
xpath.setFunctionContext(fc);
// register namespace for XPath extension function
- xpath.addNamespace("synapse", Constants.SYNAPSE_NAMESPACE);
- xpath.addNamespace("syn", Constants.SYNAPSE_NAMESPACE);
+ xpath.addNamespace("synapse", SynapseConstants.SYNAPSE_NAMESPACE);
+ xpath.addNamespace("syn", SynapseConstants.SYNAPSE_NAMESPACE);
} catch (JaxenException je) {
handleException("Error setting up the Synapse XPath " +
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java Wed Sep 19 02:09:01 2007
@@ -26,7 +26,7 @@
import org.apache.axis2.engine.AxisEngine;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.endpoints.utils.EndpointDefinition;
import org.apache.synapse.statistics.StatisticsUtils;
@@ -74,7 +74,7 @@
AxisEngine ae = new AxisEngine(messageContext.getConfigurationContext());
try {
- messageContext.setProperty(Constants.ISRESPONSE_PROPERTY, Boolean.TRUE);
+ messageContext.setProperty(SynapseConstants.ISRESPONSE_PROPERTY, Boolean.TRUE);
// check if addressing is already engaged for this message.
// if engaged we should use the addressing enabled Configuraion context.
if (smc.isResponse()) {
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java Wed Sep 19 02:09:01 2007
@@ -20,14 +20,11 @@
package org.apache.synapse.core.axis2;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.soap.SOAPProcessingException;
-import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.OperationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
@@ -38,10 +35,6 @@
import org.apache.synapse.statistics.StatisticsCollector;
import org.apache.synapse.statistics.StatisticsUtils;
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
-import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
-import edu.emory.mathcs.backport.java.util.concurrent.Executors;
-
/**
* <p> This is the Axis2 implementation of the MessageContext
@@ -79,20 +72,20 @@
}
// if this is a response to a proxy service
- if (synCtx.getProperty(Constants.PROXY_SERVICE) != null) {
+ if (synCtx.getProperty(SynapseConstants.PROXY_SERVICE) != null) {
if (synCtx.getConfiguration().getProxyService((String) synCtx.getProperty(
- Constants.PROXY_SERVICE)).getTargetOutSequence() != null) {
+ SynapseConstants.PROXY_SERVICE)).getTargetOutSequence() != null) {
String sequenceName = synCtx.getConfiguration().getProxyService((String) synCtx.
- getProperty(Constants.PROXY_SERVICE)).getTargetOutSequence();
+ getProperty(SynapseConstants.PROXY_SERVICE)).getTargetOutSequence();
Mediator outSequence = synCtx.getSequence(sequenceName);
if (outSequence != null) {
if (log.isDebugEnabled()) {
log.debug("Using the sequence named " + sequenceName
+ " for the outgoing message mediation of the proxy service "
- + synCtx.getProperty(Constants.PROXY_SERVICE));
+ + synCtx.getProperty(SynapseConstants.PROXY_SERVICE));
}
outSequence.mediate(synCtx);
} else {
@@ -103,17 +96,17 @@
}
} else if (synCtx.getConfiguration().getProxyService((String) synCtx.getProperty(
- Constants.PROXY_SERVICE)).getTargetInLineOutSequence() != null) {
+ SynapseConstants.PROXY_SERVICE)).getTargetInLineOutSequence() != null) {
if (log.isDebugEnabled()) {
log.debug("Using the anonymous out-sequence specified in the proxy service "
- + synCtx.getProperty(Constants.PROXY_SERVICE)
+ + synCtx.getProperty(SynapseConstants.PROXY_SERVICE)
+ " for outgoing message mediation");
}
synCtx.getConfiguration().getProxyService((String) synCtx.getProperty(
- Constants.PROXY_SERVICE)).getTargetInLineOutSequence().mediate(synCtx);
+ SynapseConstants.PROXY_SERVICE)).getTargetInLineOutSequence().mediate(synCtx);
} else {
if (log.isDebugEnabled()) {
- log.debug("Proxy service " + synCtx.getProperty(Constants.PROXY_SERVICE)
+ log.debug("Proxy service " + synCtx.getProperty(SynapseConstants.PROXY_SERVICE)
+ " does not specifies an out-sequence - sending the response back");
}
Axis2Sender.sendBack(synCtx);
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java Wed Sep 19 02:09:01 2007
@@ -34,7 +34,7 @@
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import javax.xml.namespace.QName;
@@ -184,7 +184,7 @@
// envelope does not contain addressing headers
MessageContext responseMessageContext = new MessageContext();
responseMessageContext.setMessageID(msgctx.getMessageID());
- responseMessageContext.setProperty(Constants.RELATES_TO_FOR_POX, msgctx.getMessageID());
+ responseMessageContext.setProperty(SynapseConstants.RELATES_TO_FOR_POX, msgctx.getMessageID());
responseMessageContext.setOptions(options);
addMessageContext(responseMessageContext);
@@ -209,7 +209,7 @@
msgctx.getProperty(org.apache.axis2.Constants.OUT_TRANSPORT_INFO));
responseMessageContext.setProperty(
- org.apache.synapse.Constants.ISRESPONSE_PROPERTY, Boolean.TRUE);
+ org.apache.synapse.SynapseConstants.ISRESPONSE_PROPERTY, Boolean.TRUE);
responseMessageContext.setTransportIn(msgctx.getTransportIn());
responseMessageContext.setTransportOut(msgctx.getTransportOut());
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/MessageContextCreatorForAxis2.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/MessageContextCreatorForAxis2.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/MessageContextCreatorForAxis2.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/MessageContextCreatorForAxis2.java Wed Sep 19 02:09:01 2007
@@ -20,11 +20,9 @@
package org.apache.synapse.core.axis2;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.SynapseConfiguration;
@@ -34,7 +32,7 @@
* The MessageContext needs to be set up and then is used by the SynapseMessageReceiver to inject messages.
* This class is used by the SynapseMessageReceiver to find the environment. The env is stored in a Parameter to the Axis2 config
*/
-public class MessageContextCreatorForAxis2 implements Constants {
+public class MessageContextCreatorForAxis2 {
private static Log log = LogFactory.getLog(MessageContextCreatorForAxis2.class);
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java Wed Sep 19 02:09:01 2007
@@ -21,18 +21,14 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.transport.http.server.HttpUtils;
import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.mediators.base.SequenceMediator;
import org.apache.synapse.endpoints.Endpoint;
@@ -41,8 +37,6 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLInputFactory;
import java.io.IOException;
import java.io.InputStream;
import java.io.ByteArrayOutputStream;
@@ -75,7 +69,7 @@
public class ProxyService {
private static final Log log = LogFactory.getLog(ProxyService.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/**
* The name of the proxy service
*/
@@ -162,11 +156,11 @@
/**
* To decide to whether statistics should have collected or not
*/
- private int statisticsEnable = Constants.STATISTICS_UNSET;
+ private int statisticsEnable = SynapseConstants.STATISTICS_UNSET;
/**
* The variable that indicate tracing on or off for the current mediator
*/
- protected int traceState = Constants.TRACING_UNSET;
+ protected int traceState = SynapseConstants.TRACING_UNSET;
/**
* Build the underlying Axis2 service from the Proxy service definition
@@ -362,7 +356,7 @@
if (wsRMEnabled) {
try {
proxyService.engageModule(axisCfg.getModule(
- Constants.SANDESHA2_MODULE_NAME), axisCfg);
+ SynapseConstants.SANDESHA2_MODULE_NAME), axisCfg);
} catch (AxisFault axisFault) {
handleException("Error loading WS RM module on proxy service : " + name, axisFault);
}
@@ -372,7 +366,7 @@
if (wsSecEnabled) {
try {
proxyService.engageModule(axisCfg.getModule(
- Constants.RAMPART_MODULE_NAME), axisCfg);
+ SynapseConstants.RAMPART_MODULE_NAME), axisCfg);
} catch (AxisFault axisFault) {
handleException("Error loading WS Sec module on proxy service : "
+ name, axisFault);
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java Wed Sep 19 02:09:01 2007
@@ -33,7 +33,7 @@
public class ProxyServiceMessageReceiver extends SynapseMessageReceiver {
private static final Log log = LogFactory.getLog(ProxyServiceMessageReceiver.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/**
* The name of the Proxy Service
@@ -59,24 +59,24 @@
MessageContext synCtx = MessageContextCreatorForAxis2.getSynapseMessageContext(mc);
try {
- synCtx.setProperty(org.apache.synapse.Constants.PROXY_SERVICE, name);
+ synCtx.setProperty(org.apache.synapse.SynapseConstants.PROXY_SERVICE, name);
ProxyService proxy = synCtx.getConfiguration().getProxyService(name);
// Setting Required property to collect the proxy service statistics
boolean statisticsEnable;
if (proxy != null) {
statisticsEnable = (
- org.apache.synapse.Constants.STATISTICS_ON == proxy.getStatisticsEnable());
+ org.apache.synapse.SynapseConstants.STATISTICS_ON == proxy.getStatisticsEnable());
if (statisticsEnable) {
ProxyServiceStatisticsStack proxyServiceStatisticsStack
= new ProxyServiceStatisticsStack();
boolean isFault = synCtx.getEnvelope().getBody().hasFault();
proxyServiceStatisticsStack.put(name, System.currentTimeMillis(),
!synCtx.isResponse(), statisticsEnable, isFault);
- synCtx.setProperty(org.apache.synapse.Constants.PROXYSERVICE_STATISTICS_STACK,
+ synCtx.setProperty(org.apache.synapse.SynapseConstants.PROXYSERVICE_STATISTICS_STACK,
proxyServiceStatisticsStack);
}
- boolean shouldTrace = (proxy.getTraceState() == Constants.TRACING_ON);
+ boolean shouldTrace = (proxy.getTraceState() == SynapseConstants.TRACING_ON);
if (shouldTrace) {
trace.trace("Proxy Service " + name + " received a new message...");
trace.trace("Received Message :: " + mc.getEnvelope());
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java Wed Sep 19 02:09:01 2007
@@ -34,7 +34,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.client.SandeshaClientConstants;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.FaultHandler;
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.SynapseConfiguration;
@@ -55,7 +55,7 @@
TimeoutHandler timeoutHandler = new TimeoutHandler(callbackStore);
Timer timeOutTimer = synCfg.getSynapseTimer();
- timeOutTimer.schedule(timeoutHandler, 0, Constants.TIMEOUT_HANDLER_INTERVAL);
+ timeOutTimer.schedule(timeoutHandler, 0, SynapseConstants.TIMEOUT_HANDLER_INTERVAL);
}
public void addCallback(String MsgID, Callback callback) {
@@ -69,7 +69,7 @@
if (messageCtx.getOptions() != null && messageCtx.getOptions().getRelatesTo() != null) {
messageID = messageCtx.getOptions().getRelatesTo().getValue();
} else if (messageCtx.getProperty(SandeshaClientConstants.SEQUENCE_KEY) == null) {
- messageID = (String) messageCtx.getProperty(Constants.RELATES_TO_FOR_POX);
+ messageID = (String) messageCtx.getProperty(SynapseConstants.RELATES_TO_FOR_POX);
}
if (messageID != null) {
@@ -125,10 +125,10 @@
}
// set an error code to the message context, so that error sequences can filter
// using that property to determine the cause of error
- synapseOutMsgCtx.setProperty(Constants.ERROR_CODE, Constants.SENDING_FAULT);
+ synapseOutMsgCtx.setProperty(SynapseConstants.ERROR_CODE, SynapseConstants.SENDING_FAULT);
SOAPFaultReason faultReason = fault.getReason();
if (faultReason != null) {
- synapseOutMsgCtx.setProperty(Constants.ERROR_MESSAGE,
+ synapseOutMsgCtx.setProperty(SynapseConstants.ERROR_MESSAGE,
faultReason.getText());
}
((FaultHandler) faultStack.pop()).handleFault(synapseOutMsgCtx, e);
@@ -171,7 +171,7 @@
// set properties on response
response.setServerSide(true);
- response.setProperty(Constants.ISRESPONSE_PROPERTY, Boolean.TRUE);
+ response.setProperty(SynapseConstants.ISRESPONSE_PROPERTY, Boolean.TRUE);
response.setProperty(MessageContext.TRANSPORT_OUT,
axisOutMsgCtx.getProperty(MessageContext.TRANSPORT_OUT));
response.setProperty(org.apache.axis2.Constants.OUT_TRANSPORT_INFO,
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java Wed Sep 19 02:09:01 2007
@@ -58,10 +58,10 @@
try {
StatisticsStack synapseServiceStack =
(StatisticsStack) synCtx.getProperty(
- org.apache.synapse.Constants.SYNAPSESERVICE_STATISTICS_STACK);
+ org.apache.synapse.SynapseConstants.SYNAPSESERVICE_STATISTICS_STACK);
if (synapseServiceStack == null) {
synapseServiceStack = new ProxyServiceStatisticsStack();
- synCtx.setProperty(org.apache.synapse.Constants.SYNAPSESERVICE_STATISTICS_STACK,
+ synCtx.setProperty(org.apache.synapse.SynapseConstants.SYNAPSESERVICE_STATISTICS_STACK,
synapseServiceStack);
}
String name = "SynapseService";
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java Wed Sep 19 02:09:01 2007
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.ServerManager;
import javax.servlet.ServletConfig;
@@ -57,7 +57,7 @@
if (synapseHome.endsWith("/")) {
synapseHome = synapseHome.substring(0, synapseHome.lastIndexOf("/"));
}
- System.setProperty(Constants.SYNAPSE_HOME, synapseHome);
+ System.setProperty(SynapseConstants.SYNAPSE_HOME, synapseHome);
//setting axis2 repository location
String axis2Repo = System.getProperty(org.apache.axis2.Constants.AXIS2_REPO);
if (axis2Repo == null) {
@@ -76,12 +76,12 @@
+ File.separator + org.apache.axis2.Constants.AXIS2_CONF);
}
//setting synapse configuration location
- String synapseXml = System.getProperty(org.apache.synapse.Constants.SYNAPSE_XML);
+ String synapseXml = System.getProperty(org.apache.synapse.SynapseConstants.SYNAPSE_XML);
if (synapseXml == null) {
- System.setProperty(org.apache.synapse.Constants.SYNAPSE_XML,
+ System.setProperty(org.apache.synapse.SynapseConstants.SYNAPSE_XML,
synapseHome + File.separator
+ "WEB-INF/conf"
- + File.separator + org.apache.synapse.Constants.SYNAPSE_XML);
+ + File.separator + org.apache.synapse.SynapseConstants.SYNAPSE_XML);
}
} else {
@@ -115,14 +115,14 @@
private String resolveSynapseHome(ServletConfig servletConfig) {
// If synapse.home has provided as init-param,the it will take as synapse home
- String synapseHomeAsParam = servletConfig.getInitParameter(Constants.SYNAPSE_HOME);
+ String synapseHomeAsParam = servletConfig.getInitParameter(SynapseConstants.SYNAPSE_HOME);
if (synapseHomeAsParam != null) {
if (synapseHomeAsParam.endsWith("/")) {
return synapseHomeAsParam.substring(0, synapseHomeAsParam.lastIndexOf("/"));
}
}
//if synapse.home has set as a system property , then use it
- String synapseHome = System.getProperty(Constants.SYNAPSE_HOME);
+ String synapseHome = System.getProperty(SynapseConstants.SYNAPSE_HOME);
//Setting the all required system properties
if (synapseHome == null || "".equals(synapseHome)) {
ServletContext servletContext = servletConfig.getServletContext();
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java Wed Sep 19 02:09:01 2007
@@ -20,9 +20,7 @@
package org.apache.synapse.core.axis2;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.Constants;
-import org.apache.synapse.FaultHandler;
-import org.apache.synapse.mediators.transform.FaultMediator;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.mediators.MediatorFaultHandler;
import java.util.TimerTask;
@@ -89,12 +87,12 @@
Object key = i.next();
AsyncCallback callback = (AsyncCallback) callbackStore.get(key);
- if (callback.getTimeOutAction() != Constants.NONE) {
+ if (callback.getTimeOutAction() != SynapseConstants.NONE) {
if (callback.getTimeOutOn() <= currentTime) {
callbackStore.remove(key);
- if (callback.getTimeOutAction() == Constants.DISCARD_AND_FAULT) {
+ if (callback.getTimeOutAction() == SynapseConstants.DISCARD_AND_FAULT) {
// actiavte the fault sequence of the current sequence mediator
@@ -102,7 +100,7 @@
// add an error code to the message context, so that error sequences
// can identify the cause of error
- msgContext.setProperty(Constants.ERROR_CODE, Constants.TIME_OUT);
+ msgContext.setProperty(SynapseConstants.ERROR_CODE, SynapseConstants.TIME_OUT);
Stack faultStack = msgContext.getFaultStack();
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java Wed Sep 19 02:09:01 2007
@@ -20,12 +20,10 @@
package org.apache.synapse.endpoints;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.FaultHandler;
import org.apache.synapse.endpoints.utils.EndpointDefinition;
-import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.statistics.impl.EndPointStatisticsStack;
-import org.apache.axis2.addressing.EndpointReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -149,18 +147,18 @@
String endPointName = this.getName();
if(endPointName ==null) {
- endPointName = Constants.ANONYMOUS_ENDPOINTS;
+ endPointName = SynapseConstants.ANONYMOUS_ENDPOINTS;
}
// Setting Required property to collect the End Point statistics
boolean statisticsEnable =
- (org.apache.synapse.Constants.STATISTICS_ON == endpoint.getStatisticsEnable());
+ (org.apache.synapse.SynapseConstants.STATISTICS_ON == endpoint.getStatisticsEnable());
if (statisticsEnable) {
EndPointStatisticsStack endPointStatisticsStack = null;
Object statisticsStackObj =
- synCtx.getProperty(org.apache.synapse.Constants.ENDPOINT_STATISTICS_STACK);
+ synCtx.getProperty(org.apache.synapse.SynapseConstants.ENDPOINT_STATISTICS_STACK);
if (statisticsStackObj == null) {
endPointStatisticsStack = new EndPointStatisticsStack();
- synCtx.setProperty(org.apache.synapse.Constants.ENDPOINT_STATISTICS_STACK,
+ synCtx.setProperty(org.apache.synapse.SynapseConstants.ENDPOINT_STATISTICS_STACK,
endPointStatisticsStack);
} else if (statisticsStackObj instanceof EndPointStatisticsStack) {
endPointStatisticsStack = (EndPointStatisticsStack) statisticsStackObj;
@@ -188,7 +186,7 @@
synCtx.pushFaultHandler(this);
// add this as the last endpoint to process this message. it is used by statistics code.
- synCtx.setProperty(Constants.PROCESSED_ENDPOINT, this);
+ synCtx.setProperty(SynapseConstants.PROCESSED_ENDPOINT, this);
synCtx.getEnvironment().send(endpoint, synCtx);
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java Wed Sep 19 02:09:01 2007
@@ -20,12 +20,10 @@
package org.apache.synapse.endpoints;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.FaultHandler;
import org.apache.synapse.endpoints.utils.EndpointDefinition;
import org.apache.synapse.statistics.impl.EndPointStatisticsStack;
-import org.apache.synapse.core.axis2.Axis2MessageContext;
-import org.apache.axis2.addressing.EndpointReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.axiom.om.OMElement;
@@ -83,19 +81,19 @@
eprAddress = endpointDefinition.getAddress().toString();
String endPointName = this.getName();
if (endPointName == null) {
- endPointName = Constants.ANONYMOUS_ENDPOINTS;
+ endPointName = SynapseConstants.ANONYMOUS_ENDPOINTS;
}
// Setting Required property to collect the End Point statistics
boolean statisticsEnable =
- (org.apache.synapse.Constants.STATISTICS_ON
+ (org.apache.synapse.SynapseConstants.STATISTICS_ON
== endpointDefinition.getStatisticsEnable());
if (statisticsEnable) {
EndPointStatisticsStack endPointStatisticsStack = null;
Object statisticsStackObj =
- synCtx.getProperty(org.apache.synapse.Constants.ENDPOINT_STATISTICS_STACK);
+ synCtx.getProperty(org.apache.synapse.SynapseConstants.ENDPOINT_STATISTICS_STACK);
if (statisticsStackObj == null) {
endPointStatisticsStack = new EndPointStatisticsStack();
- synCtx.setProperty(org.apache.synapse.Constants.ENDPOINT_STATISTICS_STACK,
+ synCtx.setProperty(org.apache.synapse.SynapseConstants.ENDPOINT_STATISTICS_STACK,
endPointStatisticsStack);
} else if (statisticsStackObj instanceof EndPointStatisticsStack) {
endPointStatisticsStack = (EndPointStatisticsStack) statisticsStackObj;
@@ -122,7 +120,7 @@
synCtx.pushFaultHandler(this);
// add this as the last endpoint to process this message. it is used by statistics code.
- synCtx.setProperty(Constants.PROCESSED_ENDPOINT, this);
+ synCtx.setProperty(SynapseConstants.PROCESSED_ENDPOINT, this);
synCtx.getEnvironment().send(endpointDefinition, synCtx);
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java Wed Sep 19 02:09:01 2007
@@ -19,7 +19,7 @@
package org.apache.synapse.endpoints.utils;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
/**
@@ -61,10 +61,10 @@
private long timeoutDuration = 0;
/** action to perform when a timeout occurs (NONE | DISCARD | DISCARD_AND_FAULT) **/
- private int timeoutAction = Constants.NONE;
+ private int timeoutAction = SynapseConstants.NONE;
/** To decide to whether statistics should have collected or not */
- private int statisticsEnable = Constants.STATISTICS_UNSET;
+ private int statisticsEnable = SynapseConstants.STATISTICS_UNSET;
/**
* This should return the absolute EPR address referenced by the named endpoint. This may be possibly computed.
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java Wed Sep 19 02:09:01 2007
@@ -19,8 +19,7 @@
package org.apache.synapse.mediators;
-import org.apache.synapse.Constants;
-import org.apache.synapse.ManagedLifecycle;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
@@ -31,10 +30,10 @@
public abstract class AbstractMediator implements Mediator {
/** The parent tracing state */
- protected int parentTraceState = Constants.TRACING_UNSET;
+ protected int parentTraceState = SynapseConstants.TRACING_UNSET;
/** State of tracing for the current mediator */
- protected int traceState = Constants.TRACING_UNSET;
+ protected int traceState = SynapseConstants.TRACING_UNSET;
/**
* Returns the class name of the mediator
@@ -94,8 +93,8 @@
* @return true if tracing should be performed
*/
public boolean shouldTrace(int parentTraceState){
- return (traceState == Constants.TRACING_ON) ||
- (traceState == Constants.TRACING_UNSET &&
- parentTraceState == Constants.TRACING_ON);
+ return (traceState == SynapseConstants.TRACING_ON) ||
+ (traceState == SynapseConstants.TRACING_UNSET &&
+ parentTraceState == SynapseConstants.TRACING_ON);
}
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java Wed Sep 19 02:09:01 2007
@@ -22,8 +22,9 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.jaxen.Context;
import org.jaxen.Function;
@@ -77,7 +78,7 @@
}
return null;
} else if (size == 1) {
- return evaluate(Constants.SCOPE_DEFAULT, args.get(0), context.getNavigator());
+ return evaluate(XMLConfigConstants.SCOPE_DEFAULT, args.get(0), context.getNavigator());
} else if (size == 2) {
return evaluate(args.get(0), args.get(1), context.getNavigator());
} else {
@@ -118,34 +119,34 @@
}
return null;
}
- if (Constants.SCOPE_DEFAULT.equals(scope)) {
+ if (XMLConfigConstants.SCOPE_DEFAULT.equals(scope)) {
- if (Constants.HEADER_TO.equals(key)) {
+ if (SynapseConstants.HEADER_TO.equals(key)) {
EndpointReference toEPR = synCtx.getTo();
if (toEPR != null) {
return toEPR.getAddress();
}
- } else if (Constants.HEADER_FROM.equals(key)) {
+ } else if (SynapseConstants.HEADER_FROM.equals(key)) {
EndpointReference fromEPR = synCtx.getFrom();
if (fromEPR != null) {
return fromEPR.getAddress();
}
- } else if (Constants.HEADER_ACTION.equals(key)) {
+ } else if (SynapseConstants.HEADER_ACTION.equals(key)) {
String wsaAction = synCtx.getWSAAction();
if (wsaAction != null) {
return wsaAction;
}
- } else if (Constants.HEADER_FAULT.equals(key)) {
+ } else if (SynapseConstants.HEADER_FAULT.equals(key)) {
EndpointReference faultEPR = synCtx.getFaultTo();
if (faultEPR != null) {
return faultEPR.getAddress();
}
- } else if (Constants.HEADER_REPLY_TO.equals(key)) {
+ } else if (SynapseConstants.HEADER_REPLY_TO.equals(key)) {
EndpointReference replyToEPR = synCtx.getReplyTo();
if (replyToEPR != null) {
return replyToEPR.getAddress();
}
- } else if (Constants.HEADER_MESSAGE_ID.equals(key)) {
+ } else if (SynapseConstants.HEADER_MESSAGE_ID.equals(key)) {
String messageID = synCtx.getMessageID();
if (messageID != null) {
return messageID;
@@ -158,11 +159,11 @@
return synCtx.getEntry(key);
}
}
- } else if (Constants.SCOPE_AXIS2.equals(scope) && synCtx instanceof Axis2MessageContext) {
+ } else if (XMLConfigConstants.SCOPE_AXIS2.equals(scope) && synCtx instanceof Axis2MessageContext) {
org.apache.axis2.context.MessageContext axis2MessageContext
= ((Axis2MessageContext) synCtx).getAxis2MessageContext();
return axis2MessageContext.getConfigurationContext().getProperty(key);
- } else if (Constants.SCOPE_TRANSPORT.equals(scope)
+ } else if (XMLConfigConstants.SCOPE_TRANSPORT.equals(scope)
&& synCtx instanceof Axis2MessageContext) {
org.apache.axis2.context.MessageContext axis2MessageContext
= ((Axis2MessageContext) synCtx).getAxis2MessageContext();
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorProperty.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorProperty.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorProperty.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorProperty.java Wed Sep 19 02:09:01 2007
@@ -22,7 +22,7 @@
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.MessageContext;
import org.apache.synapse.core.axis2.Axis2MessageContext;
-import org.apache.synapse.config.xml.Constants;
+import org.apache.synapse.config.xml.XMLConfigConstants;
import javax.xml.namespace.QName;
@@ -33,10 +33,10 @@
*/
public class MediatorProperty {
- public static final QName PROPERTY_Q = new QName(Constants.SYNAPSE_NAMESPACE, "property");
- public static final QName ATT_NAME_Q = new QName(Constants.NULL_NAMESPACE, "name");
- public static final QName ATT_VALUE_Q = new QName(Constants.NULL_NAMESPACE, "value");
- public static final QName ATT_EXPR_Q = new QName(Constants.NULL_NAMESPACE, "expression");
+ public static final QName PROPERTY_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "property");
+ public static final QName ATT_NAME_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "name");
+ public static final QName ATT_VALUE_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "value");
+ public static final QName ATT_EXPR_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "expression");
private String name;
private String value;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java Wed Sep 19 02:09:01 2007
@@ -22,7 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.mediators.AbstractListMediator;
@@ -45,7 +45,7 @@
public class SequenceMediator extends AbstractListMediator {
private static final Log log = LogFactory.getLog(SequenceMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/** The name of the this sequence */
private String name = null;
/** The local registry key which is used to pick a sequnce definition*/
@@ -58,7 +58,7 @@
private String registryKey = null;
/** To decide to whether statistics should have collected or not */
- private int statisticsEnable = Constants.STATISTICS_UNSET;
+ private int statisticsEnable = SynapseConstants.STATISTICS_UNSET;
/**
* If this mediator refers to another named Sequence, execute that. Else
@@ -83,15 +83,15 @@
if (key == null) {
// Setting Required property to collect the sequence statistics
boolean isStatisticsEnable
- = (org.apache.synapse.Constants.STATISTICS_ON == statisticsEnable);
+ = (org.apache.synapse.SynapseConstants.STATISTICS_ON == statisticsEnable);
if (isStatisticsEnable) {
StatisticsStack sequenceStack
- = (StatisticsStack) synCtx.getProperty(Constants.SEQUENCE_STATISTICS_STACK);
+ = (StatisticsStack) synCtx.getProperty(SynapseConstants.SEQUENCE_STATISTICS_STACK);
if (sequenceStack == null) {
sequenceStack = new SequenceStatisticsStack();
- synCtx.setProperty(Constants.SEQUENCE_STATISTICS_STACK, sequenceStack);
+ synCtx.setProperty(SynapseConstants.SEQUENCE_STATISTICS_STACK, sequenceStack);
}
- String seqName = (name == null ? Constants.ANONYMOUS_SEQUENCES : name);
+ String seqName = (name == null ? SynapseConstants.ANONYMOUS_SEQUENCES : name);
boolean isFault = synCtx.getEnvelope().getBody().hasFault();
sequenceStack.put(seqName, System.currentTimeMillis(),
!synCtx.isResponse(), isStatisticsEnable, isFault);
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java Wed Sep 19 02:09:01 2007
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.statistics.StatisticsStack;
import org.apache.synapse.statistics.StatisticsUtils;
@@ -40,7 +40,7 @@
public class SynapseMediator extends AbstractListMediator {
private static final Log log = LogFactory.getLog(SynapseMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/**
* Perform the mediation specified by the rule set
@@ -64,10 +64,10 @@
}
//put the required property for the collecttng statistics for the message mediation
StatisticsStack sequenceStack = (StatisticsStack) synCtx.getProperty(
- Constants.SEQUENCE_STATISTICS_STACK);
+ SynapseConstants.SEQUENCE_STATISTICS_STACK);
if (sequenceStack == null) {
sequenceStack = new SequenceStatisticsStack();
- synCtx.setProperty(Constants.SEQUENCE_STATISTICS_STACK,sequenceStack);
+ synCtx.setProperty(SynapseConstants.SEQUENCE_STATISTICS_STACK,sequenceStack);
}
String seqName = "MainSequence";
boolean isFault = synCtx.getEnvelope().getBody().hasFault();
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java Wed Sep 19 02:09:01 2007
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.statistics.StatisticsUtils;
import org.apache.synapse.mediators.AbstractMediator;
@@ -32,7 +32,7 @@
public class DropMediator extends AbstractMediator {
private static final Log log = LogFactory.getLog(DropMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/**
* Halts further mediation of the current message by returning false.
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java Wed Sep 19 02:09:01 2007
@@ -24,7 +24,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.mediators.MediatorProperty;
@@ -44,7 +44,7 @@
public class LogMediator extends AbstractMediator {
private static final Log log = LogFactory.getLog(LogMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/** Log levels ,according to the log level ,the information going to log will be changed */
public static final int CUSTOM = 0;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java Wed Sep 19 02:09:01 2007
@@ -22,9 +22,10 @@
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
@@ -56,7 +57,7 @@
/** Set the property (ACTION_SET) or remove it (ACTION_REMOVE). Defaults to ACTION_SET */
private int action = ACTION_SET;
private static final Log log = LogFactory.getLog(PropertyMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/**
* Sets a property into the current (local) Synapse Context or into the Axis Message Context
@@ -91,10 +92,10 @@
if (scope == null) {
//Setting property into the Synapse Context
smc.setProperty(name, resultValue);
- } else if (Constants.SCOPE_DEFAULT.equals(scope)) {
+ } else if (XMLConfigConstants.SCOPE_DEFAULT.equals(scope)) {
//Setting property into the Synapse Context
smc.setProperty(name, resultValue);
- } else if (Constants.SCOPE_AXIS2.equals(scope)
+ } else if (XMLConfigConstants.SCOPE_AXIS2.equals(scope)
&& smc instanceof Axis2MessageContext) {
//Setting property into the Axis2 Message Context
Axis2MessageContext axis2smc = (Axis2MessageContext) smc;
@@ -102,7 +103,7 @@
axis2smc.getAxis2MessageContext();
axis2MessageCtx.getOptions().setProperty(name, resultValue);
- } else if (Constants.SCOPE_TRANSPORT.equals(scope)
+ } else if (XMLConfigConstants.SCOPE_TRANSPORT.equals(scope)
&& smc instanceof Axis2MessageContext) {
//Setting Transport Headers
Axis2MessageContext axis2smc = (Axis2MessageContext) smc;
@@ -144,13 +145,13 @@
if (pros != null) {
pros.remove(name);
}
- } else if (Constants.SCOPE_DEFAULT.equals(scope)) {
+ } else if (XMLConfigConstants.SCOPE_DEFAULT.equals(scope)) {
//Removing property from the Synapse Context
Set pros = smc.getPropertyKeySet();
if (pros != null) {
pros.remove(name);
}
- } else if (Constants.SCOPE_AXIS2.equals(scope)
+ } else if (XMLConfigConstants.SCOPE_AXIS2.equals(scope)
&& smc instanceof Axis2MessageContext) {
//Removing property from the Axis2 Message Context
Axis2MessageContext axis2smc = (Axis2MessageContext) smc;
@@ -160,7 +161,7 @@
if (pros != null) {
pros.remove(name);
}
- } else if (Constants.SCOPE_TRANSPORT.equals(scope)
+ } else if (XMLConfigConstants.SCOPE_TRANSPORT.equals(scope)
&& smc instanceof Axis2MessageContext) {
// Removing transport headers
Axis2MessageContext axis2smc = (Axis2MessageContext) smc;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java Wed Sep 19 02:09:01 2007
@@ -29,10 +29,11 @@
import org.apache.synapse.util.UUIDGenerator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.Entry;
+import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.sandesha2.client.SandeshaClientConstants;
@@ -41,7 +42,7 @@
public class RMSequenceMediator extends AbstractMediator {
private static Log log = LogFactory.getLog(RMSequenceMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
private AXIOMXPath correlation = null;
private AXIOMXPath lastMessage = null;
@@ -76,7 +77,7 @@
String version = getVersionValue();
orgMessageCtx.getOptions().setProperty(
- Constants.SANDESHA_SPEC_VERSION, version);
+ SynapseConstants.SANDESHA_SPEC_VERSION, version);
if (log.isDebugEnabled()) {
log.debug("using WS-RM version " + version);
}
@@ -84,11 +85,11 @@
if (isSingle()) {
String sequenceID = UUIDGenerator.getUUID();
orgMessageCtx.getOptions().setProperty(
- Constants.SANDESHA_SEQUENCE_KEY, sequenceID);
+ SynapseConstants.SANDESHA_SEQUENCE_KEY, sequenceID);
orgMessageCtx.getOptions().setProperty(
SandeshaClientConstants.OFFERED_SEQUENCE_ID, UUIDGenerator.getUUID());
orgMessageCtx.getOptions().setProperty(
- Constants.SANDESHA_LAST_MESSAGE, "true");
+ SynapseConstants.SANDESHA_LAST_MESSAGE, "true");
return true;
}
@@ -109,14 +110,14 @@
String sequenceID = retrieveSequenceID(correlationValue);
orgMessageCtx.getOptions().setProperty(
- Constants.SANDESHA_SEQUENCE_KEY, sequenceID);
+ SynapseConstants.SANDESHA_SEQUENCE_KEY, sequenceID);
if (log.isDebugEnabled()) {
log.debug("RMSequence Mediator :: using sequence " + sequenceID);
}
if (lastMessage) {
orgMessageCtx.getOptions().setProperty(
- Constants.SANDESHA_LAST_MESSAGE, "true");
+ SynapseConstants.SANDESHA_LAST_MESSAGE, "true");
sequenceMap.remove(correlationValue);
}
@@ -164,7 +165,7 @@
}
private String getVersionValue() {
- if (Constants.SEQUENCE_VERSION_1_1.equals(getVersion())) {
+ if (XMLConfigConstants.SEQUENCE_VERSION_1_1.equals(getVersion())) {
return WSRM_SpecVersion_1_1;
} else {
return WSRM_SpecVersion_1_0;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java Wed Sep 19 02:09:01 2007
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.endpoints.Endpoint;
@@ -40,7 +40,7 @@
public class SendMediator extends AbstractMediator {
private static final Log log = LogFactory.getLog(SendMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
private Endpoint endpoint = null;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java Wed Sep 19 02:09:01 2007
@@ -27,7 +27,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.config.Util;
import org.apache.synapse.config.Entry;
import org.apache.synapse.mediators.AbstractListMediator;
@@ -62,7 +62,7 @@
public class ValidateMediator extends AbstractListMediator {
private static final Log log = LogFactory.getLog(ValidateMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/**
* A list of property keys, referring to the schemas to be used for the validation
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java Wed Sep 19 02:09:01 2007
@@ -22,7 +22,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
@@ -42,7 +42,7 @@
private static final Log log = LogFactory.getLog(ClassMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
private Mediator mediator = null;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java Wed Sep 19 02:09:01 2007
@@ -22,7 +22,6 @@
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.*;
import org.apache.synapse.config.xml.PropertyHelper;
-import org.apache.synapse.core.SynapseEnvironment;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.axiom.om.OMElement;
@@ -51,7 +50,7 @@
/**
* This will hold the trace object to be used for tracing
*/
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/**
* This will hold the command object to be executed
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java Wed Sep 19 02:09:01 2007
@@ -22,7 +22,7 @@
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractListMediator;
@@ -38,7 +38,7 @@
public class FilterMediator extends AbstractListMediator implements org.apache.synapse.mediators.FilterMediator {
private static final Log log = LogFactory.getLog(FilterMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
private AXIOMXPath source = null;
private Pattern regex = null;
private AXIOMXPath xpath = null;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java Wed Sep 19 02:09:01 2007
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.mediators.AbstractListMediator;
@@ -34,7 +34,7 @@
public class InMediator extends AbstractListMediator implements org.apache.synapse.mediators.FilterMediator {
private static final Log log = LogFactory.getLog(InMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/**
* Executes the list of sub/child mediators, if the filter condition is satisfied
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java Wed Sep 19 02:09:01 2007
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.mediators.AbstractListMediator;
@@ -34,7 +34,7 @@
public class OutMediator extends AbstractListMediator implements org.apache.synapse.mediators.FilterMediator {
private static final Log log = LogFactory.getLog(OutMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/**
* Executes the list of sub/child mediators, if the filter condition is satisfied
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java Wed Sep 19 02:09:01 2007
@@ -22,10 +22,9 @@
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.config.xml.SwitchCase;
-import org.apache.synapse.config.xml.AnonymousListMediator;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
@@ -42,7 +41,7 @@
public class SwitchMediator extends AbstractMediator {
private static final Log log = LogFactory.getLog(SwitchMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
/** The XPath expression specifying the source element to apply the switch case expressions against */
private AXIOMXPath source = null;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java Wed Sep 19 02:09:01 2007
@@ -27,7 +27,7 @@
import org.apache.axis2.AxisFault;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.core.axis2.Axis2MessageContext;
@@ -48,7 +48,7 @@
public class FaultMediator extends AbstractMediator {
private static final Log log = LogFactory.getLog(FaultMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
public static final String WSA_ACTION = "Action";
/** Make a SOAP 1.1 fault */
public static final int SOAP11 = 1;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java Wed Sep 19 02:09:01 2007
@@ -28,7 +28,7 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
@@ -47,7 +47,7 @@
public class HeaderMediator extends AbstractMediator {
private static final Log log = LogFactory.getLog(HeaderMediator.class);
- private static final Log trace = LogFactory.getLog(Constants.TRACE_LOGGER);
+ private static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER);
public static final int ACTION_SET = 0;
public static final int ACTION_REMOVE = 1;
@@ -92,15 +92,15 @@
trace.trace("Set Header : " + qName + " to : " + value);
}
if (qName.getNamespaceURI() == null || "".equals(qName.getNamespaceURI())) {
- if (Constants.HEADER_TO.equals(qName.getLocalPart())) {
+ if (SynapseConstants.HEADER_TO.equals(qName.getLocalPart())) {
synCtx.setTo(new EndpointReference(value));
- } else if (Constants.HEADER_FROM.equals(qName.getLocalPart())) {
+ } else if (SynapseConstants.HEADER_FROM.equals(qName.getLocalPart())) {
synCtx.setFrom(new EndpointReference(value));
- } else if (Constants.HEADER_ACTION.equals(qName.getLocalPart())) {
+ } else if (SynapseConstants.HEADER_ACTION.equals(qName.getLocalPart())) {
synCtx.setWSAAction(value);
- } else if (Constants.HEADER_FAULT.equals(qName.getLocalPart())) {
+ } else if (SynapseConstants.HEADER_FAULT.equals(qName.getLocalPart())) {
synCtx.setFaultTo(new EndpointReference(value));
- } else if (Constants.HEADER_REPLY_TO.equals(qName.getLocalPart())) {
+ } else if (SynapseConstants.HEADER_REPLY_TO.equals(qName.getLocalPart())) {
synCtx.setReplyTo(new EndpointReference(value));
} else {
addCustomHeader(synCtx);
@@ -119,15 +119,15 @@
}
if (qName.getNamespaceURI() == null || "".equals(qName.getNamespaceURI())) {
- if (Constants.HEADER_TO.equals(qName.getLocalPart())) {
+ if (SynapseConstants.HEADER_TO.equals(qName.getLocalPart())) {
synCtx.setTo(null);
- } else if (Constants.HEADER_FROM.equals(qName.getLocalPart())) {
+ } else if (SynapseConstants.HEADER_FROM.equals(qName.getLocalPart())) {
synCtx.setFrom(null);
- } else if (Constants.HEADER_ACTION.equals(qName.getLocalPart())) {
+ } else if (SynapseConstants.HEADER_ACTION.equals(qName.getLocalPart())) {
synCtx.setWSAAction(null);
- } else if (Constants.HEADER_FAULT.equals(qName.getLocalPart())) {
+ } else if (SynapseConstants.HEADER_FAULT.equals(qName.getLocalPart())) {
synCtx.setFaultTo(null);
- } else if (Constants.HEADER_REPLY_TO.equals(qName.getLocalPart())) {
+ } else if (SynapseConstants.HEADER_REPLY_TO.equals(qName.getLocalPart())) {
synCtx.setReplyTo(null);
} else {
SOAPEnvelope envelope = synCtx.getEnvelope();
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org