Author: alessio.soldano(a)jboss.com Date: 2011-09-07 06:44:11 -0400 (Wed, 07 Sep 2011) New Revision: 14946 Modified: stack/native/trunk/build.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/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/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2011-09-07 09:14:26 UTC (rev 14945) +++ stack/native/trunk/build.xml 2011-09-07 10:44:11 UTC (rev 14946) @@ -117,12 +117,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> @@ -131,12 +131,12 @@ <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-native-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-native-bin-dist.zip"> @@ -152,12 +152,12 @@ <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="${stack.output.dir}/jbossws-native-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-native-src-dist.zip"> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-09-07 09:14:26 UTC (rev 14945) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-09-07 10:44:11 UTC (rev 14946) @@ -424,6 +424,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> @@ -565,6 +570,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> @@ -706,6 +716,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> @@ -877,6 +892,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/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2011-09-07 09:14:26 UTC (rev 14945) +++ stack/native/trunk/pom.xml 2011-09-07 10:44:11 UTC (rev 14946) @@ -529,6 +529,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> @@ -541,6 +546,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> @@ -553,6 +563,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> @@ -565,6 +580,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> @@ -601,6 +621,11 @@ --> <profile> <id>testsuite</id> + <activation> + <property> + <name>!no-testsuite</name> + </property> + </activation> <modules> <module>modules/testsuite</module> </modules>