Author: nickboldt Date: 2011-09-21 20:26:00 -0400 (Wed, 21 Sep 2011) New Revision: 34939 Modified: trunk/build/aggregate/bottests-site/site/build.xml trunk/build/aggregate/bottests-site/site/pom.xml trunk/build/aggregate/site/build.xml trunk/build/aggregate/site/pom.xml trunk/build/aggregate/soa-site/build.xml trunk/build/aggregate/soa-site/pom.xml trunk/build/aggregate/webtools-site/build.xml trunk/build/aggregate/webtools-site/pom.xml Log: https://issues.jboss.org/browse/JBIDE-9743 pass JBT_VERSION into ant scripts; update example code for test-running locally Modified: trunk/build/aggregate/bottests-site/site/build.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/build.xml 2011-09-22 00:16:30 UTC (rev 34938) +++ trunk/build/aggregate/bottests-site/site/build.xml 2011-09-22 00:26:00 UTC (rev 34939) @@ -1,9 +1,7 @@ <project default="custom.build" name="jbosstools aggregate site build.xml"> - - <!-- pass in properties to Maven/Ant via Hudson job: - -DJOB_NAME=${JOB_NAME} - -DBUILD_ID=${BUILD_ID} - -DBUILD_NUMBER=${BUILD_NUMBER} + <!-- + To test output, run maven in this folder: + $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.bottests.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" --> <!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. --> @@ -430,20 +428,11 @@ <target name="add.web.content"> <!-- - Properties needed for index.html are defined in aggregateSite.properties - update.site.description=Nightly Build - update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 - - or calculated here + Properties calculated here from ${JOB_NAME} = jbosstools-3.2.0.M1.aggregate get 3.2.0.M1 from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER} default update.site.description=Nightly Build default update.site.version=(null) - - To test output, run in parent folder (bottests-site/): - $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.bottests.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 - or - $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.bottests.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" --> <property name="update.site.description" value="Nightly Build" /> <if> Modified: trunk/build/aggregate/bottests-site/site/pom.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/pom.xml 2011-09-22 00:16:30 UTC (rev 34938) +++ trunk/build/aggregate/bottests-site/site/pom.xml 2011-09-22 00:26:00 UTC (rev 34939) @@ -31,6 +31,7 @@ <quiet>true</quiet> <tasks> <!-- called AFTER generating update site + zip to add in extra content --> + <property name="JBT_VERSION" value="${JBT_VERSION}"/> <ant antfile="build.xml"/> </tasks> Modified: trunk/build/aggregate/site/build.xml =================================================================== --- trunk/build/aggregate/site/build.xml 2011-09-22 00:16:30 UTC (rev 34938) +++ trunk/build/aggregate/site/build.xml 2011-09-22 00:26:00 UTC (rev 34939) @@ -1,9 +1,7 @@ <project default="custom.build" name="jbosstools aggregate site build.xml"> - - <!-- pass in properties to Maven/Ant via Hudson job: - -DJOB_NAME=${JOB_NAME} - -DBUILD_ID=${BUILD_ID} - -DBUILD_NUMBER=${BUILD_NUMBER} + <!-- + To test output, run maven in this folder: + $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" --> <!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. --> @@ -429,11 +427,7 @@ <target name="add.web.content"> <!-- - Properties needed for index.html are defined in aggregateSite.properties - update.site.description=Nightly Build - update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 - - or calculated here + Properties calculated here from ${JOB_NAME} = jbosstools-3.2.0.M1.aggregate get 3.2.0.M1 from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER} default update.site.description=Nightly Build Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2011-09-22 00:16:30 UTC (rev 34938) +++ trunk/build/aggregate/site/pom.xml 2011-09-22 00:26:00 UTC (rev 34939) @@ -33,10 +33,10 @@ <configuration> <quiet>true</quiet> <tasks> + <!-- called AFTER generating update site + zip to add in extra content --> <property name="inputRepo1" value="${inputRepo1}"/> <property name="inputRepos" value="${inputRepos}"/> - - <!-- called AFTER generating update site + zip to add in extra content --> + <property name="JBT_VERSION" value="${JBT_VERSION}"/> <ant antfile="build.xml"/> </tasks> Modified: trunk/build/aggregate/soa-site/build.xml =================================================================== --- trunk/build/aggregate/soa-site/build.xml 2011-09-22 00:16:30 UTC (rev 34938) +++ trunk/build/aggregate/soa-site/build.xml 2011-09-22 00:26:00 UTC (rev 34939) @@ -1,9 +1,7 @@ <project default="custom.build" name="jbosstools aggregate site build.xml"> - - <!-- pass in properties to Maven/Ant via Hudson job: - -DJOB_NAME=${JOB_NAME} - -DBUILD_ID=${BUILD_ID} - -DBUILD_NUMBER=${BUILD_NUMBER} + <!-- + To test output, run maven in this folder: + $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.soa-tooling.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" --> <!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. --> @@ -429,11 +427,7 @@ <target name="add.web.content"> <!-- - Properties needed for index.html are defined in aggregateSite.properties - update.site.description=Nightly Build - update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 - - or calculated here + Properties calculated here from ${JOB_NAME} = jbosstools-3.2.0.M1.aggregate get 3.2.0.M1 from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER} default update.site.description=Nightly Build Modified: trunk/build/aggregate/soa-site/pom.xml =================================================================== --- trunk/build/aggregate/soa-site/pom.xml 2011-09-22 00:16:30 UTC (rev 34938) +++ trunk/build/aggregate/soa-site/pom.xml 2011-09-22 00:26:00 UTC (rev 34939) @@ -38,10 +38,10 @@ <configuration> <quiet>true</quiet> <tasks> + <!-- called AFTER generating update site + zip to add in extra content --> <property name="inputRepo1" value="${inputRepo1}"/> <property name="inputRepos" value="${inputRepos}"/> - - <!-- called AFTER generating update site + zip to add in extra content --> + <property name="JBT_VERSION" value="${JBT_VERSION}"/> <ant antfile="build.xml"/> </tasks> Modified: trunk/build/aggregate/webtools-site/build.xml =================================================================== --- trunk/build/aggregate/webtools-site/build.xml 2011-09-22 00:16:30 UTC (rev 34938) +++ trunk/build/aggregate/webtools-site/build.xml 2011-09-22 00:26:00 UTC (rev 34939) @@ -1,9 +1,7 @@ <project default="custom.build" name="jbosstools aggregate site build.xml"> - - <!-- pass in properties to Maven/Ant via Hudson job: - -DJOB_NAME=${JOB_NAME} - -DBUILD_ID=${BUILD_ID} - -DBUILD_NUMBER=${BUILD_NUMBER} + <!-- + To test output, run maven in this folder: + $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.webtools.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" --> <!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. --> @@ -430,20 +428,11 @@ <target name="add.web.content"> <!-- - Properties needed for index.html are defined in aggregateSite.properties - update.site.description=Nightly Build - update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 - - or calculated here + Properties calculated here from ${JOB_NAME} = jbosstools-3.2.0.M1.aggregate get 3.2.0.M1 from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER} default update.site.description=Nightly Build default update.site.version=(null) - - To test output, run in parent folder (bottests-site/): - $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.webtools.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 - or - $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.webtools.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" --> <property name="update.site.description" value="Nightly Build" /> <if> Modified: trunk/build/aggregate/webtools-site/pom.xml =================================================================== --- trunk/build/aggregate/webtools-site/pom.xml 2011-09-22 00:16:30 UTC (rev 34938) +++ trunk/build/aggregate/webtools-site/pom.xml 2011-09-22 00:26:00 UTC (rev 34939) @@ -30,6 +30,7 @@ <configuration> <quiet>true</quiet> <tasks> + <property name="JBT_VERSION" value="${JBT_VERSION}"/> <!-- called AFTER generating update site + zip to add in extra content --> <ant antfile="build.xml"/> </tasks>