You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by su...@apache.org on 2011/01/24 08:53:31 UTC

svn commit: r1062670 [2/4] - in /synapse/trunk/java: modules/core/src/main/java/org/apache/synapse/ modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/ modules/core/src/main/java/org/apache/synapse/mediators/transform/ modules/core/src/te...

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=1062670&r1=1062669&r2=1062670&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 Mon Jan 24 07:53:26 2011
@@ -32,7 +32,7 @@ public class ProxyServiceSerializationTe
 
 
     public void testProxyServiceSerializationSenarioOne() throws Exception {
-        String inputXml = "<proxy xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" name=\"name\" " +
+        String inputXml = "<proxy xmlns=\"http://ws.apache.org/ns/synapse\" name=\"name\" " +
             "startOnLoad=\"true\"  transports=\"http\"><description>description</description>" +
             "<target inSequence=\"inseqname\" outSequence=\"outseqname\" faultSequence=\"faultseqname\" />" +
             "<publishWSDL uri=\"http://uri\" ></publishWSDL><policy key=\"key\"/>" +
@@ -44,7 +44,7 @@ public class ProxyServiceSerializationTe
     }
 
     public void testProxyServiceSerializationSenarioTwo() throws Exception {
-        String inputXml = "<proxy xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" startOnLoad=\"true\" " +
+        String inputXml = "<proxy xmlns=\"http://ws.apache.org/ns/synapse\" startOnLoad=\"true\" " +
             "name=\"name\"  transports=\"http\"><description>description</description>" +
             "<target endpoint=\"epr\" outSequence=\"out\"/><publishWSDL key=\"key\">" +
             "</publishWSDL><policy key=\"key\"/><parameter name=\"para\">text</parameter></proxy>";
@@ -55,7 +55,7 @@ public class ProxyServiceSerializationTe
     }
 
     public void testProxyServiceSerializationSenarioThree() throws Exception {
-        String inputXml = "<proxy xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" " +
+        String inputXml = "<proxy xmlns=\"http://ws.apache.org/ns/synapse\" " +
             "name=\"name\" startOnLoad=\"true\"  transports=\"http\"><description>" +
             "description</description><target><inSequence onError=\"ref\"><description>Test documentation</description><send/></inSequence>" +
             "<outSequence><send/></outSequence></target><publishWSDL  key=\"key\"></publishWSDL>" +
@@ -67,7 +67,7 @@ public class ProxyServiceSerializationTe
     }
 
     public void testProxyServiceSerializationSenarioFour() throws Exception {
-        String inputXml = "<proxy xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" " +
+        String inputXml = "<proxy xmlns=\"http://ws.apache.org/ns/synapse\" " +
             "name=\"name\" startOnLoad=\"true\"  transports=\"http\"><description>" +
             "description</description><target><inSequence onError=\"ref\"><send/></inSequence>" +
             "<outSequence><send/></outSequence></target><enableAddressing/><publishWSDL  key=\"key\"></publishWSDL>" +
@@ -79,7 +79,7 @@ public class ProxyServiceSerializationTe
     }
 
     public void testProxyServiceSerializationSenarioFive() throws Exception {
-        String inputXml = "<proxy xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" startOnLoad=\"true\" " +
+        String inputXml = "<proxy xmlns=\"http://ws.apache.org/ns/synapse\" startOnLoad=\"true\" " +
             "name=\"name\"  transports=\"http\"><description>description</description><target>" +
             "<endpoint><address uri=\"http://www.example.com/testepr\"/></endpoint><outSequence><send/>" +
             "</outSequence></target><publishWSDL uri=\"http://uri\"></publishWSDL><policy key=\"key\"/>" +
@@ -90,7 +90,7 @@ public class ProxyServiceSerializationTe
         assertTrue(compare(resultOM, inputOM));
     }
 //     public void testProxyServiceSerializationSenarioSix() throws Exception {
-//        String inputXml = "<proxy xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" startOnLoad=\"true\" name=\"name\"  transports=\"http\"><description>description</description><target><endpoint address=\"http://www.example.com/testepr\" /></target><publish-wsdl uri=\"http://uri\" key=\"key\"></publish-wsdl><policy key=\"key\"/><parameter name=\"para\"><inline xmlns=\"http://customns\"><test/></inline></parameter></proxy>";
+//        String inputXml = "<proxy xmlns=\"http://ws.apache.org/ns/synapse\" startOnLoad=\"true\" name=\"name\"  transports=\"http\"><description>description</description><target><endpoint address=\"http://www.example.com/testepr\" /></target><publish-wsdl uri=\"http://uri\" key=\"key\"></publish-wsdl><policy key=\"key\"/><parameter name=\"para\"><inline xmlns=\"http://customns\"><test/></inline></parameter></proxy>";
 //        OMElement inputOM = createOMElement(inputXml);
 //        ProxyService proxy = ProxyServiceFactory.createProxy(inputOM);
 //        OMElement resultOM = ProxyServiceSerializer.serializeProxy(null, proxy);
