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/09/22 11:47:19 UTC

svn commit: r999844 - in /synapse/trunk/java/modules: core/src/main/java/org/apache/synapse/config/xml/ core/src/main/java/org/apache/synapse/config/xml/endpoints/ core/src/main/java/org/apache/synapse/registry/ core/src/test/java/org/apache/synapse/co...

Author: ruwan
Date: Wed Sep 22 09:47:18 2010
New Revision: 999844

URL: http://svn.apache.org/viewvc?rev=999844&view=rev
Log:
Fixing the Configuration building API to pass in properties with additional information 
This helps to get rid of the static references to the resolve root and so forth via the ServerManager 

Committing in parts as my commit as a bunch failed

Modified:
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorFactory.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointFactory.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/registry/Registry.java
    synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/ProxyServiceSerializationTest.java
    synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java
    synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/ReplaceMediatorFactory.java
    synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java
    synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java?rev=999844&r1=999843&r2=999844&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java Wed Sep 22 09:47:18 2010
@@ -35,10 +35,7 @@ import org.apache.synapse.util.PolicyInf
 import javax.xml.namespace.QName;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
+import java.util.*;
 
 /**
  * Factory for {@link ProxyService} instances.
@@ -73,7 +70,7 @@ public class ProxyServiceFactory {
 
     private static final Log log = LogFactory.getLog(ProxyServiceFactory.class);
 
-    public static ProxyService createProxy(OMElement elem) {
+    public static ProxyService createProxy(OMElement elem, Properties properties) {
 
         ProxyService proxy = null;
 
@@ -92,7 +89,7 @@ public class ProxyServiceFactory {
                 // default to all transports using service name as destination
             } else {
                 StringTokenizer st = new StringTokenizer(transports, " ,");
-                ArrayList transportList = new ArrayList();
+                ArrayList<String> transportList = new ArrayList<String>();
                 while (st.hasMoreTokens()) {
                     String token = st.nextToken();
                     if (token.length() != 0) {
@@ -111,7 +108,7 @@ public class ProxyServiceFactory {
                 // default to all servers
             } else {
                 StringTokenizer st = new StringTokenizer(pinnedServersValue, " ,");
-                List pinnedServersList = new ArrayList();
+                List<String> pinnedServersList = new ArrayList<String>();
                 while (st.hasMoreTokens()) {
                     String token = st.nextToken();
                     if (token.length() != 0) {
@@ -173,7 +170,7 @@ public class ProxyServiceFactory {
                         new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "inSequence"));
                 if (inSequenceElement != null) {
                     proxy.setTargetInLineInSequence(
-                            mediatorFactory.createAnonymousSequence(inSequenceElement));
+                            mediatorFactory.createAnonymousSequence(inSequenceElement, properties));
                     isTargetOk = true;
                 }
             }
@@ -185,8 +182,8 @@ public class ProxyServiceFactory {
                 OMElement outSequenceElement = target.getFirstChildWithName(
                         new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "outSequence"));
                 if (outSequenceElement != null) {
-                    proxy.setTargetInLineOutSequence(
-                            mediatorFactory.createAnonymousSequence(outSequenceElement));
+                    proxy.setTargetInLineOutSequence(mediatorFactory
+                            .createAnonymousSequence(outSequenceElement, properties));
                 }
             }
             OMAttribute faultSequence = target.getAttribute(
@@ -197,8 +194,8 @@ public class ProxyServiceFactory {
                 OMElement faultSequenceElement = target.getFirstChildWithName(
                         new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "faultSequence"));
                 if (faultSequenceElement != null) {
-                    proxy.setTargetInLineFaultSequence(
-                            mediatorFactory.createAnonymousSequence(faultSequenceElement));
+                    proxy.setTargetInLineFaultSequence(mediatorFactory
+                            .createAnonymousSequence(faultSequenceElement, properties));
                 }
             }
             OMAttribute tgtEndpt = target.getAttribute(
@@ -210,8 +207,8 @@ public class ProxyServiceFactory {
                 OMElement endpointElement = target.getFirstChildWithName(
                         new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "endpoint"));
                 if (endpointElement != null) {
-                    proxy.setTargetInLineEndpoint(
-                            EndpointFactory.getEndpointFromElement(endpointElement, true));
+                    proxy.setTargetInLineEndpoint(EndpointFactory.getEndpointFromElement(
+                            endpointElement, true, properties));
                     isTargetOk = true;
                 }
             }

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java?rev=999844&r1=999843&r2=999844&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java Wed Sep 22 09:47:18 2010
@@ -27,6 +27,7 @@ import org.apache.synapse.mediators.buil
 import org.jaxen.JaxenException;
 
 import javax.xml.namespace.QName;
+import java.util.Properties;
 
 /**
  * Factory for {@link RMSequenceMediator} instances.
@@ -45,7 +46,7 @@ public class RMSequenceMediatorFactory e
     private static final QName ATT_VERSION = new QName("version");
     private static final QName ATT_SINGLE = new QName("single");
 
-    public Mediator createSpecificMediator(OMElement elem) {
+    public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         RMSequenceMediator sequenceMediator = new RMSequenceMediator();
         OMAttribute correlation = elem.getAttribute(ATT_CORR);

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java?rev=999844&r1=999843&r2=999844&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java Wed Sep 22 09:47:18 2010
@@ -41,11 +41,15 @@ public class RegistryFactory {
 
     private static final Log log = LogFactory.getLog(RegistryFactory.class);
 
-    public static final QName PROVIDER_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "provider");
-    public static final QName PARAMETER_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "parameter");
-    public static final QName NAME_Q     = new QName(XMLConfigConstants.NULL_NAMESPACE, "name");
+    public static final QName PROVIDER_Q
+            = new QName(XMLConfigConstants.NULL_NAMESPACE, "provider");
+    public static final QName PARAMETER_Q
+            = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "parameter");
+    public static final QName NAME_Q
+            = new QName(XMLConfigConstants.NULL_NAMESPACE, "name");
 
-    public static Registry createRegistry(OMElement elem) {
+    @SuppressWarnings({"UnusedDeclaration"})
+    public static Registry createRegistry(OMElement elem, Properties properties) {
 
         OMAttribute prov = elem.getAttribute(PROVIDER_Q);
         if (prov != null) {
@@ -66,7 +70,8 @@ public class RegistryFactory {
                     prov.getAttributeValue(), e);
             }
         } else {
-            handleException("The registry 'provider' attribute is required for a registry definition");
+            handleException("The registry 'provider' " +
+                    "attribute is required for a registry definition");
         }
 
         return null;

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorFactory.java?rev=999844&r1=999843&r2=999844&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SamplingThrottleMediatorFactory.java Wed Sep 22 09:47:18 2010
@@ -27,6 +27,7 @@ import org.apache.synapse.mediators.eip.
 import org.apache.synapse.mediators.eip.sample.SamplingThrottleMediator;
 
 import javax.xml.namespace.QName;
+import java.util.Properties;
 
 /**
  * Builds the {@link org.apache.synapse.mediators.eip.sample.SamplingThrottleMediator} instance by looking at the
@@ -55,7 +56,7 @@ public class SamplingThrottleMediatorFac
     private static final QName CLASS_ATTR
             = new QName(XMLConfigConstants.NULL_NAMESPACE, "class");
 
-    public Mediator createSpecificMediator(OMElement omElement) {
+    public Mediator createSpecificMediator(OMElement omElement, Properties properties) {
 
         SamplingThrottleMediator samplingThrottleMediator = new SamplingThrottleMediator();
         processAuditStatus(samplingThrottleMediator, omElement);
@@ -89,7 +90,7 @@ public class SamplingThrottleMediatorFac
 
         OMElement targetElem = omElement.getFirstChildWithName(TARGET_Q);
         if (targetElem != null) {
-            Target target = TargetFactory.createTarget(targetElem);
+            Target target = TargetFactory.createTarget(targetElem, properties);
             samplingThrottleMediator.setTarget(target);
         } else {
             handleException("Sampler requires a target for the sampling mediation");

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointFactory.java?rev=999844&r1=999843&r2=999844&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointFactory.java Wed Sep 22 09:47:18 2010
@@ -26,6 +26,7 @@ import org.apache.axiom.om.OMElement;
 import org.jaxen.JaxenException;
 
 import javax.xml.namespace.QName;
+import java.util.Properties;
 
 /**
  * 
@@ -42,7 +43,8 @@ public class ResolvingEndpointFactory ex
         return instance;
     }
 
-    protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint) {
+    protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
+                                      Properties properties) {
 
         ResolvingEndpoint resolvingEndpoint = new ResolvingEndpoint();       
         String name = epConfig.getAttributeValue(new QName("name"));

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=999844&r1=999843&r2=999844&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 Wed Sep 22 09:47:18 2010
@@ -33,6 +33,7 @@ import org.apache.synapse.endpoints.disp
 
 import javax.xml.namespace.QName;
 import java.util.List;
+import java.util.Properties;
 
 /**
  * Creates {@link SALoadbalanceEndpoint} from an XML configuration.
@@ -54,7 +55,8 @@ public class SALoadbalanceEndpointFactor
         return instance;
     }
 
-    protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint) {
+    protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint,
+                                      Properties properties) {
 
         // create the endpoint, manager and the algorithms
         SALoadbalanceEndpoint loadbalanceEndpoint = new SALoadbalanceEndpoint();
@@ -110,7 +112,8 @@ public class SALoadbalanceEndpointFactor
         if(loadbalanceElement != null) {
 
             // set endpoints
-            List<Endpoint> endpoints = getEndpoints(loadbalanceElement, loadbalanceEndpoint);
+            List<Endpoint> endpoints = getEndpoints(loadbalanceElement,
+                    loadbalanceEndpoint, properties);
             loadbalanceEndpoint.setChildren(endpoints);
 
             // set load balance algorithm

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/Registry.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/Registry.java?rev=999844&r1=999843&r2=999844&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/Registry.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/Registry.java Wed Sep 22 09:47:18 2010
@@ -49,10 +49,11 @@ public interface Registry {
      * the content from the registry and cache if required.
      *
      * @param entry the registry Entry
+     * @param properties
      * @return the value from the registry or local cache
      * @see AbstractRegistry
      */
