[jbossws-commits] JBossWS SVN: r3236 - in trunk: build/ant-import and 15 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-05-24 11:12:38 -0400 (Thu, 24 May 2007) New Revision: 3236 Added: trunk/integration/jbws/ant-import/macros-deploy-native.xml trunk/integration/jbws/src/main/etc/component-info42.xml trunk/integration/jbws/src/main/etc/component-info50.xml trunk/integration/jbws/src/main/resources/jbossws-native42.sar/ trunk/integration/jbws/src/main/resources/jbossws-native50.deployer/ trunk/integration/jbws/src/main/resources/jbossws-native50.sar/ trunk/integration/sunri/ant-import/build-distro.xml trunk/integration/sunri/src/main/resources/jbossws-sunri50.deployer/ trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/ trunk/integration/xfire/ant-import/build-distro.xml trunk/integration/xfire/ant-import/macros-deploy-xfire.xml trunk/integration/xfire/src/main/resources/jbossws-xfire50.deployer/ trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/ trunk/jbossws-core/src/test/etc/ Removed: trunk/integration/jbws/ant-import/macros-deploy-jbws.xml trunk/integration/jbws/src/main/etc/component-info-jbws42.xml trunk/integration/jbws/src/main/etc/component-info-jbws50.xml trunk/integration/jbws/src/main/resources/jbossws-jboss50.deployer/ trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/ trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/ trunk/integration/sunri/ant-import/build-distribution.xml trunk/integration/sunri/src/main/resources/jbossws-jboss50.deployer/ trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/ trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/ trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/ Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-testsuite.xml trunk/build/build.xml trunk/integration/jbws/ant-import/build-deploy.xml trunk/integration/jbws/ant-import/build-release.xml trunk/integration/jbws/ant-import/build-testsuite.xml trunk/integration/jbws/build.xml trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/sunri/build.xml trunk/integration/sunri/src/main/etc/bindist-build.xml trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/build.xml trunk/integration/xfire/src/main/etc/ trunk/jbossws-core/ant-import/build-deploy.xml trunk/testsuite/ant-import/build-testsuite.xml Log: XFire binary dist Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/build/ant-import/build-release.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -43,7 +43,7 @@ <ant antfile="${core.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${int.jboss50.dir}/build.xml" target="release" inheritall="false"/> - <ant antfile="${int.jbws.dir}/build.xml" target="release" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="release" inheritall="false"/> </target> <!-- Release to portal content --> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/build/ant-import/build-setup.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -23,7 +23,7 @@ <property name="testsuite.dir" value="${basedir}/testsuite"/> <property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/> <property name="int.jboss42.dir" value="${basedir}/integration/jboss42"/> - <property name="int.jbws.dir" value="${basedir}/integration/jbws"/> + <property name="int.native.dir" value="${basedir}/integration/jbws"/> <property name="int.sunri.dir" value="${basedir}/integration/sunri"/> <property name="int.xfire.dir" value="${basedir}/integration/xfire"/> Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/build/ant-import/build-testsuite.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -10,10 +10,9 @@ <project> - <property name="tests.etc.dir" value="${tests.dir}/src/etc"/> - <property name="tests.java.dir" value="${tests.dir}/src/java"/> - <property name="tests.resources.dir" value="${tests.dir}/src/resources"/> - <property name="tests.output.dir" value="${tests.dir}/output-tests"/> + <property name="tests.etc.dir" value="${tests.dir}/etc"/> + <property name="tests.java.dir" value="${tests.dir}/java"/> + <property name="tests.resources.dir" value="${tests.dir}/resources"/> <!-- ================================================================== --> <!-- Setup --> @@ -182,9 +181,15 @@ <macrodef name="macro-copy-resources"> <attribute name="srcdir"/> <sequential> - <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/> - <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/> + <!-- copy etc --> + <copy todir="${tests.output.dir}/classes"> + <fileset dir="@{srcdir}/etc"> + <include name="jndi.properties"/> + <include name="log4j.xml"/> + </fileset> + </copy> + <!-- copy handler definitions --> <copy todir="${tests.output.dir}/classes"> <fileset dir="@{srcdir}/java"> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/build/build.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -42,7 +42,7 @@ <ant antfile="${int.jboss50.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${int.jbws.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="clean" inheritall="false"/> </target> @@ -53,7 +53,7 @@ <ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.jboss50.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="clobber" inheritall="false"/> - <ant antfile="${int.jbws.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="clobber" inheritall="false"/> </target> @@ -66,7 +66,7 @@ </target> <target name="most" description="Builds almost everything." depends="prepare"> - <ant antfile="${int.jbws.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="tests-main" inheritall="false"/> Modified: trunk/integration/jbws/ant-import/build-deploy.xml =================================================================== --- trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -13,7 +13,7 @@ <project> - <import file="${int.jbws.dir}/ant-import/macros-deploy-jbws.xml"/> + <import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/> <!-- ================================================================== --> <!-- Deployment JBoss50 --> @@ -23,32 +23,32 @@ <target name="deploy-jboss50" depends="jars-jbws50" description="Deploy jbossws to jboss50"> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <macro-deploy-jbws50 + <macro-deploy-native50 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss50.dir}/output/lib" corelibs="${core.dir}/output/lib" - jbwslibs="${int.jbws.dir}/output/lib" + stacklibs="${int.native.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <!-- Remove jbossws from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> - <macro-undeploy-jbws50/> + <macro-undeploy-native50/> </target> <!-- Deploy jbossws to jboss42 --> <target name="deploy-jboss42" depends="jars-jbws42" description="Deploy jbossws to jboss42"> - <macro-deploy-jbws42 + <macro-deploy-native42 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss42.dir}/output/lib" corelibs="${core.dir}/output/lib" - jbwslibs="${int.jbws.dir}/output/lib" + stacklibs="${int.native.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <!-- Remove jbossws from jboss42 --> <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> - <macro-undeploy-jbws42/> + <macro-undeploy-native42/> </target> </project> Modified: trunk/integration/jbws/ant-import/build-release.xml =================================================================== --- trunk/integration/jbws/ant-import/build-release.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/ant-import/build-release.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -17,30 +17,30 @@ <target name="release" depends="jars" description="Release to jboss.local.repository"> - <!-- jboss/jbossws-jbws50 --> + <!-- jboss/jbossws-native50 --> <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-jbws50/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-jbws50/${repository.id}/lib" overwrite="true"> - <fileset dir="${int.jbws.dir}/output/lib"> - <include name="jbossws-jbws50.sar"/> - <include name="jbossws-jbws50-deployer.zip"/> + <mkdir dir="${jboss.repository.dir}/jbossws-native50/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-native50/${repository.id}/lib" overwrite="true"> + <fileset dir="${int.native.dir}/output/lib"> + <include name="jbossws-native50.sar"/> + <include name="jbossws-native50-deployer.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jbws50/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info-jbws50.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> - <!-- jboss/jbossws-jbws42 --> + <!-- jboss/jbossws-native42 --> <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-jbws42/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-jbws42/${repository.id}/lib" overwrite="true"> - <fileset dir="${int.jbws.dir}/output/lib"> - <include name="jbossws-jbws42.sar"/> + <mkdir dir="${jboss.repository.dir}/jbossws-native42/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-native42/${repository.id}/lib" overwrite="true"> + <fileset dir="${int.native.dir}/output/lib"> + <include name="jbossws-native42.sar"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jbws42/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info-jbws42.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-native42/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info42.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> Modified: trunk/integration/jbws/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -13,10 +13,10 @@ <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> <!-- Define excludesfile --> - <condition property="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss50.txt"> + <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss50.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> </condition> - <condition property="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss42.txt"> + <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss42.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> @@ -35,6 +35,7 @@ </path> <path id="tests.extra.classpath"> + <pathelement location="${core.dir}/thirdparty/policy.jar"/> </path> </target> Deleted: trunk/integration/jbws/ant-import/macros-deploy-jbws.xml =================================================================== --- trunk/integration/jbws/ant-import/macros-deploy-jbws.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/ant-import/macros-deploy-jbws.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -1,182 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- ================================================================== --> - <!-- Deployment JBossWS/Native --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbws50"> - <attribute name="spilibs"/> - <attribute name="jbosslibs"/> - <attribute name="corelibs"/> - <attribute name="jbwslibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="@{corelibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="@{corelibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.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){jbwslibs}/jbossws-jbws50-deployer.zip&quot;/&gt; - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){jbwslibs}/jbossws-jbws50.sar&quot;/&gt; - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/> - <!-- Deploy juddi-service.sar --> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbws42"> - <attribute name="spilibs"/> - <attribute name="jbosslibs"/> - <attribute name="corelibs"/> - <attribute name="jbwslibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss42.jar"/> - </fileset> - <fileset dir="@{corelibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss42.home}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss42.jar"/> - </fileset> - <fileset dir="@{corelibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){jbwslibs}/jbossws-jbws42.sar&quot;/&gt; - <!-- Deploy juddi-service.sar --> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-jbws50"> - <sequential> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <delete> - <fileset dir="${jboss50.home}/client"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> - <!-- Undeploy juddi-service.sar --> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-jbws42"> - <sequential> - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <delete> - <fileset dir="${jboss42.home}/client"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - <fileset dir="${jboss42.home}/lib"> - <include name="jbossws-integration.jar"/> <!-- The old integration jar--> - </fileset> - <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <!-- Undeploy juddi-service.sar --> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - -</project> Copied: trunk/integration/jbws/ant-import/macros-deploy-native.xml (from rev 3233, trunk/integration/jbws/ant-import/macros-deploy-jbws.xml) =================================================================== --- trunk/integration/jbws/ant-import/macros-deploy-native.xml (rev 0) +++ trunk/integration/jbws/ant-import/macros-deploy-native.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -0,0 +1,182 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- Deployment JBossWS/Native --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-native50"> + <attribute name="spilibs"/> + <attribute name="jbosslibs"/> + <attribute name="corelibs"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="@{corelibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="@{corelibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.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){stacklibs}/jbossws-native50-deployer.zip&quot;/&gt; + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native50.sar&quot;/&gt; + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/> + <!-- Deploy juddi-service.sar --> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <macrodef name="macro-deploy-native42"> + <attribute name="spilibs"/> + <attribute name="jbosslibs"/> + <attribute name="corelibs"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + <copy todir="${jboss42.home}/client" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="@{corelibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss42.home}/lib" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="@{corelibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; + <!-- Deploy juddi-service.sar --> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native50"> + <sequential> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> + <!-- Undeploy juddi-service.sar --> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native42"> + <sequential> + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + <delete> + <fileset dir="${jboss42.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss42.home}/lib"> + <include name="jbossws-integration.jar"/> <!-- The old integration jar--> + </fileset> + <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <!-- Undeploy juddi-service.sar --> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +</project> Modified: trunk/integration/jbws/build.xml =================================================================== --- trunk/integration/jbws/build.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/build.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -15,16 +15,16 @@ <import file="${basedir}/build/ant-import/build-setup.xml"/> - <import file="${int.jbws.dir}/ant-import/build-deploy.xml"/> - <import file="${int.jbws.dir}/ant-import/build-release.xml"/> - <import file="${int.jbws.dir}/ant-import/build-testsuite.xml"/> - <import file="${int.jbws.dir}/ant-import/build-thirdparty.xml"/> + <import file="${int.native.dir}/ant-import/build-deploy.xml"/> + <import file="${int.native.dir}/ant-import/build-release.xml"/> + <import file="${int.native.dir}/ant-import/build-testsuite.xml"/> + <import file="${int.native.dir}/ant-import/build-thirdparty.xml"/> <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - <property name="jbws.dir" value="${int.jbws.dir}"/> + <property name="jbws.dir" value="${int.native.dir}"/> <property name="jbws.src.dir" value="${jbws.dir}/src/main"/> <property name="jbws.etc.dir" value="${jbws.src.dir}/etc"/> <property name="jbws.java.dir" value="${jbws.src.dir}/java"/> @@ -74,7 +74,7 @@ <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}"/> + <filter token="implementation.version" value="jbossws-native-${version.id}"/> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> @@ -111,7 +111,7 @@ </war> <!-- Build jbossws-jbws50.sar --> - <jar jarfile="${jbws.output.lib.dir}/jbossws-jbws50.sar" manifest="${jbws.output.etc.dir}/default.mf"> + <jar jarfile="${jbws.output.lib.dir}/jbossws-native50.sar" manifest="${jbws.output.etc.dir}/default.mf"> <!-- [JBAS-4379] MC beans deployed twice because of jacc service <fileset dir="${jbws.output.lib.dir}"> <include name="jbossws-context.war"/> @@ -129,14 +129,14 @@ <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${jbws.resources.dir}/jbossws-jbws50.sar/META-INF"> + <metainf dir="${jbws.resources.dir}/jbossws-native50.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> <!-- Build jbossws-jbws50.deployer --> - <zip zipfile="${jbws.output.lib.dir}/jbossws-jbws50-deployer.zip"> - <fileset dir="${jbws.resources.dir}/jbossws-jboss50.deployer"> + <zip zipfile="${jbws.output.lib.dir}/jbossws-native50-deployer.zip"> + <fileset dir="${jbws.resources.dir}/jbossws-native50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> @@ -153,7 +153,7 @@ <mkdir dir="${jbws.output.lib.dir}"/> <!-- Build jbossws-jbws42.sar --> - <jar jarfile="${jbws.output.lib.dir}/jbossws-jbws42.sar" manifest="${jbws.output.etc.dir}/default.mf"> + <jar jarfile="${jbws.output.lib.dir}/jbossws-native42.sar" manifest="${jbws.output.etc.dir}/default.mf"> <fileset dir="${jbws.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> @@ -173,13 +173,13 @@ <include name="xmlsec.jar"/> <include name="wstx.jar"/> </fileset> - <fileset dir="${jbws.resources.dir}/jbossws-jbws42.sar"> + <fileset dir="${jbws.resources.dir}/jbossws-native42.sar"> <include name="jbossws.beans/**"/> </fileset> <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${jbws.resources.dir}/jbossws-jbws42.sar/META-INF"> + <metainf dir="${jbws.resources.dir}/jbossws-native42.sar/META-INF"> <include name="jboss-service.xml"/> <include name="jboss-beans.xml"/> </metainf> @@ -196,7 +196,7 @@ </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.jbws.dir}/output-tests"/> + <delete dir="${int.native.dir}/output-tests"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> Deleted: trunk/integration/jbws/src/main/etc/component-info-jbws42.xml =================================================================== --- trunk/integration/jbws/src/main/etc/component-info-jbws42.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/src/main/etc/component-info-jbws42.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -1,31 +0,0 @@ -<project name="jboss/jbossws-jbws42"> - - <component id="jboss/jbossws-jbws42" - description="JBossWS an implementation of J2EE Web Services" - version=&quot;@repository.id(a)&quot; - licenseType="lgpl"> - - <artifact id="jbossws-jbws42.sar"/> - - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/jbossws"> - <compatible version=&quot;@repository.id(a)&quot;/&gt; - </import> - <import componentref="jboss/jbossws-jboss50"> - <compatible version=&quot;@repository.id(a)&quot;/&gt; - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version=&quot;@repository.id(a)&quot;/&gt; - </import> - - <export> - </export> - - </component> - -</project> Deleted: trunk/integration/jbws/src/main/etc/component-info-jbws50.xml =================================================================== --- trunk/integration/jbws/src/main/etc/component-info-jbws50.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/src/main/etc/component-info-jbws50.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -1,32 +0,0 @@ -<project name="jboss/jbossws-jbws50"> - - <component id="jboss/jbossws-jbws50" - description="JBossWS an implementation of J2EE Web Services" - version=&quot;@repository.id(a)&quot; - licenseType="lgpl"> - - <artifact id="jbossws-jbws50.sar"/> - <artifact id="jbossws-jbws50-deployer.zip"/> - - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/jbossws"> - <compatible version=&quot;@repository.id(a)&quot;/&gt; - </import> - <import componentref="jboss/jbossws-jboss50"> - <compatible version=&quot;@repository.id(a)&quot;/&gt; - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version=&quot;@repository.id(a)&quot;/&gt; - </import> - - <export> - </export> - - </component> - -</project> Copied: trunk/integration/jbws/src/main/etc/component-info42.xml (from rev 3219, trunk/integration/jbws/src/main/etc/component-info-jbws42.xml) =================================================================== --- trunk/integration/jbws/src/main/etc/component-info42.xml (rev 0) +++ trunk/integration/jbws/src/main/etc/component-info42.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -0,0 +1,31 @@ +<project name="jboss/jbossws-native42"> + + <component id="jboss/jbossws-native42" + description="JBossWS an implementation of J2EE Web Services" + version=&quot;@repository.id(a)&quot; + licenseType="lgpl"> + + <artifact id="jbossws-native42.sar"/> + + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/jbossws"> + <compatible version=&quot;@repository.id(a)&quot;/&gt; + </import> + <import componentref="jboss/jbossws-jboss50"> + <compatible version=&quot;@repository.id(a)&quot;/&gt; + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version=&quot;@repository.id(a)&quot;/&gt; + </import> + + <export> + </export> + + </component> + +</project> Copied: trunk/integration/jbws/src/main/etc/component-info50.xml (from rev 3219, trunk/integration/jbws/src/main/etc/component-info-jbws50.xml) =================================================================== --- trunk/integration/jbws/src/main/etc/component-info50.xml (rev 0) +++ trunk/integration/jbws/src/main/etc/component-info50.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -0,0 +1,32 @@ +<project name="jboss/jbossws-native50"> + + <component id="jboss/jbossws-native50" + description="JBossWS an implementation of J2EE Web Services" + version=&quot;@repository.id(a)&quot; + licenseType="lgpl"> + + <artifact id="jbossws-native50.sar"/> + <artifact id="jbossws-native50-deployer.zip"/> + + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/jbossws"> + <compatible version=&quot;@repository.id(a)&quot;/&gt; + </import> + <import componentref="jboss/jbossws-jboss50"> + <compatible version=&quot;@repository.id(a)&quot;/&gt; + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version=&quot;@repository.id(a)&quot;/&gt; + </import> + + <export> + </export> + + </component> + +</project> Copied: trunk/integration/jbws/src/main/resources/jbossws-native42.sar (from rev 3219, trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar) Copied: trunk/integration/jbws/src/main/resources/jbossws-native50.deployer (from rev 3219, trunk/integration/jbws/src/main/resources/jbossws-jboss50.deployer) Copied: trunk/integration/jbws/src/main/resources/jbossws-native50.sar (from rev 3219, trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar) Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -21,12 +21,12 @@ <!-- Deploy jbossws/sunri to jboss50 --> <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> - <ant antfile="${int.jbws.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-sunri50 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss50.dir}/output/lib" - sunrilibs="${int.sunri.dir}/output/lib" + stacklibs="${int.sunri.dir}/output/lib" thirdpartylibs="${int.sunri.dir}/thirdparty"/> </target> Deleted: trunk/integration/sunri/ant-import/build-distribution.xml =================================================================== --- trunk/integration/sunri/ant-import/build-distribution.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/sunri/ant-import/build-distribution.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- ================================================================== --> - <!-- Binary distribution JBossWS/SunRI --> - <!-- ================================================================== --> - - <target name="binary-dist" depends="jars" description="Build the binary distribution"> - - <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/> - <property name="bindist.build.dir" value="${bindist.dir}/build"/> - <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> - <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> - <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> - - <delete dir="${bindist.dir}"/> - <mkdir dir="${bindist.build.dir}"/> - <mkdir dir="${bindist.lib.dir}/thirdparty"/> - <mkdir dir="${bindist.docs.dir}"/> - <mkdir dir="${bindist.tests.dir}"/> - - <!-- root --> - <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/etc/bindist.properties"/> - <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/> - <copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/> - - <!-- build --> - <copy todir="${bindist.build.dir}"> - <fileset dir="${build.dir}"> - <include name="version.properties"/> - </fileset> - <fileset dir="${build.dir}/ant-import"> - <include name="build-testsuite.xml"/> - </fileset> - <fileset dir="${int.jbws.dir}/ant-import"> - <include name="macros-deploy-jbws.xml"/> - </fileset> - <fileset dir="${int.sunri.dir}/ant-import"> - <include name="macros-deploy-sunri.xml"/> - </fileset> - <fileset dir="${testsuite.dir}/ant-import"> - <include name="build-jars-jaxws.xml"/> - </fileset> - </copy> - - <!-- docs --> - <copy todir="${bindist.docs.dir}"> - <fileset dir="${build.dir}/etc"> - <include name="JBossORG-EULA.txt"/> - </fileset> - </copy> - - <!-- lib --> - <copy todir="${bindist.lib.dir}" overwrite="true"> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${int.jboss42.dir}/output/lib"> - <include name="jbossws-jboss42.jar"/> - </fileset> - <fileset dir="${int.jboss50.dir}/output/lib"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="${int.sunri.dir}/output/lib"> - <include name="jbossws-context.war"/> - <include name="jbossws-sunri42.sar"/> - <include name="jbossws-sunri50.sar"/> - <include name="jbossws-sunri50-deployer.zip"/> - </fileset> - </copy> - <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> - <fileset dir="${int.sunri.dir}/thirdparty"/> - </copy> - - <!-- tests --> - <copy todir="${bindist.tests.dir}" overwrite="true"> - <fileset dir="${testsuite.dir}"> - <include name="src/**"/> - </fileset> - <fileset dir="${int.sunri.dir}"> - <include name="src/test/**"/> - </fileset> - </copy> - - <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip"> - <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/> - </zip> - </target> - -</project> Added: trunk/integration/sunri/ant-import/build-distro.xml =================================================================== --- trunk/integration/sunri/ant-import/build-distro.xml (rev 0) +++ trunk/integration/sunri/ant-import/build-distro.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- Binary distribution JBossWS/SunRI --> + <!-- ================================================================== --> + + <target name="binary-dist" depends="jars" description="Build the binary distribution"> + + <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/> + <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> + <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> + <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + + <delete dir="${bindist.dir}"/> + <mkdir dir="${bindist.build.dir}"/> + <mkdir dir="${bindist.lib.dir}/thirdparty"/> + <mkdir dir="${bindist.docs.dir}"/> + <mkdir dir="${bindist.tests.dir}"/> + + <!-- root --> + <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/etc/bindist.properties"/> + <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/> + <copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/> + + <!-- build --> + <copy todir="${bindist.build.dir}"> + <fileset dir="${build.dir}"> + <include name="version.properties"/> + </fileset> + <fileset dir="${build.dir}/ant-import"> + <include name="build-testsuite.xml"/> + </fileset> + <fileset dir="${int.native.dir}/ant-import"> + <include name="macros-deploy-native.xml"/> + </fileset> + <fileset dir="${int.sunri.dir}/ant-import"> + <include name="macros-deploy-sunri.xml"/> + </fileset> + <fileset dir="${testsuite.dir}/ant-import"> + <include name="build-jars-jaxws.xml"/> + </fileset> + </copy> + + <!-- docs --> + <copy todir="${bindist.docs.dir}"> + <fileset dir="${build.dir}/etc"> + <include name="JBossORG-EULA.txt"/> + </fileset> + </copy> + + <!-- lib --> + <copy todir="${bindist.lib.dir}" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${int.sunri.dir}/output/lib"> + <include name="jbossws-context.war"/> + <include name="jbossws-sunri42.sar"/> + <include name="jbossws-sunri50.sar"/> + <include name="jbossws-sunri50-deployer.zip"/> + </fileset> + </copy> + <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> + <fileset dir="${int.sunri.dir}/thirdparty"/> + </copy> + + <!-- tests --> + <copy todir="${bindist.tests.dir}" overwrite="true"> + <fileset dir="${testsuite.dir}/src"/> + <fileset dir="${int.sunri.dir}/src/test"/> + </copy> + + <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip"> + <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/> + </zip> + </target> + +</project> Property changes on: trunk/integration/sunri/ant-import/build-distro.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -20,7 +20,7 @@ <macrodef name="macro-deploy-sunri50"> <attribute name="spilibs"/> <attribute name="jbosslibs"/> - <attribute name="sunrilibs"/> + <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> @@ -52,10 +52,10 @@ </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){sunrilibs}/jbossws-sunri50-deployer.zip&quot;/&gt; + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){stacklibs}/jbossws-sunri50-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){sunrilibs}/jbossws-sunri50.sar&quot;/&gt; - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file=&quot;(a){sunrilibs}/jbossws-context.war&quot; overwrite="true"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri50.sar&quot;/&gt; + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file=&quot;(a){stacklibs}/jbossws-context.war&quot; overwrite="true"/> </sequential> </macrodef> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/sunri/build.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -16,7 +16,7 @@ <import file="${basedir}/build/ant-import/build-setup.xml"/> <import file="${int.sunri.dir}/ant-import/build-deploy.xml"/> - <import file="${int.sunri.dir}/ant-import/build-distribution.xml"/> + <import file="${int.sunri.dir}/ant-import/build-distro.xml"/> <import file="${int.sunri.dir}/ant-import/build-release.xml"/> <import file="${int.sunri.dir}/ant-import/build-testsuite.xml"/> <import file="${int.sunri.dir}/ant-import/build-thirdparty.xml"/> @@ -149,7 +149,7 @@ <include name="stax-ex.jar"/> <include name="streambuffer.jar"/> </fileset> - <metainf dir="${sunri.resources.dir}/jbossws-jboss50.sar/META-INF"> + <metainf dir="${sunri.resources.dir}/jbossws-sunri50.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> @@ -162,7 +162,7 @@ <fileset dir="${sunri.output.lib.dir}"> <include name="jbossws-sunri50.jar"/> </fileset> - <fileset dir="${sunri.resources.dir}/jbossws-jboss50.deployer"> + <fileset dir="${sunri.resources.dir}/jbossws-sunri50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -22,6 +22,7 @@ <property name="lib.dir" value="${basedir}/lib"/> <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${tests.dir}/output"/> <property file="${basedir}/ant.properties"/> <property file="${basedir}/version.properties"/> @@ -67,10 +68,10 @@ </condition> <!-- Define excludesfile --> - <condition property="excludesfile" value="${tests.dir}/src/test/resources/excludes-jboss50.txt"> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> </condition> - <condition property="excludesfile" value="${tests.dir}/src/test/resources/excludes-jboss42.txt"> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> @@ -106,7 +107,7 @@ <!-- ================================================================== --> <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/src/java"/> + <macro-compile-classes srcdir="${tests.dir}/java"/> </target> <!-- ================================================================== --> @@ -115,7 +116,7 @@ <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}/src"/> + <macro-copy-resources srcdir="${tests.dir}"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources"> @@ -130,11 +131,11 @@ <!-- Deploy jbossws/sunri to jboss50 --> <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50"> - <macro-undeploy-jbws50/> + <macro-undeploy-native50/> <macro-deploy-sunri50 spilibs="${lib.dir}" jbosslibs="${lib.dir}" - sunrilibs="${lib.dir}" + stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}/thirdparty"/> </target> Copied: trunk/integration/sunri/src/main/resources/jbossws-sunri50.deployer (from rev 3219, trunk/integration/sunri/src/main/resources/jbossws-jboss50.deployer) Copied: trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar (from rev 3219, trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar) Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -19,39 +19,9 @@ <!-- Deploy jbossws/xfire to jboss50 --> <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50"> - - <ant antfile="${int.jbws.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - </fileset> - <fileset dir="${int.jboss50.dir}/output/lib"> - <include name="jbossws-jboss50.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/lib" overwrite="true"> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${int.jboss50.dir}/output/lib"> - <include name="jbossws-jboss50.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="${xfire.output.lib.dir}/jbossws-xfire50-deployer.zip"/> - <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="${xfire.output.lib.dir}/jbossws-xfire50.sar"/> - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${xfire.output.lib.dir}/jbossws-context.war" overwrite="true"/> </target> <!-- Remove jbossws/xfire from jboss50 --> Added: trunk/integration/xfire/ant-import/build-distro.xml =================================================================== --- trunk/integration/xfire/ant-import/build-distro.xml (rev 0) +++ trunk/integration/xfire/ant-import/build-distro.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- Binary distribution JBossWS/XFire --> + <!-- ================================================================== --> + + <target name="binary-dist" depends="jars" description="Build the binary distribution"> + + <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/> + <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> + <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> + <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + + <delete dir="${bindist.dir}"/> + <mkdir dir="${bindist.build.dir}"/> + <mkdir dir="${bindist.lib.dir}/thirdparty/client"/> + <mkdir dir="${bindist.docs.dir}"/> + <mkdir dir="${bindist.tests.dir}"/> + + <!-- root --> + <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/etc/bindist.properties"/> + <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bindist-build.xml"/> + <copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/> + + <!-- build --> + <copy todir="${bindist.build.dir}"> + <fileset dir="${build.dir}"> + <include name="version.properties"/> + </fileset> + <fileset dir="${build.dir}/ant-import"> + <include name="build-testsuite.xml"/> + </fileset> + <fileset dir="${int.native.dir}/ant-import"> + <include name="macros-deploy-native.xml"/> + </fileset> + <fileset dir="${int.xfire.dir}/ant-import"> + <include name="macros-deploy-xfire.xml"/> + </fileset> + <fileset dir="${testsuite.dir}/ant-import"> + <include name="build-jars-jaxws.xml"/> + </fileset> + </copy> + + <!-- docs --> + <copy todir="${bindist.docs.dir}"> + <fileset dir="${build.dir}/etc"> + <include name="JBossORG-EULA.txt"/> + </fileset> + </copy> + + <!-- lib --> + <copy todir="${bindist.lib.dir}" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${int.xfire.dir}/output/lib"> + <include name="jbossws-context.war"/> + <include name="jbossws-xfire42.sar"/> + <include name="jbossws-xfire50.sar"/> + <include name="jbossws-xfire50-deployer.zip"/> + </fileset> + </copy> + <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> + <fileset dir="${int.xfire.dir}/thirdparty"/> + </copy> + <copy todir="${bindist.lib.dir}/thirdparty/client" overwrite="true"> + <fileset dir="${int.sunri.dir}/thirdparty"/> + </copy> + + <!-- tests --> + <copy todir="${bindist.tests.dir}" overwrite="true"> + <fileset dir="${testsuite.dir}/src"/> + <fileset dir="${int.xfire.dir}/src/test"/> + </copy> + + <zip destfile="${xfire.output.dir}/jbossws-xfire-${version.id}.zip"> + <fileset dir="${xfire.output.dir}" includes="jbossws-xfire-${version.id}/**"/> + </zip> + </target> + +</project> Property changes on: trunk/integration/xfire/ant-import/build-distro.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml (rev 0) +++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- Deployment JBoss50 --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-xfire50"> + <attribute name="spilibs"/> + <attribute name="jbosslibs"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + </fileset> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.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){stacklibs}/jbossws-xfire50-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; + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file=&quot;(a){stacklibs}/jbossws-context.war&quot; overwrite="true"/> + </sequential> + </macrodef> + + <!-- Remove jbossws/xfire from jboss50 --> + <macrodef name="macro-undeploy-xfire"> + <sequential> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> + </sequential> + </macrodef> + +</project> Property changes on: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/xfire/build.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -16,6 +16,7 @@ <import file="${basedir}/build/ant-import/build-setup.xml"/> <import file="${int.xfire.dir}/ant-import/build-deploy.xml"/> + <import file="${int.xfire.dir}/ant-import/build-distro.xml"/> <import file="${int.xfire.dir}/ant-import/build-release.xml"/> <import file="${int.xfire.dir}/ant-import/build-testsuite.xml"/> <import file="${int.xfire.dir}/ant-import/build-thirdparty.xml"/> @@ -144,7 +145,7 @@ <include name="xfire-all.jar"/> <include name="xfire-jsr181-api.jar"/> </fileset> - <metainf dir="${xfire.resources.dir}/jbossws-jboss50.sar/META-INF"> + <metainf dir="${xfire.resources.dir}/jbossws-xfire50.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> @@ -157,7 +158,7 @@ <fileset dir="${xfire.output.lib.dir}"> <include name="jbossws-xfire50.jar"/> </fileset> - <fileset dir="${xfire.resources.dir}/jbossws-jboss50.deployer"> + <fileset dir="${xfire.resources.dir}/jbossws-xfire50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> Property changes on: trunk/integration/xfire/src/main/etc ___________________________________________________________________ Name: svn:ignore + bindist-build.xml Copied: trunk/integration/xfire/src/main/resources/jbossws-xfire50.deployer (from rev 3219, trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer) Copied: trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar (from rev 3219, trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar) Modified: trunk/jbossws-core/ant-import/build-deploy.xml =================================================================== --- trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -15,12 +15,12 @@ <!-- Deploy jbossws to jboss50 --> <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws"> - <ant antfile="${int.jbws.dir}/build.xml" target="deploy-jboss50" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss50" inheritall="false"/> </target> <!-- Deploy jbossws to jboss42 --> <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws"> - <ant antfile="${int.jbws.dir}/build.xml" target="deploy-jboss42" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss42" inheritall="false"/> </target> </project> Modified: trunk/testsuite/ant-import/build-testsuite.xml =================================================================== --- trunk/testsuite/ant-import/build-testsuite.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/testsuite/ant-import/build-testsuite.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -1,6 +1,7 @@ <project> - <property name="tests.dir" value="${testsuite.dir}"/> + <property name="tests.dir" value="${testsuite.dir}/src"/> + <property name="tests.output.dir" value="${testsuite.dir}/output-tests"/> <import file="${build.dir}/ant-import/build-testsuite.xml"/> @@ -24,7 +25,7 @@ <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${tests.dir}/src"/> + <macro-copy-resources srcdir="${tests.dir}"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">