@@ -98,7 +98,7 @@ public class ProxyServiceSerializationTe
 //    }
 
     public void testProxyServiceSerializationWithResourceMap() throws Exception {
-        String inputXml = "<proxy xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" name=\"name\" " +
+        String inputXml = "<proxy xmlns=\"http://ws.apache.org/ns/synapse\" name=\"name\" " +
             "startOnLoad=\"true\"><target><endpoint><address uri=\"http://www.example.com/testepr\"/>" +
             "</endpoint><outSequence><send/></outSequence></target><publishWSDL uri=\"http://uri\">" +
             "<resource location=\"test1.xsd\" key=\"test-key1\"/><resource location=\"test2.xsd\"" +

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RMSequenceMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RMSequenceMediatorSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RMSequenceMediatorSerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RMSequenceMediatorSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -30,14 +30,14 @@ public class RMSequenceMediatorSerializa
     }
 
     public void testRMSequenceSerializationTestScenarioOne() {
-        String inputXml = "<RMSequence xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" " +
+        String inputXml = "<RMSequence xmlns=\"http://ws.apache.org/ns/synapse\" " +
                           "single=\"true\" version=\"1.0\"/>";
         assertTrue(serialization(inputXml, rmSequenceMediatorFactory, rmSequenceMediatorSerializer));
         assertTrue(serialization(inputXml, rmSequenceMediatorSerializer));
     }
 
     public void testRMSequenceSerializationTestScenarioTwo() {
-        String inputXml = "<RMSequence xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" " +
+        String inputXml = "<RMSequence xmlns=\"http://ws.apache.org/ns/synapse\" " +
                           "correlation=\"get-property('To')\" last-message=\"get-property('To')\" version=\"1.1\"/>";
         assertTrue(serialization(inputXml, rmSequenceMediatorFactory, rmSequenceMediatorSerializer));
         assertTrue(serialization(inputXml, rmSequenceMediatorSerializer));

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=1062670&r1=1062669&r2=1062670&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 Mon Jan 24 07:53:26 2011
@@ -32,7 +32,7 @@ public class RegistrySerializationTest e
 
     public void testRegistrySerialization() {
 
-        String regitryConfiguration = "<syn:registry xmlns:syn=\"http://synapse.apache.org/ns/2010/04/configuration\" " +
+        String regitryConfiguration = "<syn:registry xmlns:syn=\"http://ws.apache.org/ns/synapse\" " +
                 "provider=\"org.apache.synapse.registry.url.SimpleURLRegistry\">" +
                 "<syn:parameter name=\"root\">file:./../../repository/</syn:parameter>" +
                 "<syn:parameter name=\"cachableDuration\">15000</syn:parameter>" +

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -46,7 +46,7 @@ public class SendMediatorSerializationTe
 
     public void testAddressEndpointSerialization() {
 
-        String sendConfig = "<send xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+        String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
                      "<endpoint>" +
                           "<address uri='http://localhost:9000/services/MyService1'>" +
                                "<enableAddressing/>" +
@@ -83,7 +83,7 @@ public class SendMediatorSerializationTe
 
     public void testWSDLEndpointSerialization() {
 
-        String sendConfig = "<send xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+        String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
                      "<endpoint>" +
                           "<wsdl uri='file:src/test/resources/esbservice.wsdl' service='esbservice' port='esbserviceSOAP11port_http'>" +
                                "<enableAddressing/>" +
@@ -120,7 +120,7 @@ public class SendMediatorSerializationTe
 
     public void testSimpleLoadbalanceSendSerialization() {
 
-        String sendConfig = "<send xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+        String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<endpoint>" +
                     "<loadbalance>" +
                         "<endpoint>" +
@@ -169,7 +169,7 @@ public class SendMediatorSerializationTe
 
     public void testSimpleFailoverSendSerialization() {
 
-        String sendConfig = "<send xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+        String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<endpoint>" +
                     "<failover>" +
                         "<endpoint>" +
@@ -218,7 +218,7 @@ public class SendMediatorSerializationTe
 
     public void testNestedLoadbalanceFailoverSendSerialization() {
 
-        String sendConfig = "<send xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+        String sendConfig = "<send xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<endpoint>" +
                     "<loadbalance>" +
                         "<endpoint>" +

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SequenceMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SequenceMediatorSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SequenceMediatorSerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SequenceMediatorSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -36,43 +36,43 @@ public class SequenceMediatorSerializati
     }
 
     public void testSequenceMediatorSerializationSenarioOne() throws Exception {
-        String xml = "<sequence xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" name=\"namedsequence\"><header name=\"To\" value=\"http://localhost:9000/services/TestService\"/><send/></sequence>";
+        String xml = "<sequence xmlns=\"http://ws.apache.org/ns/synapse\" name=\"namedsequence\"><header name=\"To\" value=\"http://localhost:9000/services/TestService\"/><send/></sequence>";
         assertTrue(serialization(xml, sequenceMediatorFactory, sequenceMediatorSerializer));
         assertTrue(serialization(xml, sequenceMediatorSerializer));
     }
 
     public void testSequenceMediatorSerializationSenarioTwo() throws Exception {
-        String xml = "<sequence xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" name=\"namedsequence\"  onError=\"ErrorHandler\"><header name=\"To\" value=\"http://localhost:9000/services/TestService\"/><send/></sequence>";
+        String xml = "<sequence xmlns=\"http://ws.apache.org/ns/synapse\" name=\"namedsequence\"  onError=\"ErrorHandler\"><header name=\"To\" value=\"http://localhost:9000/services/TestService\"/><send/></sequence>";
         assertTrue(serialization(xml, sequenceMediatorFactory, sequenceMediatorSerializer));
         assertTrue(serialization(xml, sequenceMediatorSerializer));
     }
 
     public void testSequenceMediatorSerializationSenarioTwoWithDescription() throws Exception {
-        String xml = "<sequence xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" name=\"namedsequence\"  onError=\"ErrorHandler\"><description>Test documentation</description><header name=\"To\" value=\"http://localhost:9000/services/TestService\"/><send/></sequence>";
+        String xml = "<sequence xmlns=\"http://ws.apache.org/ns/synapse\" name=\"namedsequence\"  onError=\"ErrorHandler\"><description>Test documentation</description><header name=\"To\" value=\"http://localhost:9000/services/TestService\"/><send/></sequence>";
         assertTrue(serialization(xml, sequenceMediatorFactory, sequenceMediatorSerializer));
         assertTrue(serialization(xml, sequenceMediatorSerializer));
     }
 
     public void testSequenceMediatorSerializationSenarioThree() throws Exception {
-        String xml = "<sequence xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" key=\"sequenceone\"></sequence>";
+        String xml = "<sequence xmlns=\"http://ws.apache.org/ns/synapse\" key=\"sequenceone\"></sequence>";
         assertTrue(serialization(xml, sequenceMediatorFactory, sequenceMediatorSerializer));
         assertTrue(serialization(xml, sequenceMediatorSerializer));
     }
 
     public void testSequenceMediatorSerializationSenarioThreeWithDescription() throws Exception {
-        String xml = "<sequence xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" key=\"sequenceone\"><description>Test description</description></sequence>";
+        String xml = "<sequence xmlns=\"http://ws.apache.org/ns/synapse\" key=\"sequenceone\"><description>Test description</description></sequence>";
         assertTrue(serialization(xml, sequenceMediatorFactory, sequenceMediatorSerializer));
         assertTrue(serialization(xml, sequenceMediatorSerializer));
     }
 
     public void testSequenceMediatorSerializationSenarioFour() throws Exception {
-        String xml = "<sequence xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" name=\"sequenceone\" onError=\"ErrorHandler\"></sequence>";
+        String xml = "<sequence xmlns=\"http://ws.apache.org/ns/synapse\" name=\"sequenceone\" onError=\"ErrorHandler\"></sequence>";
         assertTrue(serialization(xml, sequenceMediatorFactory, sequenceMediatorSerializer));
         assertTrue(serialization(xml, sequenceMediatorSerializer));
     }
 
     public void testSequenceMediatorSerializationSenarioFive() throws Exception {
-        String xml = "<sequence xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" key=\"sequenceone\" ></sequence>";
+        String xml = "<sequence xmlns=\"http://ws.apache.org/ns/synapse\" key=\"sequenceone\" ></sequence>";
         assertTrue(serialization(xml, sequenceMediatorFactory, sequenceMediatorSerializer));
         assertTrue(serialization(xml, sequenceMediatorSerializer));
     }

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -31,7 +31,7 @@ public class StartupSerializationTest ex
 
     public void testStartupSerializationSenarioOne() throws Exception {
         String inputXml = "<task class=\"org.apache.synapse.util.TestTask\" group=\"org\" " +
-                "name=\"TestTask\" xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+                "name=\"TestTask\" xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<property name=\"name\" value=\"foo\"/>" +
                 "<trigger interval=\"5\"/></task>";
         OMElement inputOM = createOMElement(inputXml);
@@ -42,7 +42,7 @@ public class StartupSerializationTest ex
 
     public void testStartupSerializationSenarioTwo() throws Exception {
         String inputXml = "<task class=\"org.apache.synapse.util.TestTask\" group=\"org\" " +
-                "name=\"TestTask\" xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+                "name=\"TestTask\" xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<description>Test description</description>" +
                 "<property name=\"name\" value=\"foo\"/>" +
                 "<trigger interval=\"5\"/></task>";

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SwitchMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SwitchMediatorSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SwitchMediatorSerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SwitchMediatorSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -33,7 +33,7 @@ public class SwitchMediatorSerialization
 
     public void testSwitchMediatorSerializationScenarioOne() {
 
-        String switchConfiguration = "<syn:switch xmlns:syn=\"http://synapse.apache.org/ns/2010/04/configuration\" source=\"synapse:get-property('to')\">" +
+        String switchConfiguration = "<syn:switch xmlns:syn=\"http://ws.apache.org/ns/synapse\" source=\"synapse:get-property('to')\">" +
                 "<syn:case regex=\"MyService1\"><syn:drop/></syn:case>" +
                 "<syn:case regex=\"MyService2\"><syn:drop/></syn:case>" +
                 "<syn:default><syn:drop/></syn:default>" +
@@ -48,7 +48,7 @@ public class SwitchMediatorSerialization
 
     public void testSwitchMediatorSerializationScenarioTwo() {
 
-        String switchConfiguration = "<syn:switch xmlns:syn=\"http://synapse.apache.org/ns/2010/04/configuration\" source=\"synapse:get-property('to')\">" +
+        String switchConfiguration = "<syn:switch xmlns:syn=\"http://ws.apache.org/ns/synapse\" source=\"synapse:get-property('to')\">" +
                 "<syn:case regex=\"MyService1\"><syn:drop/></syn:case>" +
                 "<syn:case regex=\"MyService2\"><syn:drop/></syn:case>" +
                 "</syn:switch>";

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/TransactionMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/TransactionMediatorSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/TransactionMediatorSerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/TransactionMediatorSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -31,7 +31,7 @@ public class TransactionMediatorSerializ
     }
 
     public void testTransactionMediatorSerializationSenarioOne() throws Exception {
-        String inputXml = "<transaction action=\"new\" xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" />";
+        String inputXml = "<transaction action=\"new\" xmlns=\"http://ws.apache.org/ns/synapse\" />";
         assertTrue(serialization(inputXml, transactionMediatorFactory,
                 transactionMediatorSerializer));
         assertTrue(serialization(inputXml, transactionMediatorSerializer));

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -30,7 +30,7 @@ public class URLRewriteMediatorSerializa
     }
 
     public void testSerializationScenario1() {
-        String xml = "<rewrite xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\"><rule>" +
+        String xml = "<rewrite xmlns=\"http://ws.apache.org/ns/synapse\"><rule>" +
                 "<action fragment=\"protocol\" value=\"https\" type=\"set\"/><action " +
                 "fragment=\"host\" value=\"www.test.com\" type=\"set\"/><action " +
                 "fragment=\"port\" value=\"9090\" type=\"set\"/><action fragment=\"path\" " +
@@ -39,7 +39,7 @@ public class URLRewriteMediatorSerializa
     }
 
     public void testSerializationScenario2() {
-        String xml = "<rewrite xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+        String xml = "<rewrite xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<rule><condition><match xmlns=\"\" type=\"url\" source=\"host\" regex=\"localhost\"/>" +
                 "</condition><action fragment=\"protocol\" value=\"https\" type=\"set\"/>" +
                 "<action fragment=\"host\" value=\"www.test.com\" type=\"set\"/><action " +
@@ -50,7 +50,7 @@ public class URLRewriteMediatorSerializa
     }
 
     public void testSerializationScenario3() {
-        String xml = "<rewrite xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\"><rule>" +
+        String xml = "<rewrite xmlns=\"http://ws.apache.org/ns/synapse\"><rule>" +
                 "<action fragment=\"full\" value=\"http://localhost:8080/synapse\" type=\"set\"/></rule>" +
                 "<rule><condition><match xmlns=\"\" type=\"url\" source=\"host\" regex=\"localhost\"/>" +
                 "</condition><action fragment=\"protocol\" value=\"https\" type=\"set\"/>" +

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/XSLTMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/XSLTMediatorSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/XSLTMediatorSerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/XSLTMediatorSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -30,13 +30,13 @@ public class XSLTMediatorSerializationTe
     }
 
     public void testRMSequenceSerializationTestScenarioOne() {
-        String inputXml = "<xslt xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" key=\"xslt-key-req\"/>";
+        String inputXml = "<xslt xmlns=\"http://ws.apache.org/ns/synapse\" key=\"xslt-key-req\"/>";
         assertTrue(serialization(inputXml, xsltMediatorFactory, xsltMediatorSerializer));
         assertTrue(serialization(inputXml, xsltMediatorSerializer));
     }
 
     public void testRMSequenceSerializationTestScenarioTwo() {
-        String inputXml = "<xslt xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" " +
+        String inputXml = "<xslt xmlns=\"http://ws.apache.org/ns/synapse\" " +
                           "key=\"xslt-key-req\" source=\"get-property('To')\">" +
                           "<property name=\"propName\" value=\"val\"/>" +
                           "<feature name=\"http://javax.xml.XMLConstants/feature/secure-processing\" value=\"true\" />" +
@@ -46,7 +46,7 @@ public class XSLTMediatorSerializationTe
     }
 
     public void testRMSequenceSerializationTestScenarioThree() {
-        String inputXml = "<xslt xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" " +
+        String inputXml = "<xslt xmlns=\"http://ws.apache.org/ns/synapse\" " +
                           "key=\"xslt-key-req\" source=\"get-property('To')\">" +
                           "<property name=\"propName0\" value=\"val\"/>" +
                           "<property name=\"propName1\" expression=\"get-property('To')\"/>" +

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -26,7 +26,7 @@ import org.apache.synapse.endpoints.Addr
 public class AddressEndpointSerializationTest extends AbstractTestCase {
 
     public void testAddressEndpointScenarioOne() throws Exception {
-        String inputXML = "<endpoint  xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+        String inputXML = "<endpoint  xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<address uri=\"http://localhost:9000/services/SimpleStockQuoteService\" />" +
                 "</endpoint>" ;
 
@@ -42,7 +42,7 @@ public class AddressEndpointSerializatio
     public void testAddressEndpointScenarioTwo() throws Exception {
         String inputXML =
                 "<endpoint name=\"testEndpoint\" onFault=\"foo\" xmlns=" +
-                        "\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+                        "\"http://ws.apache.org/ns/synapse\">" +
                 "<address uri=\"http://localhost:9000/services/SimpleStockQuoteService\" >" +
                 "</address>"+
                 "</endpoint>" ;
@@ -56,7 +56,7 @@ public class AddressEndpointSerializatio
     }
 
     public void testAddressEndpointScenarioThree() throws Exception {
-        String inputXML = "<endpoint  xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+        String inputXML = "<endpoint  xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<address uri=\"http://localhost:9000/services/SimpleStockQuoteService\" >" +
                 "<markForSuspension>" +
                 "<errorCodes>101507,101508</errorCodes>" +
@@ -86,7 +86,7 @@ public class AddressEndpointSerializatio
 
     public void testAddressEndpointScenarioFour() throws Exception {
          String inputXML =
-                "<endpoint xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+                "<endpoint xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<address uri=\"http://localhost:9000/services/SimpleStockQuoteService\" >" +
                 "</address>"+
                 "</endpoint>" ;

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/LoadBalanceEndpointSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/LoadBalanceEndpointSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/LoadBalanceEndpointSerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/LoadBalanceEndpointSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -26,7 +26,7 @@ import org.apache.synapse.endpoints.Endp
 public class LoadBalanceEndpointSerializationTest extends AbstractTestCase {
 
     public void testLoadBalanceEndpointScenarioOne()throws Exception {
-        String inputXml = "<endpoint xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+        String inputXml = "<endpoint xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<session type=\"simpleClientSession\"/>" +
                 "<loadbalance algorithm=\"org.apache.synapse.endpoints.algorithms.RoundRobin\">" +
                 "<endpoint>" +

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java Mon Jan 24 07:53:26 2011
@@ -95,7 +95,7 @@ public abstract class AbstractTestCase e
     }
 
     protected OMElement getParent() {
-        String parentXML = "<synapse xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\"><definitions></definitions></synapse>";
+        String parentXML = "<synapse xmlns=\"http://ws.apache.org/ns/synapse\"><definitions></definitions></synapse>";
         return createOMElement(parentXML);
     }
 

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorSerializationTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -35,7 +35,7 @@ public class ValidateMediatorSerializati
 
     public void testValidateMediatorSerialization() throws Exception {
 
-        String validateConfiguration = "<syn:validate xmlns:syn=\"http://synapse.apache.org/ns/2010/04/configuration\" source=\"//regRequest\">" +
+        String validateConfiguration = "<syn:validate xmlns:syn=\"http://ws.apache.org/ns/synapse\" source=\"//regRequest\">" +
                 "<syn:schema key=\"file:synapse_repository/conf/sample/validate.xsd\"/>" +
                 "<syn:feature name=\"http://javax.xml.XMLConstants/feature/secure-processing\" value=\"true\"/>" +
                 "<syn:on-fail>" +

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java Mon Jan 24 07:53:26 2011
@@ -86,7 +86,7 @@ public class ValidateMediatorTest extend
             "</CheckPriceRequest>\n";
 
     private static final String DEFAULT_FEATURES_MEDIATOR_CONFIG =
-            "<validate xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+            "<validate xmlns=\"http://ws.apache.org/ns/synapse\">" +
             "   <schema key=\"file:synapse_repository/conf/sample/validate.xsd\"/>" +
             "   <on-fail>" +
             "       <makefault>" +
@@ -97,7 +97,7 @@ public class ValidateMediatorTest extend
             "</validate>";
 
     private static final String CUSTOM_FEATURES_MEDIATOR_CONFIG =
-            "<validate xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+            "<validate xmlns=\"http://ws.apache.org/ns/synapse\">" +
             "   <schema key=\"file:synapse_repository/conf/sample/validate.xsd\"/>" +
             "   <feature name=\"" + SCHEMA_FULL_CHECKING_FEATURE_ID + "\" value=\"false\"/>" +
             "   <feature name=\"" + HONOUR_ALL_SCHEMA_LOCATIONS_FEATURE_ID + "\" value=\"true\"/>" +
@@ -110,7 +110,7 @@ public class ValidateMediatorTest extend
             "</validate>";
 
     private static final String REG_KEY =
-            "<validate xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+            "<validate xmlns=\"http://ws.apache.org/ns/synapse\">" +
             "   <schema key=\"file:synapse_repository/conf/sample/validate.xsd\"/>" +
             "   <on-fail>" +
             "       <makefault>" +

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBLookupMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBLookupMediatorTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBLookupMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBLookupMediatorTest.java Mon Jan 24 07:53:26 2011
@@ -63,7 +63,7 @@ public class DBLookupMediatorTest extend
 
                 lookup = (DBLookupMediator)
                     new DBLookupMediatorFactory().createMediator(createOMElement(
-                        "<dblookup xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">\n" +
+                        "<dblookup xmlns=\"http://ws.apache.org/ns/synapse\">\n" +
                             "  <connection>\n" +
                             "    <pool>\n" +
                             "      <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>\n" +

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java Mon Jan 24 07:53:26 2011
@@ -68,7 +68,7 @@ public class DBReportMediatorTest extend
 
                 report = (DBReportMediator)
                     new DBReportMediatorFactory().createMediator(createOMElement(
-                        "<dblookup xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">\n" +
+                        "<dblookup xmlns=\"http://ws.apache.org/ns/synapse\">\n" +
                             "  <connection>\n" +
                             "    <pool>\n" +
                             "      <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>\n" +

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/CloneMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/CloneMediatorTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/CloneMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/CloneMediatorTest.java Mon Jan 24 07:53:26 2011
@@ -42,7 +42,7 @@ public class CloneMediatorTest extends A
 
     public void testClonningScenarioOne() throws Exception {
         Mediator clone = fac.createMediator(createOMElement("<clone " +
-            "xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\"><target soapAction=\"urn:clone\" " +
+            "xmlns=\"http://ws.apache.org/ns/synapse\"><target soapAction=\"urn:clone\" " +
             "sequence=\"seqRef\"/><target to=\"http://test\"><sequence><sequence " +
             "key=\"seqRef\"/></sequence></target></clone>"), new Properties());
         clone.mediate(testCtx);
@@ -62,7 +62,7 @@ public class CloneMediatorTest extends A
 
     public void testClonningWithContinueParent() throws Exception {
         Mediator clone = fac.createMediator(createOMElement("<clone continueParent=\"true\" " +
-            "xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\"><target soapAction=\"urn:clone\" " +
+            "xmlns=\"http://ws.apache.org/ns/synapse\"><target soapAction=\"urn:clone\" " +
             "sequence=\"seqRef\"/><target to=\"http://test\"><sequence><sequence " +
             "key=\"seqRef\"/></sequence></target></clone>"), new Properties());
         assertTrue(clone.mediate(testCtx));

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java Mon Jan 24 07:53:26 2011
@@ -50,7 +50,7 @@ public class IterateMediatorTest extends
 
     public void testIterationScenarioOne() throws Exception {
         Mediator iterate = fac.createMediator(createOMElement("<iterate " +
-            "expression=\"//original/itr\" xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+            "expression=\"//original/itr\" xmlns=\"http://ws.apache.org/ns/synapse\">" +
             "<target soapAction=\"urn:iterate\" sequence=\"seqRef\"/></iterate>"), new Properties());
         helperMediator.clearMediatedContexts();
         iterate.mediate(testCtx);
@@ -71,7 +71,7 @@ public class IterateMediatorTest extends
     public void testIterationWithPreservePayload() throws Exception {
         Mediator iterate = fac.createMediator(createOMElement("<iterate " +
             "expression=\"//original/itr\" preservePayload=\"true\" attachPath=\"//original\" " +
-            "xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\"><target soapAction=\"urn:iterate\" " +
+            "xmlns=\"http://ws.apache.org/ns/synapse\"><target soapAction=\"urn:iterate\" " +
             "sequence=\"seqRef\"/></iterate>"), new Properties());
         iterate.mediate(testCtx);
         while(helperMediator.getMediatedContext(1) == null) {

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediatorTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/AnnotatedCommandMediatorTest.java Mon Jan 24 07:53:26 2011
@@ -74,7 +74,7 @@ public class AnnotatedCommandMediatorTes
         m.setCommand(AnnotatedCommand.class);
 
         Mediator pcm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
-           "<annotatedCommand name='org.apache.synapse.mediators.ext.AnnotatedCommand2' xmlns='http://synapse.apache.org/ns/2010/04/configuration'/>"), new Properties());
+           "<annotatedCommand name='org.apache.synapse.mediators.ext.AnnotatedCommand2' xmlns='http://ws.apache.org/ns/synapse'/>"), new Properties());
 
         MessageContext mc = TestUtils.getTestContext("<m:getQuote xmlns:m=\"http://services.samples/xsd\"><m:request><m:symbol>IBM</m:symbol></m:request></m:getQuote>");
         pcm.mediate(mc);

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTest.java Mon Jan 24 07:53:26 2011
@@ -38,7 +38,7 @@ public class ClassMediatorTest extends A
     public void testMediationWithoutProperties() throws Exception {
         Mediator cm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
                 "<class name='org.apache.synapse.mediators.ext.ClassMediatorTestMediator' " +
-                        "xmlns='http://synapse.apache.org/ns/2010/04/configuration'/>"), new Properties());
+                        "xmlns='http://ws.apache.org/ns/synapse'/>"), new Properties());
         cm.mediate(new TestMessageContext());
         assertTrue(ClassMediatorTestMediator.invoked);
     }
@@ -46,7 +46,7 @@ public class ClassMediatorTest extends A
     public void testMediationWithLiteralProperties() throws Exception {
         Mediator cm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
                 "<class name='org.apache.synapse.mediators.ext.ClassMediatorTestMediator' " +
-                        "xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property name='testProp' value='testValue'/></class>"), new Properties());
+                        "xmlns='http://ws.apache.org/ns/synapse'><property name='testProp' value='testValue'/></class>"), new Properties());
         cm.mediate(new TestMessageContext());
         assertTrue(ClassMediatorTestMediator.invoked);
         assertTrue(ClassMediatorTestMediator.testProp.equals("testValue"));
@@ -55,7 +55,7 @@ public class ClassMediatorTest extends A
     public void testInitializationAndMedition() throws Exception {
         Mediator cm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
                 "<class name='org.apache.synapse.mediators.ext.ClassMediatorTestMediator' " +
-                        "xmlns='http://synapse.apache.org/ns/2010/04/configuration'/>"), new Properties());
+                        "xmlns='http://ws.apache.org/ns/synapse'/>"), new Properties());
         ((ManagedLifecycle) cm).init(new Axis2SynapseEnvironment(new SynapseConfiguration()));
         assertTrue(ClassMediatorTestMediator.initialized);
         cm.mediate(new TestMessageContext());
@@ -65,7 +65,7 @@ public class ClassMediatorTest extends A
     public void testDestroy() throws Exception {
         Mediator cm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
                 "<class name='org.apache.synapse.mediators.ext.ClassMediatorTestMediator' " +
-                        "xmlns='http://synapse.apache.org/ns/2010/04/configuration'/>"), new Properties());
+                        "xmlns='http://ws.apache.org/ns/synapse'/>"), new Properties());
         cm.mediate(new TestMessageContext());
         assertTrue(ClassMediatorTestMediator.invoked);
         ((ManagedLifecycle) cm).destroy();

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/POJOCommandMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/POJOCommandMediatorTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/POJOCommandMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/POJOCommandMediatorTest.java Mon Jan 24 07:53:26 2011
@@ -38,7 +38,7 @@ public class POJOCommandMediatorTest ext
     public void testPojoWithoutPropertiesNotCommandImpl() throws Exception {
         Mediator pcm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
                 "<pojoCommand name='org.apache.synapse.mediators.ext.POJOCommandTestMediator' " +
-                        "xmlns='http://synapse.apache.org/ns/2010/04/configuration'/>"), new Properties());
+                        "xmlns='http://ws.apache.org/ns/synapse'/>"), new Properties());
         POJOCommandTestHelper.reset();
         pcm.mediate(new TestMessageContext());
         assertTrue(POJOCommandTestHelper.getInstance().isExecuted());
@@ -47,7 +47,7 @@ public class POJOCommandMediatorTest ext
     public void testPojoWithPropertiesNotCommandImpl() throws Exception {
         Mediator pcm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
                 "<pojoCommand name='org.apache.synapse.mediators.ext.POJOCommandTestMediator' " +
-                        "xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property name=\"testProp\" " +
+                        "xmlns='http://ws.apache.org/ns/synapse'><property name=\"testProp\" " +
                         "expression=\"fn:concat('XPATH ', 'FUNC')\" action=\"ReadMessage\"/></pojoCommand>"), new Properties());
         POJOCommandTestHelper.reset();
         pcm.mediate(new TestMessageContext());
@@ -58,7 +58,7 @@ public class POJOCommandMediatorTest ext
     public void testPojoWithoutPropertiesCommandImpl() throws Exception {
         Mediator pcm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
                 "<pojoCommand name='org.apache.synapse.mediators.ext.POJOCommandTestImplementedMediator' " +
-                        "xmlns='http://synapse.apache.org/ns/2010/04/configuration'/>"), new Properties());
+                        "xmlns='http://ws.apache.org/ns/synapse'/>"), new Properties());
         POJOCommandTestHelper.reset();
         pcm.mediate(new TestMessageContext());
         assertTrue(POJOCommandTestHelper.getInstance().isExecuted());
@@ -67,7 +67,7 @@ public class POJOCommandMediatorTest ext
     public void testPojoWithPropertiesCommandImpl() throws Exception {
         Mediator pcm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
                 "<pojoCommand name='org.apache.synapse.mediators.ext.POJOCommandTestImplementedMediator' " +
-                        "xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property name=\"testProp\" " +
+                        "xmlns='http://ws.apache.org/ns/synapse'><property name=\"testProp\" " +
                         "expression=\"fn:concat('XPATH ', 'FUNC')\" action=\"ReadMessage\"/></pojoCommand>"), new Properties());
         POJOCommandTestHelper.reset();
         pcm.mediate(new TestMessageContext());
