cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject [1/5] CXF-5543 Removing jms old style config, changing tests to use soap over jms style
Date Mon, 03 Mar 2014 14:14:07 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 6738039a6 -> 40b898684


http://git-wip-us.apache.org/repos/asf/cxf/blob/40b89868/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
index 0eec399..cc75a0c 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
@@ -19,10 +19,7 @@
 package org.apache.cxf.systest.mtom;
 
 import java.io.InputStream;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
 
 import javax.activation.DataHandler;
 import javax.mail.util.ByteArrayDataSource;
@@ -30,140 +27,98 @@ import javax.xml.namespace.QName;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Holder;
 import javax.xml.ws.soap.SOAPBinding;
-import javax.xml.ws.soap.SOAPFaultException;
 
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.pool.PooledConnectionFactory;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.endpoint.ClientImpl;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.jaxws.EndpointImpl;
-import org.apache.cxf.jaxws.JaxWsClientProxy;
-import org.apache.cxf.jaxws.binding.soap.SOAPBindingImpl;
-import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
-import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
+import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.mime.TestMtom;
-import org.apache.cxf.service.Service;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
-import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
-
+import org.apache.cxf.transport.jms.ConnectionFactoryFeature;
+import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class ClientMtomXopWithJMSTest extends AbstractBusClientServerTestBase {
-    public static final String JMS_PORT = EmbeddedJMSBrokerLauncher.PORT;
-    
+public class ClientMtomXopWithJMSTest {
     public static final QName MTOM_PORT = new QName("http://cxf.apache.org/mime", "TestMtomJMSPort");
     public static final QName MTOM_SERVICE = new QName("http://cxf.apache.org/mime", "TestMtomJMSService");
 
-    public static class ServerWithJMS extends AbstractBusTestServerBase {
-        EndpointImpl jaxep;
-        protected void run() {
-            Object implementor = new TestMtomJMSImpl();
-            String address = "http://not.required.for.jms";
-            try {
-                Bus bus = BusFactory.getDefaultBus();
-                setBus(bus);
-                EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus, "testutils/mtom_xop.wsdl");
-                
-                jaxep = (EndpointImpl) javax.xml.ws.Endpoint.publish(address, implementor);
-                Endpoint ep = jaxep.getServer().getEndpoint();
-                ep.getInInterceptors().add(new TestMultipartMessageInterceptor());
-                ep.getOutInterceptors().add(new TestAttachmentOutInterceptor());
-                ep.getInInterceptors().add(new LoggingInInterceptor());
-                ep.getOutInterceptors().add(new LoggingOutInterceptor());
-                SOAPBinding jaxWsSoapBinding = (SOAPBinding) jaxep.getBinding();
-                jaxWsSoapBinding.setMTOMEnabled(true);
-
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-        public void tearDown() {
-            jaxep.stop();
-        }
-
-    }
+    private static Bus bus;
+    private static ConnectionFactoryFeature cff;
 
     @BeforeClass
     public static void startServers() throws Exception {
-        Map<String, String> props = new HashMap<String, String>();                
-        if (System.getProperty("org.apache.activemq.default.directory.prefix") != null) {
-            props.put("org.apache.activemq.default.directory.prefix",
-                      System.getProperty("org.apache.activemq.default.directory.prefix"));
-        }
-        props.put("java.util.logging.config.file", 
-                  System.getProperty("java.util.logging.config.file"));
-        
-        assertTrue("server did not launch correctly", 
-                   launchServer(EmbeddedJMSBrokerLauncher.class, props, null));
-        assertTrue("server did not launch correctly", launchServer(ServerWithJMS.class, true));
-        createStaticBus();
+        Object implementor = new TestMtomJMSImpl();
+        bus = BusFactory.getDefaultBus();
+
+        ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
+        PooledConnectionFactory cfp = new PooledConnectionFactory(cf);
+        cff = new ConnectionFactoryFeature(cfp);
+
+        EndpointImpl jaxep = (EndpointImpl)javax.xml.ws.Endpoint.publish(null, implementor, cff);
+        Endpoint ep = jaxep.getServer().getEndpoint();
+        ep.getInInterceptors().add(new TestMultipartMessageInterceptor());
+        ep.getOutInterceptors().add(new TestAttachmentOutInterceptor());
+        ep.getInInterceptors().add(new LoggingInInterceptor());
+        ep.getOutInterceptors().add(new LoggingOutInterceptor());
+        SOAPBinding jaxWsSoapBinding = (SOAPBinding)jaxep.getBinding();
+        jaxWsSoapBinding.setMTOMEnabled(true);
     }
-    
-    
+
+    @AfterClass
+    public static void stopServers() throws Exception {
+        bus.shutdown(false);
+    }
+
     @Test
     public void testMtomXop() throws Exception {
         TestMtom mtomPort = createPort(MTOM_SERVICE, MTOM_PORT, TestMtom.class, true);
-        try {
-            InputStream pre = this.getClass().getResourceAsStream("/wsdl/mtom_xop.wsdl");
-            int fileSize = 0;
-            for (int i = pre.read(); i != -1; i = pre.read()) {
-                fileSize++;
-            }
-            Holder<DataHandler> param = new Holder<DataHandler>();
-            
-            int count = 50;
-            byte[] data = new byte[fileSize *  count];
-            for (int x = 0; x < count; x++) {
-                this.getClass().getResourceAsStream("/wsdl/mtom_xop.wsdl").read(data, 
-                                                                                fileSize * x,
-                                                                                fileSize);
-            }
-            
-            param.value = new DataHandler(new ByteArrayDataSource(data, "application/octet-stream"));
-            Holder<String> name = new Holder<String>("call detail");
-            mtomPort.testXop(name, param);
-            fail("Expect the exception here !");
-            assertEquals("name unchanged", "return detail + call detail", name.value);
-            assertNotNull(param.value);
-            param.value.getInputStream().close();
-            
-        } catch (SOAPFaultException ex) {
-            assertTrue("Expect the configuration exception here",
-                       ex.getCause() instanceof org.apache.cxf.configuration.ConfigurationException);
+        InputStream pre = this.getClass().getResourceAsStream("/wsdl/mtom_xop.wsdl");
+        int fileSize = 0;
+        for (int i = pre.read(); i != -1; i = pre.read()) {
+            fileSize++;
+        }
+        Holder<DataHandler> param = new Holder<DataHandler>();
+
+        int count = 50;
+        byte[] data = new byte[fileSize * count];
+        for (int x = 0; x < count; x++) {
+            this.getClass().getResourceAsStream("/wsdl/mtom_xop.wsdl").read(data, fileSize * x, fileSize);
         }
+
+        param.value = new DataHandler(new ByteArrayDataSource(data, "application/octet-stream"));
+        Holder<String> name = new Holder<String>("call detail");
+        mtomPort.testXop(name, param);
+
+        // TODO Why should it fail here?
+        // Assert.fail("Expect the exception here !");
+
+        Assert.assertEquals("name unchanged", "return detail + call detail", name.value);
+        Assert.assertNotNull(param.value);
+        param.value.getInputStream().close();
+
     }
 
-    private static <T> T createPort(QName serviceName, 
-                                    QName portName, 
-                                    Class<T> serviceEndpointInterface,
-                                    boolean enableMTOM)
-        throws Exception {
-        Bus bus = getStaticBus();
-        ReflectionServiceFactoryBean serviceFactory = new JaxWsServiceFactoryBean();
-        serviceFactory.setBus(bus);
-        serviceFactory.setServiceName(serviceName);
-        serviceFactory.setServiceClass(serviceEndpointInterface);
-        serviceFactory.setWsdlURL(ClientMtomXopTest.class.getResource("/wsdl/mtom_xop.wsdl"));
-        Service service = serviceFactory.create();
-        EndpointInfo ei = service.getEndpointInfo(portName);
-        JaxWsEndpointImpl jaxwsEndpoint = new JaxWsEndpointImpl(bus, service, ei);
-        SOAPBinding jaxWsSoapBinding = new SOAPBindingImpl(ei.getBinding(), jaxwsEndpoint);
-        jaxWsSoapBinding.setMTOMEnabled(enableMTOM);
-        
-        jaxwsEndpoint.getBinding().getInInterceptors().add(new TestMultipartMessageInterceptor());
-        jaxwsEndpoint.getBinding().getOutInterceptors().add(new TestAttachmentOutInterceptor());
-        
-        Client client = new ClientImpl(bus, jaxwsEndpoint);
-        InvocationHandler ih = new JaxWsClientProxy(client, jaxwsEndpoint.getJaxwsBinding());
-        Object obj = Proxy.newProxyInstance(serviceEndpointInterface.getClassLoader(), new Class[] {
-            serviceEndpointInterface, BindingProvider.class }, ih);
-        return serviceEndpointInterface.cast(obj);
+    private static <T> T createPort(QName serviceName, QName portName, Class<T> serviceEndpointInterface,
+                                    boolean enableMTOM) throws Exception {
+        JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
+        factory.setBus(bus);
+        factory.setServiceName(serviceName);
+        factory.setServiceClass(serviceEndpointInterface);
+        factory.setWsdlURL(ClientMtomXopTest.class.getResource("/wsdl/mtom_xop.wsdl").toExternalForm());
+        factory.setFeatures(Collections.singletonList(cff));
+        factory.getInInterceptors().add(new TestMultipartMessageInterceptor());
+        factory.getOutInterceptors().add(new TestAttachmentOutInterceptor());
+        @SuppressWarnings("unchecked")
+        T proxy = (T)factory.create();
+        BindingProvider bp = (BindingProvider)proxy;
+        SOAPBinding binding = (SOAPBinding)bp.getBinding();
+        binding.setMTOMEnabled(true);
+        return proxy;
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/40b89868/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractClientServerTestBase.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractClientServerTestBase.java b/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractClientServerTestBase.java
index 7212d3c..3601f70 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractClientServerTestBase.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractClientServerTestBase.java
@@ -20,20 +20,11 @@
 package org.apache.cxf.testutil.common;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.ws.BindingProvider;
-
-import org.apache.cxf.common.util.ReflectionUtil;
-import org.apache.cxf.endpoint.Client;
-
 import org.junit.AfterClass;
 import org.junit.Assert;
 
@@ -126,60 +117,13 @@ public abstract class AbstractClientServerTestBase extends Assert {
         return ok;
     }
     
-    
-    // extra methods to help support the dynamic port allocations
     protected void setAddress(Object o, String address) {
-        if (o instanceof BindingProvider) {
-            ((BindingProvider)o).getRequestContext()
-                .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
-                     address);
-        }
-        Client c = null;
-        if (o instanceof Client) {
-            c = (Client)o;
-        }
-        if (c == null) {
-            try {
-                InvocationHandler i = Proxy.getInvocationHandler(o);
-                c = (Client)i.getClass().getMethod("getClient").invoke(i);
-            } catch (Throwable t) {
-                //ignore
-            }
-        }
-        if (c == null) {
-            try {
-                final Method m = o.getClass().getDeclaredMethod("getClient");
-                ReflectionUtil.setAccessible(m);
-
-                c = (Client)m.invoke(o);
-            } catch (Throwable t) {
-                //ignore
-            }
-        }
-        if (c != null) {
-            c.getEndpoint().getEndpointInfo().setAddress(address);
-        }
+        TestUtil.setAddress(o, address);
     }
+    
     protected void updateAddressPort(Object o, String port) 
         throws NumberFormatException, MalformedURLException {
-        updateAddressPort(o, Integer.parseInt(port));
-    }
-    protected void updateAddressPort(Object o, int port) throws MalformedURLException {
-        String address = null;
-        if (o instanceof BindingProvider) {
-            address = ((BindingProvider)o).getRequestContext()
-                .get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY).toString();
-        } else if (o instanceof Client) {
-            Client c = (Client)o;
-            address = c.getEndpoint().getEndpointInfo().getAddress();
-        }
-        if (address != null) {
-            URL url = new URL(address);
-            url = new URL(url.getProtocol(), url.getHost(),
-                          port, url.getFile());
-            setAddress(o, url.toString());
-        }
-        //maybe simple frontend proxy?
+        TestUtil.updateAddressPort(o, port);
     }
     
     protected static String allocatePort(String s) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/40b89868/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java b/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
index 4aff1fe..e6a8bcc 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
@@ -21,7 +21,10 @@ package org.apache.cxf.testutil.common;
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.MalformedURLException;
 import java.net.ServerSocket;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -30,7 +33,11 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.logging.Logger;
 
+import javax.xml.ws.BindingProvider;
+
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.ReflectionUtil;
+import org.apache.cxf.endpoint.Client;
 
 
 public final class TestUtil {
@@ -167,4 +174,61 @@ public final class TestUtil {
         System.setProperty("testutil.ports." + simpleName, p);
         return p;
     }
+    
+    public static void updateAddressPort(Object o, String port) 
+        throws NumberFormatException, MalformedURLException {
+        updateAddressPort(o, Integer.parseInt(port));
+    }
+
+    public static void updateAddressPort(Object o, int port) throws MalformedURLException {
+        String address = null;
+        if (o instanceof BindingProvider) {
+            address = ((BindingProvider)o).getRequestContext()
+                .get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY).toString();
+        } else if (o instanceof Client) {
+            Client c = (Client)o;
+            address = c.getEndpoint().getEndpointInfo().getAddress();
+        }
+        if (address != null && address.startsWith("http:")) {
+            URL url = new URL(address);
+            url = new URL(url.getProtocol(), url.getHost(),
+                          port, url.getFile());
+            setAddress(o, url.toString());
+        }
+        //maybe simple frontend proxy?
+    }
+    
+    // extra methods to help support the dynamic port allocations
+    public static void setAddress(Object o, String address) {
+        if (o instanceof BindingProvider) {
+            ((BindingProvider)o).getRequestContext()
+                .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+                     address);
+        }
+        Client c = null;
+        if (o instanceof Client) {
+            c = (Client)o;
+        }
+        if (c == null) {
+            try {
+                InvocationHandler i = Proxy.getInvocationHandler(o);
+                c = (Client)i.getClass().getMethod("getClient").invoke(i);
+            } catch (Throwable t) {
+                //ignore
+            }
+        }
+        if (c == null) {
+            try {
+                final Method m = o.getClass().getDeclaredMethod("getClient");
+                ReflectionUtil.setAccessible(m);
+
+                c = (Client)m.invoke(o);
+            } catch (Throwable t) {
+                //ignore
+            }
+        }
+        if (c != null) {
+            c.getEndpoint().getEndpointInfo().setAddress(address);
+        }
+    }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/40b89868/testutils/src/main/resources/wsdl/factory_pattern.wsdl
----------------------------------------------------------------------
diff --git a/testutils/src/main/resources/wsdl/factory_pattern.wsdl b/testutils/src/main/resources/wsdl/factory_pattern.wsdl
index 703ef1d..15d3858 100644
--- a/testutils/src/main/resources/wsdl/factory_pattern.wsdl
+++ b/testutils/src/main/resources/wsdl/factory_pattern.wsdl
@@ -17,7 +17,17 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:jms="http://cxf.apache.org/transports/jms" xmlns:ns1="http://factory_pattern.cxf.apache.org/" xmlns:tns="http://cxf.apache.org/factory_pattern" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="NumberFactoryService" targetNamespace="http://cxf.apache.org/factory_pattern">
+<wsdl:definitions 
+	xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:wsa="http://www.w3.org/2005/08/addressing"
+	xmlns:jms="http://www.w3.org/2010/soapjms/"
+	xmlns:ns1="http://factory_pattern.cxf.apache.org/"
+	xmlns:tns="http://cxf.apache.org/factory_pattern"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:soap="http://schemas.xmlsoap.org/soap/"
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+	name="NumberFactoryService"
+	targetNamespace="http://cxf.apache.org/factory_pattern">
     <wsdl:types>
         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://factory_pattern.cxf.apache.org/">
             <xsd:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="/schemas/wsdl/ws-addr.xsd"/>
@@ -91,7 +101,7 @@
         </wsdl:operation>
     </wsdl:binding>
     <wsdl:binding name="NumberServiceSoapJmsBinding" type="tns:Number">
-        <wsdlsoap:binding style="document" transport="http://cxf.apache.org/transports/jms"/>
+        <wsdlsoap:binding style="document" transport="http://www.w3.org/2010/soapjms/"/>
         <wsdl:operation name="isEven">
             <wsdlsoap:operation soapAction="" style="document"/>
             <wsdl:input>
@@ -114,10 +124,9 @@
             <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/02/addressing/wsdl"/>
         </wsdl:port>
         <wsdl:port name="NumberPortJMS" binding="tns:NumberServiceSoapJmsBinding">
-            <jms:address destinationStyle="queue" jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.cxf.factory_pattern.queue">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+        	<jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+    	    <jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
+            <soap:address location="jms:jndi:dynamicQueues/test.cxf.factory_pattern.queue" />
             <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/02/addressing/wsdl"/>
         </wsdl:port>
     </wsdl:service>

http://git-wip-us.apache.org/repos/asf/cxf/blob/40b89868/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl
----------------------------------------------------------------------
diff --git a/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl b/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl
index ea4935e..74fc7d3 100644
--- a/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl
+++ b/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl
@@ -17,7 +17,20 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xformat="http://cxf.apache.org/bindings/xformat" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:jms="http://cxf.apache.org/transports/jms" xmlns:tns="http://apache.org/hello_world_doc_lit" xmlns:x1="http://apache.org/hello_world_doc_lit/types" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://apache.org/hello_world_doc_lit" name="HelloWorld">
+<wsdl:definitions 
+	xmlns="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:xformat="http://cxf.apache.org/bindings/xformat"
+	xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+	xmlns:jms="http://www.w3.org/2010/soapjms/"
+	xmlns:tns="http://apache.org/hello_world_doc_lit"
+	xmlns:x1="http://apache.org/hello_world_doc_lit/types"
+	xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
+	targetNamespace="http://apache.org/hello_world_doc_lit"
+	name="HelloWorld">
+
     <wsdl:types>
         <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://apache.org/hello_world_doc_lit/types" elementFormDefault="qualified">
             <element name="sayHi">
@@ -216,18 +229,16 @@
             <soap:address location="http://localhost:9001/SOAPDocLitService/SoapPort"/>
         </wsdl:port>
         <wsdl:port name="JMSPort" binding="tns:Greeter_SOAPBinding">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/routertest.MultiTransportServiceQ.text">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+	        <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+    	    <jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
+    	    <soap:address location="jms:jndi:dynamicQueues/routertest.MultiTransportServiceQ.text" />
         </wsdl:port>
     </wsdl:service>
     <wsdl:service name="SOAPService2">
         <wsdl:port name="SoapPort2" binding="tns:Greeter_SOAPBinding">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/routertest.SOAPService2Q.text">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+	        <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+    	    <jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
+    	    <soap:address location="jms:jndi:dynamicQueues/routertest.SOAPService2Q.text" />
         </wsdl:port>
     </wsdl:service>
     <wsdl:service name="SOAPService3">
@@ -237,10 +248,9 @@
     </wsdl:service>
     <wsdl:service name="SOAPService4">
         <wsdl:port name="SoapPort4" binding="tns:Greeter_SOAPBinding">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/routertest.SOAPService4Q.text">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+        	<jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+    	    <jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
+	        <soap:address location="jms:jndi:dynamicQueues/routertest.SOAPService4Q.text" />
         </wsdl:port>
     </wsdl:service>
     <wsdl:service name="SOAPService5">
@@ -249,27 +259,24 @@
         </wsdl:port>
     </wsdl:service>
     <wsdl:service name="SOAPService6">
+    	<jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+        <jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
         <wsdl:port name="SoapPort6" binding="tns:Greeter_SOAPBinding">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jmsDestinationName="dynamicQueues/routertest.SOAPService6Q.text" jmsReplyDestinationName="dynamicQueues/SoapService6.reply.queue">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+        	<soap:address location="jms:jndi:dynamicQueues/routertest.SOAPService6Q.text?replyToQueueName=dynamicQueues/SoapService6.reply.queue" />
         </wsdl:port>
     </wsdl:service>
     <wsdl:service name="SOAPService7">
+	    <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+        <jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
         <wsdl:port name="SoapPort7" binding="tns:Greeter_SOAPBinding">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jmsDestinationName="dynamicQueues/messageidascorrelationid.SOAPService7Q.text" jmsReplyDestinationName="dynamicQueues/SoapService7.reply.queue" jmsReplyToDestinationName="dynamicQueues/SoapService7.replyto.queue">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+        	<soap:address location="jms:jndi:dynamicQueues/messageidascorrelationid.SOAPService7Q.text?replyToQueueName=dynamicQueues/SoapService7.replyto.queue" />
         </wsdl:port>
     </wsdl:service>
     <wsdl:service name="SOAPService8">
+	    <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+        <jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
         <wsdl:port name="SoapPort8" binding="tns:Greeter_SOAPBinding_soap12">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/routertest.SOAPService2Q.text">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+        	<soap:address location="jms:jndi:dynamicQueues/routertest.SOAPService2Q.text" />
         </wsdl:port>
     </wsdl:service>
     <!-- XML Binding based Services-->
@@ -280,18 +287,16 @@
     </wsdl:service>
     <wsdl:service name="XMLService2">
         <wsdl:port name="XMLPort2" binding="tns:Greeter_XMLBinding">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/routertest.XMLService2Q.text">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+	        <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+    	    <jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
+    	    <soap:address location="jms:jndi:dynamicQueues/routertest.XMLService2Q.text" />
         </wsdl:port>
     </wsdl:service>
     <wsdl:service name="XMLService3">
         <wsdl:port name="XMLPort3" binding="tns:Greeter_XMLBinding">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/routertest.XMLService3Q.text">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+	        <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+    	    <jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
+            <soap:address location="jms:jndi:dynamicQueues/routertest.XMLService3Q.text" />
         </wsdl:port>
     </wsdl:service>
     <wsdl:service name="XMLService4">

http://git-wip-us.apache.org/repos/asf/cxf/blob/40b89868/testutils/src/main/resources/wsdl/jms_spec_test.wsdl
----------------------------------------------------------------------
diff --git a/testutils/src/main/resources/wsdl/jms_spec_test.wsdl b/testutils/src/main/resources/wsdl/jms_spec_test.wsdl
index bc75aba..1b81264 100644
--- a/testutils/src/main/resources/wsdl/jms_spec_test.wsdl
+++ b/testutils/src/main/resources/wsdl/jms_spec_test.wsdl
@@ -19,7 +19,16 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://cxf.apache.org/jms_greeter" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:x1="http://cxf.apache.org/jms_greeter/types" xmlns:soapjms="http://www.w3.org/2010/soapjms/" name="JMSGreeterService" targetNamespace="http://cxf.apache.org/jms_greeter">
+<wsdl:definitions 
+	xmlns="http://schemas.xmlsoap.org/wsdl/" 
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+	xmlns:tns="http://cxf.apache.org/jms_greeter" 
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+	xmlns:x1="http://cxf.apache.org/jms_greeter/types" 
+	xmlns:soapjms="http://www.w3.org/2010/soapjms/" 
+	name="JMSGreeterService" 
+	targetNamespace="http://cxf.apache.org/jms_greeter">
     <wsdl:types>
         <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://cxf.apache.org/jms_greeter/types" elementFormDefault="qualified">
             <element name="sayHi">

http://git-wip-us.apache.org/repos/asf/cxf/blob/40b89868/testutils/src/main/resources/wsdl/jms_test.wsdl
----------------------------------------------------------------------
diff --git a/testutils/src/main/resources/wsdl/jms_test.wsdl b/testutils/src/main/resources/wsdl/jms_test.wsdl
index 7cdec9a..6ff92f8 100644
--- a/testutils/src/main/resources/wsdl/jms_test.wsdl
+++ b/testutils/src/main/resources/wsdl/jms_test.wsdl
@@ -17,7 +17,16 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:jms="http://cxf.apache.org/transports/jms" xmlns:x1="http://cxf.apache.org/hello_world_jms/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://cxf.apache.org/hello_world_jms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="HelloWorldService" targetNamespace="http://cxf.apache.org/hello_world_jms">
+<definitions name="HelloWorldService" 
+	targetNamespace="http://cxf.apache.org/hello_world_jms"
+	xmlns="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:jms="http://www.w3.org/2010/soapjms/" 
+	xmlns:x1="http://cxf.apache.org/hello_world_jms/types" 
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+	xmlns:tns="http://cxf.apache.org/hello_world_jms" 
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.w3.org/2010/soapjms/ http://svn.apache.org/repos/asf/cxf/tags/cxf-2.7.7/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd ">
     <types>
         <schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://cxf.apache.org/hello_world_jms/types" targetNamespace="http://cxf.apache.org/hello_world_jms/types" elementFormDefault="qualified">
             <complexType name="ErrorCode">
@@ -104,7 +113,10 @@
         </operation>
     </portType>
     <binding name="HelloWorldPortBinding" type="tns:HelloWorldPortType">
-        <soap:binding style="rpc" transport="http://cxf.apache.org/transports/jms"/>
+        <soap:binding style="rpc" transport="http://www.w3.org/2010/soapjms/"/>
+        <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+        <jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
+        
         <operation name="greetMe">
             <soap:operation soapAction="" style="rpc"/>
             <input name="greetMe">
@@ -146,7 +158,10 @@
         </operation>
     </binding>
     <binding name="HelloWorldQueueBinMsgBinding" type="tns:HelloWorldPortType">
-        <soap:binding style="rpc" transport="http://cxf.apache.org/transports/jms"/>
+        <soap:binding style="rpc" transport="http://www.w3.org/2010/soapjms/"/>
+    	<jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+  		<jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
+ 
         <operation name="greetMe">
             <soap:operation soapAction="" style="rpc"/>
             <input name="greetMe">
@@ -173,7 +188,10 @@
         </operation>
     </binding>
     <binding name="HWStaticReplyQTextPortBinding" type="tns:HelloWorldPortType">
-        <soap:binding style="rpc" transport="http://cxf.apache.org/transports/jms"/>
+        <soap:binding style="rpc" transport="http://www.w3.org/2010/soapjms/"/>
+        <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+  		<jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
+
         <operation name="greetMe">
             <soap:operation soapAction="" style="rpc"/>
             <input name="greetMe">
@@ -200,7 +218,10 @@
         </operation>
     </binding>
     <binding name="HWStaticReplyQBinMsgBinding" type="tns:HelloWorldPortType">
-        <soap:binding style="rpc" transport="http://cxf.apache.org/transports/jms"/>
+        <soap:binding style="rpc" transport="http://www.w3.org/2010/soapjms/"/>
+        <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+  		<jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
+        
         <operation name="greetMe">
             <soap:operation soapAction="" style="rpc"/>
             <input name="greetMe">
@@ -227,7 +248,9 @@
         </operation>
     </binding>
     <binding name="HWJMSAddressingBinding" type="tns:HelloWorldPortType">
-        <soap:binding style="rpc" transport="http://cxf.apache.org/transports/jms"/>
+        <soap:binding style="rpc" transport="http://www.w3.org/2010/soapjms/"/>
+        <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+  		<jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
         <operation name="greetMe">
             <soap:operation soapAction="" style="rpc"/>
             <input name="greetMe">
@@ -254,7 +277,9 @@
         </operation>
     </binding>
     <binding name="HelloWorldOneWayBinding" type="tns:HelloWorldOneWayPort">
-        <soap:binding style="rpc" transport="http://cxf.apache.org/transports/jms"/>
+        <soap:binding style="rpc" transport="http://www.w3.org/2010/soapjms/"/>
+        <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+  		<jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
         <operation name="greetMeOneWay">
             <soap:operation style="rpc"/>
             <input name="greetMeOneWay">
@@ -263,7 +288,9 @@
         </operation>
     </binding>
     <binding name="HelloWorldPubSubBinding" type="tns:HelloWorldPubSubPort">
-        <soap:binding style="rpc" transport="http://cxf.apache.org/transports/jms"/>
+        <soap:binding style="rpc" transport="http://www.w3.org/2010/soapjms/"/>
+        <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+  		<jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
         <operation name="greetMeOneWay">
             <soap:operation style="rpc"/>
             <input name="greetMeOneWay">
@@ -273,187 +300,100 @@
     </binding>
     <service name="HelloWorldQueueBinMsgService">
         <port binding="tns:HelloWorldQueueBinMsgBinding" name="HelloWorldQueueBinMsgPort">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.binary">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
-            <jms:client messageType="binary"/>
-            <jms:server durableSubscriberName="CXF_subscriber"/>
+        	<soap:address location="jms:jndi:dynamicQueues/test.jmstransport.binary?replyToQueueName=dynamicQueues/test.jms.addr.reply.queue&amp;messageType=binary&amp;receiveTimeout=500&amp;timeTolive=600" />
+            <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/02/addressing/wsdl"/>
         </port>
     </service>
     <service name="HelloWorldService">
         <port binding="tns:HelloWorldPortBinding" name="HelloWorldPort">
-            <jms:clientConfig useConduitIdSelector="false"/>
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.text" connectionUserName="testUser" connectionPassword="testPassword">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
-            <jms:server durableSubscriberName="CXF_subscriber"/>
-            <jms:sessionPool hightWaterMark="5" lowWaterMark="5"/>
+            <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.text?username=testUser&amp;password=testPassword&amp;useConduitIdSelector=false" />
         </port>
     </service>
     <service name="HelloWorldServiceAppCorrelationID">
         <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortAppCorrelationIDEng">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id" jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+	        <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.text.app.correlation.id?replyToQueueName=dynamicQueues/test.jmstransport.text.app.correlation.id.reply" />
         </port>
         <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortAppCorrelationIDSales">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id" jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+	        <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.text.app.correlation.id?replyToQueueName=dynamicQueues/test.jmstransport.text.app.correlation.id.reply" />
         </port>
     </service>
     <service name="HelloWorldServiceAppCorrelationIDStaticPrefix">
         <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortAppCorrelationIDStaticPrefixEng">
-            <jms:clientConfig conduitSelectorPrefix="com.mycompany.eng:" useConduitIdSelector="false"/>
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id.static.prefix" jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id.static.prefix.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+            <jms:clientConfig  useConduitIdSelector="false"/>
+            <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.text.app.correlation.id.static.prefix?replyToQueueName=dynamicQueues/test.jmstransport.text.app.correlation.id.static.prefix.reply&amp;conduitSelectorPrefix=com.mycompany.eng:" />
         </port>
         <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortAppCorrelationIDStaticPrefixSales">
-            <jms:clientConfig conduitSelectorPrefix="com.mycompany.sales:" useConduitIdSelector="false"/>
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id.static.prefix" jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id.static.prefix.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+	        <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.text.app.correlation.id.static.prefix?replyToQueueName=dynamicQueues/test.jmstransport.text.app.correlation.id.static.prefix.reply&amp;conduitSelectorPrefix=com.mycompany.sales:&amp;useConduitIdSelector=false" />
         </port>
     </service>
     <service name="HelloWorldServiceAppCorrelationIDNoPrefix">
         <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortAppCorrelationIDNoPrefix">
-            <jms:clientConfig clientReceiveTimeout="5000" useConduitIdSelector="true"/>
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id.no.prefix" jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.app.correlation.id.no.prefix.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+	        <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.text.app.correlation.id.no.prefix?replyToQueueName=dynamicQueues/test.jmstransport.text.app.correlation.id.no.prefix.reply&amp;receiveTimeout=5000" />
         </port>
     </service>
     <service name="HelloWorldServiceRuntimeCorrelationIDStaticPrefix">
         <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortRuntimeCorrelationIDStaticPrefixEng">
-            <jms:clientConfig conduitSelectorPrefix="com.mycompany.eng:" useConduitIdSelector="true"/>
+	        <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.text.runtime.correlation.id.static.prefix?replyToQueueName=dynamicQueues/test.jmstransport.text.runtime.correlation.id.static.prefix.reply&amp;conduitSelectorPrefix=com.mycompany.eng:&amp;useConduitIdSelector=true" />
             <jms:server messageSelector="JMSCorrelationID LIKE 'com.mycompany.eng:%'"/>
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.text.runtime.correlation.id.static.prefix" jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.runtime.correlation.id.static.prefix.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
         </port>
         <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortRuntimeCorrelationIDStaticPrefixSales">
-            <jms:clientConfig conduitSelectorPrefix="com.mycompany.sales:" useConduitIdSelector="true"/>
             <jms:server messageSelector="JMSCorrelationID LIKE 'com.mycompany.sales:%'"/>
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.text.runtime.correlation.id.static.prefix" jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.runtime.correlation.id.static.prefix.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+            <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.text.runtime.correlation.id.static.prefix?replyToQueueName=dynamicQueues/test.jmstransport.text.runtime.correlation.id.static.prefix.reply&amp;conduitSelectorPrefix=com.mycompany.sales:&amp;useConduitIdSelector=true" />
         </port>
     </service>
     <service name="HelloWorldServiceRuntimeCorrelationIDDynamicPrefix">
         <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortRuntimeCorrelationIDDynamicPrefix">
-            <jms:clientConfig useConduitIdSelector="true"/>
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.text.runtime.correlation.id.dynamic.prefix" jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.runtime.correlation.id.dynamic.prefix.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+        	<soap:address location="jms:jndi:dynamicQueues/test.jmstransport.text.runtime.correlation.id.dynamic.prefix?replyToQueueName=dynamicQueues/test.jmstransport.text.runtime.correlation.id.dynamic.prefix.reply" />
         </port>
     </service>
     <service name="HelloWorldServiceLoop">
         <port binding="tns:HWStaticReplyQBinMsgBinding" name="HelloWorldPortLoop">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.binary" jndiReplyDestinationName="dynamicQueues/test.jmstransport.binary.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
-            <jms:client messageType="binary"/>
-            <jms:server durableSubscriberName="CXF_subscriber"/>
+	        <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.binary?replyToQueueName=dynamicQueues/test.jmstransport.binary.reply&amp;messageType=binary" />
         </port>
     </service>
     <service name="HWStaticReplyQBinMsgService">
         <port binding="tns:HWStaticReplyQBinMsgBinding" name="HWStaticReplyQBinMsgPort">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.binary" jndiReplyDestinationName="dynamicQueues/test.jmstransport.binary.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
-            <jms:client messageType="binary"/>
-            <jms:server durableSubscriberName="CXF_subscriber"/>
+	        <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.binary?replyToQueueName=dynamicQueues/test.jmstransport.binary.reply&amp;messageType=binary" />
         </port>
     </service>
     <service name="HWByteMsgService">
         <port binding="tns:HelloWorldPortBinding" name="HWSByteMsgPort">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.binary" jndiReplyDestinationName="dynamicQueues/test.jmstransport.binary.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
-            <jms:client messageType="byte"/>
-            <jms:server durableSubscriberName="CXF_subscriber"/>
+	        <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.binary?replyToQueueName=dynamicQueues/test.jmstransport.binary.reply&amp;messageType=byte" />
         </port>
     </service>
     <service name="HWStaticReplyQTextMsgService">
         <port binding="tns:HWStaticReplyQTextPortBinding" name="HWStaticReplyQTextPort">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.text" jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
-            <jms:server durableSubscriberName="CXF_subscriber"/>
+	        <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.text?replyToQueueName=dynamicQueues/test.jmstransport.text.reply" />
         </port>
     </service>
     <service name="HelloWorldOneWayQueueService">
         <port binding="tns:HelloWorldOneWayBinding" name="HelloWorldOneWayQueuePort">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.oneway">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
-            <jms:server durableSubscriberName="CXF_subscriber"/>
+            <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.oneway" />
         </port>
     </service>
     <service name="HelloWorldQueueDecoupledOneWaysService">
         <port binding="tns:HelloWorldOneWayBinding" name="HelloWorldQueueDecoupledOneWaysPort">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.oneway.with.set.replyto">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+            <soap:address location="jms:jndi:dynamicQueues/test.jmstransport.oneway.with.set.replyto" />
             <jms:clientConfig enforceSpec="false"/>
         </port>
         <port binding="tns:HelloWorldOneWayBinding" name="HelloWorldQueueDecoupledOneWaysReplyPort">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jmstransport.oneway.with.set.replyto.reply">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+			<soap:address location="jms:jndi:dynamicQueues/test.jmstransport.oneway.with.set.replyto.reply" />
         </port>
     </service>
     <service name="HelloWorldPubSubService">
         <port binding="tns:HelloWorldPubSubBinding" name="HelloWorldPubSubPort">
-            <jms:address destinationStyle="topic" jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicTopics/test.jmstransport.oneway.topic">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+	        <soap:address location="jms:jndi-topic:dynamicTopics/test.jmstransport.oneway.topic" />
         </port>
     </service>
     <service name="JmsDestinationPubSubService">
         <port binding="tns:HelloWorldPubSubBinding" name="JmsDestinationPubSubPort">
-            <jms:address destinationStyle="topic" jndiConnectionFactoryName="ConnectionFactory" jmsDestinationName="dynamicTopics/test.jmstransport.oneway.topic.jmsdest">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+	        <soap:address location="jms:jndi-topic:dynamicTopics/test.jmstransport.oneway.topic.jmsdest" />
         </port>
     </service>
     <service name="JMSSOAPServiceAddressing">
         <port binding="tns:HWJMSAddressingBinding" name="HWJMSAddressingPort">
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.jms.addr.queue" jndiReplyDestinationName="dynamicQueues/test.jms.addr.reply.queue">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+        	<soap:address location="jms:jndi:dynamicQueues/test.jms.addr.queue&amp;replyToQueueName=dynamicQueues/test.jms.addr.reply.queue" />
             <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/02/addressing/wsdl"/>
         </port>
     </service>
-    <service name="HelloWorldServiceSpringICF">
-        <port binding="tns:HelloWorldPortBinding" name="HelloWorldPortSpringICF">
-            <jms:clientConfig useConduitIdSelector="false"/>
-            <jms:address jndiConnectionFactoryName="ConnectionFactory" jmsDestinationName="dynamicQueues/test.jmstransport.text">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.xbean.spring.jndi.SpringInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="classpath:/jms_test_jndi.xml"/>
-            </jms:address>
-            <jms:server durableSubscriberName="CXF_subscriber"/>
-        </port>
-    </service>
 </definitions>

http://git-wip-us.apache.org/repos/asf/cxf/blob/40b89868/testutils/src/main/resources/wsdl/jms_test_mtom.wsdl
----------------------------------------------------------------------
diff --git a/testutils/src/main/resources/wsdl/jms_test_mtom.wsdl b/testutils/src/main/resources/wsdl/jms_test_mtom.wsdl
index bc7721c..916a499 100644
--- a/testutils/src/main/resources/wsdl/jms_test_mtom.wsdl
+++ b/testutils/src/main/resources/wsdl/jms_test_mtom.wsdl
@@ -15,7 +15,17 @@
                 the specific language governing permissions and limitations under the
                 License.
         -->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:jms="http://cxf.apache.org/transports/jms" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://cxf.apache.org/jms_mtom" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:x1="http://cxf.apache.org/jms_mtom/types" name="JMSMTOMService" targetNamespace="http://cxf.apache.org/jms_mtom">
+<wsdl:definitions 
+	xmlns="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:jms="http://www.w3.org/2010/soapjms/" 
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:tns="http://cxf.apache.org/jms_mtom"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
+	xmlns:x1="http://cxf.apache.org/jms_mtom/types"
+	name="JMSMTOMService" 
+	targetNamespace="http://cxf.apache.org/jms_mtom">
     <wsdl:types>
         <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://cxf.apache.org/jms_mtom/types" elementFormDefault="qualified">
             <complexType name="DataHandlerType">
@@ -60,7 +70,10 @@
         </wsdl:operation>
     </wsdl:portType>
     <wsdl:binding name="JMSMTOMPortBinding" type="tns:JMSMTOMPortType">
-        <soap:binding style="document" transport="http://cxf.apache.org/transports/jms"/>
+        <soap:binding style="document" transport="http://www.w3.org/2010/soapjms/"/>
+        <jms:jndiURL>tcp://localhost:61500</jms:jndiURL>
+  		<jms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</jms:jndiInitialContextFactory>
+        
         <wsdl:operation name="testDataHandler">
             <soap:operation soapAction=""/>
             <wsdl:input>
@@ -82,19 +95,12 @@
     </wsdl:binding>
     <wsdl:service name="JMSMTOMService">
         <wsdl:port binding="tns:JMSMTOMPortBinding" name="MTOMPort">
-            <jms:address destinationStyle="queue" jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.cxf.jmstransport.queue">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
-            <jms:client messageType="byte"/>
+	        <soap:address location="jms:jndi:dynamicQueues/test.cxf.jmstransport.queue?messageType=byte&amp;receiveTimeout=10000" />
         </wsdl:port>
     </wsdl:service>
     <wsdl:service name="JMSOutMTOMService">
         <wsdl:port binding="tns:JMSMTOMPortBinding" name="MTOMPort">
-            <jms:address destinationStyle="queue" jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/test.cxf.jmstransport.queue">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+            <soap:address location="jms:jndi:dynamicQueues/test.cxf.jmstransport.queue&amp;receiveTimeout=10000" />
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/cxf/blob/40b89868/testutils/src/main/resources/wsdl/mtom_xop.wsdl
----------------------------------------------------------------------
diff --git a/testutils/src/main/resources/wsdl/mtom_xop.wsdl b/testutils/src/main/resources/wsdl/mtom_xop.wsdl
index cab1db8..02b15fd 100644
--- a/testutils/src/main/resources/wsdl/mtom_xop.wsdl
+++ b/testutils/src/main/resources/wsdl/mtom_xop.wsdl
@@ -19,7 +19,16 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions xmlns:types="http://cxf.apache.org/mime/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://cxf.apache.org/mime" xmlns:jms="http://cxf.apache.org/transports/jms" xmlns:xmime="http://www.w3.org/2005/05/xmlmime" name="SOAPBuilders-mime-cr-test" targetNamespace="http://cxf.apache.org/mime">
+<wsdl:definitions 
+	xmlns:types="http://cxf.apache.org/mime/types"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:tns="http://cxf.apache.org/mime"
+	xmlns:jms="http://www.w3.org/2010/soapjms/"
+	xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
+	name="SOAPBuilders-mime-cr-test"
+	targetNamespace="http://cxf.apache.org/mime">
     <wsdl:types>
         <schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xmime="http://www.w3.org/2005/05/xmlmime" targetNamespace="http://cxf.apache.org/mime/types" elementFormDefault="qualified">
             <complexType name="XopType">
@@ -90,10 +99,7 @@
     </wsdl:service>
     <wsdl:service name="TestMtomJMSService">
         <wsdl:port name="TestMtomJMSPort" binding="tns:TestMtomBinding">
-            <jms:address destinationStyle="queue" jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="dynamicQueues/person.queue">
-                <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
-                <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
-            </jms:address>
+        	<soap:address location="jms:queue:person.queue"/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/cxf/blob/40b89868/testutils/src/main/resources/wsdl/others/jms_test_no_addr.wsdl
----------------------------------------------------------------------
diff --git a/testutils/src/main/resources/wsdl/others/jms_test_no_addr.wsdl b/testutils/src/main/resources/wsdl/others/jms_test_no_addr.wsdl
deleted file mode 100644
index 34b0770..0000000
--- a/testutils/src/main/resources/wsdl/others/jms_test_no_addr.wsdl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you 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.
--->
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:jms="http://cxf.apache.org/transports/jms" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://cxf.apache.org/jms_conf_test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsd1="http://cxf.apache.org/jms_conf_test/xsd" name="HelloWorldService" targetNamespace="http://cxf.apache.org/jms_conf_test">
-    <message name="greetMe">
-        <part name="stringParam0" type="xsd:string"/>
-    </message>
-    <message name="greetMeResponse">
-        <part name="return" type="xsd:string"/>
-    </message>
-    <message name="sayHi"/>
-    <message name="sayHiResponse">
-        <part name="return" type="xsd:string"/>
-    </message>
-    <message name="greetMeOneWay">
-        <part name="stringParam0" type="xsd:string"/>
-    </message>
-    <portType name="HelloWorldPortType">
-        <operation name="greetMe">
-            <input message="tns:greetMe" name="greetMe"/>
-            <output message="tns:greetMeResponse" name="greetMeResponse"/>
-        </operation>
-        <operation name="sayHi">
-            <input message="tns:sayHi" name="sayHi"/>
-            <output message="tns:sayHiResponse" name="sayHiResponse"/>
-        </operation>
-        <operation name="greetMeOneWay">
-            <input message="tns:greetMeOneWay" name="greetMeOneWay"/>
-        </operation>
-    </portType>
-    <binding name="HelloWorldQueueBinMsgBinding" type="tns:HelloWorldPortType">
-        <soap:binding style="rpc" transport="http://cxf.apache.org/transports/jms"/>
-        <operation name="greetMe">
-            <soap:operation soapAction="" style="rpc"/>
-            <input name="greetMe">
-                <soap:body namespace="http://cxf.apache.org/jms_conf_test" use="literal"/>
-            </input>
-            <output name="greetMeResponse">
-                <soap:body namespace="http://cxf.apache.org/jms_conf_test" use="literal"/>
-            </output>
-        </operation>
-        <operation name="sayHi">
-            <soap:operation soapAction="" style="rpc"/>
-            <input name="sayHi">
-                <soap:body namespace="http://cxf.apache.org/jms_conf_test" use="literal"/>
-            </input>
-            <output name="sayHiResponse">
-                <soap:body namespace="http://cxf.apache.org/jms_conf_test" use="literal"/>
-            </output>
-        </operation>
-        <operation name="greetMeOneWay">
-            <soap:operation style="rpc"/>
-            <input name="greetMeOneWay">
-                <soap:body namespace="http://cxf.apache.org/jms_conf_test" use="literal"/>
-            </input>
-        </operation>
-    </binding>
-    <service name="HelloWorldQueueBinMsgService">
-        <port binding="tns:HelloWorldQueueBinMsgBinding" name="HelloWorldQueueBinMsgPort">
-        </port>
-    </service>
-</definitions>

http://git-wip-us.apache.org/repos/asf/cxf/blob/40b89868/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java b/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
index 90fe66e..187ad54 100644
--- a/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
+++ b/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
@@ -33,7 +33,6 @@ import org.apache.cxf.tools.common.ProcessorTestBase;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolException;
 import org.apache.cxf.tools.misc.WSDLToService;
-import org.apache.cxf.transport.jms.AddressType;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -183,125 +182,6 @@ public class WSDLToServiceProcessorTest extends ProcessorTestBase {
     }
 
     @Test
-    public void testJMSNewService() throws Exception {
-        String[] args = new String[] {"-transport", "jms", "-e", "serviceins", "-p", "portins", "-n",
-                                      "HelloWorldPortBinding", "-jpu", "tcp://localhost:91919", "-jcf",
-                                      "org.activemq.jndi.ActiveMQInitialContextFactory", "-jfn",
-                                      "ConnectionFactory", "-jdn",
-                                      "dynamicQueues/test.cxf.jmstransport.queue", "-jmt", "text", "-jmc",
-                                      "false", "-jsn", "cxf_Queue_subscriber", "-d",
-                                      output.getCanonicalPath(),
-                                      getLocation("/misctools_wsdl/jms_test.wsdl")};
-        WSDLToService.main(args);
-        File outputFile = new File(output, "jms_test-service.wsdl");
-        assertTrue("New wsdl file is not generated", outputFile.exists());
-        WSDLToServiceProcessor processor = new WSDLToServiceProcessor();
-        processor.setEnvironment(env);
-        try {
-            processor.parseWSDL(outputFile.getAbsolutePath());
-            Service service = processor.getWSDLDefinition().getService(
-                                                                       new QName(processor
-                                                                           .getWSDLDefinition()
-                                                                           .getTargetNamespace(),
-                                                                                 "serviceins"));
-            if (service == null) {
-                fail("Element wsdl:service serviceins Missed!");
-            }
-            Iterator<?> it = service.getPort("portins").getExtensibilityElements().iterator();
-            if (it == null || !it.hasNext()) {
-                fail("Element wsdl:port portins Missed!");
-            }
-            boolean found = false;
-            while (it.hasNext()) {
-                Object obj = it.next();
-                if (obj instanceof AddressType) {
-                    AddressType jmsAddress = (AddressType)obj;
-                    if (!(jmsAddress.getDestinationStyle() != null
-                          && "queue".equalsIgnoreCase(jmsAddress.getDestinationStyle().toString()))) {
-                        break;
-                    }
-                    if (!(jmsAddress.getJndiDestinationName() != null && jmsAddress.getJndiDestinationName()
-                        .equals("dynamicQueues/test.cxf.jmstransport.queue"))) {
-                        break;
-                    }
-
-                    assertEquals(2, jmsAddress.getJMSNamingProperty().size());
-                    assertEquals("java.naming.factory.initial",
-                                 jmsAddress.getJMSNamingProperty().get(0).getName());
-                    assertEquals("tcp://localhost:91919",
-                                 jmsAddress.getJMSNamingProperty().get(1).getValue());
-
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) {
-                fail("Element jms:address of service port Missed!");
-            }
-        } catch (ToolException e) {
-            fail("Exception Encountered when parsing wsdl, error: " + e.getMessage());
-        }
-    }
-
-    @Test
-    public void testJMSDefaultValue() throws Exception {
-        String[] args = new String[] {"-transport", "jms", "-e", "serviceins", "-p", "portins", "-n",
-                                      "HelloWorldPortBinding",
-                                      "-d", output.getCanonicalPath(),
-                                      getLocation("/misctools_wsdl/jms_test.wsdl")};
-        WSDLToService.main(args);
-        File outputFile = new File(output, "jms_test-service.wsdl");
-        assertTrue("New wsdl file is not generated", outputFile.exists());
-        WSDLToServiceProcessor processor = new WSDLToServiceProcessor();
-        processor.setEnvironment(env);
-        try {
-            processor.parseWSDL(outputFile.getAbsolutePath());
-            Service service = processor.getWSDLDefinition().getService(
-                                                                       new QName(processor
-                                                                           .getWSDLDefinition()
-                                                                           .getTargetNamespace(),
-                                                                                 "serviceins"));
-            if (service == null) {
-                fail("Element wsdl:service serviceins Missed!");
-            }
-            Iterator<?> it = service.getPort("portins").getExtensibilityElements().iterator();
-            if (it == null || !it.hasNext()) {
-                fail("Element wsdl:port portins Missed!");
-            }
-            boolean found = false;
-            while (it.hasNext()) {
-                Object obj = it.next();
-                if (obj instanceof AddressType) {
-                    AddressType jmsAddress = (AddressType)obj;
-                    if (!(jmsAddress.getDestinationStyle() != null
-                          && "queue".equalsIgnoreCase(jmsAddress.getDestinationStyle().toString()))) {
-                        break;
-                    }
-                    if (!(jmsAddress.getJndiDestinationName() != null && jmsAddress.getJndiDestinationName()
-                        .equals("dynamicQueues/test.cxf.jmstransport.queue"))) {
-                        break;
-                    }
-
-                    assertEquals(2, jmsAddress.getJMSNamingProperty().size());
-                    assertEquals("java.naming.factory.initial",
-                                 jmsAddress.getJMSNamingProperty().get(0).getName());
-                    assertEquals("tcp://localhost:61616",
-                                 jmsAddress.getJMSNamingProperty().get(1).getValue());
-
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) {
-                fail("Element jms:address of service port Missed!");
-            }
-        } catch (ToolException e) {
-            fail("Exception Encountered when parsing wsdl, error: " + e.getMessage());
-        }
-    }
-
-
-    @Test
     public void testServiceExist() throws Exception {
 
         WSDLToServiceProcessor processor = new WSDLToServiceProcessor();

http://git-wip-us.apache.org/repos/asf/cxf/blob/40b89868/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
index 4eb23b8..7e890ec 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
@@ -33,7 +33,6 @@ import org.apache.cxf.BusFactory;
 import org.apache.cxf.bindings.xformat.XMLBindingMessageFormat;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11.JAXWSDefinitionBuilder;
-import org.apache.cxf.transport.jms.AddressType;
 import org.apache.cxf.wsdl.JAXBExtensibilityElement;
 
 import org.junit.Assert;
@@ -98,30 +97,4 @@ public class JAXWSDefinitionBuilderTest extends Assert {
                    obj instanceof XMLBindingMessageFormat);
     }
 
-    @Test
-    public void testBuildDefinitionWithJMSTransport() {
-        String qname = "http://cxf.apache.org/hello_world_jms";
-        String wsdlUrl = getClass().getResource("resources/jms_test.wsdl").toString();
-
-        JAXWSDefinitionBuilder builder = new JAXWSDefinitionBuilder();
-        builder.setBus(BusFactory.getDefaultBus());
-        builder.setContext(env);
-        Definition def = builder.build(wsdlUrl);
-        assertNotNull(def);
-
-        Map<?, ?> services = def.getServices();
-        assertNotNull(services);
-        assertEquals(8, services.size());
-        Service service = (Service)services.get(new QName(qname, "HelloWorldQueueBinMsgService"));
-        assertNotNull(service);
-
-        Map<?, ?> ports = service.getPorts();
-        assertNotNull(ports);
-        assertEquals(1, ports.size());
-        Port port = service.getPort("HelloWorldQueueBinMsgPort");
-        assertNotNull(port);
-
-        assertEquals(3, port.getExtensibilityElements().size());
-        assertTrue(port.getExtensibilityElements().get(0) instanceof AddressType);
-    }
 }


Mime
View raw message