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/29 16:25:55 UTC

svn commit: r990584 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml: AbstractListMediatorFactory.java AbstractMediatorFactory.java SequenceMediatorFactory.java SequenceMediatorSerializer.java

Author: ruwan
Date: Sun Aug 29 14:25:55 2010
New Revision: 990584

URL: http://svn.apache.org/viewvc?rev=990584&view=rev
Log:
SequenceMediator ability to add description to the anonymous sequence

Modified:
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractListMediatorFactory.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractListMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractListMediatorFactory.java?rev=990584&r1=990583&r2=990584&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractListMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractListMediatorFactory.java Sun Aug 29 14:25:55 2010
@@ -36,13 +36,15 @@ public abstract class AbstractListMediat
         Iterator it = el.getChildElements();
         while (it.hasNext()) {
             OMElement child = (OMElement) it.next();
-            Mediator med = MediatorFactoryFinder.getInstance().getMediator(child);
-            if (med != null) {
-                m.addChild(med);
-            } else {
-                String msg = "Unknown mediator : " + child.getLocalName();
-                log.error(msg);
-                throw new SynapseException(msg);
+            if (!DESCRIPTION_Q.equals(child.getQName())) { // neglect the description tag
+                Mediator med = MediatorFactoryFinder.getInstance().getMediator(child);
+                if (med != null) {
+                    m.addChild(med);
+                } else {
+                    String msg = "Unknown mediator : " + child.getLocalName();
+                    log.error(msg);
+                    throw new SynapseException(msg);
+                }
             }
         }
     }

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java?rev=990584&r1=990583&r2=990584&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java Sun Aug 29 14:25:55 2010
@@ -61,7 +61,7 @@ public abstract class AbstractMediatorFa
         = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "feature");
     protected static final QName TARGET_Q
             = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "target");
-    private static final QName DESCRIPTION_Q
+    protected static final QName DESCRIPTION_Q
             = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "description");
 
     /**

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java?rev=990584&r1=990583&r2=990584&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java Sun Aug 29 14:25:55 2010
@@ -60,6 +60,10 @@ public class SequenceMediatorFactory ext
             seqMediator.setErrorHandler(e.getAttributeValue());
         }
         processAuditStatus(seqMediator, elem);
+        OMElement descElem = elem.getFirstChildWithName(DESCRIPTION_Q);
+        if (descElem != null) {
+            seqMediator.setDescription(descElem.getText());
+        }
         addChildren(elem, seqMediator);         
         return seqMediator;
     }

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=990584&r1=990583&r2=990584&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 Sun Aug 29 14:25:55 2010
@@ -38,6 +38,11 @@ public class SequenceMediatorSerializer 
                     "onError", nullNS, mediator.getErrorHandler()));
         }
         saveTracingState(sequence, mediator);
+        if (mediator.getDescription() != null) {
+            OMElement descriptionElem = fac.createOMElement(DESCRIPTION_Q);
+            descriptionElem.setText(mediator.getDescription());
+            sequence.addChild(descriptionElem);
+        }
         serializeChildren(sequence, mediator.getList());
         if (parent != null) {
             parent.addChild(sequence);