@@ -78,7 +78,7 @@ public class POJOCommandMediatorTest ext
     public void testPojoWithStaticPropertiesCommandImpl() throws Exception {
         Mediator pcm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
                 "<pojoCommand name='org.apache.synapse.mediators.ext.POJOCommandTestImplementedMediator' " +
-                        "xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property name=\"testProp\" " +
+                        "xmlns='http://ws.apache.org/ns/synapse'><property name=\"testProp\" " +
                         "value=\"Test Property\"/></pojoCommand>"), new Properties());
         POJOCommandTestHelper.reset();
         pcm.mediate(new TestMessageContext());
@@ -89,7 +89,7 @@ public class POJOCommandMediatorTest ext
     public void testPojoWithContextPropertiesCommandImpl() throws Exception {
         Mediator pcm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
                 "<pojoCommand name='org.apache.synapse.mediators.ext.POJOCommandTestImplementedMediator' " +
-                        "xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property name=\"testProp\" " +
+                        "xmlns='http://ws.apache.org/ns/synapse'><property name=\"testProp\" " +
                         "value=\"Test Property\" context-name=\"testPropInMC\"/></pojoCommand>"), new Properties());
         POJOCommandTestHelper.reset();
         MessageContext ctx = new TestMessageContext();
@@ -102,7 +102,7 @@ public class POJOCommandMediatorTest ext
     public void testPojoWithMessagePropertiesCommandImpl() throws Exception {
         Mediator pcm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
                 "<pojoCommand name='org.apache.synapse.mediators.ext.POJOCommandTestImplementedMediator' " +
-                        "xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property name=\"testProp\" " +
+                        "xmlns='http://ws.apache.org/ns/synapse'><property name=\"testProp\" " +
                         "value=\"TestProperty\" expression=\"//testNode\"/></pojoCommand>"), new Properties());
         POJOCommandTestHelper.reset();
         MessageContext ctx = new TestMessageContext();
