[jbossws-commits] JBossWS SVN: r10906 - in stack/cxf/trunk: modules/client and 6 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Wed Oct 14 06:11:20 EDT 2009


Author: alessio.soldano at jboss.com
Date: 2009-10-14 06:11:20 -0400 (Wed, 14 Oct 2009)
New Revision: 10906

Modified:
   stack/cxf/trunk/modules/client/pom.xml
   stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java
   stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
   stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
   stack/cxf/trunk/modules/server/pom.xml
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin
   stack/cxf/trunk/pom.xml
Log:
[JBWS-2780] Upgrade to Apache CXF 2.2.4


Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml	2009-10-14 10:08:31 UTC (rev 10905)
+++ stack/cxf/trunk/modules/client/pom.xml	2009-10-14 10:11:20 UTC (rev 10906)
@@ -118,6 +118,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cxf.xjcplugins</groupId>
+      <artifactId>cxf-xjc-boolean</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf.xjcplugins</groupId>
       <artifactId>cxf-xjc-bug671</artifactId>
     </dependency>
     <dependency>
@@ -153,6 +157,10 @@
       <artifactId>wstx-asl</artifactId>
     </dependency>
     <dependency>
+      <groupId>com.sun.xml.fastinfoset</groupId>
+      <artifactId>FastInfoset</artifactId>
+    </dependency>
+    <dependency>
       <groupId>asm</groupId>
       <artifactId>asm</artifactId>
     </dependency>

Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java	2009-10-14 10:08:31 UTC (rev 10905)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java	2009-10-14 10:11:20 UTC (rev 10906)
@@ -133,7 +133,7 @@
       }
       else
       {
-         implementation.setTo(null);
+         implementation.setTo((EndpointReferenceType)null);
       }
    }
 

Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml	2009-10-14 10:08:31 UTC (rev 10905)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml	2009-10-14 10:11:20 UTC (rev 10906)
@@ -54,8 +54,16 @@
     <namespace>http://www.w3.org/2004/08/wsdl/http</namespace>
     <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
   </extension>
+  <extension class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" deferred="true">
+    <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
+    <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
+    <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
+    <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
+    <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
+    <namespace>http://cxf.apache.org/bindings/xformat</namespace>
+  </extension>
   <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager" />
-  <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="true">
+  <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="false">
     <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
     <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
     <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>

Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin	2009-10-14 10:08:31 UTC (rev 10905)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin	2009-10-14 10:11:20 UTC (rev 10906)
@@ -1,3 +1,4 @@
 com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin
 com.sun.tools.xjc.addon.apache_cxf.bug671.Bug671Plugin
-com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin
\ No newline at end of file
+com.sun.tools.xjc.addon.apache_cxf.bg.BooleanGetterPlugin
+com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin

Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml	2009-10-14 10:08:31 UTC (rev 10905)
+++ stack/cxf/trunk/modules/server/pom.xml	2009-10-14 10:11:20 UTC (rev 10906)
@@ -114,6 +114,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cxf.xjcplugins</groupId>
+      <artifactId>cxf-xjc-boolean</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf.xjcplugins</groupId>
       <artifactId>cxf-xjc-bug671</artifactId>
     </dependency>
     <dependency>

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml	2009-10-14 10:08:31 UTC (rev 10905)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml	2009-10-14 10:11:20 UTC (rev 10906)
@@ -54,8 +54,16 @@
     <namespace>http://www.w3.org/2004/08/wsdl/http</namespace>
     <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
   </extension>
+  <extension class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" deferred="true">
+    <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
+    <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
+    <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
+    <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
+    <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
+    <namespace>http://cxf.apache.org/bindings/xformat</namespace>
+  </extension>
   <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager" />
-  <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="true">
+  <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="false">
     <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
     <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
     <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin	2009-10-14 10:08:31 UTC (rev 10905)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin	2009-10-14 10:11:20 UTC (rev 10906)
@@ -1,3 +1,4 @@
 com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin
 com.sun.tools.xjc.addon.apache_cxf.bug671.Bug671Plugin
-com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin
\ No newline at end of file
+com.sun.tools.xjc.addon.apache_cxf.bg.BooleanGetterPlugin
+com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin

Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml	2009-10-14 10:08:31 UTC (rev 10905)
+++ stack/cxf/trunk/pom.xml	2009-10-14 10:11:20 UTC (rev 10906)
@@ -56,7 +56,7 @@
     <jbossws.jboss600.version>3.2.0.GA</jbossws.jboss600.version>
     -->
     <!-- END -->
-    <cxf.version>2.2.3</cxf.version>
+    <cxf.version>2.2.4</cxf.version>
     <cxf.anttasks.version>2.1.5</cxf.anttasks.version>
     <cxf.stax.version>1.0.1</cxf.stax.version>
     <cxf.asm.version>2.2.3</cxf.asm.version>
@@ -285,6 +285,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.cxf.xjcplugins</groupId>
+        <artifactId>cxf-xjc-boolean</artifactId>
+        <version>${cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf.xjcplugins</groupId>
         <artifactId>cxf-xjc-bug671</artifactId>
         <version>${cxf.version}</version>
       </dependency>



More information about the jbossws-commits mailing list