Author: thomas.diesler(a)jboss.com Date: 2007-08-14 12:05:54 -0400 (Tue, 14 Aug 2007) New Revision: 4365 Modified: stack/cxf/trunk/ stack/cxf/trunk/ant-import/build-testsuite.xml stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/ant-import/macros-deploy-xfire.xml stack/cxf/trunk/build.xml stack/cxf/trunk/version.properties Log: Build apache cxf from source Property changes on: stack/cxf/trunk ___________________________________________________________________ Name: svn:ignore - thirdparty output* version.properties.md5 ant.properties + ant.properties apache-cxf output* thirdparty version.properties.md5 Modified: stack/cxf/trunk/ant-import/build-testsuite.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite.xml 2007-08-14 14:54:15 UTC (rev 4364) +++ stack/cxf/trunk/ant-import/build-testsuite.xml 2007-08-14 16:05:54 UTC (rev 4365) @@ -26,19 +26,21 @@ <path id="ws.stack.classpath"> <pathelement location="${int.xfire.dir}/thirdparty/jbossws-common.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/cxf-incubator.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/geronimo-ws-metadata.jar"/> + + <pathelement location="${int.xfire.dir}/thirdparty/cxf-${cxf.version}.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/jdom-${cxf.jdom}.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/neethi-${cxf.neethi}.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/jaxb-api.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/jdom.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/neethi.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/resolver.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/saaj-api.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/saaj-impl.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/wsdl4j.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/wstx.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/XmlSchema.jar"/> </path> <path id="tests.extra.classpath"> Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-08-14 14:54:15 UTC (rev 4364) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-08-14 16:05:54 UTC (rev 4365) @@ -23,6 +23,10 @@ </target> <target name="thirdparty-init" depends="prepare"> + + <property name="apache.cxf.dir" value="${xfire.dir}/apache-cxf"/> + <available property="apache.cxf.available" file="${apache.cxf.dir}"/> + <property name="thirdparty.dir" value="${int.xfire.dir}/thirdparty"/> <checksum file="${int.xfire.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <condition property="force.thirdparty.get"> @@ -51,18 +55,6 @@ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/cxf-incubator.jar" dest="${thirdparty.dir}/cxf-incubator.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/geronimo-javamail.jar" dest="${thirdparty.dir}/geronimo-javamail.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/geronimo-ws-metadata.jar" dest="${thirdparty.dir}/geronimo-ws-metadata.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/neethi.jar" dest="${thirdparty.dir}/neethi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/spring-beans.jar" dest="${thirdparty.dir}/spring-beans.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/spring-context.jar" dest="${thirdparty.dir}/spring-context.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/spring-core.jar" dest="${thirdparty.dir}/spring-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/spring-web.jar" dest="${thirdparty.dir}/spring-web.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/XmlSchema.jar" dest="${thirdparty.dir}/XmlSchema.jar" 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"/> @@ -78,31 +70,99 @@ <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"/> + <antcall target="cxf-copy-jars"/> + <checksum file="${int.xfire.dir}/version.properties" fileext=".md5"/> </target> <target name="thirdparty-classpath" depends="thirdparty-get"> - <path id="xfire.integration.classpath"> <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar --> <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> - <pathelement location="${thirdparty.dir}/cxf-incubator.jar"/> - <pathelement location="${thirdparty.dir}/dom4j.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-ws-metadata.jar"/> + <pathelement location="${thirdparty.dir}/cxf-${cxf.version}.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api-${cxf.jaxws.api}.jar"/> + <pathelement location="${thirdparty.dir}/spring-beans-${cxf.spring}.jar"/> + <pathelement location="${thirdparty.dir}/spring-context-${cxf.spring}.jar"/> + <pathelement location="${thirdparty.dir}/spring-core-${cxf.spring}.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> + <pathelement location="${thirdparty.dir}/jboss-javaee.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${thirdparty.dir}/spring-beans.jar"/> - <pathelement location="${thirdparty.dir}/spring-context.jar"/> - <pathelement location="${thirdparty.dir}/spring-core.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" depends="thirdparty-init" unless="apache.cxf.available"> + <exec dir="${xfire.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" depends="thirdparty-init" if="apache.cxf.available"> + <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-commit-revision" depends="cxf-update,cxf-checkout"> + <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.commit.revision" value="${info.entry.commit(revision)}"/> + <available property="cxf.build.available" file="${apache.cxf.dir}/build-${cxf.commit.revision}.rev"/> + </target> + + <!-- Build using maven --> + <target name="cxf-maven-build" depends="cxf-commit-revision" unless="cxf.build.available"> + <exec dir="${apache.cxf.dir}" executable="mvn" failonerror="true"> + <arg value="-Pfastinstall"/> + </exec> + <exec dir="${apache.cxf.dir}/distribution" executable="mvn" failonerror="true"> + <arg value="install"/> + </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.commit.revision}.rev"/> + </target> + + <!-- Copy the cxf jars --> + <target name="cxf-copy-jars" depends="cxf-maven-build"> + <copy todir="${thirdparty.dir}"> + <fileset dir="${apache.cxf.dir}/distribution/target/apache-cxf-${cxf.version}.dir/apache-cxf-${cxf.version}/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="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/trunk/ant-import/macros-deploy-xfire.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-xfire.xml 2007-08-14 14:54:15 UTC (rev 4364) +++ stack/cxf/trunk/ant-import/macros-deploy-xfire.xml 2007-08-14 16:05:54 UTC (rev 4365) @@ -46,8 +46,8 @@ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <include name="jbossws-jboss50.jar"/> - <include name="jaxws-api.jar"/> - <include name="saaj-api.jar"/> + <include name="jaxws-api-${cxf.jaxws.api}.jar"/> + <include name="saaj-api-${cxf.saaj}.jar"/> </fileset> </copy> @@ -82,6 +82,8 @@ <!--SERVER JARS --> <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> <include name="jbossws-jboss50.jar"/> + <include name="jaxws-api-${cxf.jaxws.api}.jar"/> + <include name="saaj-api-${cxf.saaj}.jar"/> </fileset> </delete> Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2007-08-14 14:54:15 UTC (rev 4364) +++ stack/cxf/trunk/build.xml 2007-08-14 16:05:54 UTC (rev 4365) @@ -148,25 +148,26 @@ </fileset> <fileset dir="${thirdparty.dir}"> - <include name="cxf-incubator.jar"/> - <include name="geronimo-ws-metadata.jar"/> + <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="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"/> + <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> - <include name="jaxrpc-api.jar"/> - <include name="jaxws-api.jar"/> - <include name="jdom.jar"/> - <include name="neethi.jar"/> + <include name="stax-api.jar"/> <include name="wsdl4j.jar"/> - <include name="resolver.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="wstx.jar"/> - <include name="xbean.jar"/> - <include name="XmlSchema.jar"/> </fileset> <fileset dir="${xfire.output.lib.dir}"> <include name="jbossws-xfire.jar"/> @@ -203,26 +204,26 @@ <include name="jbossws-xfire.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> - <include name="jbossws-jboss42.jar"/> - <include name="cxf-incubator.jar"/> - <include name="geronimo-ws-metadata.jar"/> + <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="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"/> + <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> - <include name="jaxrpc-api.jar"/> - <include name="jaxws-api.jar"/> - <include name="jdom.jar"/> - <include name="neethi.jar"/> + <include name="stax-api.jar"/> <include name="wsdl4j.jar"/> - <include name="resolver.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="wstx.jar"/> - <include name="xbean.jar"/> - <include name="XmlSchema.jar"/> </fileset> <fileset dir="${xfire.output.lib.dir}/jbossws-xfire42"> <include name="jbossws.beans/**"/> Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2007-08-14 14:54:15 UTC (rev 4364) +++ stack/cxf/trunk/version.properties 2007-08-14 16:05:54 UTC (rev 4365) @@ -13,6 +13,23 @@ 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/trunk +cxf.svn.rev=HEAD + +# Apache CXF versions +cxf.version=2.1-incubator-SNAPSHOT +cxf.geronimo.javamail=1.4_spec-1.0-M1 +cxf.geronimo.ws.metadata=2.0_spec-1.1.1 +cxf.jaxws.api=2.0 +cxf.jdom=1.0 +cxf.neethi=2.0 +cxf.saaj=1.3 +cxf.spring=2.0.4 +cxf.xbean=2.2.0 +cxf.xml.resolver=1.2 +cxf.xmlschema=1.2 + # Thirdparty library versions jbossws-framework=2.0.1.CR1 jbossws-common=1.0.0.CR1 @@ -20,7 +37,6 @@ jbossws-jboss50=2.0.1.CR1 jbossws-jboss42=2.0.1.CR1 -apache-cxf=2.0 apache-xml-commons=1.2 ibm-wsdl4j=1.6.2 jboss-common-core=2.0.2.GA