@@ -118,7 +118,7 @@ public class POJOCommandMediatorTest ext
     public void testPojoWithContextR$UPropertiesCommandImpl() throws Exception {
         Mediator pcm = MediatorFactoryFinder.getInstance().getMediator(createOMElement(
                 "<pojoCommand name='org.apache.synapse.mediators.ext.POJOCommandTestImplementedMediator' " +
-                        "xmlns='http://synapse.apache.org/ns/2010/04/configuration'><property name=\"ctxTest\" " +
+                        "xmlns='http://ws.apache.org/ns/synapse'><property name=\"ctxTest\" " +
                         "context-name=\"testCtxProp\" action=\"ReadAndUpdateContext\"/></pojoCommand>"), new Properties());
         POJOCommandTestHelper.reset();
         MessageContext ctx = new TestMessageContext();

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java Mon Jan 24 07:53:26 2011
@@ -223,7 +223,7 @@ public class URLRewriteMediatorTest exte
 
     public void testFullRewriteScenario1() throws Exception {
         String xml =
-                "<rewrite xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">\n" +
+                "<rewrite xmlns=\"http://ws.apache.org/ns/synapse\">\n" +
                 "    <rule>\n" +
                 "        <condition>\n" +
                 "            <and>\n" +

Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/DynamicResourceTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/DynamicResourceTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/DynamicResourceTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/DynamicResourceTest.java Mon Jan 24 07:53:26 2011
@@ -35,22 +35,22 @@ import java.util.HashMap;
 public class DynamicResourceTest extends TestCase {
 
     private static final String DYNAMIC_ENDPOINT_1 =
-            "<endpoint xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">\n" +
+            "<endpoint xmlns=\"http://ws.apache.org/ns/synapse\">\n" +
             "    <address uri=\"http://test.url\"/>\n" +
             "</endpoint>";
 
     private static final String DYNAMIC_ENDPOINT_2 =
-            "<endpoint xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">\n" +
+            "<endpoint xmlns=\"http://ws.apache.org/ns/synapse\">\n" +
             "    <address uri=\"http://test2.url\"/>\n" +
             "</endpoint>";
 
     private static final String DYNAMIC_SEQUENCE_1 =
-            "<sequence xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" name=\"seq1\">\n" +
+            "<sequence xmlns=\"http://ws.apache.org/ns/synapse\" name=\"seq1\">\n" +
             "    <property name=\"foo\" value=\"bar\" />" +
             "</sequence>";
 
     private static final String DYNAMIC_SEQUENCE_2 =
-            "<sequence xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" name=\"seq1\">\n" +
+            "<sequence xmlns=\"http://ws.apache.org/ns/synapse\" name=\"seq1\">\n" +
             "    <property name=\"foo\" value=\"baz\" />" +
             "</sequence>";
 

Modified: synapse/trunk/java/modules/core/src/test/resources/synapse-config/endpoints/epr1.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-config/endpoints/epr1.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/resources/synapse-config/endpoints/epr1.xml (original)
+++ synapse/trunk/java/modules/core/src/test/resources/synapse-config/endpoints/epr1.xml Mon Jan 24 07:53:26 2011
@@ -1,3 +1,3 @@
-<endpoint name="epr1" xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<endpoint name="epr1" xmlns="http://ws.apache.org/ns/synapse">
     <address uri="http://localhost:9000/services/LBService1"/>
 </endpoint>
\ No newline at end of file

Modified: synapse/trunk/java/modules/core/src/test/resources/synapse-config/proxy-services/proxy1.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-config/proxy-services/proxy1.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/resources/synapse-config/proxy-services/proxy1.xml (original)
+++ synapse/trunk/java/modules/core/src/test/resources/synapse-config/proxy-services/proxy1.xml Mon Jan 24 07:53:26 2011
@@ -1,4 +1,4 @@
-<proxy name="proxy1" xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<proxy name="proxy1" xmlns="http://ws.apache.org/ns/synapse">
     <target endpoint="epr1" inSequence="foo">
         <outSequence>
             <send/>

Modified: synapse/trunk/java/modules/core/src/test/resources/synapse-config/registry.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-config/registry.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/resources/synapse-config/registry.xml (original)
+++ synapse/trunk/java/modules/core/src/test/resources/synapse-config/registry.xml Mon Jan 24 07:53:26 2011
@@ -1,4 +1,4 @@
-<registry xmlns="http://synapse.apache.org/ns/2010/04/configuration"
+<registry xmlns="http://ws.apache.org/ns/synapse"
           provider="org.apache.synapse.registry.url.SimpleURLRegistry">
     <parameter name="root">file:repository/conf/sample/resources/</parameter>
     <parameter name="cachableDuration">15000</parameter>

Modified: synapse/trunk/java/modules/core/src/test/resources/synapse-config/sequences/fault.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-config/sequences/fault.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/resources/synapse-config/sequences/fault.xml (original)
+++ synapse/trunk/java/modules/core/src/test/resources/synapse-config/sequences/fault.xml Mon Jan 24 07:53:26 2011
@@ -1,4 +1,4 @@
-<sequence name="fault" xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<sequence name="fault" xmlns="http://ws.apache.org/ns/synapse">
     <log level="full"/>
     <send/>
 </sequence>
\ No newline at end of file

Modified: synapse/trunk/java/modules/core/src/test/resources/synapse-config/sequences/foo.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-config/sequences/foo.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/resources/synapse-config/sequences/foo.xml (original)
+++ synapse/trunk/java/modules/core/src/test/resources/synapse-config/sequences/foo.xml Mon Jan 24 07:53:26 2011
@@ -1,4 +1,4 @@
-<sequence name="foo" xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<sequence name="foo" xmlns="http://ws.apache.org/ns/synapse">
     <filter source="get-property('To')" regex=".*/StockQuote.*">
         <then>
             <log level="full"/>                        

Modified: synapse/trunk/java/modules/core/src/test/resources/synapse-config/sequences/main.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-config/sequences/main.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/resources/synapse-config/sequences/main.xml (original)
+++ synapse/trunk/java/modules/core/src/test/resources/synapse-config/sequences/main.xml Mon Jan 24 07:53:26 2011
@@ -1,4 +1,4 @@
-<sequence name="main" xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<sequence name="main" xmlns="http://ws.apache.org/ns/synapse">
     <in>
         <log/>
         <send>

Modified: synapse/trunk/java/modules/core/src/test/resources/synapse-config/synapse.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-config/synapse.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/resources/synapse-config/synapse.xml (original)
+++ synapse/trunk/java/modules/core/src/test/resources/synapse-config/synapse.xml Mon Jan 24 07:53:26 2011
@@ -1,4 +1,4 @@
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <endpoint name="synapse_xml_epr1">
         <address uri="http://localhost:8080/services/Test"/>

Modified: synapse/trunk/java/modules/core/src/test/resources/synapse-config/tasks/task1.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-config/tasks/task1.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/resources/synapse-config/tasks/task1.xml (original)
+++ synapse/trunk/java/modules/core/src/test/resources/synapse-config/tasks/task1.xml Mon Jan 24 07:53:26 2011
@@ -1,5 +1,5 @@
 <task class="org.apache.synapse.startup.tasks.MessageInjector"
-      name="task1" xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+      name="task1" xmlns="http://ws.apache.org/ns/synapse">
     
     <property name="to" value="http://localhost:9000/services/SimpleStockQuoteService"/>
     <property name="soapAction" value="urn:getQuote"/>

Modified: synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializationTest.java (original)
+++ synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -32,19 +32,19 @@ public class ScriptMediatorSerialization
     }
 
     public void testScriptMediatorSerializationScenarioOne() throws XMLComparisonException {
-        String inputXml = "<script xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" key=\"script-key\" function=\"funOne\" language=\"js\"></script> ";
+        String inputXml = "<script xmlns=\"http://ws.apache.org/ns/synapse\" key=\"script-key\" function=\"funOne\" language=\"js\"></script> ";
         assertTrue(serialization(inputXml, mediatorFactory, scriptMediatorSerializer));
         assertTrue(serialization(inputXml, scriptMediatorSerializer));
     }
 
     public void testScriptMediatorSerializationScenarioTwo() throws XMLComparisonException {
-        String inputXml = "<script xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" language=\"js\" key=\"script-key\" ></script> ";
+        String inputXml = "<script xmlns=\"http://ws.apache.org/ns/synapse\" language=\"js\" key=\"script-key\" ></script> ";
         assertTrue(serialization(inputXml, mediatorFactory, scriptMediatorSerializer));
         assertTrue(serialization(inputXml, scriptMediatorSerializer));
     }
 
     public void testInlineScriptMediatorSerializationScenarioOne() throws XMLComparisonException {
-        String inputXml = "<syn:script xmlns:syn=\"http://synapse.apache.org/ns/2010/04/configuration\" language='js'>" +
+        String inputXml = "<syn:script xmlns:syn=\"http://ws.apache.org/ns/synapse\" language='js'>" +
                 "<![CDATA[var symbol = mc.getPayloadXML()..*::Code.toString();mc.setPayloadXML(<m:getQuote xmlns:m=\"http://services.samples/xsd\">\n" +
                 "<m:request><m:symbol>{symbol}</m:symbol></m:request></m:getQuote>);]]></syn:script> ";
         assertTrue(serialization(inputXml, mediatorFactory, scriptMediatorSerializer));
@@ -52,7 +52,7 @@ public class ScriptMediatorSerialization
     }
 
     public void testInlineScriptMediatorSerializationScenarioTwo() throws XMLComparisonException {
-        String inputXml = "<syn:script xmlns:syn=\"http://synapse.apache.org/ns/2010/04/configuration\" language='rb'>" +
+        String inputXml = "<syn:script xmlns:syn=\"http://ws.apache.org/ns/synapse\" language='rb'>" +
                 "<![CDATA[" +
                 "require 'rexml/document'\n" +
                 "include REXML\n" +

Modified: synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializationTest.java (original)
+++ synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -37,7 +37,7 @@ public class ThrottleMediatorSerializati
     }
 
     public void testThrottleMediatorSerializationSenarioOne() throws Exception {
-        String inputXml = "<throttle id=\"A\" xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" >" +
+        String inputXml = "<throttle id=\"A\" xmlns=\"http://ws.apache.org/ns/synapse\" >" +
                 "<policy key=\"thottleKey\"/></throttle>";
         assertTrue(serialization(inputXml, throttleMediatorFactory, throttleMediatorSerializer));
         assertTrue(serialization(inputXml, throttleMediatorSerializer));

Modified: synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializationTest.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializationTest.java (original)
+++ synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializationTest.java Mon Jan 24 07:53:26 2011
@@ -34,7 +34,7 @@ public class XQueryMediatorSerialization
     }
 
     public void testXQueryMediatorSerializationSenarioOne() throws Exception {
-        String inputXml = "<xquery xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\" key=\"querykey\" target=\"target\">" +
+        String inputXml = "<xquery xmlns=\"http://ws.apache.org/ns/synapse\" key=\"querykey\" target=\"target\">" +
                           "<dataSource>" +
                           "<property name=\"username\" value=\"valueone\" />" +
                           "</dataSource>" +

Modified: synapse/trunk/java/modules/migrator/src/main/resources/synapse-configuration-migrator.xslt
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/migrator/src/main/resources/synapse-configuration-migrator.xslt?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/migrator/src/main/resources/synapse-configuration-migrator.xslt (original)
+++ synapse/trunk/java/modules/migrator/src/main/resources/synapse-configuration-migrator.xslt Mon Jan 24 07:53:26 2011
@@ -25,7 +25,7 @@ version to the 2.x compatible version
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:syn="http://ws.apache.org/ns/synapse"
                 xmlns:spring="http://ws.apache.org/ns/synapse/spring"
-                xmlns:synNew="http://synapse.apache.org/ns/2010/04/configuration"
+                xmlns:synNew="http://ws.apache.org/ns/synapse"
                 exclude-result-prefixes="syn">
 
     <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
@@ -35,23 +35,23 @@ version to the 2.x compatible version
     </xsl:template>
 
     <xsl:template match="syn:filter | synNew:filter" priority="0">
-        <xsl:element name="{local-name()}" namespace="http://synapse.apache.org/ns/2010/04/configuration">
+        <xsl:element name="{local-name()}" namespace="http://ws.apache.org/ns/synapse">
             <xsl:copy-of select="@*"/>
             <xsl:choose>
                 <xsl:when test="local-name(child::*[position()=1])='then' or local-name(child::*[position()=1])='else'">
                     <xsl:if test="count(child::syn:then)>0 or count(child::synNew:then)>0">
-                        <xsl:element name="then" namespace="http://synapse.apache.org/ns/2010/04/configuration">
+                        <xsl:element name="then" namespace="http://ws.apache.org/ns/synapse">
                             <xsl:apply-templates select="child::syn:then/* | child::synNew:then/*"/>
                         </xsl:element>
                     </xsl:if>
                     <xsl:if test="count(child::syn:else)>0 or count(child::synNew:else)>0">
-                        <xsl:element name="else" namespace="http://synapse.apache.org/ns/2010/04/configuration">
+                        <xsl:element name="else" namespace="http://ws.apache.org/ns/synapse">
                             <xsl:apply-templates select="child::syn:else/* | child::synNew:else/*"/>
                         </xsl:element>
                     </xsl:if>
                 </xsl:when>
                 <xsl:otherwise>
-                    <xsl:element name="then" namespace="http://synapse.apache.org/ns/2010/04/configuration">
+                    <xsl:element name="then" namespace="http://ws.apache.org/ns/synapse">
                         <xsl:apply-templates/>
                     </xsl:element>
                 </xsl:otherwise>
@@ -64,7 +64,7 @@ version to the 2.x compatible version
     </xsl:template>
 
     <xsl:template match="syn:definitions | synNew:definitions" priority="1">
-        <xsl:element name="definitions" namespace="http://synapse.apache.org/ns/2010/04/configuration">
+        <xsl:element name="definitions" namespace="http://ws.apache.org/ns/synapse">
             <xsl:text>
 
 </xsl:text>
@@ -82,7 +82,7 @@ version to the 2.x compatible version
                 </xsl:if>
             </xsl:for-each>
             <xsl:if test="not(syn:sequence[@name='main'] or synNew:sequence[@name='main']) and (count(syn:*[local-name()!='sequence' and local-name()!='localEntry' and local-name()!='proxy' and local-name()!='task' and local-name()!='endpoint' and local-name()!='eventSource' and local-name()!='registry']) + count(synNew:*[local-name()!='sequence' and local-name()!='localEntry' and local-name()!='proxy' and local-name()!='task' and local-name()!='endpoint' and local-name()!='eventSource' and local-name()!='priorityExecutor' and local-name()!='registry']))!=0">
-                <xsl:element name="sequence" namespace="http://synapse.apache.org/ns/2010/04/configuration">
+                <xsl:element name="sequence" namespace="http://ws.apache.org/ns/synapse">
                     <xsl:attribute name="name">main</xsl:attribute>
                     <xsl:for-each select="syn:* | synNew:* | spring:* | comment()">
                         <xsl:if test="local-name()!='sequence' and local-name()!='localEntry' and local-name()!='proxy' and local-name()!='task' and local-name()!='endpoint' and local-name()!='eventSource' and local-name()!='priorityExecutor' and local-name()!='registry'">
@@ -124,7 +124,7 @@ version to the 2.x compatible version
     </xsl:template>
 
     <xsl:template name="convertNS">
-        <xsl:element name="{local-name()}" namespace="http://synapse.apache.org/ns/2010/04/configuration">
+        <xsl:element name="{local-name()}" namespace="http://ws.apache.org/ns/synapse">
             <xsl:copy-of select="@*"/>
             <xsl:apply-templates/>
         </xsl:element>

Modified: synapse/trunk/java/modules/packaging/package-archetype/src/main/resources/archetype-resources/repository/conf/synapse.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/packaging/package-archetype/src/main/resources/archetype-resources/repository/conf/synapse.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/packaging/package-archetype/src/main/resources/archetype-resources/repository/conf/synapse.xml (original)
+++ synapse/trunk/java/modules/packaging/package-archetype/src/main/resources/archetype-resources/repository/conf/synapse.xml Mon Jan 24 07:53:26 2011
@@ -17,6 +17,6 @@
 ##  under the License.
 ##
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
 </definitions>
\ No newline at end of file

Modified: synapse/trunk/java/modules/samples/src/main/java/samples/userguide/LoadbalanceFailoverClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/LoadbalanceFailoverClient.java?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/src/main/java/samples/userguide/LoadbalanceFailoverClient.java (original)
+++ synapse/trunk/java/modules/samples/src/main/java/samples/userguide/LoadbalanceFailoverClient.java Mon Jan 24 07:53:26 2011
@@ -407,7 +407,7 @@ public class LoadbalanceFailoverClient {
         envelope.addChild(header);
 
         OMNamespace synNamespace = soapFactory.
-                createOMNamespace("http://synapse.apache.org/ns/2010/04/configuration", "syn");
+                createOMNamespace("http://ws.apache.org/ns/synapse", "syn");
         OMElement clientIDElement = soapFactory.createOMElement("ClientID", synNamespace);
         clientIDElement.setText(clientID);
         header.addChild(clientIDElement);

Modified: synapse/trunk/java/repository/conf/sample/resources/endpoint/dynamic_endpt_1.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/resources/endpoint/dynamic_endpt_1.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/resources/endpoint/dynamic_endpt_1.xml (original)
+++ synapse/trunk/java/repository/conf/sample/resources/endpoint/dynamic_endpt_1.xml Mon Jan 24 07:53:26 2011
@@ -1,3 +1,3 @@
-<endpoint xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<endpoint xmlns="http://ws.apache.org/ns/synapse">
     <address uri="http://localhost:9000/services/SimpleStockQuoteService"/>
 </endpoint>

Modified: synapse/trunk/java/repository/conf/sample/resources/misc/synapse.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/resources/misc/synapse.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/resources/misc/synapse.xml (original)
+++ synapse/trunk/java/repository/conf/sample/resources/misc/synapse.xml Mon Jan 24 07:53:26 2011
@@ -17,7 +17,7 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <registry provider="org.apache.synapse.registry.url.SimpleURLRegistry">
         <!-- the root property of the simple URL registry helps resolve a resource URL as root + key -->

Modified: synapse/trunk/java/repository/conf/sample/resources/sequence/dynamic_seq_1.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/resources/sequence/dynamic_seq_1.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/resources/sequence/dynamic_seq_1.xml (original)
+++ synapse/trunk/java/repository/conf/sample/resources/sequence/dynamic_seq_1.xml Mon Jan 24 07:53:26 2011
@@ -1,4 +1,4 @@
-<sequence name="dynamic_sequence" xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<sequence name="dynamic_sequence" xmlns="http://ws.apache.org/ns/synapse">
 	<in>
 		<log level="custom">
       	   <property name="message" value="*** Test Message 1 ***"/>

Modified: synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml (original)
+++ synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml Mon Jan 24 07:53:26 2011
@@ -17,7 +17,7 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <registry provider="org.apache.synapse.registry.url.SimpleURLRegistry">
         <parameter name="root">file:./../../repository/</parameter>

Modified: synapse/trunk/java/repository/conf/sample/resources/synapse.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/resources/synapse.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/resources/synapse.xml (original)
+++ synapse/trunk/java/repository/conf/sample/resources/synapse.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- a registry based Synapse configuration -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <sequence name="main">
         <log level="custom">

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_0.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_0.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_0.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_0.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- Introduction to Synapse -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <sequence name="main">
         <!-- log all attributes of messages passing through -->

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_1.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_1.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_1.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_1.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- Simple content based routing (CBR) of messages -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <sequence name="main">
         <!-- filtering of messages with XPath and regex matches -->

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_10.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_10.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_10.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_10.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- Introduction to dynamic endpoints with the Registry -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <registry provider="org.apache.synapse.registry.url.SimpleURLRegistry">
         <parameter name="root">file:repository/conf/sample/resources/</parameter>

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_100.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_100.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_100.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_100.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- Using WS-Security for outgoing messages -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <localEntry key="sec_policy" src="file:repository/conf/sample/resources/policy/policy_3.xml"/>
 

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_101.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_101.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_101.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_101.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- Reliable message exchange between Synapse and the back-end server using WS-ReliableMessaging -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <sequence name="main">
         <in>

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_102.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_102.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_102.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_102.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- Reliable message exchange between Synapse and the back-end server using WS-ReliableMessaging -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <sequence name="main">
         <in>

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_11.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_11.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_11.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_11.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- A full registry based configuration, and sharing a configuration between multiple instances -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <registry provider="org.apache.synapse.registry.url.SimpleURLRegistry">
         <parameter name="root">file:./repository/conf/sample/resources/</parameter>

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_12.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_12.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_12.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_12.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- Introduction to  endpoints /sequence from local registry -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <localEntry key="local-enrty-ep-key"
                 src="file:repository/conf/sample/resources/endpoint/dynamic_endpt_1.xml"/>

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_15.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_15.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_15.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_15.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- Message Copying and Content Enriching with Enrich Mediator -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <sequence name="main">
 

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_150.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_150.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_150.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_150.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- Introduction to proxy services -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <proxy name="StockQuoteProxy">
         <target>

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_151.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_151.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_151.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_151.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- Custom sequences and endpoints with proxy services -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <localEntry key="proxy_wsdl"
                 src="file:repository/conf/sample/resources/proxy/sample_proxy_1.wsdl"/>

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_152.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_152.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_152.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_152.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- Switching transports and message format from SOAP to REST/POX -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <proxy name="StockQuoteProxy" transports="https">
         <target>

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_153.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_153.xml?rev=1062670&r1=1062669&r2=1062670&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_153.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_153.xml Mon Jan 24 07:53:26 2011
@@ -19,7 +19,7 @@
   -->
 
 <!-- Routing the messages arrived to a proxy service without processing the security headers -->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+<definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <proxy name="StockQuoteProxy">
         <target>