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 2006/12/14 07:24:31 UTC
svn commit: r486990 - in /incubator/synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/
core/src/main/java/org/apache/synapse/config/xml/
core/src/main/java/org/apache/synapse/core/axis2/
core/src/main/java/org/apache/synapse/mediators/ ...
Author: asankha
Date: Wed Dec 13 22:24:29 2006
New Revision: 486990
URL: http://svn.apache.org/viewvc?view=rev&rev=486990
Log:
Commit for Indika after review
http://issues.apache.org/jira/browse/SYNAPSE-46
Modified:
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Mediator.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POXMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseDefaultMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TryMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TryMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
incubator/synapse/trunk/java/modules/core/src/main/resources/log4j.properties
incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestMediator.java
incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/json/JsonMediator.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorFactory.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorSerializer.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java
incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorSerializer.java
incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMediator.java
incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringTestBean.java
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java Wed Dec 13 22:24:29 2006
@@ -112,4 +112,13 @@
String HEADER_ACTION = "Action";
/** Refers the ReplyTo header */
String HEADER_REPLY_TO = "ReplyTo";
+
+ /** The tracing state -off */
+ int TRACING_OFF =0;
+ /** The tracing state-on */
+ int TRACING_ON =1;
+ /** The tracing state-unset */
+ int TRACING_UNSET=2;
+ /** Tracing logger */
+ String TRACE_LOGGER ="TRACE_LOGGER";
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Mediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Mediator.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Mediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Mediator.java Wed Dec 13 22:24:29 2006
@@ -44,4 +44,16 @@
* @return a String representation of the mediator type
*/
public String getType();
-}
\ No newline at end of file
+
+ /**
+ * This is used to check whether the tracing should be enabled on the current mediator or not
+ * @return value that indicate whether tracing is on, off or unset
+ */
+ public int getTraceState();
+
+ /**
+ * This is used to set the value of tracing enable variable
+ * @param traceState Set whether the tracing is enabled or not
+ */
+ public void setTraceState(int traceState);
+}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java Wed Dec 13 22:24:29 2006
@@ -170,13 +170,13 @@
* Set the message if
* @param messageID
*/
- public void setMessageId(String messageID);
+ public void setWSAMessageID(String messageID);
/**
* Gets the message id
- * @return the message id
+ * @return the WSA MessageID
*/
- public String getMessageId();
+ public String getWSAMessageID();
/**
* If this message using MTOM?
@@ -245,5 +245,17 @@
* @return true if this is a response to a fault message
*/
public boolean isFaultResponse();
+
+ /**
+ * This is used to check whether the tracing should be enabled on the current mediator or not
+ * @return indicate whether tracing is on, off or unset
+ */
+ public int getTracingState();
+
+ /**
+ * This is used to set the value of tracing enable variable
+ * @param tracingState Set whether the tracing is enabled or not
+ */
+ public void setTracingState(int tracingState);
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -18,5 +18,34 @@
*/
package org.apache.synapse.config.xml;
+import org.apache.synapse.Mediator;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAttribute;
+
+import javax.xml.namespace.QName;
+
public abstract class AbstractMediatorFactory implements MediatorFactory {
+
+ /**
+ * This is to Initialize the mediator with the default attributes
+ *
+ * @param mediator
+ * @param mediatorOmElement
+ */
+ public void initMediator(Mediator mediator, OMElement mediatorOmElement) {
+
+ OMAttribute trace = mediatorOmElement.getAttribute(
+ new QName(Constants.NULL_NAMESPACE, Constants.TRACE_ATTRIB_NAME));
+
+ if (trace != null) {
+ String traceValue = trace.getAttributeValue();
+ if (traceValue != null) {
+ if (traceValue.equals(Constants.TRACE_ENABLE)) {
+ mediator.setTraceState(org.apache.synapse.Constants.TRACING_ON);
+ } else if (traceValue.equals(Constants.TRACE_DISABLE)) {
+ mediator.setTraceState(org.apache.synapse.Constants.TRACING_OFF);
+ }
+ }
+ }
+ }
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -24,10 +24,11 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.xpath.AXIOMXPath;
-import org.apache.synapse.mediators.MediatorProperty;
-import org.apache.synapse.SynapseException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.Mediator;
+import org.apache.synapse.SynapseException;
+import org.apache.synapse.mediators.MediatorProperty;
import java.util.Collection;
import java.util.Iterator;
@@ -38,6 +39,28 @@
protected static final OMNamespace synNS = fac.createOMNamespace(Constants.SYNAPSE_NAMESPACE, "syn");
protected static final OMNamespace nullNS = fac.createOMNamespace(Constants.NULL_NAMESPACE, "");
private static final Log log = LogFactory.getLog(AbstractMediatorSerializer.class);
+
+ /**
+ * Perform common functions and finalize the mediator serialization.
+ * i.e. process any common attributes
+ *
+ * @param mediatorOmElement the OMElement being created
+ * @param mediator the Mediator instance being serialized
+ */
+ public void finalizeSerialization(OMElement mediatorOmElement, Mediator mediator) {
+ int traceState = mediator.getTraceState();
+ String traceValue = null;
+ if (traceState == org.apache.synapse.Constants.TRACING_ON) {
+ traceValue = Constants.TRACE_ENABLE;
+ } else if (traceState == org.apache.synapse.Constants.TRACING_OFF) {
+ traceValue = Constants.TRACE_DISABLE;
+ }
+ if (traceValue != null) {
+ mediatorOmElement.addAttribute(fac.createOMAttribute(
+ Constants.TRACE_ATTRIB_NAME, nullNS, traceValue));
+ }
+
+ }
public void serializeMediatorProperties(OMElement parent, Collection props) {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -63,7 +63,9 @@
log.error(msg, e);
throw new SynapseException(msg, e);
}
-
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(classMediator,elem);
classMediator.addAllProperties(MediatorPropertyFactory.getMediatorProperties(elem));
return classMediator;
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -45,6 +45,8 @@
}
ClassMediator mediator = (ClassMediator) m;
OMElement clazz = fac.createOMElement("class", synNS);
+ finalizeSerialization(clazz, mediator);
+
if (mediator.getClazz() != null) {
clazz.addAttribute(fac.createOMAttribute(
"name", nullNS, mediator.getClazz().getName()));
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java Wed Dec 13 22:24:29 2006
@@ -38,4 +38,12 @@
public static final String NULL_NAMESPACE = "";
public static final String RAMPART_POLICY = "rampartPolicy";
public static final String SANDESHA_POLICY = "sandeshaPolicy";
+
+ /** The trace local name */
+ public static final String TRACE_ATTRIB_NAME ="trace";
+ /** The Trace value 'enable' */
+ public static final String TRACE_ENABLE ="enable";
+ /** The Trace value 'disable' */
+ public static final String TRACE_DISABLE ="disable";
+
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -37,7 +37,13 @@
private static final QName DROP_Q = new QName(Constants.SYNAPSE_NAMESPACE, "drop");
public Mediator createMediator(OMElement el) {
- return new DropMediator();
+
+ Mediator dropMediator = new DropMediator();
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(dropMediator,el);
+
+ return dropMediator;
}
public QName getTagQName() {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -39,6 +39,7 @@
DropMediator mediator = (DropMediator) m;
OMElement drop = fac.createOMElement("drop", synNS);
+ finalizeSerialization(drop,mediator);
if (parent != null) {
parent.addChild(drop);
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -153,6 +153,10 @@
throw new SynapseException(msg);
}
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(faultMediator,elem);
+
OMElement node = elem.getFirstChildWithName(NODE_Q);
if (node != null && node.getText() != null) {
try {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -54,6 +54,7 @@
FaultMediator mediator = (FaultMediator) m;
OMElement fault = fac.createOMElement("makefault", synNS);
+ finalizeSerialization(fault,mediator);
if(mediator.getSoapVersion()==FaultMediator.SOAP11) {
fault.addAttribute(fac.createOMAttribute(
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -50,7 +50,6 @@
public Mediator createMediator(OMElement elem) {
FilterMediator filter = new FilterMediator();
- super.addChildren(elem, filter);
OMAttribute attXpath = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "xpath"));
OMAttribute attSource = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "source"));
@@ -105,6 +104,10 @@
log.error(msg);
throw new SynapseException(msg);
}
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(filter,elem);
+ super.addChildren(elem, filter);
return filter;
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -46,7 +46,7 @@
FilterMediator mediator = (FilterMediator) m;
OMElement filter = fac.createOMElement("filter", synNS);
-
+
if (mediator.getSource() != null && mediator.getRegex() != null) {
filter.addAttribute(fac.createOMAttribute(
"source", nullNS, mediator.getSource().toString()));
@@ -65,6 +65,7 @@
"Should have either a 'source' and a 'regex' OR an 'xpath' ");
}
+ finalizeSerialization(filter, mediator);
super.serializeChildren(filter, mediator.getList());
if (parent != null) {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -84,6 +84,10 @@
}
}
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(headerMediator,elem);
+
// The action attribute is optional, if provided and equals to 'remove' the
// header mediator will act as a header remove mediator
if (action != null && "remove".equals(action.getAttributeValue())) {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -51,6 +51,7 @@
HeaderMediator mediator = (HeaderMediator) m;
OMElement header = fac.createOMElement("header", synNS);
+ finalizeSerialization(header,mediator);
QName qName = mediator.getQName();
if (qName != null) {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -40,6 +40,9 @@
public Mediator createMediator(OMElement elem) {
InMediator filter = new InMediator();
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(filter,elem);
super.addChildren(elem, filter);
return filter;
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -39,6 +39,8 @@
InMediator mediator = (InMediator) m;
OMElement in = fac.createOMElement("in", synNS);
+ finalizeSerialization(in,mediator);
+
super.serializeChildren(in, mediator.getList());
if (parent != null) {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -55,6 +55,10 @@
LogMediator logMediator = new LogMediator();
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(logMediator,elem);
+
// Set the high level set of properties to be logged (i.e. log level)
OMAttribute level = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "level"));
if (level != null) {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -46,6 +46,7 @@
LogMediator mediator = (LogMediator) m;
OMElement log = fac.createOMElement("log", synNS);
+ finalizeSerialization(log,mediator);
if (mediator.getLogLevel() != LogMediator.SIMPLE) {
log.addAttribute(fac.createOMAttribute(
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -40,6 +40,11 @@
public Mediator createMediator(OMElement elem) {
OutMediator filter = new OutMediator();
+
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(filter,elem);
+
super.addChildren(elem, filter);
return filter;
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -39,6 +39,7 @@
OutMediator mediator = (OutMediator) m;
OMElement out = fac.createOMElement("out", synNS);
+ finalizeSerialization(out,mediator);
super.serializeChildren(out, mediator.getList());
if (parent != null) {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POXMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POXMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POXMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POXMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -41,7 +41,11 @@
public Mediator createMediator(OMElement el) {
POXMediator restMediator = new POXMediator();
OMAttribute value = el.getAttribute(new QName(Constants.NULL_NAMESPACE, "value"));
- if (value != null) {
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(restMediator,el);
+
+ if (value != null) {
String valueString = value.getAttributeValue();
if (valueString.toLowerCase().equals("true")) {
restMediator.setValue(true);
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -76,6 +76,9 @@
throw new SynapseException(msg);
}
}
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(propMediator,elem);
return propMediator;
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -44,6 +44,8 @@
PropertyMediator mediator = (PropertyMediator) m;
OMElement property = fac.createOMElement("set-property", synNS);
+ finalizeSerialization(property,mediator);
+
if (mediator.getName() != null) {
property.addAttribute(fac.createOMAttribute(
"name", nullNS, mediator.getName()));
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -39,7 +39,13 @@
public Mediator createMediator(OMElement elem) {
log.info("RMMediatorFactory :: createMediator()");
//TODO: Fill properties if needed
- return new RMMediator();
+ Mediator rmMediator = new RMMediator();
+
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(rmMediator,elem);
+
+ return rmMediator;
}
public QName getTagQName() {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -87,6 +87,10 @@
SendMediator sm = new SendMediator();
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(sm,elem);
+
Iterator iter = elem.getChildrenWithName(new QName(Constants.SYNAPSE_NAMESPACE, "endpoint"));
while (iter.hasNext()) {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -84,7 +84,7 @@
SendMediator mediator = (SendMediator) m;
OMElement send = fac.createOMElement("send", synNS);
-
+ finalizeSerialization(send, mediator);
if (mediator.getEndpoints() != null) {
Iterator iter = mediator.getEndpoints().iterator();
while (iter.hasNext()) {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -83,6 +83,9 @@
throw new SynapseException(msg);
}
}
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(seqMediator,elem);
return seqMediator;
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -52,6 +52,7 @@
SequenceMediator mediator = (SequenceMediator) m;
OMElement sequence = fac.createOMElement("sequence", synNS);
+ finalizeSerialization(sequence,mediator);
if (mediator.getRef() != null) {
sequence.addAttribute(fac.createOMAttribute(
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseDefaultMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseDefaultMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseDefaultMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseDefaultMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -41,6 +41,9 @@
SwitchCaseMediator switchCaseMediator = new SwitchCaseMediator();
switchCaseMediator.setDefaultCase(true);
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(switchCaseMediator,elem);
super.addChildren(elem, switchCaseMediator);
return switchCaseMediator;
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -55,6 +55,10 @@
throw new SynapseException(msg);
}
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(switchCaseMediator,elem);
+
super.addChildren(elem, switchCaseMediator);
return switchCaseMediator;
}
@@ -62,4 +66,4 @@
public QName getTagQName() {
return SWITCH_CASE_Q;
}
-}
\ No newline at end of file
+}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -44,6 +44,7 @@
} else {
caseElem = fac.createOMElement("case", synNS);
}
+ finalizeSerialization(caseElem,mediator);
if (!mediator.isDefaultCase()) {
if (mediator.getRegex() != null) {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -76,6 +76,9 @@
throw new SynapseException(msg);
}
}
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(switchMediator,elem);
Iterator iter = elem.getChildrenWithName(CASE_Q);
while (iter.hasNext()) {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -54,6 +54,7 @@
SwitchMediator mediator = (SwitchMediator) m;
OMElement switchMed = fac.createOMElement("switch", synNS);
+ finalizeSerialization(switchMed,mediator);
if (mediator.getSource() != null) {
switchMed.addAttribute(fac.createOMAttribute(
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -44,6 +44,11 @@
public Mediator createMediator(OMElement elem) {
SynapseMediator sm = new SynapseMediator();
+
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(sm,elem);
+
super.addChildren(elem, sm);
return sm;
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -46,6 +46,8 @@
SynapseMediator mediator = (SynapseMediator) m;
OMElement rules = fac.createOMElement("rules", synNS);
+ finalizeSerialization(rules,mediator);
+
super.serializeChildren(rules, mediator.getList());
if (parent != null) {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TryMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TryMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TryMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TryMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -98,6 +98,9 @@
}
}
}
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(tryMediator,elem);
return tryMediator;
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TryMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TryMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TryMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TryMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -54,6 +54,7 @@
TryMediator mediator = (TryMediator) m;
OMElement tryMed = fac.createOMElement("try", synNS);
+ finalizeSerialization(tryMed,mediator);
OMElement sequence = fac.createOMElement("sequence", synNS);
super.serializeChildren(sequence, mediator.getList());
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java Wed Dec 13 22:24:29 2006
@@ -56,6 +56,8 @@
private boolean faultResponse = false;
+ private int tracingState = Constants.TRACING_UNSET;
+
public SynapseConfiguration getConfiguration() {
return cfg;
}
@@ -163,11 +165,11 @@
return axis2MessageContext.getWSAAction();
}
- public void setMessageId(String messageID) {
+ public void setWSAMessageID(String messageID) {
axis2MessageContext.setWSAMessageId(messageID);
}
- public String getMessageId() {
+ public String getWSAMessageID() {
return axis2MessageContext.getMessageID();
}
@@ -222,6 +224,14 @@
public boolean isFaultResponse() {
return this.faultResponse;
+ }
+
+ public int getTracingState() {
+ return tracingState;
+ }
+
+ public void setTracingState(int tracingState) {
+ this.tracingState= tracingState;
}
public org.apache.axis2.context.MessageContext getAxis2MessageContext() {
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java Wed Dec 13 22:24:29 2006
@@ -26,17 +26,20 @@
import org.apache.axis2.modules.Module;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.MDC;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.Policy;
import org.apache.synapse.Constants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.config.SynapseConfigurationBuilder;
-import org.apache.neethi.Assertion;
-import org.apache.neethi.Policy;
import javax.xml.namespace.QName;
-import java.util.Iterator;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Iterator;
/**
* This is the Synapse Module implementation class, which would initialize Synapse when it is
@@ -45,15 +48,30 @@
public class SynapseModule implements Module {
private static final Log log = LogFactory.getLog(SynapseModule.class);
-
private static final String SYNAPSE_SERVICE_NAME = "synapse";
private static final QName MEDIATE_OPERATION_Q_NAME = new QName("mediate");
public void init(ConfigurationContext configurationContext,
- AxisModule axisModule) throws AxisFault {
+ AxisModule axisModule) throws AxisFault {
+ try {
+ InetAddress addr = InetAddress.getLocalHost();
+ if (addr != null) {
+ // Get IP Address
+ String ipAddr = addr.getHostAddress();
+ if (ipAddr != null)
+ MDC.put("ip", ipAddr);
+
+ // Get hostname
+ String hostname = addr.getHostName();
+ MDC.put("host", hostname);
+ }
- log.info("Deploying the Synapse service..");
+ }
+ catch (UnknownHostException e) {
+ log.warn("Unable to report hostname or IP address for tracing", e);
+ }
+ log.info("Deploying the Synapse service..");
// Dynamically initialize the Synapse Service and deploy it into Axis2
AxisConfiguration axisCfg = configurationContext.getAxisConfiguration();
AxisService synapseService = new AxisService(SYNAPSE_SERVICE_NAME);
@@ -71,7 +89,7 @@
while (iter.hasNext()) {
ProxyService proxy = (ProxyService) iter.next();
proxy.buildAxisService(synCfg, axisCfg);
- if(!proxy.isStartOnLoad()) {
+ if (!proxy.isStartOnLoad()) {
proxy.stop(synCfg);
}
}
@@ -80,7 +98,7 @@
}
private static SynapseConfiguration initializeSynapse(
- ConfigurationContext cfgCtx) {
+ ConfigurationContext cfgCtx) {
AxisConfiguration axisConfiguration = cfgCtx.getAxisConfiguration();
@@ -96,21 +114,21 @@
if (config != null) {
log.info("System property '" + Constants.SYNAPSE_XML +
- "' specifies synapse configuration as " + config);
+ "' specifies synapse configuration as " + config);
synapseConfiguration =
- SynapseConfigurationBuilder.getConfiguration(config);
+ SynapseConfigurationBuilder.getConfiguration(config);
} else if (configParam != null) {
log.info(
- "Synapse configuration is available via the " +
+ "Synapse configuration is available via the " +
"'SynapseConfiguration' parameter in axis2.xml");
synapseConfiguration = SynapseConfigurationBuilder
- .getConfiguration(configParam.getValue().toString().trim());
+ .getConfiguration(configParam.getValue().toString().trim());
} else {
log.warn("System property '" + Constants.SYNAPSE_XML +
- "' is not specified or 'SynapseConfiguration' Parameter " +
- "is not available via axis2.xml. Using default configuration..");
+ "' is not specified or 'SynapseConfiguration' Parameter " +
+ "is not available via axis2.xml. Using default configuration..");
synapseConfiguration =
- SynapseConfigurationBuilder.getDefaultConfiguration();
+ SynapseConfigurationBuilder.getDefaultConfiguration();
}
// Set the Axis2 ConfigurationContext to the SynapseConfiguration
@@ -127,8 +145,8 @@
String clazz = (String) synEnvImpl.getValue();
try {
Constructor constr = Class.forName(clazz).getDeclaredConstructor(
- new Class [] {ConfigurationContext.class});
- synapseEnvParam.setValue(constr.newInstance(new Object[] {cfgCtx}));
+ new Class[]{ConfigurationContext.class});
+ synapseEnvParam.setValue(constr.newInstance(new Object[]{cfgCtx}));
} catch (ClassNotFoundException e) {
handleException("Cannot find Synapse environment implementation : " + clazz, e);
} catch (NoSuchMethodException e) {
@@ -150,7 +168,7 @@
} catch (AxisFault e) {
String msg =
- "Could not set parameters '" + Constants.SYNAPSE_CONFIG +
+ "Could not set parameters '" + Constants.SYNAPSE_CONFIG +
"' and/or '" + Constants.SYNAPSE_ENV +
"'to the Axis2 configuration : " + e.getMessage();
log.fatal(msg, e);
@@ -173,7 +191,7 @@
}
public void shutdown(ConfigurationContext configurationContext)
- throws AxisFault {
+ throws AxisFault {
// FixMe
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java Wed Dec 13 22:24:29 2006
@@ -21,8 +21,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.MessageContext;
import org.apache.synapse.Mediator;
+import org.apache.synapse.MessageContext;
import java.util.ArrayList;
import java.util.Iterator;
@@ -40,14 +40,19 @@
protected List mediators = new ArrayList();
public boolean mediate(MessageContext synCtx) {
- log.debug("Implicit Sequence <" + getType() + "> :: mediate()");
-
- Iterator it = mediators.iterator();
- while (it.hasNext()) {
- Mediator m = (Mediator) it.next();
- if (!m.mediate(synCtx)) {
- return false;
+ try {
+ log.debug("Implicit Sequence <" + getType() + "> :: mediate()");
+ saveAndSetTraceState(synCtx);
+ Iterator it = mediators.iterator();
+ while (it.hasNext()) {
+ Mediator m = (Mediator) it.next();
+ if (!m.mediate(synCtx)) {
+ return false;
+ }
}
+ }
+ finally {
+ restoreTracingState(synCtx);
}
return true;
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java Wed Dec 13 22:24:29 2006
@@ -19,7 +19,9 @@
package org.apache.synapse.mediators;
+import org.apache.synapse.Constants;
import org.apache.synapse.Mediator;
+import org.apache.synapse.MessageContext;
/**
* This class is an abstract Mediator, that defines the logging and debugging
@@ -27,8 +29,15 @@
*/
public abstract class AbstractMediator implements Mediator {
+ /** The parent tracing state */
+ protected int parentTraceState = Constants.TRACING_UNSET;
+
+ /** State of tracing for the current mediator */
+ protected int traceState = Constants.TRACING_UNSET;
+
/**
* Returns the class name of the mediator
+ *
* @return the class name of the mediator
*/
public String getType() {
@@ -37,6 +46,55 @@
if (p == -1)
return cls;
else
- return cls.substring(p+1);
+ return cls.substring(p + 1);
+ }
+
+ /**
+ * Returns the tracing state
+ *
+ * @return int
+ */
+ public int getTraceState() {
+ return traceState;
+ }
+
+ /**
+ * Set the tracing state variable
+ *
+ * @param traceState
+ */
+ public void setTraceState(int traceState) {
+ this.traceState = traceState;
+ }
+
+ /**
+ * This method is used to save previous tracing state and set next the tracing state for a child
+ * mediator
+ *
+ * @param synCtx current message
+ */
+ public void saveAndSetTraceState(MessageContext synCtx) {
+ parentTraceState = synCtx.getTracingState();
+ synCtx.setTracingState(traceState);
+ }
+
+ /**
+ * This method is used to restore parent tracing state back
+ * @param synCtx the current message
+ */
+ public void restoreTracingState(MessageContext synCtx){
+ synCtx.setTracingState(parentTraceState);
+ }
+
+ /**
+ * Should this mediator perform tracing? True if its explicitly asked to
+ * trace, or its parent has been asked to trace and it does not reject it
+ * @param parentTraceState parents trace state
+ * @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);
}
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java Wed Dec 13 22:24:29 2006
@@ -26,7 +26,6 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.config.Endpoint;
import org.apache.synapse.mediators.AbstractMediator;
-
import java.util.ArrayList;
import java.util.List;
@@ -40,6 +39,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);
/** The list of endpoints to which the message should be sent to. If none
* are specified, the message is sent where its implicitly stated in the
@@ -61,6 +61,9 @@
// seems like a woodstox issue. Use hack for now
// synCtx.getEnvelope().build();
+ if (shouldTrace(synCtx.getTracingState())) {
+ trace.trace("Sending Message :: " + synCtx.getEnvelope());
+ }
// if no endpoints are defined, send where implicitly stated
if (endpoints.isEmpty()) {
log.debug("Sending message using implicit message properties..");
Modified: incubator/synapse/trunk/java/modules/core/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/resources/log4j.properties?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/resources/log4j.properties (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/resources/log4j.properties Wed Dec 13 22:24:29 2006
@@ -19,6 +19,17 @@
log4j.rootCategory=ERROR,logfile,stdout
+log4j.logger.TRACE_LOGGER = TRACE,TRACE_APPENDER
+
+# TRACE_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout.
+log4j.appender.TRACE_APPENDER=org.apache.log4j.DailyRollingFileAppender
+# Log file will be overridden by the configuration setting in the DB
+
+log4j.appender.TRACE_APPENDER.File=logs/trace.log
+log4j.appender.TRACE_APPENDER.Append=true
+log4j.appender.TRACE_APPENDER.layout=org.apache.log4j.PatternLayout
+log4j.appender.TRACE_APPENDER.layout.ConversionPattern=[%X{ip}] [%X{host}] [%t] %-5p %C{1} - %m %n
+
# Set the level to DEBUG if you want to log all Exceptions (some of them aren't errors)
#log4j.category.org.apache.axis2=INFO
log4j.category.org.apache.synapse=DEBUG
@@ -39,4 +50,4 @@
log4j.appender.logfile.MaxBackupIndex=10
log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logfile.layout.ConversionPattern=%6r [%t] %5p %C{1} (%F:%L) - %m%n
\ No newline at end of file
+log4j.appender.logfile.layout.ConversionPattern=%6r [%t] %5p %C{1} (%F:%L) - %m%n
Modified: incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java Wed Dec 13 22:24:29 2006
@@ -145,10 +145,10 @@
public void setSoapAction(String string) {
}
- public void setMessageId(String messageID) {
+ public void setWSAMessageID(String messageID) {
}
- public String getMessageId() {
+ public String getWSAMessageID() {
return null;
}
@@ -189,6 +189,14 @@
public boolean isFaultResponse() {
return false;
+ }
+
+ public int getTracingState() {
+ return 0; //Todo
+ }
+
+ public void setTracingState(int tracingState) {
+ //Todo
}
public MessageContext getSynapseContext() {
Modified: incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestMediator.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestMediator.java Wed Dec 13 22:24:29 2006
@@ -25,7 +25,7 @@
/**
* Test mediator class.
*/
-public class TestMediator implements Mediator {
+public class TestMediator extends AbstractMediator {
private TestMediateHandler handlerTest = null;
@@ -50,4 +50,4 @@
public void setHandler(TestMediateHandler handlerTest) {
this.handlerTest = handlerTest;
}
-}
\ No newline at end of file
+}
Modified: incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java Wed Dec 13 22:24:29 2006
@@ -21,13 +21,14 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.Mediator;
+import org.apache.synapse.mediators.AbstractMediator;
/**
* Since the class mediator always "instantiates" a new instance of a class
* use a static member variable just to test this.. This class is not nice.. :-)
* but does what is expected... :-(
*/
-public class ClassMediatorTestMediator implements Mediator {
+public class ClassMediatorTestMediator extends AbstractMediator {
public static boolean invoked = false;
Modified: incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java Wed Dec 13 22:24:29 2006
@@ -60,7 +60,7 @@
* Set the SOAP body payload from XML
*
* @param payload
- * @throws XMLStreamException
+ *
*/
public void setPayloadXML(Object payload) {
mc.getEnvelope().getBody().setFirstChild(convertor.fromScript(payload));
@@ -190,12 +190,12 @@
mc.setSoapAction(string);
}
- public void setMessageId(String messageID) {
- mc.setMessageId(messageID);
+ public void setWSAMessageID(String messageID) {
+ mc.setWSAMessageID(messageID);
}
- public String getMessageId() {
- return mc.getMessageId();
+ public String getWSAMessageID() {
+ return mc.getWSAMessageID();
}
public boolean isDoingMTOM() {
@@ -242,4 +242,12 @@
return mc.isFaultResponse();
}
-}
\ No newline at end of file
+ public int getTracingState() {
+ return mc.getTracingState();
+ }
+
+ public void setTracingState(int tracingState) {
+ mc.setTracingState(tracingState);
+ }
+
+}
Modified: incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java Wed Dec 13 22:24:29 2006
@@ -105,8 +105,8 @@
return getMC().getMessageID();
}
- public String getMessageId() {
- return getMC().getMessageId();
+ public String getWSAMessageID() {
+ return getMC().getWSAMessageID();
}
public Object getProperty(String key) {
@@ -153,6 +153,10 @@
return getMC().isFaultResponse();
}
+ public int getTracingState() {
+ return getMC().getTracingState();
+ }
+
public boolean isResponse() {
return getMC().isResponse();
}
@@ -165,6 +169,10 @@
getMC().setConfiguration(cfg);
}
+ public void setTracingState(int tracingState) {
+ getMC().setTracingState(tracingState);
+ }
+
public void setDoingMTOM(boolean b) {
getMC().setDoingMTOM(b);
}
@@ -201,8 +209,8 @@
getMC().setMessageID(string);
}
- public void setMessageId(String messageID) {
- getMC().setMessageId(messageID);
+ public void setWSAMessageID(String messageID) {
+ getMC().setWSAMessageID(messageID);
}
public void setProperty(String key, Object value) {
Modified: incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/json/JsonMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/json/JsonMediator.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/json/JsonMediator.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/json/JsonMediator.java Wed Dec 13 22:24:29 2006
@@ -25,11 +25,12 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Mediator;
+import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import javax.xml.namespace.QName;
-public class JsonMediator implements Mediator {
+public class JsonMediator extends AbstractMediator {
private static final Log log = LogFactory.getLog(JsonMediator.class);
@@ -97,8 +98,4 @@
log.error(msg);
throw new SynapseException(msg);
}
-
-
-
-
}
Modified: incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java Wed Dec 13 22:24:29 2006
@@ -24,6 +24,7 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Mediator;
+import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.config.Util;
import org.apache.synapse.config.Property;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -39,7 +40,7 @@
* refers to a Spring bean name, and also either a Spring configuration defined to Synapse
* or an inlined Spring configuration.
*/
-public class SpringMediator implements Mediator {
+public class SpringMediator extends AbstractMediator {
private static final Log log = LogFactory.getLog(SpringMediator.class);
Modified: incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -62,6 +62,10 @@
} else if (key == null) {
handleException("A 'key' attribute is required for a Spring mediator definition");
} else {
+
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(sm,elem);
sm.setBeanName(bean.getAttributeValue());
sm.setConfigKey(key.getAttributeValue());
return sm;
Modified: incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -54,6 +54,7 @@
} else {
handleException("Invalid mediator. Bean name required.");
}
+ finalizeSerialization(spring,mediator);
if (mediator.getConfigKey() != null) {
spring.addAttribute(fac.createOMAttribute(
Modified: incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -76,6 +76,9 @@
attSource.getAttributeValue());
}
}
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(transformMediator,elem);
transformMediator.addAllProperties(
MediatorPropertyFactory.getMediatorProperties(elem));
@@ -93,4 +96,4 @@
throw new SynapseException(msg);
}
-}
\ No newline at end of file
+}
Modified: incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -52,6 +52,7 @@
} else {
handleException("Invalid XSLT mediator. XSLT registry key is required");
}
+ finalizeSerialization(xslt,mediator);
if (mediator.getSource() != null &&
!XSLTMediator.DEFAULT_XPATH.toString().equals(mediator.getSource().toString())) {
Modified: incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java Wed Dec 13 22:24:29 2006
@@ -114,6 +114,10 @@
"the <validate> mediator");
}
+ // after successfully creating the mediator
+ // set its common attributes such as tracing etc
+ initMediator(validateMediator,elem);
+
// process properties
validateMediator.addAllProperties(
MediatorPropertyFactory.getMediatorProperties(elem));
Modified: incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorSerializer.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorSerializer.java Wed Dec 13 22:24:29 2006
@@ -51,6 +51,7 @@
ValidateMediator mediator = (ValidateMediator) m;
OMElement validate = fac.createOMElement("validate", synNS);
+ finalizeSerialization(validate,mediator);
if (mediator.getSource() != null) {
validate.addAttribute(fac.createOMAttribute(
Modified: incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMediator.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMediator.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMediator.java Wed Dec 13 22:24:29 2006
@@ -20,11 +20,12 @@
package org.apache.synapse;
import org.apache.synapse.Mediator;
+import org.apache.synapse.mediators.AbstractMediator;
/**
* Test mediator class.
*/
-public class TestMediator implements Mediator {
+public class TestMediator extends AbstractMediator {
private org.apache.synapse.TestMediateHandler handlerTest = null;
Modified: incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java Wed Dec 13 22:24:29 2006
@@ -145,6 +145,14 @@
public void setSoapAction(String string) {
}
+ public void setWSAMessageID(String messageID) {
+ //Todo
+ }
+
+ public String getWSAMessageID() {
+ return null; //Todo
+ }
+
public void setMessageId(String messageID) {
}
@@ -189,6 +197,13 @@
public boolean isFaultResponse() {
return false;
+ }
+
+ public int getTracingState() {
+ return 0;
+ }
+
+ public void setTracingState(int tracingState) {
}
public MessageContext getSynapseContext() {
Modified: incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringTestBean.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringTestBean.java?view=diff&rev=486990&r1=486989&r2=486990
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringTestBean.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringTestBean.java Wed Dec 13 22:24:29 2006
@@ -22,13 +22,14 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.TestMediateHandler;
import org.apache.synapse.Mediator;
+import org.apache.synapse.mediators.AbstractMediator;
/**
* This is a very simple Spring bean, that has one int property, and a
* reference to another bean. This second bean is invoked on each mediate()
* call, and it keeps a count of the invocations to be tested by JUnit
*/
-public class SpringTestBean implements Mediator {
+public class SpringTestBean extends AbstractMediator {
private int testProperty;
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org