[jbossws-commits] JBossWS SVN: r6717 - in stack/cxf/trunk: src/main/distro and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-28 06:11:01 -0400 (Mon, 28 Apr 2008) New Revision: 6717 Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/src/main/distro/ant.properties stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/distro/build-setup.xml stack/cxf/trunk/src/main/distro/build.xml stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml Log: More work on bin-dist Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/build.xml 2008-04-28 10:11:01 UTC (rev 6717) @@ -32,6 +32,7 @@ <import file="${stack.distro.dir}/jbossws-deploy-macros.xml"/> <property name="jbossws.default.deploy.conf" value="${stack.distro.dir}/jbossws-default-deploy.conf"/> + <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- ================================================================== --> <!-- Initialization --> @@ -42,24 +43,10 @@ <property name="version.id" value="${project.version}"/> <echo message="version.id=${version.id}"/> - <echo message="jbossid=${jbossws.integration.target}"/> + <echo message="deploy.target=${jbossws.deploy.target}"/> - <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> - - <condition property="jbossws.integration.jboss42" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </or> - </condition> - <condition property="jbossws.integration.jboss50" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> - - <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/> + <fail message="jbossws.deploy.target not set" unless="jbossws.deploy.target"/> + <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.deploy.target}"/> </target> <!-- ================================================================== --> Modified: stack/cxf/trunk/src/main/distro/ant.properties =================================================================== --- stack/cxf/trunk/src/main/distro/ant.properties 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/src/main/distro/ant.properties 2008-04-28 10:11:01 UTC (rev 6717) @@ -9,9 +9,6 @@ jboss500.home=(a)jboss500.home@ jboss501.home=(a)jboss501.home@ -# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501] -jbossws.integration.target=jboss422 - # The JBoss settings jboss.server.instance=default jboss.bind.address=localhost Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-28 10:11:01 UTC (rev 6717) @@ -33,6 +33,7 @@ <target name="target-jboss422"> <property name="jbossws.integration.target" value="jboss422"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422"> @@ -54,6 +55,7 @@ <target name="target-jboss423"> <property name="jbossws.integration.target" value="jboss423"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423"> @@ -89,6 +91,7 @@ <target name="target-jboss500"> <property name="jbossws.integration.target" value="jboss500"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> @@ -102,7 +105,6 @@ <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - <macro-undeploy-deployer targetdir="${jboss500.server.deploy}/jbossws.sar"/> </target> <!-- ================================================================== --> @@ -111,6 +113,7 @@ <target name="target-jboss501"> <property name="jbossws.integration.target" value="jboss501"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> @@ -124,7 +127,6 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - <macro-undeploy-deployer targetdir="${jboss501.server.deploy}/jbossws.sar"/> </target> <!-- ================================================================== --> Modified: stack/cxf/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2008-04-28 10:11:01 UTC (rev 6717) @@ -63,6 +63,10 @@ <!-- ================================================================== --> <target name="prepare"> + + <!-- Load jbossws.integration.target properties --> + <property file="${target.properties.file}"/> + <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> Modified: stack/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/src/main/distro/build.xml 2008-04-28 10:11:01 UTC (rev 6717) @@ -26,24 +26,21 @@ <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> + <property name="target.properties.file" value="${basedir}/target.properties"/> <import file="${build.dir}/build-setup.xml"/> <import file="${build.dir}/build-deploy.xml"/> <import file="${build.dir}/jbossws-deploy-macros.xml"/> <import file="${tests.dir}/ant-import/build-testsuite.xml"/> - <!-- Define excludesfile --> - <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> - <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> <target name="init" depends="prepare"> - <echo message="jbossid=${jbossws.integration.target}"/> - <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> + <echo message="integration.target=${jbossws.integration.target}"/> <condition property="jbossws.integration.jboss42" value="true"> <or> @@ -59,6 +56,7 @@ </condition> <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/> + <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> </target> <target name="tests-init" depends="init,tests-classpath"> Modified: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-28 10:11:01 UTC (rev 6717) @@ -359,8 +359,8 @@ <!-- delete stale container integration jars --> <delete> - <fileset dir="${jboss.server.home}/lib"> - <include name="jbossws-jboss*.jar"/> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> </fileset> <fileset dir="${jboss.home}/client"> <include name="jbossws-jboss*.jar"/> @@ -378,16 +378,4 @@ </sequential> </macrodef> - <macrodef name="macro-undeploy-deployer"> - <attribute name="targetdir"/> - <sequential> - <property name="jboss.server.home" value="@{targetdir}/../.."/> - <delete> - <fileset dir="${jboss.server.home}/deployers/jbossws.deployer"> - <include name="jbossws-jboss*.jar"/> - </fileset> - </delete> - </sequential> - </macrodef> - </project> \ No newline at end of file Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-28 10:08:20 UTC (rev 6716) +++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-28 10:11:01 UTC (rev 6717) @@ -67,6 +67,7 @@ <dependencySet> <outputDirectory>tests</outputDirectory> <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> <unpack>true</unpack> <includes> <include>*:jbossws-framework:zip:testsuite</include>