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 2008/06/23 20:13:30 UTC

svn commit: r670699 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: config/xml/ config/xml/endpoints/ mediators/

Author: ruwan
Date: Mon Jun 23 11:13:29 2008
New Revision: 670699

URL: http://svn.apache.org/viewvc?rev=670699&view=rev
Log:
Code reformatting, no functional changes

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/AbstractListMediatorSerializer.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/AbstractMediatorSerializer.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.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/AnnotatedCommandMediatorFactory.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediator.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/XMLConfigConstants.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.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=670699&r1=670698&r2=670699&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 Mon Jun 23 11:13:29 2008
@@ -20,13 +20,10 @@
 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.SynapseException;
 import org.apache.synapse.mediators.ListMediator;
-import org.apache.synapse.Mediator;
 
-import javax.xml.namespace.QName;
 import java.util.Iterator;
 
 /**

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractListMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractListMediatorSerializer.java?rev=670699&r1=670698&r2=670699&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractListMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractListMediatorSerializer.java Mon Jun 23 11:13:29 2008
@@ -20,20 +20,19 @@
 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.SynapseException;
 import org.apache.synapse.Mediator;
 
-import java.util.Iterator;
 import java.util.List;
 
+/**
+ * Parent class for all the {@link org.apache.synapse.mediators.ListMediator} serialization
+ * implementations.
+ */
 public abstract class AbstractListMediatorSerializer extends AbstractMediatorSerializer {
 
-    protected void serializeChildren(OMElement parent, List list) {
-        Iterator iter = list.iterator();
-        while (iter.hasNext()) {
-            Mediator child = (Mediator) iter.next();
+    protected void serializeChildren(OMElement parent, List<Mediator> list) {
+        
+        for (Mediator child : list) {
             MediatorSerializer medSer = MediatorSerializerFinder.getInstance().getSerializer(child);
             if (medSer != null) {
                 medSer.serializeMediator(parent, child);

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=670699&r1=670698&r2=670699&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 Mon Jun 23 11:13:29 2008
@@ -28,6 +28,9 @@
 
 import javax.xml.namespace.QName;
 
+/**
+ * Parent class for all the {@link MediatorFactory} implementations
+ */
 public abstract class AbstractMediatorFactory implements MediatorFactory {
 
     /** the standard log for mediators, will assign the logger for the actual subclass */
@@ -61,8 +64,8 @@
     /**
      * This is to Initialize the mediator with the default attributes
      *
-     * @param mediator
-     * @param mediatorOmElement
+     * @param mediator of which trace state has to be set
+     * @param mediatorOmElement from which the trace state is extracted
      */
     protected void processTraceState(Mediator mediator, OMElement mediatorOmElement) {
 

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=670699&r1=670698&r2=670699&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 Jun 23 11:13:29 2008
@@ -32,8 +32,10 @@
 
 import javax.xml.namespace.QName;
 import java.util.Collection;
-import java.util.Iterator;
 
+/**
+ * Parent class for all the {@link MediatorSerializer} implementations
+ */
 public abstract class AbstractMediatorSerializer implements MediatorSerializer {
 
     /** the standard log for mediators, will assign the logger for the actual subclass */
@@ -59,7 +61,7 @@
      * i.e. process any common attributes
      *
      * @param mediatorOmElement the OMElement being created
-     * @param mediator          the Mediator instance being serialized
+     * @param mediator the Mediator instance being serialized
      */
     protected static void saveTracingState(OMElement mediatorOmElement, Mediator mediator) {
         int traceState = mediator.getTraceState();
@@ -76,11 +78,10 @@
 
     }
 
-    protected void serializeMediatorProperties(OMElement parent, Collection props) {
+    protected void serializeMediatorProperties(OMElement parent,
+        Collection<MediatorProperty> props) {
 
-        Iterator iter = props.iterator();
-        while (iter.hasNext()) {
-            MediatorProperty mp = (MediatorProperty) iter.next();
+        for (MediatorProperty mp : props) {
             OMElement prop = fac.createOMElement("property", synNS, parent);
             if (mp.getName() != null) {
                 prop.addAttribute(fac.createOMAttribute("name", nullNS, mp.getName()));
@@ -100,14 +101,13 @@
         }
     }
 
-    protected void serializeProperties(OMElement parent, Collection props) {
+    protected void serializeProperties(OMElement parent, Collection<MediatorProperty> props) {
         serializeMediatorProperties(parent, props);
     }
 
     protected void serializeNamespaces(OMElement elem, AXIOMXPath xpath) {
-        Iterator iter = xpath.getNamespaces().keySet().iterator();
-        while (iter.hasNext()) {
-            String prefix = (String) iter.next();
+        for (Object obj : xpath.getNamespaces().keySet()) {
+            String prefix = (String) obj;
             String uri = xpath.getNamespaceContext().translateNamespacePrefixToUri(prefix);
             if (!XMLConfigConstants.SYNAPSE_NAMESPACE.equals(uri)) {
                 elem.declareNamespace(uri, prefix);

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java?rev=670699&r1=670698&r2=670699&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java Mon Jun 23 11:13:29 2008
@@ -21,8 +21,6 @@
 
 import org.apache.axiom.om.OMAttribute;
 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.SequenceMediator;
 import org.apache.synapse.mediators.builtin.DropMediator;
@@ -32,7 +30,7 @@
 import javax.xml.namespace.QName;
 
 /**
- * Factory for {@link AggregateMediator} instances.
+ * Factory for {@link AggregateMediator} instances from the config;
  * 
  * <pre>
  * &lt;aggregate&gt;
@@ -48,20 +46,29 @@
  */
 public class AggregateMediatorFactory extends AbstractMediatorFactory {
 
-    private static final Log log = LogFactory.getLog(AggregateMediatorFactory.class);
-
-    private static final QName AGGREGATE_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "aggregate");
-    private static final QName CORELATE_ON_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "correlateOn");
-    private static final QName COMPLETE_CONDITION_Q
+    /** Element QName definitions **/
+    protected static final QName AGGREGATE_Q
+            = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "aggregate");
+    protected static final QName CORELATE_ON_Q
+            = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "correlateOn");
+    protected static final QName COMPLETE_CONDITION_Q
             = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "completeCondition");
-    private static final QName MESSAGE_COUNT_Q
+    protected static final QName MESSAGE_COUNT_Q
             = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "messageCount");
-    private static final QName ON_COMPLETE_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "onComplete");
-    private static final QName EXPRESSION_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "expression");
-    private static final QName TIMEOUT_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "timeout");
-    private static final QName MIN_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "min");
-    private static final QName MAX_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "max");
-    private static final QName SEQUENCE_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "sequence");
+    protected static final QName ON_COMPLETE_Q
+            = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "onComplete");
+
+    /** Attribute QName definitions **/
+    private static final QName EXPRESSION_Q
+            = new QName(XMLConfigConstants.NULL_NAMESPACE, "expression");
+    private static final QName TIMEOUT_Q
+            = new QName(XMLConfigConstants.NULL_NAMESPACE, "timeout");
+    private static final QName MIN_Q
+            = new QName(XMLConfigConstants.NULL_NAMESPACE, "min");
+    private static final QName MAX_Q
+            = new QName(XMLConfigConstants.NULL_NAMESPACE, "max");
+    private static final QName SEQUENCE_Q
+            = new QName(XMLConfigConstants.NULL_NAMESPACE, "sequence");
 
     public Mediator createMediator(OMElement elem) {
 

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=670699&r1=670698&r2=670699&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 Jun 23 11:13:29 2008
@@ -22,37 +22,27 @@
 import org.apache.axiom.om.OMElement;
 import org.apache.synapse.Mediator;
 import org.apache.synapse.mediators.eip.aggregator.AggregateMediator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Serializer for {@link AggregateMediator} instances.
  * 
- * <pre>
- * &lt;aggregate&gt;
- *   &lt;correlateOn expression="xpath"/&gt;?
- *   &lt;completeCondition [timeout="time-in-seconds"]&gt;
- *     &lt;messageCount min="int-min" max="int-max"/&gt;?
- *   &lt;/completeCondition&gt;?
- *   &lt;onComplete expression="xpath" [sequence="sequence-ref"]&gt;
- *     (mediator +)?
- *   &lt;/onComplete&gt;
- * &lt;/aggregate&gt;
- * </pre>
+ * @see AggregateMediatorFactory
  */
 public class AggregateMediatorSerializer extends AbstractMediatorSerializer {
 
-    private static final Log log = LogFactory.getLog(AggregateMediatorSerializer.class);
-
     public OMElement serializeMediator(OMElement parent, Mediator m) {
 
+        AggregateMediator mediator = null;
         if (!(m instanceof AggregateMediator)) {
             handleException("Unsupported mediator passed in for serialization : " + m.getType());
+        } else {
+            mediator = (AggregateMediator) m;
         }
-        AggregateMediator mediator = (AggregateMediator) m;
+
         OMElement aggregator = fac.createOMElement("aggregate", synNS);
         saveTracingState(aggregator, mediator);
 
+        assert mediator != null;
         if (mediator.getCorrelateExpression() != null) {
             OMElement corelateOn = fac.createOMElement("correlateOn", synNS);
             SynapseXPathSerializer.serializeXPath(
@@ -62,14 +52,17 @@
 
         OMElement completeCond = fac.createOMElement("completeCondition", synNS);
         if (mediator.getCompletionTimeoutMillis() != 0) {
-            completeCond.addAttribute("timeout", Long.toString(mediator.getCompletionTimeoutMillis() / 1000), nullNS);
+            completeCond.addAttribute("timeout",
+                    Long.toString(mediator.getCompletionTimeoutMillis() / 1000), nullNS);
         }
         OMElement messageCount = fac.createOMElement("messageCount", synNS);
         if (mediator.getMinMessagesToComplete() != 0) {
-            messageCount.addAttribute("min", Integer.toString(mediator.getMinMessagesToComplete()), nullNS);
+            messageCount.addAttribute("min",
+                    Integer.toString(mediator.getMinMessagesToComplete()), nullNS);
         }
         if (mediator.getMaxMessagesToComplete() != 0) {
-            messageCount.addAttribute("max", Integer.toString(mediator.getMaxMessagesToComplete()), nullNS);
+            messageCount.addAttribute("max",
+                    Integer.toString(mediator.getMaxMessagesToComplete()), nullNS);
         }
         completeCond.addChild(messageCount);
         aggregator.addChild(completeCond);

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java?rev=670699&r1=670698&r2=670699&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnnotatedCommandMediatorFactory.java Mon Jun 23 11:13:29 2008
@@ -81,7 +81,7 @@
                         "A POJO command mediator property must specify the name attribute");
                 } else {
                     if (child.getAttribute(ATT_EXPRN) != null) {
-                        SynapseXPath xpath = null;
+                        SynapseXPath xpath;
                         try {
                             xpath = SynapseXPathFactory.getSynapseXPath(child, ATT_EXPRN);
                             pojoMediator.addMessageSetterProperty(propName, xpath);

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediator.java?rev=670699&r1=670698&r2=670699&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AnonymousListMediator.java Mon Jun 23 11:13:29 2008
@@ -24,7 +24,6 @@
 /**
  * This mediator represents an unnamed list mediator
  */
-
 public class AnonymousListMediator extends AbstractListMediator {
 
      public boolean mediate(MessageContext synCtx) {

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=670699&r1=670698&r2=670699&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 Jun 23 11:13:29 2008
@@ -20,9 +20,6 @@
 
 import org.apache.axiom.om.OMElement;
 import org.apache.synapse.Mediator;
-import org.apache.synapse.SynapseException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * This is Serializer  for serialization of an anonymous list mediator(an unnamed list of mediators )
@@ -38,11 +35,13 @@
      * @return OMElement
      */
     public OMElement serializeMediator(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());
         }
-        AnonymousListMediator mediator = (AnonymousListMediator) m;
-        serializeChildren(parent, mediator.getList());
         return parent;
     }
 

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java?rev=670699&r1=670698&r2=670699&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java Mon Jun 23 11:13:29 2008
@@ -20,6 +20,8 @@
 package org.apache.synapse.config.xml;
 
 import org.apache.synapse.SynapseConstants;
+import org.apache.axiom.om.OMNamespace;
+
 import javax.xml.namespace.QName;
 
 /**
@@ -29,6 +31,7 @@
 
     // re-definition of the Synapse NS here to make things easier for the XML config lang code
     public static final String SYNAPSE_NAMESPACE = SynapseConstants.SYNAPSE_NAMESPACE;
+    public static final OMNamespace SYNAPSE_OMNAMESPACE = SynapseConstants.SYNAPSE_OMNAMESPACE;
 
     //- Mediators -
     //-- PropertyMediator --

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java?rev=670699&r1=670698&r2=670699&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java Mon Jun 23 11:13:29 2008
@@ -106,34 +106,6 @@
                     createLoadbalanceAlgorithm(loadbalanceElement, endpoints);
             loadbalanceEndpoint.setAlgorithm(algorithm);
 
-            // set abandon time
-            //long abandonTime = 0;
-            //OMAttribute atAttribute = loadbalanceElement.getAttribute(new QName(
-            //      null, org.apache.synapse.config.xml.Constants.RETRY_AFTER_FAILURE_TIME));
-            //if(atAttribute != null) {
-            //    String at = atAttribute.getAttributeValue();
-            //    abandonTime = Long.parseLong(at);
-            //    loadbalanceEndpoint.setAbandonTime(abandonTime);
-            //}
-
-            //long retryInterval = 30000;
-            //OMAttribute riAttribute = loadbalanceElement.getAttribute
-            //        (new QName(null, Constants.RETRY_INTERVAL));
-            //
-            //if(riAttribute != null) {
-            //    String ri = riAttribute.getAttributeValue();
-            //    retryInterval = Long.parseLong(ri);
-            //}
-
-            //int maximumRetries = 0;
-            //OMAttribute mrAttribute = loadbalanceElement.getAttribute
-            //        (new QName(null, Constants.MAXIMUM_RETRIES));
-            //
-            //if(mrAttribute != null) {
-            //    String mr = mrAttribute.getAttributeValue();
-            //    maximumRetries = Integer.parseInt(mr);
-            //}
-
             return loadbalanceEndpoint;
         }
 

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java?rev=670699&r1=670698&r2=670699&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java Mon Jun 23 11:13:29 2008
@@ -37,7 +37,7 @@
     protected OMElement serializeEndpoint(Endpoint endpoint) {
 
         if (!(endpoint instanceof WSDLEndpoint)) {
-            throw new SynapseException("Invalid endpoint type.");
+            handleException("Invalid endpoint type.");
         }
 
         fac = OMAbstractFactory.getOMFactory();

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java?rev=670699&r1=670698&r2=670699&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java Mon Jun 23 11:13:29 2008
@@ -65,7 +65,7 @@
         return true;
     }
 
-    public List getList() {
+    public List<Mediator> getList() {
         return mediators;
     }