8:12 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2010-05-06 09:12:17 -0400 (Thu, 06 May 2010)
New Revision: 12180
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
[JBPAPP-4124] Move to Apache CXF 2.2.4 (merge versions 10906,10907,10909)
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2010-05-06 12:11:21 UTC
(rev 12179)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2010-05-06 13:12:17 UTC
(rev 12180)
@@ -100,6 +100,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>
@@ -135,6 +139,10 @@
<artifactId>wstx-asl</artifactId>
</dependency>
<dependency>
+ <groupId>sun-fi</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.objectweb.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-05-06
12:11:21 UTC (rev 12179)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-05-06
13:12:17 UTC (rev 12180)
@@ -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</name...
+ <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/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2010-05-06
12:11:21 UTC (rev 12179)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2010-05-06
13:12:17 UTC (rev 12180)
@@ -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/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat 2010-05-06
12:11:21 UTC (rev 12179)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat 2010-05-06
13:12:17 UTC (rev 12180)
@@ -35,7 +35,8 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-framework.jar
rem CXF XJC patched plugins
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/cxf-xjc-bug671.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-boolean.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-bug671.jar
rem shared jaxws libs
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh 2010-05-06
12:11:21 UTC (rev 12179)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh 2010-05-06
13:12:17 UTC (rev 12180)
@@ -74,6 +74,7 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-framework.jar"
# CXF XJC patched plugins
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-boolean.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-bug671.jar"
# shared jaxws libs
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2010-05-06
12:11:21 UTC (rev 12179)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2010-05-06
13:12:17 UTC (rev 12180)
@@ -18,7 +18,6 @@
set "JAVAC_JAR=%JAVA_HOME%\lib\tools.jar"
)
)
-
set JBOSS_HOME=%DIRNAME%\..
set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
@@ -34,7 +33,8 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
rem CXF XJC patched plugins
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/cxf-xjc-bug671.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-boolean.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-bug671.jar
rem shared jaxws libs
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2010-05-06
12:11:21 UTC (rev 12179)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2010-05-06
13:12:17 UTC (rev 12180)
@@ -75,6 +75,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/mail.jar"
# CXF XJC patched plugins
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-xjc-boolean.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-xjc-bug671.jar"
# shared jaxws libs
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2010-05-06 12:11:21 UTC
(rev 12179)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2010-05-06 13:12:17 UTC
(rev 12180)
@@ -100,6 +100,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/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2010-05-06
12:11:21 UTC (rev 12179)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2010-05-06
13:12:17 UTC (rev 12180)
@@ -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</name...
+ <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/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin 2010-05-06
12:11:21 UTC (rev 12179)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin 2010-05-06
13:12:17 UTC (rev 12180)
@@ -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/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-05-06 12:11:21 UTC (rev 12179)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-05-06 13:12:17 UTC (rev 12180)
@@ -52,7 +52,7 @@
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.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.spring.version>2.5.6.SEC01</cxf.spring.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
@@ -393,6 +393,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>