[jbossws-commits] JBossWS SVN: r3362 - in trunk/integration/sunri: src/main/etc and 1 other directory.

Author: heiko.braun(a)jboss.com Date: 2007-06-01 09:18:34 -0400 (Fri, 01 Jun 2007) New Revision: 3362 Modified: trunk/integration/sunri/ant-import/build-distro.xml trunk/integration/sunri/src/main/etc/bindist-build.xml Log: Deploy SPI from distribution Modified: trunk/integration/sunri/ant-import/build-distro.xml =================================================================== --- trunk/integration/sunri/ant-import/build-distro.xml 2007-06-01 13:14:42 UTC (rev 3361) +++ trunk/integration/sunri/ant-import/build-distro.xml 2007-06-01 13:18:34 UTC (rev 3362) @@ -13,92 +13,99 @@ <project> - <!-- ================================================================== --> - <!-- Binary distribution JBossWS/SunRI --> - <!-- ================================================================== --> - - <target name="binary-dist" depends="jars" description="Build the binary distribution"> - - <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> - <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> - - <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"/> + <!-- ================================================================== --> + <!-- Binary distribution JBossWS/SunRI --> + <!-- ================================================================== --> - <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}/dist/ant.properties.example"/> - <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="${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.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> - + <target name="binary-dist" depends="jars" description="Build the binary distribution"> + + <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> + <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> + + <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}/dist/ant.properties.example"/> + <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="${spi.dir}/ant-import"> + <include name="macros-deploy-spi.xml"/> + </fileset> + <fileset dir="${spi.dir}/etc"> + <include name="*.sh"/> + <include name="*.bat"/> + </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.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> Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-01 13:14:42 UTC (rev 3361) +++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-01 13:18:34 UTC (rev 3362) @@ -12,169 +12,181 @@ <!-- $Id$ --> <project default="main" basedir="." name="JBossWS/SunRI"> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <property name="build.dir" value="${basedir}/build"/> - <property name="docs.dir" value="${basedir}/docs"/> - <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"/> - <property file="${build.dir}/version.properties"/> - - <property name="jboss50.lib" value="${jboss50.home}/lib"/> - <property name="jboss50.client" value="${jboss50.home}/client"/> - <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> - <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> - <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> - <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> - - <property name="jboss42.lib" value="${jboss42.home}/lib"/> - <property name="jboss42.client" value="${jboss42.home}/client"/> - <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> - <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> - <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> - - <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> - <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> - - <available property="jboss50.available" file="${jboss50.available.file}"/> - <available property="jboss42.available" file="${jboss42.available.file}"/> - - <import file="${basedir}/build/build-testsuite.xml"/> - <import file="${basedir}/build/macros-deploy-native.xml"/> - <import file="${basedir}/build/macros-deploy-sunri.xml"/> - <import file="${basedir}/build/macros-deploy-xfire.xml"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="prepare"> - - <!-- Define jboss.home --> - <condition property="jboss.home" value="${jboss50.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - - <!-- Define excludesfile --> - <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - - </target> - - <target name="tests-init" depends="prepare,tests-classpath"> + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> - <path id="ws.stack.classpath"> - <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> - <pathelement location="${thirdparty.dir}/http.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> - <pathelement location="${thirdparty.dir}/jsr173_api.jar"/> - <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> - <pathelement location="${thirdparty.dir}/jsr250-api.jar"/> - <pathelement location="${thirdparty.dir}/resolver.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/sjsxp.jar"/> - <pathelement location="${thirdparty.dir}/stax-ex.jar"/> - <pathelement location="${thirdparty.dir}/streambuffer.jar"/> - <pathelement location="${thirdparty.dir}/wstx.jar"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${lib.dir}/jbossws-spi.jar"/> - </path> - - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> - </target> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources"> - <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> - - <!-- ================================================================== --> - <!-- Deployment --> - <!-- ================================================================== --> - - <!-- Deploy jbossws/sunri to jboss50 --> - <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50"> - <macro-undeploy-native50/> - <macro-undeploy-xfire50/> - <macro-deploy-sunri50 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}/thirdparty"/> - </target> - - <!-- Remove jbossws/sunri from jboss50 --> - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> - <macro-undeploy-sunri50/> - </target> - - <!-- Deploy jbossws/sunri to jboss42 --> - <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/sunri to jboss42"> - <macro-undeploy-native42/> - <macro-undeploy-xfire42/> - <macro-deploy-sunri42 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}/thirdparty"/> - </target> - - <!-- Remove jbossws/sunri from jboss42 --> - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> - <macro-undeploy-sunri42/> - </target> - - <!-- ================================================================== --> - <!-- Miscellaneous --> - <!-- ================================================================== --> - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" depends="most" description="Executes the default target (most)."/> - - <target name="most" depends="tests-main" description="Builds almost everything."/> - + <property name="build.dir" value="${basedir}/build"/> + <property name="docs.dir" value="${basedir}/docs"/> + <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"/> + <property file="${build.dir}/version.properties"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> + + <available property="jboss50.available" file="${jboss50.available.file}"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + + <import file="${basedir}/build/build-testsuite.xml"/> + <import file="${basedir}/build/macros-deploy-native.xml"/> + <import file="${basedir}/build/macros-deploy-sunri.xml"/> + <import file="${basedir}/build/macros-deploy-xfire.xml"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="prepare"> + + <!-- Define jboss.home --> + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + <!-- Define excludesfile --> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> + <pathelement location="${thirdparty.dir}/http.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> + <pathelement location="${thirdparty.dir}/jsr173_api.jar"/> + <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/jsr250-api.jar"/> + <pathelement location="${thirdparty.dir}/resolver.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> + <pathelement location="${thirdparty.dir}/sjsxp.jar"/> + <pathelement location="${thirdparty.dir}/stax-ex.jar"/> + <pathelement location="${thirdparty.dir}/streambuffer.jar"/> + <pathelement location="${thirdparty.dir}/wstx.jar"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${lib.dir}/jbossws-spi.jar"/> + </path> + + </target> + + <!-- ================================================================== --> + <!-- Compile --> + <!-- ================================================================== --> + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> + </target> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <!-- Copy resources --> + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + + <!-- ================================================================== --> + <!-- Deployment --> + <!-- ================================================================== --> + + <!-- Deploy jbossws/sunri to jboss50 --> + <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50"> + <macro-undeploy-native50/> + <macro-undeploy-xfire50/> + <macro-deploy-sunri50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${build.dir}" + thirdpartylibs="${lib.dir}"/> + </target> + + <!-- Remove jbossws/sunri from jboss50 --> + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> + <macro-undeploy-sunri50/> + <macro-undeploy-spi/> + </target> + + <!-- Deploy jbossws/sunri to jboss42 --> + <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/sunri to jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-xfire42/> + <macro-deploy-sunri42 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${build.dir}" + thirdpartylibs="${lib.dir}"/> + </target> + + <!-- Remove jbossws/sunri from jboss42 --> + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> + <macro-undeploy-sunri42/> + <macro-undeploy-spi/> + </target> + + <!-- ================================================================== --> + <!-- Miscellaneous --> + <!-- ================================================================== --> + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + </project>