Author: thomas.diesler(a)jboss.com Date: 2008-04-12 11:36:24 -0400 (Sat, 12 Apr 2008) New Revision: 6391 Added: stack/cxf/branches/tdiesler/trunk/pom.xml Removed: stack/cxf/branches/tdiesler/trunk/src/main/etc/component-info50.xml Modified: stack/cxf/branches/tdiesler/trunk/ stack/cxf/branches/tdiesler/trunk/.classpath stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml stack/cxf/branches/tdiesler/trunk/build.xml stack/cxf/branches/tdiesler/trunk/src/main/etc/default.mf stack/cxf/branches/tdiesler/trunk/version.properties Log: Switch to maven build Property changes on: stack/cxf/branches/tdiesler/trunk ___________________________________________________________________ Name: svn:ignore - ant.properties apache-cxf output* thirdparty version.properties.md5 clipboard.* + ant.properties apache-cxf version.properties.md5 clipboard.* target thirdparty Modified: stack/cxf/branches/tdiesler/trunk/.classpath =================================================================== --- stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-12 12:43:28 UTC (rev 6390) +++ stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-12 15:36:24 UTC (rev 6391) @@ -4,38 +4,11 @@ <classpathentry kind="src" path="src/test-framework/java"/> <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> - <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/jboss-common-core.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core-sources.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="thirdparty/jbossws-framework.jar" sourcepath="thirdparty/jbossws-framework-src.zip"/> - <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/> - <classpathentry kind="lib" path="thirdparty/jdom-1.0.jar"/> - <classpathentry kind="lib" path="thirdparty/neethi-2.0.2.jar"/> - <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/wsdl4j.jar"/> - <classpathentry kind="lib" path="thirdparty/wsdl4j-src.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"/> - <classpathentry kind="lib" path="thirdparty/jaxws-api-2.0.jar"/> - <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/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"/> + <classpathentry combineaccessrules="false" kind="src" path="/common"/> + <classpathentry combineaccessrules="false" kind="src" path="/spi"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.0.5-incubator/cxf-rt-transports-http-2.0.5-incubator.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.0.5-incubator/cxf-rt-frontend-jaxws-2.0.5-incubator.jar"/> + <classpathentry kind="output" path="target/eclipse"/> </classpath> Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml 2008-04-12 12:43:28 UTC (rev 6390) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml 2008-04-12 15:36:24 UTC (rev 6391) @@ -17,7 +17,7 @@ <!-- Binary distribution --> <!-- ================================================================== --> - <target name="build-bin-dist" depends="jars,javadoc,prepare-deploy" description="Build the binary distribution"> + <target name="build-bin-dist" depends="jars,prepare-deploy" description="Build the binary distribution"> <property name="bindist.dir" value="${cxf.output.dir}/jbossws-cxf-dist"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2008-04-12 12:43:28 UTC (rev 6390) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2008-04-12 15:36:24 UTC (rev 6391) @@ -24,9 +24,6 @@ <target name="thirdparty-init" depends="prepare"> - <property name="apache.cxf.dir" value="${cxf.dir}/apache-cxf"/> - <available property="apache.cxf.available" file="${apache.cxf.dir}"/> - <checksum file="${int.cxf.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <property name="checksum.ok.${checksum.ok}" value="true"/> @@ -49,35 +46,13 @@ <!-- thirdpartry-get --> - <target name="thirdparty-get" depends="thirdparty-delete,cxf-copy-jars" if="force.thirdparty.get" + <target name="thirdparty-get" depends="thirdparty-delete" if="force.thirdparty.get" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.zip" dest="${thirdparty.dir}/jbossws-common-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> - - <get src="${jboss.repository}/apache-xml-commons/${apache-xml-commons}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> <checksum file="${int.cxf.dir}/version.properties" fileext=".md5"/> </target> @@ -105,150 +80,5 @@ <pathelement location="${thirdparty.dir}/servlet-api.jar"/> </path> </target> - - <!-- Build CXF from source --> - <target name="cxf-build" depends="cxf-copy-jars" description="Build Apache CXF from source"> - </target> - <!-- SVN checkout the Apache CXF sources --> - <target name="cxf-checkout-dir" depends="thirdparty-init" unless="apache.cxf.available"> - <property name="cxf.checkout.required" value="true"/> - <echo message="cxf.checkout.required=${cxf.checkout.required}"/> - </target> - - <target name="cxf-checkout-required" depends="cxf-checkout-dir" if="apache.cxf.available"> - <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true" output="${apache.cxf.dir}/svn-info.xml"> - <arg line="info"/> - <arg line="--xml"/> - </exec> - <xmlproperty file="${apache.cxf.dir}/svn-info.xml"/> - <property name="cxf.entry.url" value="${info.entry.url}"/> - <condition property="cxf.checkout.required"> - <not> - <equals arg1="${cxf.entry.url}" arg2="${cxf.svn.url}"/> - </not> - </condition> - <echo message="cxf.checkout.required=${cxf.checkout.required}"/> - </target> - - <target name="cxf-checkout" depends="cxf-checkout-required" if="cxf.checkout.required"> - <delete dir="${apache.cxf.dir}"/> - <echo message="svn checkout -r${cxf.svn.rev} ${cxf.svn.url}"/> - <exec dir="${cxf.dir}" executable="svn" failonerror="true"> - <arg value="checkout"/> - <arg value="-r${cxf.svn.rev}"/> - <arg value="${cxf.svn.url}"/> - <arg value="apache-cxf"/> - </exec> - </target> - - <!-- SVN update the Apache CXF sources --> - <target name="cxf-update-required" depends="thirdparty-init" if="apache.cxf.available" unless="skip-cxf-update"> - <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true" output="${apache.cxf.dir}/svn-info.xml"> - <arg line="info"/> - <arg line="--xml"/> - </exec> - <xmlproperty file="${apache.cxf.dir}/svn-info.xml"/> - <property name="cxf.entry.url" value="${info.entry.url}"/> - <condition property="cxf.update.required"> - <equals arg1="${cxf.entry.url}" arg2="${cxf.svn.url}"/> - </condition> - <echo message="cxf.update.required=${cxf.update.required}"/> - </target> - - <target name="cxf-update" depends="cxf-update-required" if="cxf.update.required" unless="cxf.checkout.required"> - <echo message="svn update -r${cxf.svn.rev} ${cxf.svn.url}"/> - <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true"> - <arg value="update"/> - <arg value="-r${cxf.svn.rev}"/> - </exec> - </target> - - <!-- SVN get commit revision --> - <target name="cxf-svn-info" depends="cxf-checkout,cxf-update"> - <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true" output="${apache.cxf.dir}/svn-info.xml"> - <arg line="info"/> - <arg line="--xml"/> - </exec> - <xmlproperty file="${apache.cxf.dir}/svn-info.xml"/> - <property name="cxf.entry.commit.revision" value="${info.entry.commit(revision)}"/> - <available property="cxf.build.available" file="${apache.cxf.dir}/build-${cxf.entry.commit.revision}.rev"/> - </target> - - <!-- Build using maven --> - <target name="cxf-maven-build" depends="cxf-svn-info" unless="cxf.build.available"> - <exec dir="${apache.cxf.dir}" executable="mvn" failonerror="true"> - <arg value="clean"/> - <arg value="install"/> - <arg value="-Pfastinstall,everything"/> - </exec> - <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true" output="${apache.cxf.dir}/svn-info.xml"> - <arg line="info"/> - <arg line="--xml"/> - </exec> - <touch file="${apache.cxf.dir}/build-${cxf.entry.commit.revision}.rev"/> - </target> - - <!-- Copy the cxf jars --> - <target name="cxf-copy-jars" depends="cxf-maven-build"> - <mkdir dir="${thirdparty.dir}"/> - - <property name="cxf.distribution.lib" value="${apache.cxf.dir}/distribution/target/apache-cxf-${cxf.version}.dir/apache-cxf-${cxf.version}/lib"/> - - <available property="cxf.available" filepath="${cxf.distribution.lib}" file="cxf-${cxf.version}.jar"/> - <available property="geronimo-javamail.available" filepath="${cxf.distribution.lib}" file="geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <available property="geronimo-ws-metadata.available" filepath="${cxf.distribution.lib}" file="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <available property="jaxws-api.available" filepath="${cxf.distribution.lib}" file="jaxws-api-${cxf.jaxws.api}.jar"/> - <available property="jetty.available" filepath="${cxf.distribution.lib}" file="jetty-${cxf.jetty}.jar"/> - <available property="jetty-util.available" filepath="${cxf.distribution.lib}" file="jetty-util-${cxf.jetty}.jar"/> - <available property="jdom.available" filepath="${cxf.distribution.lib}" file="jdom-${cxf.jdom}.jar"/> - <available property="neethi.available" filepath="${cxf.distribution.lib}" file="neethi-${cxf.neethi}.jar"/> - <available property="saaj-api.available" filepath="${cxf.distribution.lib}" file="saaj-api-${cxf.saaj}.jar"/> - <available property="saaj-impl.available" filepath="${cxf.distribution.lib}" file="saaj-impl-${cxf.saaj}.jar"/> - <available property="spring-beans.available" filepath="${cxf.distribution.lib}" file="spring-beans-${cxf.spring}.jar"/> - <available property="spring-context.available" filepath="${cxf.distribution.lib}" file="spring-context-${cxf.spring}.jar"/> - <available property="spring-core.available" filepath="${cxf.distribution.lib}" file="spring-core-${cxf.spring}.jar"/> - <available property="xbean.available" filepath="${cxf.distribution.lib}" file="xbean-${cxf.xbean}.jar"/> - <available property="xml-resolver.available" filepath="${cxf.distribution.lib}" file="xml-resolver-${cxf.xml.resolver}.jar"/> - <available property="XmlSchema.available" filepath="${cxf.distribution.lib}" file="XmlSchema-${cxf.xmlschema}.jar"/> - - <fail message="cxf-${cxf.version}.jar not available" unless="cxf.available"/> - <fail message="geronimo-javamail_${cxf.geronimo.javamail}.jar not available" unless="geronimo-javamail.available"/> - <fail message="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar not available" unless="geronimo-ws-metadata.available"/> - <fail message="jaxws-api-${cxf.jaxws.api}.jar not available" unless="jaxws-api.available"/> - <fail message="jetty-${cxf.jetty}.jar not available" unless="jetty.available"/> - <fail message="jetty-util-${cxf.jetty}.jar not available" unless="jetty-util.available"/> - <fail message="jdom-${cxf.jdom}.jar not available" unless="jdom.available"/> - <fail message="neethi-${cxf.neethi}.jar not available" unless="neethi.available"/> - <fail message="saaj-api-${cxf.saaj}.jar not available" unless="saaj-api.available"/> - <fail message="saaj-impl-${cxf.saaj}.jar not available" unless="saaj-impl.available"/> - <fail message="spring-beans-${cxf.spring}.jar not available" unless="spring-beans.available"/> - <fail message="spring-context-${cxf.spring}.jar not available" unless="spring-context.available"/> - <fail message="spring-core-${cxf.spring}.jar not available" unless="spring-core.available"/> - <fail message="xbean-${cxf.xbean}.jar not available" unless="xbean.available"/> - <fail message="xml-resolver-${cxf.xml.resolver}.jar not available" unless="xml-resolver.available"/> - <fail message="XmlSchema-${cxf.xmlschema}.jar not available" unless="XmlSchema.available"/> - - <copy todir="${thirdparty.dir}"> - <fileset dir="${cxf.distribution.lib}"> - <include name="cxf-${cxf.version}.jar"/> - <include name="geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <include name="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <include name="jaxws-api-${cxf.jaxws.api}.jar"/> - <include name="jetty-${cxf.jetty}.jar"/> - <include name="jetty-util-${cxf.jetty}.jar"/> - <include name="jdom-${cxf.jdom}.jar"/> - <include name="neethi-${cxf.neethi}.jar"/> - <include name="saaj-api-${cxf.saaj}.jar"/> - <include name="saaj-impl-${cxf.saaj}.jar"/> - <include name="spring-beans-${cxf.spring}.jar"/> - <include name="spring-context-${cxf.spring}.jar"/> - <include name="spring-core-${cxf.spring}.jar"/> - <include name="xbean-${cxf.xbean}.jar"/> - <include name="xml-resolver-${cxf.xml.resolver}.jar"/> - <include name="XmlSchema-${cxf.xmlschema}.jar"/> - </fileset> - </copy> - </target> - </project> Modified: stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-12 12:43:28 UTC (rev 6390) +++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-12 15:36:24 UTC (rev 6391) @@ -26,29 +26,31 @@ </patternset> <patternset id="jbossws.client.patternset"> - <include name="**/cxf-${cxf.version}.jar"/> + <include name="**/cxf-api.jar"/> + <include name="**/cxf-common-utilities.jar"/> + <include name="**/cxf-rt-core.jar"/> <include name="**/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> <include name="**/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> <include name="**/jaxb-xjc.jar"/> - <include name="**/jaxws-api-${cxf.jaxws.api}.jar"/> + <include name="**/jaxws-api.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-cxf-client.jar"/> <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-spi.jar"/> - <include name="**/jdom-${cxf.jdom}.jar"/> - <include name="**/neethi-${cxf.neethi}.jar"/> - <include name="**/saaj-api-${cxf.saaj}.jar"/> - <include name="**/saaj-impl-${cxf.saaj}.jar"/> - <include name="**/spring-beans-${cxf.spring}.jar"/> - <include name="**/spring-context-${cxf.spring}.jar"/> - <include name="**/spring-core-${cxf.spring}.jar"/> + <include name="**/jdom.jar"/> + <include name="**/neethi.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/spring-beans.jar"/> + <include name="**/spring-context.jar"/> + <include name="**/spring-core.jar"/> <include name="**/stax-api.jar"/> <include name="**/wsdl4j.jar"/> <include name="**/wstx.jar"/> - <include name="**/xml-resolver-${cxf.xml.resolver}.jar"/> - <include name="**/XmlSchema-${cxf.xmlschema}.jar"/> + <include name="**/xml-resolver.jar"/> + <include name="**/XmlSchema.jar"/> </patternset> <patternset id="jbossws.lib.patternset"> @@ -63,28 +65,28 @@ <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-spi.jar"/> - <include name="**/jaxws-api-${cxf.jaxws.api}.jar"/> - <include name="**/saaj-api-${cxf.saaj}.jar"/> + <include name="**/jaxws-api.jar"/> + <include name="**/saaj-api.jar"/> </patternset> <patternset id="jbossws.service.lib.patternset"> - <include name="**/cxf-${cxf.version}.jar"/> + <include name="**/cxf-*.jar"/> <include name="**/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> <include name="**/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> <include name="**/jaxrpc-api.jar"/> - <include name="**/jaxws-api-${cxf.jaxws.api}.jar"/> + <include name="**/jaxws-api.jar"/> <include name="**/jbossws-cxf.jar"/> - <include name="**/jdom-${cxf.jdom}.jar"/> - <include name="**/neethi-${cxf.neethi}.jar"/> - <include name="**/saaj-api-${cxf.saaj}.jar"/> - <include name="**/saaj-impl-${cxf.saaj}.jar"/> - <include name="**/spring-beans-${cxf.spring}.jar"/> - <include name="**/spring-context-${cxf.spring}.jar"/> - <include name="**/spring-core-${cxf.spring}.jar"/> + <include name="**/jdom.jar"/> + <include name="**/neethi.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/spring-beans.jar"/> + <include name="**/spring-context.jar"/> + <include name="**/spring-core.jar"/> <include name="**/wsdl4j.jar"/> - <include name="**/xbean-${cxf.xbean}.jar"/> - <include name="**/xml-resolver-${cxf.xml.resolver}.jar"/> - <include name="**/XmlSchema-${cxf.xmlschema}.jar"/> + <include name="**/xbean.jar"/> + <include name="**/xml-resolver.jar"/> + <include name="**/XmlSchema.jar"/> </patternset> <!-- ================================================================== --> Modified: stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-04-12 12:43:28 UTC (rev 6390) +++ stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-04-12 15:36:24 UTC (rev 6391) @@ -26,26 +26,27 @@ <path id="ws.stack.classpath"> <pathelement location="${int.cxf.dir}/thirdparty/jbossws-common.jar"/> <pathelement location="${int.cxf.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/cxf-api.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/cxf-common-utilities.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/cxf-rt-core.jar"/> <pathelement location="${int.cxf.dir}/thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> <pathelement location="${int.cxf.dir}/thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> <pathelement location="${int.cxf.dir}/thirdparty/jaxb-api.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jdom-${cxf.jdom}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/neethi-${cxf.neethi}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-beans-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-context-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-core-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jaxws-api.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jdom.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/neethi.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/spring-beans.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/spring-context.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/spring-core.jar"/> <pathelement location="${int.cxf.dir}/thirdparty/wsdl4j.jar"/> <pathelement location="${int.cxf.dir}/thirdparty/wstx.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/XmlSchema.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${int.cxf.dir}/output/lib/cxf-${cxf.version}.jar"/> - <pathelement location="${int.cxf.dir}/output/lib/jbossws-cxf-client.jar"/> <pathelement location="${int.cxf.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${int.cxf.dir}/thirdparty/jaxws-tools.jar"/> </path> Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-12 12:43:28 UTC (rev 6390) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-12 15:36:24 UTC (rev 6391) @@ -33,7 +33,7 @@ <property name="cxf.distro.dir" value="${cxf.src.dir}/distro"/> <property name="cxf.java.dir" value="${cxf.src.dir}/java"/> <property name="cxf.resources.dir" value="${cxf.src.dir}/resources"/> - <property name="cxf.output.dir" value="${cxf.dir}/output"/> + <property name="cxf.output.dir" value="${cxf.dir}/target"/> <property name="cxf.output.apidocs.dir" value="${cxf.output.dir}/apidocs"/> <property name="cxf.output.classes.dir" value="${cxf.output.dir}/classes"/> <property name="cxf.output.deploy.dir" value="${cxf.output.dir}/deploy"/> @@ -44,8 +44,10 @@ <property name="deploy.artifacts.dir" value="${cxf.output.deploy.dir}-artifacts"/> <property name="deploy.structure.jboss42" value="${cxf.output.deploy.dir}-jboss42"/> <property name="deploy.structure.jboss50" value="${cxf.output.deploy.dir}-jboss50"/> - <property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/> - + <property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/> + + <property name="thirdparty.dir" value="${basedir}/thirdparty"/> + <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> <!-- ================================================================== --> @@ -53,7 +55,7 @@ <!-- ================================================================== --> <target name="init" depends="prepare,thirdparty"> - <mkdir dir="${cxf.output.apidocs.dir}"/> + <mkdir dir="${cxf.output.apidocs.dir}"/> </target> <!-- ================================================================== --> @@ -68,37 +70,8 @@ | documentation compiles. --> - <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/> + <target name="compile" depends="init,compile-resources" description="Compile all source files."/> - <!-- Compile java sources --> - <target name="compile-classes" depends="compile-classes-cxf"/> - <target name="compile-classes-cxf" depends="init"> - <mkdir dir="${cxf.output.classes.dir}"/> - <javac srcdir="${cxf.java.dir}" sourcepath="" destdir="${cxf.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/wsf/stack/cxf/**"/> - <classpath refid="cxf.integration.classpath"/> - </javac> - </target> - - <!-- Compile etc files (manifests and such) --> - <target name="compile-etc" depends="init"> - <mkdir dir="${cxf.output.etc.dir}"/> - <copy todir="${cxf.output.etc.dir}" filtering="yes" overwrite="true"> - <fileset dir="${cxf.etc.dir}"> - <include name="component-info.xml"/> - <include name="default.mf"/> - </fileset> - <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${int.cxf.dir}/version.properties"/> - </filterset> - </copy> - </target> - <!-- Compile resource files --> <target name="compile-resources" depends="init"> @@ -106,25 +79,22 @@ <mkdir dir="${cxf.output.resources.dir}"/> <concat destfile="${cxf.output.resources.dir}/jbossws-cxf50-beans.xml"> <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; - </header> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/> <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> + &lt;/deployment&gt; </footer> </concat> <!-- Concat jboss-beans.xml --> <unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> <concat destfile="${cxf.output.resources.dir}/jbossws-cxf42-beans.xml"> <header trimleading="yes"> - &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; - </header> + &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"&gt; </header> <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/> <fileset file="${cxf.output.resources.dir}/jbossws-jboss42-config.xml"/> <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> + &lt;/deployment&gt; </footer> </concat> <copy todir="${cxf.output.resources.dir}"> @@ -133,7 +103,7 @@ </fileset> </copy> </target> - + <!-- ================================================================== --> <!-- Archives --> <!-- ================================================================== --> @@ -143,22 +113,11 @@ --> <target name="jars" depends="compile" description="Builds all jar files."> - <!-- Build jbossws-cxf.jar --> - <mkdir dir="${cxf.output.lib.dir}"/> - <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf.jar" manifest="${cxf.output.etc.dir}/default.mf"> - <fileset dir="${cxf.output.classes.dir}"> - <include name="org/jboss/wsf/stack/cxf/**"/> - </fileset> - <metainf dir="${cxf.resources.dir}/jbossws-cxf.jar/META-INF"/> - </jar> + <!-- Run the maven build --> + <exec dir="${basedir}" executable="mvn" failonerror="true"> + <arg value="package"/> + </exec> - <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf-client.jar" manifest="${cxf.output.etc.dir}/default.mf"> - <fileset dir="${cxf.output.classes.dir}"> - <include name="org/jboss/wsf/stack/cxf/client/**"/> - </fileset> - <metainf dir="${cxf.resources.dir}/jbossws-cxf-client.jar/META-INF"/> - </jar> - <!-- Build jbossws-context.war --> <copy todir="${cxf.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true"> <fileset dir="${cxf.resources.dir}/jbossws-context.war"/> @@ -168,8 +127,7 @@ <filtersfile file="${cxf.dir}/version.properties"/> </filterset> </copy> - <war warfile="${cxf.output.lib.dir}/jbossws-context.war" - webxml="${cxf.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml" + <war warfile="${cxf.output.lib.dir}/jbossws-context.war" webxml="${cxf.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml" manifest="${cxf.output.etc.dir}/default.mf"> <fileset dir="${cxf.output.resources.dir}/jbossws-context.war"> <include name="index.html"/> @@ -180,48 +138,8 @@ </webinf> </war> - <!-- Remove config files from cxf-${cxf.version}.jar --> - <unjar src="${thirdparty.dir}/cxf-${cxf.version}.jar" dest="${cxf.output.lib.dir}/cxf-${cxf.version}"/> - <jar destfile="${cxf.output.lib.dir}/cxf-${cxf.version}.jar" manifest="${cxf.output.lib.dir}/cxf-${cxf.version}/META-INF/MANIFEST.MF"> - <fileset dir="${cxf.output.lib.dir}/cxf-${cxf.version}"> - <exclude name="META-INF/**"/> - </fileset> - </jar> - - <!-- Build jbossws-cxf-src.zip --> - <zip zipfile="${cxf.output.lib.dir}/jbossws-cxf-src.zip" > - <fileset dir="${cxf.java.dir}"/> - </zip> </target> - <!-- Generate the JavaDoc --> - <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> - - <!-- expand the cxf sources --> - <mkdir dir="${cxf.output.dir}/thirdparty-sources"/> - <unzip src="${thirdparty.dir}/cxf-distribution-sources.jar" dest="${cxf.output.dir}/thirdparty-sources"/> - - - <javadoc destdir="${cxf.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API ${version.id} "> - <classpath> - <pathelement path="${cxf.integration.classpath}"/> - </classpath> - <packageset dir="${cxf.java.dir}" defaultexcludes="yes"> - <include name="org/jboss/wsf/**"/> - </packageset> - <packageset dir="${cxf.output.dir}/thirdparty-sources" defaultexcludes="yes"> - <include name="org/codehaus/**"/> - </packageset> - <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration CXF</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> - <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/--> - <group title="Stack integration" packages="org.jboss.wsf.stack*"/> - <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/> - <group title="Container integration" packages="org.jboss.wsf.container*"/> - <tag name="todo" scope="all" description="To do:"/> - </javadoc> - </target> - <!-- ================================================================== --> <!-- Miscellaneous --> <!-- ================================================================== --> Added: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-12 15:36:24 UTC (rev 6391) @@ -0,0 +1,132 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf</artifactId> + <packaging>jar</packaging> + <version>3.0.2-SNAPSHOT</version> + <name>JBoss Web Services - Stack CXF</name> + <organization> + <name>JBoss, a division of Red Hat</name> + <url>http://www.jboss.org</url> + </organization> + <url>http://maven.apache.org</url> + + <!-- Properties --> + <properties> + <cxf-version>2.0.5-incubator</cxf-version> + </properties> + + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>${cxf-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>${cxf-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>3.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <version>3.0.2-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>3.0.0-SNAPSHOT</version> + </dependency> + </dependencies> + + <!-- Parent --> + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>3</version> + </parent> + + <!-- Plugins --> + <build> + <resources> + <resource> + <targetPath>../etc</targetPath> + <directory>src/main/etc</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>./thirdparty</outputDirectory> + <stripVersion>true</stripVersion> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jboss/test/ws/jaxws/cxf/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + + <!-- Repositories --> + <repositories> + <repository> + <id>apache.incubating.repository</id> + <url>http://people.apache.org/repo/m2-incubating-repository</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> +</project> Property changes on: stack/cxf/branches/tdiesler/trunk/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: stack/cxf/branches/tdiesler/trunk/src/main/etc/component-info50.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/etc/component-info50.xml 2008-04-12 12:43:28 UTC (rev 6390) +++ stack/cxf/branches/tdiesler/trunk/src/main/etc/component-info50.xml 2008-04-12 15:36:24 UTC (rev 6391) @@ -1,23 +0,0 @@ -<project name="jboss/jbossws-cxf50"> - - <component id="jboss/jbossws-cxf50" - description="JBossWS an implementation of J2EE Web Services" - version=&quot;@repository.id(a)&quot; - licenseType="lgpl"> - - <artifact id="jbossws-cxf50.sar"/> - <artifact id="jbossws-cxf50-deployer.zip"/> - - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version=&quot;@repository.id(a)&quot;/&gt; - </import> - - <export> - </export> - - </component> - -</project> Modified: stack/cxf/branches/tdiesler/trunk/src/main/etc/default.mf =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/etc/default.mf 2008-04-12 12:43:28 UTC (rev 6390) +++ stack/cxf/branches/tdiesler/trunk/src/main/etc/default.mf 2008-04-12 15:36:24 UTC (rev 6391) @@ -8,8 +8,7 @@ Implementation-Version: @implementation.version@ (build=(a)build.id@) Implementation-Vendor: @implementation.vendor@ Implementation-Vendor-Id: @implementation.vendor.id@ -Class-Path: cxf-@cxf.version@.jar geronimo-javamail_@cxf.geronimo.javamail@.jar geronimo-ws-metadata_@cxf.geronimo.ws.metadata@.jar - jaxb-api.jar jaxb-impl.jar jaxws-api-@cxf.jaxws.api@.jar jbossws-common.jar jbossws-framework.jar jbossws-spi.jar - jdom-@cxf.jdom@.jar neethi-@cxf.neethi@.jar saaj-api-@cxf.saaj@.jar saaj-impl-@cxf.saaj@.jar - spring-beans-@cxf.spring@.jar spring-context-@cxf.spring@.jar spring-core-@cxf.spring@.jar - stax-api.jar wsdl4j.jar wstx.jar xml-resolver-@cxf.xml.resolver@.jar XmlSchema-@cxf.xmlschema@.jar \ No newline at end of file +Class-Path: cxf-rt-core.jar geronimo-javamail_@cxf.geronimo.javamail@.jar geronimo-ws-metadata_@cxf.geronimo.ws.metadata@.jar + jaxb-api.jar jaxb-impl.jar jaxws-api.jar jbossws-common.jar jbossws-framework.jar jbossws-spi.jar + neethi.jar saaj-api.jar saaj-impl.jar spring-beans.jar spring-context.jar spring-core.jar + stax-api.jar wsdl4j.jar wstx.jar xml-resolver.jar XmlSchema.jar \ No newline at end of file Modified: stack/cxf/branches/tdiesler/trunk/version.properties =================================================================== --- stack/cxf/branches/tdiesler/trunk/version.properties 2008-04-12 12:43:28 UTC (rev 6390) +++ stack/cxf/branches/tdiesler/trunk/version.properties 2008-04-12 15:36:24 UTC (rev 6391) @@ -1,52 +1,11 @@ # $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ -specification.title=JBossWS -specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-3.0 - -version.id=cxf-3.0.2.DEV -repository.id=snapshot - -implementation.title=JBoss Web Services - Apache CXF -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -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.5-incubator -cxf.svn.rev=HEAD - # Apache CXF versions -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.8 -cxf.jdom=1.0 -cxf.neethi=2.0.2 -cxf.saaj=1.3 -cxf.spring=2.0.8 -cxf.xbean=2.2.0 -cxf.xml.resolver=1.2 -cxf.xmlschema=1.3.2 +cxf.geronimo.javamail=1.4_spec +cxf.geronimo.ws.metadata=2.0_spec # Thirdparty library versions -jbossws-spi=1.0.2.GA -jbossws-common=snapshot jbossws-framework=snapshot jbossws-jboss42=4.2.1.GA - -apache-xml-commons=1.2 -ibm-wsdl4j=1.6.2 -jboss-common-core=2.0.2.GA -jboss-common-logging-spi=2.0.2.GA -jboss-javaee=5.0.0.Beta3Update1 jboss-jaxr=1.2.0.GA -jboss-security-spi=2.0.0.Beta -stax-api=1.0.1 -sun-jaf=1.1 -sun-jaxb=2.1.6 -sun-jaxrpc=1.1 -sun-servlet=2.5 -woodstox=3.2.4