Author: jim.ma Date: 2011-01-28 05:37:46 -0500 (Fri, 28 Jan 2011) New Revision: 13633 Removed: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss600.txt stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss601.txt Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml Log: Clean up exclude test files and zip binaray distribution in the stack.output.dir Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml 2011-01-28 10:20:07 UTC (rev 13632) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml 2011-01-28 10:37:46 UTC (rev 13633) @@ -18,6 +18,7 @@ <property name="dist.dir" value="${stack.dir}/modules/dist"/> <property name="dist.distro.dir" value="${dist.dir}/src/main/distro"/> <property name="dist.output.dir" value="${dist.dir}/target"/> + <property name="stack.output.dir" value="${stack.dir}/target"/> <property name="stack.modules.dir" value="${stack.dir}/modules"/> <property name="stack.management.dir" value="${stack.modules.dir}/management"/> <property name="stack.client.dir" value="${stack.modules.dir}/client"/> @@ -111,7 +112,7 @@ </exec> </target> - <target name="build-bin-dist" depends="prepare,os-init" description="Build the binary distribution"> + <target name="build-bin-dist" depends="prepare,os-init,makedir" description="Build the binary distribution"> <!-- Use a system property to overwrite the empty default value --> <property name="maven.opts" value=""/> @@ -121,10 +122,10 @@ <delete dir="${dist.output.dir}/jbossws-cxf-bin-dist"/> <exec dir="${basedir}" executable="${mvn}" failonerror="true"> - <arg line="${maven.opts} -Pdist -Dbindist install"/> + <arg line="${maven.opts} -Pdist -Dbindist clean install"/> </exec> - <zip destfile="${dist.output.dir}/jbossws-cxf-bin-dist.zip"> + <zip destfile="${stack.output.dir}/jbossws-cxf-bin-dist.zip"> <zipfileset dir="${dist.output.dir}/assembly/jbossws-cxf-bin-dist" includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example" @@ -132,12 +133,12 @@ </zip> </target> - <target name="build-src-dist" depends="prepare,os-init" description="Build the source distribution"> + <target name="build-src-dist" depends="prepare,os-init,makedir" description="Build the source distribution"> <!-- Use a system property to overwrite the empty default value --> <property name="maven.opts" value=""/> <echo/> - <echo message="${mvn} ${maven.opts} -Pdist -Dsrcdist install"/> + <echo message="${mvn} ${maven.opts} -Pdist -Dsrcdist clean install"/> <echo/> <delete dir="${dist.output.dir}/jbossws-cxf-src-dist"/> @@ -145,12 +146,21 @@ <arg line="${maven.opts} -Pdist -Dsrcdist install"/> </exec> - <zip destfile="${dist.output.dir}/jbossws-cxf-src-dist.zip"> + <zip destfile="${stack.output.dir}/jbossws-cxf-src-dist.zip"> <zipfileset dir="${dist.output.dir}/assembly/jbossws-cxf-src-dist" includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example .classpath .project" prefix="jbossws-cxf-src-dist"/> </zip> </target> + + + <target name="check.exist"> + <available file="${stack.output.dir}" property="file.exists" value="true" /> + </target> + + <target name="makedir" depends="check.exist" unless="file.exists"> + <mkdir dir="${stack.output.dir}" /> + </target> </project> Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-01-28 10:20:07 UTC (rev 13632) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-01-28 10:37:46 UTC (rev 13633) @@ -34,14 +34,13 @@ </includes> </fileSet> <fileSet> - <directory></directory> + <directory>../../</directory> <outputDirectory>jbossws-cxf-src-dist/</outputDirectory> <includes> <include>.classpath</include> <include>.project</include> <include>build.xml</include> <include>pom.xml</include> - <include>profiles.xml.example</include> </includes> </fileSet> </fileSets> Deleted: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss600.txt 2011-01-28 10:20:07 UTC (rev 13632) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss600.txt 2011-01-28 10:37:46 UTC (rev 13633) @@ -1,26 +0,0 @@ -# UsernameTestCase requires trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.* - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-2006] RespectBinding feature and not understood required extensibility elements -org/jboss/test/ws/jaxws/jbws2449/** - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2561] XOP request not properly inlined -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-2480] Soap attachments are dropped on server response -org/jboss/test/ws/jaxws/jbws1283/** - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBAS-8363] Virtual host issue in JBossWeb -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# Seems MSFT interop. endpoints are down :( -org/jboss/test/ws/jaxws/cxf/interop/wstrust10/** Deleted: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss601.txt 2011-01-28 10:20:07 UTC (rev 13632) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss601.txt 2011-01-28 10:37:46 UTC (rev 13633) @@ -1,26 +0,0 @@ -# UsernameTestCase requires trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.* - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-2006] RespectBinding feature and not understood required extensibility elements -org/jboss/test/ws/jaxws/jbws2449/** - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2561] XOP request not properly inlined -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-2480] Soap attachments are dropped on server response -org/jboss/test/ws/jaxws/jbws1283/** - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBAS-8363] Virtual host issue in JBossWeb -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# Seems MSFT interop. endpoints are down :( -org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**