You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2006/08/08 07:05:10 UTC

svn commit: r429579 - in /incubator/synapse/trunk/java/modules: core/src/org/apache/synapse/config/ core/src/org/apache/synapse/config/xml/ core/src/org/apache/synapse/registry/ core/src/org/apache/synapse/registry/url/ core/test/org/apache/synapse/reg...

Author: asankha
Date: Mon Aug  7 22:05:08 2006
New Revision: 429579

URL: http://svn.apache.org/viewvc?rev=429579&view=rev
Log:
Complete config serialization - needs to be tested with unit tests
Fix invalid json package reference in extensions
Update samples to pick up non-deprecated Axis2 transport constant

Added:
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/RegistrySerializer.java
Modified:
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FaultMediatorSerializer.java
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/RegistryFactory.java
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/AbstractRegistry.java
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/Registry.java
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/url/SimpleURLRegistry.java
    incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/registry/url/SimpleURLRegistryTest.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/CDL.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/Cookie.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/CookieList.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/HTTP.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/HTTPTokener.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONArray.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONException.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONObject.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONStringer.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONTokener.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONWriter.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JsonMediator.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/SynapseJsonSender.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/XML.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/XMLTokener.java
    incubator/synapse/trunk/java/modules/samples/src/samples/common/Util.java
    incubator/synapse/trunk/java/modules/samples/src/samples/qos/security/SecurityInteropClient.java
    incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DirectStockQuoteClient.java
    incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DumbStockQuoteClient.java
    incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteClient.java

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java Mon Aug  7 22:05:08 2006
@@ -271,6 +271,14 @@
         return reg;
     }
 
+    /**
+     * Get the map of registered registries
+     * @return a map of registry name to registry instance
+     */
+    public Map getRegistries() {
+        return registryMap;
+    }
+
     private void handleException(String msg) {
         log.error(msg);
         throw new SynapseException(msg);

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FaultMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FaultMediatorSerializer.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FaultMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FaultMediatorSerializer.java Mon Aug  7 22:05:08 2006
@@ -45,7 +45,7 @@
         }
 
         FaultMediator mediator = (FaultMediator) m;
