cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r1213965 - in /cxf/trunk/rt/javascript: javascript-rt/pom.xml javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java javascript-tests/pom.xml
Date Tue, 13 Dec 2011 22:37:50 GMT
Author: bimargulies
Date: Tue Dec 13 22:37:49 2011
New Revision: 1213965

URL: http://svn.apache.org/viewvc?rev=1213965&view=rev
Log:
[CXF-3972] further trimming of dependency tree in the hopes of getting out of the cycle business.

Modified:
    cxf/trunk/rt/javascript/javascript-rt/pom.xml
    cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
    cxf/trunk/rt/javascript/javascript-tests/pom.xml

Modified: cxf/trunk/rt/javascript/javascript-rt/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/pom.xml?rev=1213965&r1=1213964&r2=1213965&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/javascript-rt/pom.xml (original)
+++ cxf/trunk/rt/javascript/javascript-rt/pom.xml Tue Dec 13 22:37:49 2011
@@ -42,21 +42,10 @@
             <artifactId>cxf-rt-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-simple</artifactId>
+	<dependency>
+	  <groupId>org.apache.cxf</groupId>
+	  <artifactId>cxf-rt-bindings-soap</artifactId>
             <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-local</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+	</dependency>
     </dependencies>
 </project>

Modified: cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java?rev=1213965&r1=1213964&r2=1213965&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
(original)
+++ cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
Tue Dec 13 22:37:49 2011
@@ -29,6 +29,7 @@ import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
 
+
 import org.apache.cxf.binding.soap.SoapBindingConstants;
 import org.apache.cxf.binding.soap.SoapBindingFactory;
 import org.apache.cxf.binding.soap.SoapVersion;
@@ -53,7 +54,6 @@ import org.apache.cxf.service.model.Mess
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.transport.local.LocalTransportFactory;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAny;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
@@ -866,7 +866,8 @@ public class ServiceJavascriptBuilder ex
                 if (WSDLConstants.NS_SOAP11_HTTP_TRANSPORT.equals(sbi.getTransportURI())
                     || WSDLConstants.NS_SOAP12_HTTP_BINDING.equals(sbi.getTransportURI())
                     // we may want this for testing.
-                    || LocalTransportFactory.TRANSPORT_ID.equals(sbi.getTransportURI()))
{
+                    // we do NOT want a dependency on the local transport.
+                    || "http://cxf.apache.org/transports/local".equals(sbi.getTransportURI()))
{
                     soapBindingInfo = sbi;
                     break;
                 }

Modified: cxf/trunk/rt/javascript/javascript-tests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/pom.xml?rev=1213965&r1=1213964&r2=1213965&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/javascript-tests/pom.xml (original)
+++ cxf/trunk/rt/javascript/javascript-tests/pom.xml Tue Dec 13 22:37:49 2011
@@ -100,5 +100,29 @@
             <artifactId>slf4j-api</artifactId>
             <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>
+	  <artifactId>cxf-rt-transports-http</artifactId>
+	  <version>${project.version}</version>
+	  <scope>test</scope>
+	</dependency>
+	<dependency>
+	  <groupId>org.apache.cxf</groupId>
+	  <artifactId>cxf-rt-transports-local</artifactId>
+	  <version>${project.version}</version>
+	  <scope>test</scope>
+	</dependency>
+	<dependency>
+	  <groupId>org.apache.cxf</groupId>
+	  <artifactId>cxf-rt-frontend-simple</artifactId>
+	  <version>${project.version}</version>
+	  <scope>test</scope>
+	</dependency>
     </dependencies>
 </project>



Mime
View raw message