-    public Object getResource(Entry entry);
+    public Object getResource(Entry entry, Properties properties);
 
     /**
      * Get the registry entry for the given key

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/ProxyServiceSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/ProxyServiceSerializationTest.java?rev=999844&r1=999843&r2=999844&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/ProxyServiceSerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/ProxyServiceSerializationTest.java Wed Sep 22 09:47:18 2010
@@ -21,6 +21,8 @@ package org.apache.synapse.config.xml;
 import org.apache.axiom.om.OMElement;
 import org.apache.synapse.core.axis2.ProxyService;
 
+import java.util.Properties;
+
 /**
  *
  *
@@ -36,7 +38,7 @@ public class ProxyServiceSerializationTe
             "<publishWSDL uri=\"http://uri\" ></publishWSDL><policy key=\"key\"/>" +
             "<parameter name=\"para\">text</parameter></proxy>";
         OMElement inputOM = createOMElement(inputXml);
-        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM);
+        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM, new Properties());
         OMElement resultOM = ProxyServiceSerializer.serializeProxy(null, proxy);
         assertTrue(compare(resultOM, inputOM));
     }
@@ -47,7 +49,7 @@ public class ProxyServiceSerializationTe
             "<target endpoint=\"epr\" outSequence=\"out\"/><publishWSDL key=\"key\">" +
             "</publishWSDL><policy key=\"key\"/><parameter name=\"para\">text</parameter></proxy>";
         OMElement inputOM = createOMElement(inputXml);
-        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM);
+        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM, new Properties());
         OMElement resultOM = ProxyServiceSerializer.serializeProxy(null, proxy);
         assertTrue(compare(resultOM, inputOM));
     }
@@ -59,7 +61,7 @@ public class ProxyServiceSerializationTe
             "<outSequence><send/></outSequence></target><publishWSDL  key=\"key\"></publishWSDL>" +
             "<policy key=\"key\"/><parameter name=\"para\">text</parameter></proxy>";
         OMElement inputOM = createOMElement(inputXml);
-        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM);
+        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM, new Properties());
         OMElement resultOM = ProxyServiceSerializer.serializeProxy(null, proxy);
         assertTrue(compare(resultOM, inputOM));
     }
@@ -71,7 +73,7 @@ public class ProxyServiceSerializationTe
             "<outSequence><send/></outSequence></target><enableAddressing/><publishWSDL  key=\"key\"></publishWSDL>" +
             "<policy key=\"key\"/><parameter name=\"para\">text</parameter></proxy>";
         OMElement inputOM = createOMElement(inputXml);
-        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM);
+        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM, new Properties());
         OMElement resultOM = ProxyServiceSerializer.serializeProxy(null, proxy);
         assertTrue(compare(resultOM, inputOM));
     }
@@ -83,7 +85,7 @@ public class ProxyServiceSerializationTe
             "</outSequence></target><publishWSDL uri=\"http://uri\"></publishWSDL><policy key=\"key\"/>" +
             "<parameter name=\"para\">text</parameter></proxy>";
         OMElement inputOM = createOMElement(inputXml);
-        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM);
+        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM, new Properties());
         OMElement resultOM = ProxyServiceSerializer.serializeProxy(null, proxy);
         assertTrue(compare(resultOM, inputOM));
     }
@@ -102,7 +104,7 @@ public class ProxyServiceSerializationTe
             "<resource location=\"test1.xsd\" key=\"test-key1\"/><resource location=\"test2.xsd\"" +
             " key=\"test-key2\"/></publishWSDL></proxy>";
         OMElement inputOM = createOMElement(inputXml);
-        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM);
+        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM, new Properties());
         assertNotNull(proxy.getResourceMap());
         OMElement resultOM = ProxyServiceSerializer.serializeProxy(null, proxy);
         assertTrue(compare(resultOM, inputOM));

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java?rev=999844&r1=999843&r2=999844&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java Wed Sep 22 09:47:18 2010
@@ -23,6 +23,8 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.impl.exception.XMLComparisonException;
 import org.apache.synapse.registry.Registry;
 
+import java.util.Properties;
+
 public class RegistrySerializationTest extends AbstractTestCase {
 
     public RegistrySerializationTest() {
@@ -37,7 +39,7 @@ public class RegistrySerializationTest e
                 "</syn:registry>";
 
         OMElement registryElement = createOMElement(regitryConfiguration);
-        Registry registry = RegistryFactory.createRegistry(registryElement);
+        Registry registry = RegistryFactory.createRegistry(registryElement, new Properties());
         OMElement serializedElement = RegistrySerializer.serializeRegistry(null, registry);
         try {
             assertTrue(compare(registryElement, serializedElement));

Modified: synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/ReplaceMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/ReplaceMediatorFactory.java?rev=999844&r1=999843&r2=999844&view=diff
==============================================================================
--- synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/ReplaceMediatorFactory.java (original)
+++ synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/ReplaceMediatorFactory.java Wed Sep 22 09:47:18 2010
@@ -28,6 +28,8 @@ import org.apache.synapse.config.xml.XML
 import org.apache.synapse.util.xpath.SynapseXPath;
 import org.jaxen.JaxenException;
 
+import java.util.Properties;
+
 public class ReplaceMediatorFactory extends AbstractMediatorFactory {
 
     private static final QName TAG_NAME
@@ -38,7 +40,7 @@ public class ReplaceMediatorFactory exte
         return TAG_NAME;
     }
 
-    public ReplaceMediator createSpecificMediator(OMElement elem) {
+    public ReplaceMediator createSpecificMediator(OMElement elem, Properties properties) {
         ReplaceMediator mediator = new ReplaceMediator();
 
         OMAttribute attTarget = elem.getAttribute(ATT_TARGET);

Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java?rev=999844&r1=999843&r2=999844&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java Wed Sep 22 09:47:18 2010
@@ -30,6 +30,7 @@ import org.apache.synapse.config.xml.XML
 
 import java.util.Map;
 import java.util.Iterator;
+import java.util.Properties;
 import java.util.TreeMap;
 
 /**
@@ -63,7 +64,7 @@ public class ScriptMediatorFactory exten
     private static final QName INCLUDE_Q
             = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "include");
 
-    public Mediator createSpecificMediator(OMElement elem) {
+    public Mediator createSpecificMediator(OMElement elem, Properties properties) {
 
         ScriptMediator mediator;
         OMAttribute keyAtt = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE,

Modified: synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java?rev=999844&r1=999843&r2=999844&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java (original)
+++ synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java Wed Sep 22 09:47:18 2010
@@ -21,6 +21,7 @@ package org.apache.synapse.mediators.bsf
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -51,7 +52,7 @@ public class ScriptMediatorFactoryTest e
 
     public void testInlineScriptMediatorFactory() throws XMLStreamException {
         ScriptMediatorFactory mf = new ScriptMediatorFactory();
-        Mediator mediator = mf.createMediator(INLINE_MEDIATOR_CONFIG);
+        Mediator mediator = mf.createMediator(INLINE_MEDIATOR_CONFIG, new Properties());
         try{
             MessageContext mc = TestUtils.getTestContext("<foo/>",null);
             assertTrue(mediator.mediate(mc));
@@ -70,7 +71,7 @@ public class ScriptMediatorFactoryTest e
         MessageContext mc = TestUtils.getTestContext("<foo/>", props);
 
         ScriptMediatorFactory mf = new ScriptMediatorFactory();
-        Mediator mediator = mf.createMediator(REG_PROP_MEDIATOR_CONFIG);
+        Mediator mediator = mf.createMediator(REG_PROP_MEDIATOR_CONFIG, new Properties());
         assertTrue(mediator.mediate(mc));
     }
 
@@ -82,7 +83,7 @@ public class ScriptMediatorFactoryTest e
         MessageContext mc = TestUtils.getTestContext("<foo/>", props);
 
         ScriptMediatorFactory mf = new ScriptMediatorFactory();
-        Mediator mediator = mf.createMediator(REG_PROP_FOO_FUNC_MEDIATOR_CONFIG);
+        Mediator mediator = mf.createMediator(REG_PROP_FOO_FUNC_MEDIATOR_CONFIG, new Properties());
         assertTrue(mediator.mediate(mc));
     }