cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1516589 - in /cxf/trunk/rt/transports/jms: pom.xml src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java src/main/resources/META-INF/cxf/bus-extensions.txt
Date Thu, 22 Aug 2013 20:15:41 GMT
Author: dkulp
Date: Thu Aug 22 20:15:40 2013
New Revision: 1516589

URL: http://svn.apache.org/r1516589
Log:
The wsdl stuff in the jms transport is now completely optional.  Update the pom and OSGi manifests.

Modified:
    cxf/trunk/rt/transports/jms/pom.xml
    cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java
    cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.txt

Modified: cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=1516589&r1=1516588&r2=1516589&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/pom.xml (original)
+++ cxf/trunk/rt/transports/jms/pom.xml Thu Aug 22 20:15:40 2013
@@ -56,13 +56,23 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-wsdl</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+
+        
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-management</artifactId>
             <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-soap</artifactId>
             <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java?rev=1516589&r1=1516588&r2=1516589&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java
(original)
+++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java
Thu Aug 22 20:15:40 2013
@@ -21,16 +21,13 @@ package org.apache.cxf.transport.jms;
 import java.util.logging.Logger;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.binding.soap.model.SoapBindingInfo;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.ConfigurationException;
 import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.feature.AbstractFeature;
-import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.Destination;
 import org.springframework.beans.factory.annotation.Required;
@@ -53,8 +50,6 @@ public class JMSConfigFeature extends Ab
         if (!(conduit instanceof JMSConduit)) {
             throw new ConfigurationException(new Message("JMSCONFIGFEATURE_ONLY_JMS", LOG));
         }
-        Endpoint ep = client.getEndpoint();
-        changeTransportUriToJms(ep);
         JMSConduit jmsConduit = (JMSConduit)conduit;
         jmsConduit.setJmsConfig(jmsConfig);
         super.initialize(client, bus);
@@ -67,27 +62,11 @@ public class JMSConfigFeature extends Ab
         if (!(destination instanceof JMSDestination)) {
             throw new ConfigurationException(new Message("JMSCONFIGFEATURE_ONLY_JMS", LOG));
         }
-        Endpoint ep = server.getEndpoint();
-        changeTransportUriToJms(ep);
         JMSDestination jmsDestination = (JMSDestination)destination;
         jmsDestination.setJmsConfig(jmsConfig);
         super.initialize(server, bus);
     }
 
-    private void changeTransportUriToJms(Endpoint ep) {
-        if (ep.getBinding() == null) {
-            return;
-        }
-        if (ep.getBinding().getBindingInfo() == null) {
-            return;
-        }
-        BindingInfo bindingInfo = ep.getBinding().getBindingInfo();
-        if (bindingInfo instanceof SoapBindingInfo) {
-            SoapBindingInfo soapBindingInfo = (SoapBindingInfo) bindingInfo;
-            soapBindingInfo.setTransportURI("http://schemas.xmlsoap.org/soap/jms");
-        }
-    }
-
     public JMSConfiguration getJmsConfig() {
         return jmsConfig;
     }

Modified: cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1516589&r1=1516588&r2=1516589&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.txt (original)
+++ cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Aug
22 20:15:40 2013
@@ -1,4 +1,4 @@
 org.apache.cxf.transport.jms.JMSTransportFactory::true
-org.apache.cxf.transport.jms.wsdl11.JMSWSDLExtensionLoader::true
+org.apache.cxf.transport.jms.wsdl11.JMSWSDLExtensionLoader::true:true
 
 



Mime
View raw message