-        OMElement fault = fac.createOMElement("fault", synNS);
+        OMElement fault = fac.createOMElement("makefault", synNS);
 
         OMElement code = fac.createOMElement("code", synNS, fault);
         if (mediator.getFaultCodeValue() != null) {

Added: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java?rev=429579&view=auto
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java (added)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java Mon Aug  7 22:05:08 2006
@@ -0,0 +1,123 @@
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.synapse.config.xml;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.synapse.core.axis2.ProxyService;
+import org.apache.synapse.SynapseException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.Iterator;
+
+/**
+ * <proxy name="string" [description="string"] [transports="(http|https|jms)+|all"]>
+ *   <target sequence="name" | endpoint="name"/>?   // default is main sequence
+ *   <wsdl key="string">?
+ *   <schema key="string">*
+ *   <policy key="string">*
+ *   <property name="string" value="string"/>*
+ *   <enableRM/>+
+ *   <enableSec/>+
+ * </proxy>
+ */
+public class ProxyServiceSerializer {
+
+    private static final Log log = LogFactory.getLog(PropertyMediatorSerializer.class);
+
+    protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
+    protected static final OMNamespace synNS = fac.createOMNamespace(Constants.SYNAPSE_NAMESPACE, "syn");
+    protected static final OMNamespace nullNS = fac.createOMNamespace(Constants.NULL_NAMESPACE, "");
+
+    public static OMElement serializeProxy(OMElement parent, ProxyService service) {
+
+        OMElement proxy = fac.createOMElement("proxy", synNS);
+        if (service.getName() != null) {
+            proxy.addAttribute(fac.createOMAttribute(
+                "name", nullNS, service.getName()));
+        } else {
+            handleException("Invalid proxy service. Service name is required");
+        }
+
+        if (service.getDescription() != null) {
+            proxy.addAttribute(fac.createOMAttribute(
+                "description", nullNS, service.getDescription()));
+        }
+
+        if (service.getTransports() != null &&
+            !ProxyService.ALL_TRANSPORTS.equals(service.getTransports())) {
+            proxy.addAttribute(fac.createOMAttribute(
+                "transports", nullNS, service.getTransports()));
+        }
+
+        if (service.getTargetEndpoint() != null) {
+            OMElement target = fac.createOMElement("target", synNS);
+            target.addAttribute(fac.createOMAttribute(
+                "endpoint", nullNS, service.getTargetEndpoint()));
+            proxy.addChild(target);
+        } else if (service.getTargetSequence() != null) {
+            OMElement target = fac.createOMElement("target", synNS);
+            target.addAttribute(fac.createOMAttribute(
+                "sequence", nullNS, service.getTargetSequence()));
+            proxy.addChild(target);
+        }
+
+        // TODO still schemas are not used
+        // Iterator iter = service.getSchemas();
+        // ....
+
+        Iterator iter = service.getServiceLevelPolicies().iterator();
+        while (iter.hasNext()) {
+            String policyKey = (String) iter.next();
+            OMElement policy = fac.createOMElement("policy", synNS);
+            policy.addAttribute(fac.createOMAttribute(
+                "key", nullNS, policyKey));
+            proxy.addChild(policy);
+        }
+
+        iter = service.getPropertyMap().keySet().iterator();
+        while (iter.hasNext()) {
+            String propertyName = (String) iter.next();
+            OMElement property = fac.createOMElement("property", synNS);
+            property.addAttribute(fac.createOMAttribute(
+                "name", nullNS, propertyName));
+            property.addAttribute(fac.createOMAttribute(
+                "value", nullNS, (String) service.getPropertyMap().get(propertyName)));
+            proxy.addChild(property);
+        }
+
+        if (service.isWsRMEnabled()) {
+            proxy.addChild(fac.createOMElement("enableRM", synNS));
+        }
+
+        if (service.isWsSecEnabled()) {
+            proxy.addChild(fac.createOMElement("enableSec", synNS));
+        }
+
+        if (parent != null) {
+            parent.addChild(proxy);
+        }
+        return proxy;
+    }
+
+    private static void handleException(String msg) {
+        log.error(msg);
+        throw new SynapseException(msg);
+    }
+}

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/RegistryFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/RegistryFactory.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/RegistryFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/RegistryFactory.java Mon Aug  7 22:05:08 2006
@@ -82,7 +82,7 @@
                 OMAttribute nAtt = propEle.getAttribute(NAME_Q);
                 OMAttribute vAtt = propEle.getAttribute(VALUE_Q);
                 if (nAtt != null && vAtt !=null) {
-                    reg.setConfigProperty(nAtt.getAttributeValue(), vAtt.getAttributeValue());
+                    reg.addConfigProperty(nAtt.getAttributeValue(), vAtt.getAttributeValue());
                 } else {
                     handleException("The 'name' and 'value' attributes are required for a " +
                         "registry property definition");

Added: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/RegistrySerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/RegistrySerializer.java?rev=429579&view=auto
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/RegistrySerializer.java (added)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/RegistrySerializer.java Mon Aug  7 22:05:08 2006
@@ -0,0 +1,80 @@
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.synapse.config.xml;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.SynapseException;
+import org.apache.synapse.registry.Registry;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMNamespace;
+
+import java.util.Iterator;
+
+/**
+ * &lt;registry [name="string"] provider="provider.class"&gt;
+ *   &lt;property name="string" value="string"&gt;
+ * &lt;/registry&gt;
+ */
+public class RegistrySerializer {
+
+    private static final Log log = LogFactory.getLog(RegistrySerializer.class);
+
+    protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
+    protected static final OMNamespace synNS = fac.createOMNamespace(Constants.SYNAPSE_NAMESPACE, "syn");
+    protected static final OMNamespace nullNS = fac.createOMNamespace(Constants.NULL_NAMESPACE, "");
+
+    public static OMElement serializeRegistry(OMElement parent, Registry registry) {
+
+        OMElement reg = fac.createOMElement("registry", synNS);
+        if (registry.getRegistryName() != null) {
+            reg.addAttribute(fac.createOMAttribute(
+                "name", nullNS, registry.getRegistryName()));
+        }
+
+        if (registry.getProviderClass() != null) {
+            reg.addAttribute(fac.createOMAttribute(
+                "provider", nullNS, registry.getProviderClass()));
+        } else {
+            handleException("Invalid registry. Provider is required");
+        }
+
+        Iterator iter = registry.getConfigProperties().keySet().iterator();
+        while (iter.hasNext()) {
+            String name = (String) iter.next();
+            String value = (String) registry.getConfigProperties().get(name);
+            OMElement property = fac.createOMElement("property", synNS);
+            property.addAttribute(fac.createOMAttribute(
+                "name", nullNS, name));
+            property.addAttribute(fac.createOMAttribute(
+                "value", nullNS, value));
+            reg.addChild(property);
+        }
+
+        if (parent != null) {
+            parent.addChild(reg);
+        }
+        return reg;
+    }
+
+    private static void handleException(String msg) {
+        log.error(msg);
+        throw new SynapseException(msg);
+    }
+
+}

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java Mon Aug  7 22:05:08 2006
@@ -16,31 +16,145 @@
 package org.apache.synapse.config.xml;
 
 import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.config.DynamicProperty;
+import org.apache.synapse.config.Endpoint;
+import org.apache.synapse.core.axis2.ProxyService;
+import org.apache.synapse.SynapseException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMElement;
 
+import javax.xml.stream.XMLStreamException;
 import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.io.FileOutputStream;
 import java.util.Iterator;
+import java.net.URL;
+import java.net.MalformedURLException;
 
 public class XMLConfigurationSerializer {
 
-    public void serializeConfiguration(SynapseConfiguration synCfg) {
+    private static final Log log = LogFactory.getLog(XMLConfigurationSerializer.class);
 
-        Iterator iter = synCfg.getNamedSequences().keySet().iterator();
+    protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
+    protected static final OMNamespace synNS = fac.createOMNamespace(Constants.SYNAPSE_NAMESPACE, "syn");
+    protected static final OMNamespace nullNS = fac.createOMNamespace(Constants.NULL_NAMESPACE, "");
+
+
+    public void serializeConfiguration(SynapseConfiguration synCfg, OutputStream outputStream)
+        throws XMLStreamException {
+
+        OMElement synapse = fac.createOMElement("synapse", synNS);
+
+        // process registries
+        Iterator iter = synCfg.getRegistries().keySet().iterator();
+        while (iter.hasNext()) {
+            RegistrySerializer.serializeRegistry(synapse, synCfg.getRegistry((String) iter.next()));
+        }
+
+        OMElement definitions = fac.createOMElement("definitions", synNS);
+
+        // process properties
+        serializeProperties(definitions, synCfg);
+
+        // process endpoints
+        serializeEndpoints(definitions, synCfg);
+
+        // process sequences
+        iter = synCfg.getNamedSequences().keySet().iterator();
         while (iter.hasNext()) {
             String name = (String) iter.next();
-            System.out.println(MediatorSerializerFinder.getInstance().getSerializer(synCfg.getNamedSequence(name))
-                .serializeMediator(null, synCfg.getNamedSequence(name)));
+            definitions.addChild(
+                MediatorSerializerFinder.getInstance().getSerializer(synCfg.getNamedSequence(name))
+                    .serializeMediator(null, synCfg.getNamedSequence(name)));
+        }
+
+        // add definitions
+        synapse.addChild(definitions);
+
+        // add proxy services
+        OMElement proxies = fac.createOMElement("proxies", synNS);
+        iter = synCfg.getProxyServices().iterator();
+        while (iter.hasNext()) {
+            ProxyService service = (ProxyService) iter.next();
+            ProxyServiceSerializer.serializeProxy(proxies, service);
         }
+        synapse.addChild(proxies);
+
+        // process main mediator
+        synapse.addChild(
+            MediatorSerializerFinder.getInstance().getSerializer(synCfg.getMainMediator())
+                .serializeMediator(null, synCfg.getMainMediator()));
 
-        System.out.println(MediatorSerializerFinder.getInstance().getSerializer(synCfg.getMainMediator())
-            .serializeMediator(null, synCfg.getMainMediator()));
+        synapse.serialize(outputStream);
     }
 
-    public static void main(String[] args) throws Exception {
-        XMLConfigurationBuilder xmlBuilder = new XMLConfigurationBuilder();
-        SynapseConfiguration synCfg = xmlBuilder.getConfiguration(
-            new FileInputStream("C:\\Code\\Synapse\\repository\\conf\\sample\\synapse_sample_1.xml"));
+    private void serializeProperties(OMElement definitions, SynapseConfiguration synCfg) {
+
+        Iterator iter = synCfg.getGlobalProps().keySet().iterator();
+        while (iter.hasNext()) {
+            String propertyName = (String) iter.next();
+            OMElement property = fac.createOMElement("set-property", synNS);
+            property.addAttribute(fac.createOMAttribute(
+                "name", nullNS, propertyName));
+
+            DynamicProperty dp = synCfg.getDynamicProperty(propertyName);
+            if (dp != null) {
+                property.addAttribute(fac.createOMAttribute(
+                    "key", nullNS, dp.getKey()));
+
+            } else {
+                Object prop = synCfg.getProperty(propertyName);
+                if (prop instanceof String) {
+                    try {
+                        // this is a hack to test if the string is a URL
+                        new URL((String) prop);
+                        property.addAttribute(fac.createOMAttribute(
+                            "src", nullNS, (String) prop));
+
+                    } catch (MalformedURLException e) {
+                        property.addAttribute(fac.createOMAttribute(
+                            "value", nullNS, (String) prop));
+                    }
+
+                } else if (prop instanceof OMElement) {
+                    property.addChild((OMElement) prop);
+                }
+            }
+
+            definitions.addChild(property);
+        }
+    }
+
+    private void serializeEndpoints(OMElement definitions, SynapseConfiguration synCfg) {
+
+        Iterator iter = synCfg.getNamedEndpoints().keySet().iterator();
+        while (iter.hasNext()) {
+            String endpointName = (String) iter.next();
+            Object endpt = synCfg.getNamedEndpoint(endpointName);
+
+            OMElement endpoint = fac.createOMElement("endpoint", synNS);
+            if (endpt instanceof DynamicProperty) {
+                DynamicProperty dp = (DynamicProperty) endpt;
+                endpoint.addAttribute(fac.createOMAttribute(
+                    "name", nullNS, endpointName));
+                endpoint.addAttribute(fac.createOMAttribute(
+                    "key", nullNS, dp.getKey()));
+
+            } else if (endpt instanceof Endpoint) {
+                EndpointSerializer.serializeEndpoint((Endpoint) endpt, definitions);
+            } else {
+                handleException("Invalid endpoint. Type : " + endpt.getClass());
+            }
+            definitions.addChild(endpoint);
+        }
+    }
 
-        XMLConfigurationSerializer xmlSer = new XMLConfigurationSerializer();
-        xmlSer.serializeConfiguration(synCfg);
+    private void handleException(String msg) {
+        log.error(msg);
+        throw new SynapseException(msg);
     }
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/AbstractRegistry.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/AbstractRegistry.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/AbstractRegistry.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/AbstractRegistry.java Mon Aug  7 22:05:08 2006
@@ -22,6 +22,9 @@
 import org.apache.synapse.config.DynamicProperty;
 
 import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
 
 /**
  * Implements the core Registry lookup algorithm
@@ -33,6 +36,9 @@
     /** The name of the registry */
     protected String name = null;
 
+    /** The list of configuration properties */
+    protected Map properties = new HashMap();
+
     /**
      * Get the object for the given key from this registry
      * @param dp the DynamicProperty for the registry lookup
@@ -121,5 +127,17 @@
 
     public String getRegistryName() {
         return name;
+    }
+
+    public String getProviderClass() {
+        return this.getClass().getName();
+    }
+
+    public Map getConfigProperties() {
+        return properties;
+    }
+
+    public void addConfigProperty(String name, String value) {
+        properties.put(name, value);
     }
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/Registry.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/Registry.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/Registry.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/Registry.java Mon Aug  7 22:05:08 2006
@@ -18,6 +18,9 @@
 import org.apache.axiom.om.OMNode;
 import org.apache.synapse.config.DynamicProperty;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * This is the interface to a Registry from Synapse.
  */
@@ -51,7 +54,7 @@
      * @param name property name
      * @param value simple String value
      */
-    public void setConfigProperty(String name, String value);
+    public void addConfigProperty(String name, String value);
 
     /**
      * Get the name of this registry
@@ -64,4 +67,16 @@
      * @param name of this registry
      */
     public void setRegistryName(String name);
+
+    /**
+     * Return the name of the implementation class
+     * @return name of the registry provider implementation class name
+     */
+    public String getProviderClass();
+
+    /**
+     * Return the list of configuration properties set on this instance
+     * @return a Map of configuration properties
+     */
+    public Map getConfigProperties();
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/url/SimpleURLRegistry.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/url/SimpleURLRegistry.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/url/SimpleURLRegistry.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/url/SimpleURLRegistry.java Mon Aug  7 22:05:08 2006
@@ -20,8 +20,6 @@
 import org.apache.synapse.registry.RegistryEntry;
 import org.apache.synapse.SynapseException;
 import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -42,17 +40,11 @@
 
     private static final Log log = LogFactory.getLog(SimpleURLRegistry.class);
 
-    /** The root for the URLs */
-    private String root = "";
-
-    /** default cachable duration */
-    private long cachableDuration = 15000;
-
     public OMNode lookup(String key) {
 
         log.info("==> Repository fetch of resource with key : " + key);
         try {
-            URL url = new URL(root + key);
+            URL url = new URL(getRoot() + key);
             URLConnection urlc = url.openConnection();
 
             XMLStreamReader parser = XMLInputFactory.newInstance().
@@ -61,11 +53,11 @@
             return builder.getDocumentElement();
 
         } catch (MalformedURLException e) {
-            handleException("Invalid URL reference " + root + key, e);
+            handleException("Invalid URL reference " + getRoot() + key, e);
         } catch (IOException e) {
-            handleException("IO Error reading from URL " + root + key, e);
+            handleException("IO Error reading from URL " + getRoot() + key, e);
         } catch (XMLStreamException e) {
-            handleException("XML Error reading from URL " + root + key, e);
+            handleException("XML Error reading from URL " + getRoot() + key, e);
         }
         return null;
     }
@@ -74,7 +66,7 @@
 
         log.debug("Perform RegistryEntry lookup for key : " + key);
         try {
-            URL url = new URL(root + key);
+            URL url = new URL(getRoot() + key);
             URLConnection urlc = url.openConnection();
 
             URLRegistryEntry wre = new URLRegistryEntry();
@@ -88,26 +80,26 @@
                 wre.setCachableDuration(
                     urlc.getExpiration() - System.currentTimeMillis());
             } else {
-                wre.setCachableDuration(cachableDuration);
+                wre.setCachableDuration(getCachableDuration());
             }
             return wre;
 
         } catch (MalformedURLException e) {
-            handleException("Invalid URL reference " + root + key, e);
+            handleException("Invalid URL reference " + getRoot() + key, e);
         } catch (IOException e) {
-            handleException("IO Error reading from URL " + root + key, e);
+            handleException("IO Error reading from URL " + getRoot() + key, e);
         } catch (URISyntaxException e) {
-            handleException("URI Syntax error reading from URL " + root + key, e);
+            handleException("URI Syntax error reading from URL " + getRoot() + key, e);
         }
         return null;
     }
 
-    public void setConfigProperty(String name, String value) {
-        if ("root".equals(name)) {
-            this.root = value;
-        } else if ("cachableDuration".equals(name)) {
-            this.cachableDuration = Long.parseLong(value);
-        }
+    public String getRoot() {
+        return (String) properties.get("root");
+    }
+
+    public long getCachableDuration() {
+        return Long.parseLong((String) properties.get("cachableDuration"));
     }
 
     private void handleException(String msg, Exception e) {

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/registry/url/SimpleURLRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/registry/url/SimpleURLRegistryTest.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/registry/url/SimpleURLRegistryTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/registry/url/SimpleURLRegistryTest.java Mon Aug  7 22:05:08 2006
@@ -36,8 +36,8 @@
 
     public void testRegistry() throws Exception {
         Registry reg = new SimpleURLRegistry();
-        reg.setConfigProperty("root", "file:./");
-        reg.setConfigProperty("cachableDuration", "1500");
+        reg.addConfigProperty("root", "file:./");
+        reg.addConfigProperty("cachableDuration", "1500");
         DynamicProperty dp = new DynamicProperty(FILE);
 
         // initial load of file from registry
@@ -54,7 +54,7 @@
         // the renewed cache should be valid for another 1.5 secs
         // change the file now and change next cache duration
         writeToFile(TEXT_2);
-        reg.setConfigProperty("cachableDuration", "100");
+        reg.addConfigProperty("cachableDuration", "100");
 
         // still cached content should be available and valid
         assertEquals(TEXT_1, reg.getProperty(dp).toString());

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/CDL.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/CDL.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/CDL.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/CDL.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 /*
 Copyright (c) 2002 JSON.org

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/Cookie.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/Cookie.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/Cookie.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/Cookie.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 /*
 Copyright (c) 2002 JSON.org

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/CookieList.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/CookieList.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/CookieList.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/CookieList.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 /*
 Copyright (c) 2002 JSON.org

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/HTTP.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/HTTP.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/HTTP.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/HTTP.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 /*
 Copyright (c) 2002 JSON.org

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/HTTPTokener.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/HTTPTokener.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/HTTPTokener.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/HTTPTokener.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 /*
 Copyright (c) 2002 JSON.org

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONArray.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONArray.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONArray.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONArray.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 /*
 Copyright (c) 2002 JSON.org

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONException.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONException.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONException.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONException.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 /**
  * The JSONException is thrown by the JSON.org classes then things are amiss.

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONObject.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONObject.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONObject.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONObject.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 /*
 Copyright (c) 2002 JSON.org

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONStringer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONStringer.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONStringer.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONStringer.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 /*
 Copyright (c) 2006 JSON.org

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONTokener.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONTokener.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONTokener.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONTokener.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 /*
 Copyright (c) 2002 JSON.org

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONWriter.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONWriter.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONWriter.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JSONWriter.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 import java.io.IOException;
 import java.io.Writer;

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JsonMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JsonMediator.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JsonMediator.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JsonMediator.java Mon Aug  7 22:05:08 2006
@@ -19,10 +19,10 @@
 import org.apache.synapse.api.Mediator;
 import org.apache.synapse.MessageContext;
 import org.apache.synapse.SynapseException;
-import org.apache.synapse.json.XML;
-import org.apache.synapse.json.JSONException;
-import org.apache.synapse.json.JSONObject;
-import org.apache.synapse.json.SynapseJsonSender;
+import org.apache.synapse.mediators.json.XML;
+import org.apache.synapse.mediators.json.JSONException;
+import org.apache.synapse.mediators.json.JSONObject;
+import org.apache.synapse.mediators.json.SynapseJsonSender;
 import org.apache.synapse.core.axis2.Axis2MessageContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/SynapseJsonSender.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/SynapseJsonSender.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/SynapseJsonSender.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/SynapseJsonSender.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 import org.apache.axis2.transport.TransportSender;
 import org.apache.axis2.transport.http.HTTPConstants;

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/XML.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/XML.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/XML.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/XML.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 /*
 Copyright (c) 2002 JSON.org

Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/XMLTokener.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/XMLTokener.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/XMLTokener.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/XMLTokener.java Mon Aug  7 22:05:08 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 /*
 Copyright (c) 2002 JSON.org

Modified: incubator/synapse/trunk/java/modules/samples/src/samples/common/Util.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/samples/src/samples/common/Util.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/samples/src/samples/common/Util.java (original)
+++ incubator/synapse/trunk/java/modules/samples/src/samples/common/Util.java Mon Aug  7 22:05:08 2006
@@ -23,6 +23,7 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
 
 import javax.xml.namespace.QName;
 
@@ -38,7 +39,7 @@
             if (xurl != null)
                 options.setTo(new EndpointReference(xurl));
             if (turl != null)
-                options.setProperty(MessageContextConstants.TRANSPORT_URL, turl);
+                options.setProperty(Constants.Configuration.TRANSPORT_URL, turl);
             options.setAction(soapAction);
 
             ServiceClient serviceClient = null;
@@ -72,7 +73,7 @@
             if (xurl != null)
                 options.setTo(new EndpointReference(xurl));
             if (turl != null)
-                options.setProperty(MessageContextConstants.TRANSPORT_URL, turl);
+                options.setProperty(Constants.Configuration.TRANSPORT_URL, turl);
             options.setAction(soapAction);
 
             ServiceClient serviceClient = null;
@@ -105,7 +106,7 @@
             if (xurl != null)
                 options.setTo(new EndpointReference(xurl));
             if (turl != null)
-                options.setProperty(MessageContextConstants.TRANSPORT_URL, turl);
+                options.setProperty(Constants.Configuration.TRANSPORT_URL, turl);
             options.setAction(soapAction);
 
             ServiceClient serviceClient = null;
@@ -138,7 +139,7 @@
             if (xurl != null)
                 options.setTo(new EndpointReference(xurl));
             if (turl != null)
-                options.setProperty(MessageContextConstants.TRANSPORT_URL, turl);
+                options.setProperty(Constants.Configuration.TRANSPORT_URL, turl);
             options.setAction(soapAction);
 
             ServiceClient serviceClient = null;

Modified: incubator/synapse/trunk/java/modules/samples/src/samples/qos/security/SecurityInteropClient.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/samples/src/samples/qos/security/SecurityInteropClient.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/samples/src/samples/qos/security/SecurityInteropClient.java (original)
+++ incubator/synapse/trunk/java/modules/samples/src/samples/qos/security/SecurityInteropClient.java Mon Aug  7 22:05:08 2006
@@ -23,6 +23,7 @@
 import org.apache.axis2.client.Options;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContextConstants;
+import org.apache.axis2.Constants;
 
 import javax.xml.namespace.QName;
 
@@ -50,7 +51,7 @@
             ServiceClient serviceClient = new ServiceClient();
             Options options = new Options();
 
-            options.setProperty(MessageContextConstants.TRANSPORT_URL, turl);
+            options.setProperty(Constants.Configuration.TRANSPORT_URL, turl);
             options.setAction(soapAction);
             serviceClient.setOptions(options);
             OMElement result = serviceClient.sendReceive(ping);

Modified: incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DirectStockQuoteClient.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DirectStockQuoteClient.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DirectStockQuoteClient.java (original)
+++ incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DirectStockQuoteClient.java Mon Aug  7 22:05:08 2006
@@ -19,6 +19,7 @@
 import org.apache.axis2.client.Options;
 import org.apache.axis2.client.ServiceClient;
 import org.apache.axis2.context.MessageContextConstants;
+import org.apache.axis2.Constants;
 import samples.common.StockQuoteHandler;
 
 public class DirectStockQuoteClient {
@@ -37,7 +38,7 @@
 
             Options options = new Options();
             if (turl != null)
-                options.setProperty(MessageContextConstants.TRANSPORT_URL, turl);
+                options.setProperty(Constants.Configuration.TRANSPORT_URL, turl);
             options.setAction(sAction);
 
             ServiceClient serviceClient = new ServiceClient();

Modified: incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DumbStockQuoteClient.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DumbStockQuoteClient.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DumbStockQuoteClient.java (original)
+++ incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DumbStockQuoteClient.java Mon Aug  7 22:05:08 2006
@@ -19,6 +19,7 @@
 import org.apache.axis2.client.Options;
 import org.apache.axis2.client.ServiceClient;
 import org.apache.axis2.context.MessageContextConstants;
+import org.apache.axis2.Constants;
 import samples.common.StockQuoteHandler;
 
 /**
@@ -42,7 +43,7 @@
 
             Options options = new Options();
             if (turl != null)
-                options.setProperty(MessageContextConstants.TRANSPORT_URL, turl);
+                options.setProperty(Constants.Configuration.TRANSPORT_URL, turl);
             options.setAction(sAction);
 
             ServiceClient serviceClient = new ServiceClient();

Modified: incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteClient.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteClient.java?rev=429579&r1=429578&r2=429579&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteClient.java (original)
+++ incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteClient.java Mon Aug  7 22:05:08 2006
@@ -7,6 +7,7 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.MessageContextConstants;
+import org.apache.axis2.Constants;
 
 import javax.xml.namespace.QName;
 
@@ -38,7 +39,7 @@
             if (xurl != null)
                 options.setTo(new EndpointReference(xurl));
             if (turl != null)
-                options.setProperty(MessageContextConstants.TRANSPORT_URL, turl);
+                options.setProperty(Constants.Configuration.TRANSPORT_URL, turl);
             options.setAction(sAction);
 
             ServiceClient serviceClient = null;



---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org