Author: alessio.soldano(a)jboss.com Date: 2011-09-07 05:14:26 -0400 (Wed, 07 Sep 2011) New Revision: 14945 Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3215] Automatically enable jbossXYZ profiles depending on the jbossXYZ.home property provided and automatically enable testsuite profile unless no-testsuite property provided Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2011-09-07 09:04:48 UTC (rev 14944) +++ stack/cxf/trunk/build.xml 2011-09-07 09:14:26 UTC (rev 14945) @@ -119,12 +119,12 @@ <property name="maven.opts" value=""/> <echo/> - <echo message="${mvn} ${maven.opts} -Pdist install"/> + <echo message="${mvn} ${maven.opts} -Pdist -Dno-testsuite install"/> <echo/> <delete dir="${deploy.artifacts.dir}"/> <exec dir="${basedir}" executable="${mvn}" failonerror="true"> - <arg line="${maven.opts} -Pdist install"/> + <arg line="${maven.opts} -Pdist -Dno-testsuite install"/> </exec> </target> @@ -133,12 +133,12 @@ <!-- Use a system property to overwrite the empty default value --> <property name="maven.opts" value=""/> <echo/> - <echo message="${mvn} ${maven.opts} -Pdist -Dbindist install"/> + <echo message="${mvn} ${maven.opts} -Pdist -Dbindist -Dno-testsuite install"/> <echo/> <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 -Dno-testsuite install"/> </exec> <zip destfile="${stack.output.dir}/jbossws-cxf-bin-dist.zip"> @@ -154,12 +154,12 @@ <!-- 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 -Dno-testsuite install"/> <echo/> <delete dir="${dist.output.dir}/jbossws-cxf-src-dist"/> <exec dir="${basedir}" executable="${mvn}" failonerror="true"> - <arg line="${maven.opts} -Pdist -Dsrcdist install"/> + <arg line="${maven.opts} -Pdist -Dsrcdist -Dno-testsuite install"/> </exec> <zip destfile="${stack.output.dir}/jbossws-cxf-src-dist.zip"> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-09-07 09:04:48 UTC (rev 14944) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-09-07 09:14:26 UTC (rev 14945) @@ -575,6 +575,11 @@ --> <profile> <id>jboss600</id> + <activation> + <property> + <name>jboss600.home</name> + </property> + </activation> <properties> <jboss.version>6.0.0.Final</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> @@ -752,6 +757,11 @@ --> <profile> <id>jboss610</id> + <activation> + <property> + <name>jboss610.home</name> + </property> + </activation> <properties> <jboss.version>6.1.0.Final</jboss.version> <jbossws.integration.target>jboss610</jbossws.integration.target> @@ -929,6 +939,11 @@ --> <profile> <id>jboss700</id> + <activation> + <property> + <name>jboss700.home</name> + </property> + </activation> <properties> <jboss.version>7.0.0.Final</jboss.version> <jbossws.integration.target>jboss700</jbossws.integration.target> @@ -1120,6 +1135,11 @@ --> <profile> <id>jboss710</id> + <activation> + <property> + <name>jboss710.home</name> + </property> + </activation> <properties> <jboss.version>7.1.0.Alpha1-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss710</jbossws.integration.target> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-09-07 09:04:48 UTC (rev 14944) +++ stack/cxf/trunk/pom.xml 2011-09-07 09:14:26 UTC (rev 14945) @@ -1273,6 +1273,11 @@ --> <profile> <id>jboss600</id> + <activation> + <property> + <name>jboss600.home</name> + </property> + </activation> <properties> <jbossws.integration.target>jboss600</jbossws.integration.target> <jboss.home>${jboss600.home}</jboss.home> @@ -1285,6 +1290,11 @@ --> <profile> <id>jboss610</id> + <activation> + <property> + <name>jboss610.home</name> + </property> + </activation> <properties> <jbossws.integration.target>jboss610</jbossws.integration.target> <jboss.home>${jboss610.home}</jboss.home> @@ -1297,6 +1307,11 @@ --> <profile> <id>jboss700</id> + <activation> + <property> + <name>jboss700.home</name> + </property> + </activation> <properties> <jbossws.integration.target>jboss700</jbossws.integration.target> <jboss.home>${jboss700.home}</jboss.home> @@ -1309,6 +1324,11 @@ --> <profile> <id>jboss710</id> + <activation> + <property> + <name>jboss710.home</name> + </property> + </activation> <properties> <jbossws.integration.target>jboss710</jbossws.integration.target> <jboss.home>${jboss710.home}</jboss.home> @@ -1344,6 +1364,11 @@ --> <profile> <id>testsuite</id> + <activation> + <property> + <name>!no-testsuite</name> + </property> + </activation> <modules> <module>modules/testsuite</module> </modules>