Author: thomas.diesler(a)jboss.com Date: 2007-08-02 12:01:13 -0400 (Thu, 02 Aug 2007) New Revision: 4110 Modified: trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/sunri/version.properties trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/integration/xfire/ant-import/macros-deploy-xfire.xml trunk/integration/xfire/version.properties Log: Fix deploy metro,xfire Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-02 16:01:13 UTC (rev 4110) @@ -22,11 +22,10 @@ <!-- Deploy to jboss50 --> <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-sunri50 wsflibs="${framework.dir}/output/lib" - jbosslibs="${int.jboss50.dir}/output/lib" stacklibs="${int.sunri.dir}/output/lib" thirdpartylibs="${int.sunri.dir}/thirdparty"/> @@ -44,7 +43,7 @@ <!-- Deploy to jboss42 --> <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/sunri to jboss42"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <macro-deploy-sunri42 wsflibs="${framework.dir}/output/lib" Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 16:01:13 UTC (rev 4110) @@ -45,6 +45,8 @@ <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/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" 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-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}/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"/> Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-02 16:01:13 UTC (rev 4110) @@ -19,7 +19,6 @@ <macrodef name="macro-deploy-sunri50"> <attribute name="wsflibs"/> - <attribute name="jbosslibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -27,13 +26,11 @@ <!-- CLIENT JARS --> <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> <fileset dir="@{stacklibs}"> <include name="jbossws-sunri-client.jar"/> </fileset> <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss50.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -58,10 +55,8 @@ <!--SERVER JARS --> <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss50.jar"/> <include name="jaxws-api.jar"/> <include name="jsr181-api.jar"/> <include name="saaj-api.jar"/> @@ -69,7 +64,7 @@ </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){jbosslibs}/jbossws-jboss50-deployer.zip&quot;/&gt; + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){thirdpartylibs}/jbossws-jboss50-deployer.zip&quot;/&gt; <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri50.sar&quot;/&gt; <!-- Deploy juddi-service.sar --> Modified: trunk/integration/sunri/version.properties =================================================================== --- trunk/integration/sunri/version.properties 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/sunri/version.properties 2007-08-02 16:01:13 UTC (rev 4110) @@ -4,6 +4,10 @@ sunri.implementation.title=JBoss Web Services - JBossWS/SunRI # Thirdparty library versions +jbossws-common=2.0.1.CR1 +jbossws-spi=2.0.1.CR1 +jbossws-jboss50=2.0.1.CR1 + jboss-security-spi=2.0.0.Beta sun-jaxws=2.1.1 sun-servlet=2.5 Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-02 16:01:13 UTC (rev 4110) @@ -22,11 +22,10 @@ <!-- Deploy to jboss50 --> <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-xfire50 wsflibs="${framework.dir}/output/lib" - jbosslibs="${int.jboss50.dir}/output/lib" stacklibs="${int.xfire.dir}/output/lib" thirdpartylibs="${int.xfire.dir}/thirdparty"/> @@ -44,7 +43,7 @@ <!-- Deploy to jboss42 --> <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/xfire to jboss42"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <macro-deploy-xfire42 wsflibs="${framework.dir}/output/lib" Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 16:01:13 UTC (rev 4110) @@ -60,6 +60,8 @@ <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/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" 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-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}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.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"/> Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 16:01:13 UTC (rev 4110) @@ -20,7 +20,6 @@ <!-- Deploy to jboss50 --> <macrodef name="macro-deploy-xfire50"> <attribute name="wsflibs"/> - <attribute name="jbosslibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -31,11 +30,8 @@ <fileset dir="@{wsflibs}"> <include name="jbossws-framework.jar"/> </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss50.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -52,17 +48,15 @@ <!--SERVER JARS --> <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss50.jar"/> <include name="jaxws-api.jar"/> <include name="saaj-api.jar"/> </fileset> </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){jbosslibs}/jbossws-jboss50-deployer.zip&quot;/&gt; + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){thirdpartylibs}/jbossws-jboss50-deployer.zip&quot;/&gt; <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src=&quot;(a){stacklibs}/jbossws-xfire50.sar&quot;/&gt; <!-- Deploy juddi-service.sar --> Modified: trunk/integration/xfire/version.properties =================================================================== --- trunk/integration/xfire/version.properties 2007-08-02 15:43:38 UTC (rev 4109) +++ trunk/integration/xfire/version.properties 2007-08-02 16:01:13 UTC (rev 4110) @@ -4,6 +4,10 @@ sunri.implementation.title=JBoss Web Services - Apache CXF # Thirdparty library versions +jbossws-common=2.0.1.CR1 +jbossws-spi=2.0.1.CR1 +jbossws-jboss50=2.0.1.CR1 + apache-cxf=2.0 apache-xml-commons=1.2 ibm-wsdl4j=1.6.2