Author: thomas.diesler(a)jboss.com Date: 2007-09-25 13:01:03 -0400 (Tue, 25 Sep 2007) New Revision: 4627 Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/version.properties Log: Update cxf thirdparty versions Check availability of build artifacts Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-09-25 12:00:21 UTC (rev 4626) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-09-25 17:01:03 UTC (rev 4627) @@ -141,8 +141,41 @@ <!-- 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="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="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="${apache.cxf.dir}/distribution/target/apache-cxf-${cxf.version}.dir/apache-cxf-${cxf.version}/lib"> + <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"/> Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2007-09-25 12:00:21 UTC (rev 4626) +++ stack/cxf/trunk/version.properties 2007-09-25 17:01:03 UTC (rev 4627) @@ -21,11 +21,11 @@ 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.jaxws.api=2.1 cxf.jdom=1.0 cxf.neethi=2.0.2 cxf.saaj=1.3 -cxf.spring=2.0.4 +cxf.spring=2.0.6 cxf.xbean=2.2.0 cxf.xml.resolver=1.2 cxf.xmlschema=1.2