You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2010/08/23 09:46:51 UTC
svn commit: r988018 - in /synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/config/xml/
core/src/main/java/org/apache/synapse/config/xml/eventing/
extensions/src/main/java/org/apache/synapse/mediators/bsf/
extensions/src/main/java/org/a...
Author: ruwan
Date: Mon Aug 23 07:46:50 2010
New Revision: 988018
URL: http://svn.apache.org/viewvc?rev=988018&view=rev
Log:
Refactoring the common tasks in mediator serialization into the AbstractMediatorSerializer
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorSerializer.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -64,13 +64,16 @@ public abstract class AbstractMediatorSe
* Serializes the given mediator into XML element. This method handles
* adding the common information from the respective mediators to the element it get by
* delegating the mediator specific serialization to the
- * {@link #serializeSpecificMediator(org.apache.axiom.om.OMElement,
- * org.apache.synapse.Mediator)} method, which has tobe implemented by the
- * respective mediators</p>
+ * {@link #serializeSpecificMediator(org.apache.synapse.Mediator)} method, which has tobe
+ * implemented by the respective mediators</p>
+ *
+ * <p>It is treating the {@link org.apache.synapse.config.xml.AnonymousListMediator} as a
+ * special case and calls it's children serialization, since there is nothing specific to be
+ * serialized in that case</p>
*
* <p>This method has been marked as <code>final</code> to avoid mistakenly overwriting
- * this method instead of the {@link #serializeSpecificMediator(org.apache.axiom.om.OMElement,
- * org.apache.synapse.Mediator)} by the sub classes
+ * this method instead of the {@link #serializeSpecificMediator(org.apache.synapse.Mediator)}
+ * by the sub classes
*
* @param parent the OMElement to which the serialization should be attached
* @param m mediator to be serialized
@@ -78,24 +81,35 @@ public abstract class AbstractMediatorSe
*/
public final OMElement serializeMediator(OMElement parent, Mediator m) {
- OMElement elem = serializeSpecificMediator(parent, m);
- if (m.getDescription() != null) {
- OMElement descriptionElem = fac.createOMElement(DESCRIPTION_Q);
- descriptionElem.setText(m.getDescription());
- elem.addChild(descriptionElem);
+ if (m instanceof AnonymousListMediator) {
+ ((AnonymousListMediatorSerializer) this).serializeChildren(parent,
+ ((AnonymousListMediator) m).getList());
+ return parent;
+ } else {
+
+ OMElement elem = serializeSpecificMediator(m);
+ if (m.getDescription() != null) {
+ OMElement descriptionElem = fac.createOMElement(DESCRIPTION_Q);
+ descriptionElem.setText(m.getDescription());
+ elem.addChild(descriptionElem);
+ }
+
+ if (parent != null) {
+ parent.addChild(elem);
+ }
+ return elem;
}
- return elem;
+
}
/**
* Specific mediator factory implementations should implement this method to build the
* {@link org.apache.synapse.Mediator} by the given XML configuration
*
- * @param parent element to which the serialized element is attached to as the child
* @param m mediator to be serialized
* @return serialized element of the mediator
*/
- protected abstract OMElement serializeSpecificMediator(OMElement parent, Mediator m);
+ protected abstract OMElement serializeSpecificMediator(Mediator m);
/**
* Perform common functions and finalize the mediator serialization.
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -30,7 +30,7 @@ import org.apache.synapse.mediators.eip.
*/
public class AggregateMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
AggregateMediator mediator = null;
if (!(m instanceof AggregateMediator)) {
@@ -80,10 +80,6 @@ public class AggregateMediatorSerializer
}
aggregator.addChild(onCompleteElem);
- if (parent != null) {
- parent.addChild(aggregator);
- }
-
return aggregator;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -28,21 +28,13 @@ import org.apache.synapse.Mediator;
public class AnonymousListMediatorSerializer extends AbstractListMediatorSerializer {
/**
- * To serialize an anonymous list mediator
+ * To serialize an anonymous list mediator
*
- * @param parent
* @param m
* @return OMElement
*/
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
-
- if (!(m instanceof AnonymousListMediator)) {
- handleException("Unsupported mediator passed in for serialization : " + m.getType());
- } else {
- AnonymousListMediator mediator = (AnonymousListMediator) m;
- serializeChildren(parent, mediator.getList());
- }
- return parent;
+ public OMElement serializeSpecificMediator(Mediator m) {
+ throw new UnsupportedOperationException("Anonymous list mediator has nothing specific");
}
public String getMediatorClassName() {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CacheMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -38,7 +38,7 @@ import org.apache.synapse.mediators.buil
*/
public class CacheMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof CacheMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -106,10 +106,6 @@ public class CacheMediatorSerializer ext
}
}
- if (parent != null) {
- parent.addChild(cache);
- }
-
return cache;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CalloutMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -34,7 +34,7 @@ import org.apache.synapse.mediators.buil
*/
public class CalloutMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof CalloutMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -78,9 +78,6 @@ public class CalloutMediatorSerializer e
"key", nullNS, mediator.getTargetKey()));
}
- if (parent != null) {
- parent.addChild(callout);
- }
return callout;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -21,12 +21,9 @@ package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.ext.ClassMediator;
-import javax.xml.namespace.QName;
import java.util.Iterator;
/**
@@ -38,7 +35,7 @@ import java.util.Iterator;
*/
public class ClassMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof ClassMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -69,9 +66,6 @@ public class ClassMediatorSerializer ext
clazz.addChild(prop);
}
- if (parent != null) {
- parent.addChild(clazz);
- }
return clazz;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/CloneMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -49,12 +49,10 @@ public class CloneMediatorSerializer ext
* This method will implement the serializeMediator method of the MediatorSerializer interface
* and implements the serialization of CloneMediator to its configuration
*
- * @param parent OMElement describing the parent element to which the newlly generated
- * clone element should be attached as a child, if provided
* @param m Mediator of the type CloneMediator which is subjected to the serialization
* @return OMElement serialized in to xml from the given parameters
*/
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
OMElement cloneElem = fac.createOMElement("clone", synNS);
saveTracingState(cloneElem, m);
@@ -71,11 +69,6 @@ public class CloneMediatorSerializer ext
}
}
- // attach the serialized element to the parent if specified
- if (parent != null) {
- parent.addChild(cloneElem);
- }
-
return cloneElem;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -39,7 +39,7 @@ import org.apache.synapse.mediators.filt
*/
public class ConditionalRouterMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
OMElement conditionalRouterElem = fac.createOMElement("conditionalRouter", synNS);
saveTracingState(conditionalRouterElem, m);
@@ -85,10 +85,6 @@ public class ConditionalRouterMediatorSe
conditionalRouterElem.addChild(routeElem);
}
- if (parent != null) {
- parent.addChild(conditionalRouterElem);
- }
-
return conditionalRouterElem;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBLookupMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -30,7 +30,7 @@ import org.apache.synapse.mediators.db.D
*/
public class DBLookupMediatorSerializer extends AbstractDBMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof DBLookupMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -41,9 +41,6 @@ public class DBLookupMediatorSerializer
saveTracingState(dbLookup,mediator);
serializeDBInformation(mediator, dbLookup);
- if (parent != null) {
- parent.addChild(dbLookup);
- }
return dbLookup;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -30,7 +30,7 @@ import org.apache.synapse.mediators.db.D
*/
public class DBReportMediatorSerializer extends AbstractDBMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof DBReportMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -44,9 +44,6 @@ public class DBReportMediatorSerializer
saveTracingState(dbReport, mediator);
serializeDBInformation(mediator, dbReport);
- if (parent != null) {
- parent.addChild(dbReport);
- }
return dbReport;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -30,7 +30,7 @@ import org.apache.synapse.mediators.buil
*/
public class DropMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof DropMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -38,11 +38,8 @@ public class DropMediatorSerializer exte
DropMediator mediator = (DropMediator) m;
OMElement drop = fac.createOMElement("drop", synNS);
- saveTracingState(drop,mediator);
+ saveTracingState(drop, mediator);
- if (parent != null) {
- parent.addChild(drop);
- }
return drop;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnqueueMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -26,7 +26,7 @@ import org.apache.synapse.mediators.buil
public class EnqueueMediatorSerializer extends AbstractMediatorSerializer{
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
assert m instanceof EnqueueMediator :
"Unsupported mediator passed in for serialization : " + m.getType();
@@ -51,10 +51,6 @@ public class EnqueueMediatorSerializer e
enqueue.addAttribute(fac.createOMAttribute(
"priority", nullNS, mediator.getPriority() + ""));
- if (parent != null) {
- parent.addChild(enqueue);
- }
-
return enqueue;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -37,7 +37,7 @@ public class FaultMediatorSerializer ext
private static final String POX = "pox";
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof FaultMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -124,9 +124,6 @@ public class FaultMediatorSerializer ext
}
}
- if (parent != null) {
- parent.addChild(fault);
- }
return fault;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -46,7 +46,7 @@ import org.apache.synapse.mediators.filt
*/
public class FilterMediatorSerializer extends AbstractListMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof FilterMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -102,9 +102,6 @@ public class FilterMediatorSerializer ex
serializeChildren(filter, mediator.getList());
}
- if (parent != null) {
- parent.addChild(filter);
- }
return filter;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -32,7 +32,7 @@ import javax.xml.namespace.QName;
*/
public class HeaderMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof HeaderMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -75,9 +75,6 @@ public class HeaderMediatorSerializer ex
}
}
- if (parent != null) {
- parent.addChild(header);
- }
return header;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -30,7 +30,7 @@ import org.apache.synapse.mediators.filt
*/
public class InMediatorSerializer extends AbstractListMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof InMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -42,9 +42,6 @@ public class InMediatorSerializer extend
serializeChildren(in, mediator.getList());
- if (parent != null) {
- parent.addChild(in);
- }
return in;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/IterateMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -48,16 +48,12 @@ public class IterateMediatorSerializer e
* This method will implement the serialization logic of the IterateMediator class to the
* relevant xml configuration
*
- * @param parent
- * OMElement specifying the parent element to which the created configurtaion
- * element will be attached
- *
* @param m
* IterateMediator to be serialized
*
* @return OMElement describing the serialized configuration of the IterateMediator
*/
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof IterateMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -87,11 +83,6 @@ public class IterateMediatorSerializer e
itrElem.addChild(TargetSerializer.serializeTarget(itrMed.getTarget()));
- // attach the serialized element to the parent if specified
- if (parent != null) {
- parent.addChild(itrElem);
- }
-
return itrElem;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -32,7 +32,7 @@ import org.apache.synapse.mediators.buil
*/
public class LogMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof LogMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -75,9 +75,6 @@ public class LogMediatorSerializer exten
super.serializeProperties(log, mediator.getProperties());
- if (parent != null) {
- parent.addChild(log);
- }
return log;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -20,14 +20,12 @@
package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.filters.OutMediator;
public class OutMediatorSerializer extends AbstractListMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof OutMediator)) {
handleException("Unsupported mediator passed out for serialization : " + m.getType());
@@ -38,9 +36,6 @@ public class OutMediatorSerializer exten
saveTracingState(out,mediator);
serializeChildren(out, mediator.getList());
- if (parent != null) {
- parent.addChild(out);
- }
return out;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -30,7 +30,7 @@ import org.apache.synapse.mediators.ext.
*/
public class POJOCommandMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof POJOCommandMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -130,9 +130,6 @@ public class POJOCommandMediatorSerializ
}
}
- if (parent != null) {
- parent.addChild(pojoCommand);
- }
return pojoCommand;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -20,8 +20,6 @@
package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.builtin.PropertyMediator;
@@ -34,7 +32,7 @@ import org.apache.synapse.mediators.buil
*/
public class PropertyMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof PropertyMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -86,9 +84,6 @@ public class PropertyMediatorSerializer
}
}
- if (parent != null) {
- parent.addChild(property);
- }
return property;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -30,7 +30,7 @@ import org.apache.synapse.mediators.buil
*/
public class RMSequenceMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof RMSequenceMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -68,9 +68,6 @@ public class RMSequenceMediatorSerialize
sequence.addAttribute(fac.createOMAttribute("version", nullNS, mediator.getVersion()));
}
- if (parent != null) {
- parent.addChild(sequence);
- }
return sequence;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -33,7 +33,7 @@ import org.apache.synapse.mediators.eip.
*/
public class SamplingThrottleMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement omElement, Mediator mediator) {
+ public OMElement serializeSpecificMediator(Mediator mediator) {
OMElement samplerElem = fac.createOMElement("sampler", synNS);
saveTracingState(samplerElem, mediator);
@@ -62,10 +62,6 @@ public class SamplingThrottleMediatorSer
"Target is mandatory for a sampler");
}
- if (omElement != null) {
- omElement.addChild(samplerElem);
- }
-
return samplerElem;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -32,7 +32,7 @@ import org.apache.synapse.endpoints.Endp
*/
public class SendMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof SendMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -47,9 +47,6 @@ public class SendMediatorSerializer exte
send.addChild(EndpointSerializer.getElementFromEndpoint(activeEndpoint));
}
- if (parent != null) {
- parent.addChild(send);
- }
return send;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -45,7 +45,7 @@ public class SequenceMediatorSerializer
return sequence;
}
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof SequenceMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -80,9 +80,6 @@ public class SequenceMediatorSerializer
}
}
- if (parent != null) {
- parent.addChild(sequence);
- }
return sequence;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -30,7 +30,7 @@ import org.apache.synapse.mediators.filt
*/
public class SwitchMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof SwitchMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -72,9 +72,7 @@ public class SwitchMediatorSerializer ex
switchMed.addChild(caseDefaultElem);
}
}
- if (parent != null) {
- parent.addChild(switchMed);
- }
+
return switchMed;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -20,8 +20,6 @@
package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.base.SynapseMediator;
@@ -34,7 +32,7 @@ import org.apache.synapse.mediators.base
*/
public class SynapseMediatorSerializer extends AbstractListMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof SynapseMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -46,9 +44,6 @@ public class SynapseMediatorSerializer e
serializeChildren(rules, mediator.getList());
- if (parent != null) {
- parent.addChild(rules);
- }
return rules;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TransactionMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -30,7 +30,7 @@ import org.apache.synapse.mediators.tran
*/
public class TransactionMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof TransactionMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -42,9 +42,6 @@ public class TransactionMediatorSerializ
saveTracingState(transaction, mediator);
- if (parent != null) {
- parent.addChild(transaction);
- }
return transaction;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -31,10 +31,9 @@ import java.util.List;
*
* @see ValidateMediatorSerializer
*/
-public class ValidateMediatorSerializer extends AbstractListMediatorSerializer
- implements MediatorSerializer {
+public class ValidateMediatorSerializer extends AbstractListMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof ValidateMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -72,9 +71,6 @@ public class ValidateMediatorSerializer
OMElement onFail = fac.createOMElement("on-fail", synNS, validate);
serializeChildren(onFail, mediator.getList());
- if (parent != null) {
- parent.addChild(validate);
- }
return validate;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -23,7 +23,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.transform.XSLTMediator;
import org.apache.synapse.mediators.MediatorProperty;
-import org.apache.synapse.config.xml.AbstractMediatorSerializer;
import java.util.List;
@@ -39,7 +38,7 @@ public class XSLTMediatorSerializer exte
private static final QName ATTRIBUTE_Q
= new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "attribute");
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof XSLTMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -85,9 +84,6 @@ public class XSLTMediatorSerializer exte
ResourceMapSerializer.serializeResourceMap(xslt, mediator.getResourceMap());
- if (parent != null) {
- parent.addChild(xslt);
- }
return xslt;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/eventing/EventPublisherMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -29,7 +29,7 @@ import org.apache.synapse.mediators.even
*/
public class EventPublisherMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof EventPublisherMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -46,9 +46,6 @@ public class EventPublisherMediatorSeria
}
saveTracingState(elmEventPublisher, mediator);
- if (parent != null) {
- parent.addChild(elmEventPublisher);
- }
return elmEventPublisher;
}
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -34,7 +34,8 @@ import org.apache.synapse.config.xml.Abs
*/
public class ScriptMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
+
if (!(m instanceof ScriptMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
}
@@ -70,9 +71,6 @@ public class ScriptMediatorSerializer ex
}
saveTracingState(script, scriptMediator);
- if (parent != null) {
- parent.addChild(script);
- }
return script;
}
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -30,13 +30,12 @@ import org.apache.synapse.config.xml.Abs
* <spring bean="exampleBean1" (config="spring1" | src="spring.xml)"/>
*/
@SuppressWarnings({"UnusedDeclaration"})
-public class SpringMediatorSerializer extends AbstractMediatorSerializer
- implements MediatorSerializer {
+public class SpringMediatorSerializer extends AbstractMediatorSerializer {
private static final OMNamespace sprNS =
fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE+"/spring", "spring");
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof SpringMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
@@ -60,9 +59,6 @@ public class SpringMediatorSerializer ex
// TODO add support for src attribute - or replace with a reg key!
- if (parent != null) {
- parent.addChild(spring);
- }
return spring;
}
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -40,7 +40,7 @@ import org.apache.synapse.mediators.base
public class ThrottleMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof ThrottleMediator)) {
handleException("Invalid Mediator has passed to serializer");
}
@@ -95,9 +95,7 @@ public class ThrottleMediatorSerializer
throttle.addChild(element);
}
}
- if (parent != null) {
- parent.addChild(throttle);
- }
+
return throttle;
}
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java?rev=988018&r1=988017&r2=988018&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java Mon Aug 23 07:46:50 2010
@@ -42,7 +42,7 @@ import java.util.List;
*/
public class XQueryMediatorSerializer extends AbstractMediatorSerializer {
- public OMElement serializeSpecificMediator(OMElement parent, Mediator m) {
+ public OMElement serializeSpecificMediator(Mediator m) {
if (!(m instanceof XQueryMediator)) {
handleException("Invalid Mediator has passed to serializer");
@@ -178,9 +178,7 @@ public class XQueryMediatorSerializer ex
}
}
}
- if (parent != null) {
- parent.addChild(xquery);
- }
+
return xquery;
}