Author: thomas.diesler(a)jboss.com Date: 2008-04-07 13:13:02 -0400 (Mon, 07 Apr 2008) New Revision: 6261 Modified: stack/cxf/trunk/.classpath stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml stack/cxf/trunk/src/main/distro/bin-dist-build.xml stack/cxf/trunk/version.properties Log: [JBWS-2094] - Upgrade to Apache CXF 2.0.5-incubator Modified: stack/cxf/trunk/.classpath =================================================================== --- stack/cxf/trunk/.classpath 2008-04-07 17:10:56 UTC (rev 6260) +++ stack/cxf/trunk/.classpath 2008-04-07 17:13:02 UTC (rev 6261) @@ -9,8 +9,6 @@ <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry kind="lib" path="thirdparty/geronimo-javamail_1.4_spec-1.0-M1.jar"/> - <classpathentry kind="lib" path="thirdparty/geronimo-ws-metadata_2.0_spec-1.1.1.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-common-core-sources.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> @@ -22,13 +20,8 @@ <classpathentry kind="lib" path="thirdparty/resolver.jar"/> <classpathentry kind="lib" path="thirdparty/saaj-api-1.3.jar" sourcepath="apache-cxf"/> <classpathentry kind="lib" path="thirdparty/saaj-impl-1.3.jar"/> - <classpathentry kind="lib" path="thirdparty/spring-beans-2.0.6.jar"/> - <classpathentry kind="lib" path="thirdparty/spring-context-2.0.6.jar"/> - <classpathentry kind="lib" path="thirdparty/spring-core-2.0.6.jar"/> - <classpathentry kind="lib" path="thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="thirdparty/wsdl4j.jar"/> <classpathentry kind="lib" path="thirdparty/wsdl4j-src.jar"/> - <classpathentry kind="lib" path="thirdparty/wstx.jar"/> <classpathentry kind="lib" path="thirdparty/xbean-2.2.0.jar"/> <classpathentry kind="lib" path="thirdparty/xml-resolver-1.2.jar"/> <classpathentry kind="lib" path="thirdparty/XmlSchema-1.3.2.jar"/> @@ -36,6 +29,13 @@ <classpathentry kind="lib" path="tools/ant/lib/junit.jar"/> <classpathentry kind="lib" path="thirdparty/activation.jar"/> <classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.zip"/> - <classpathentry kind="lib" path="thirdparty/cxf-2.0.4-incubator.jar" sourcepath="apache-cxf"/> + <classpathentry kind="lib" path="thirdparty/geronimo-javamail_1.4_spec-1.2.jar"/> + <classpathentry kind="lib" path="thirdparty/geronimo-stax-api_1.0_spec-1.0.1.jar"/> + <classpathentry kind="lib" path="thirdparty/geronimo-ws-metadata_2.0_spec-1.1.2.jar"/> + <classpathentry kind="lib" path="thirdparty/spring-beans-2.0.8.jar"/> + <classpathentry kind="lib" path="thirdparty/spring-context-2.0.8.jar"/> + <classpathentry kind="lib" path="thirdparty/spring-core-2.0.8.jar"/> + <classpathentry kind="lib" path="thirdparty/wstx-asl-3.2.4.jar"/> + <classpathentry kind="lib" path="thirdparty/cxf-2.0.5-incubator.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-07 17:10:56 UTC (rev 6260) +++ stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-07 17:13:02 UTC (rev 6261) @@ -54,13 +54,11 @@ <patternset id="jbossws.lib.patternset"> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> </patternset> <patternset id="jbossws.lib.endorsed.patternset"> - <include name="**/jboss-jaxrpc.jar"/> - <include name="**/jboss-jaxws.jar"/> - <include name="**/jboss-jaxws-ext.jar"/> - <include name="**/jboss-saaj.jar"/> <include name="**/jaxb-api.jar"/> </patternset> @@ -88,9 +86,7 @@ <include name="**/spring-beans-${cxf.spring}.jar"/> <include name="**/spring-context-${cxf.spring}.jar"/> <include name="**/spring-core-${cxf.spring}.jar"/> - <include name="**/stax-api.jar"/> <include name="**/wsdl4j.jar"/> - <include name="**/wstx.jar"/> <include name="**/xbean-${cxf.xbean}.jar"/> <include name="**/xml-resolver-${cxf.xml.resolver}.jar"/> <include name="**/XmlSchema-${cxf.xmlschema}.jar"/> Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-04-07 17:10:56 UTC (rev 6260) +++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-04-07 17:13:02 UTC (rev 6261) @@ -132,7 +132,7 @@ <pathelement location="${thirdparty.dir}/spring-context-${cxf.spring}.jar"/> <pathelement location="${thirdparty.dir}/spring-core-${cxf.spring}.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/wstx.jar"/> + <pathelement location="${thirdparty.dir}/wstx-${cxf.wstx}.jar"/> <pathelement location="${thirdparty.dir}/xml-resolver-${cxf.xml.resolver}.jar"/> <pathelement location="${thirdparty.dir}/XmlSchema-${cxf.xmlschema}.jar"/> </path> Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2008-04-07 17:10:56 UTC (rev 6260) +++ stack/cxf/trunk/version.properties 2008-04-07 17:13:02 UTC (rev 6261) @@ -14,19 +14,19 @@ implementation.vendor.id=http://www.jboss.org # Apache CXF version -cxf.svn.url=http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.4-incubator +cxf.svn.url=http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.5-incubator cxf.svn.rev=HEAD # Apache CXF versions -cxf.version=2.0.4-incubator -cxf.geronimo.javamail=1.4_spec-1.0-M1 -cxf.geronimo.ws.metadata=2.0_spec-1.1.1 +cxf.version=2.0.5-incubator +cxf.geronimo.javamail=1.4_spec-1.2 +cxf.geronimo.ws.metadata=2.0_spec-1.1.2 cxf.jaxws.api=2.0 -cxf.jetty=6.1.6 +cxf.jetty=6.1.8 cxf.jdom=1.0 cxf.neethi=2.0.2 cxf.saaj=1.3 -cxf.spring=2.0.6 +cxf.spring=2.0.8 cxf.xbean=2.2.0 cxf.xml.resolver=1.2 cxf.xmlschema=1.3.2 @@ -44,9 +44,9 @@ jboss-javaee=5.0.0.Beta3Update1 jboss-jaxr=1.2.0.GA jboss-security-spi=2.0.0.Beta -stax-api=1.0 +stax-api=1.0.1 sun-jaf=1.1 sun-jaxb=2.1.4 sun-jaxrpc=1.1 sun-servlet=2.5 -woodstox=3.1.1 +woodstox=3.2.4