Author: nickboldt Date: 2011-06-16 19:03:45 -0400 (Thu, 16 Jun 2011) New Revision: 32153 Modified: trunk/build/aggregate/site/pom.xml trunk/build/aggregate/soa-site/pom.xml trunk/build/parent/pom.xml trunk/build/results/build.xml Log: switch from staging/_composite_/3.3.indigo to staging/_composite_/trunk Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2011-06-16 22:39:25 UTC (rev 32152) +++ trunk/build/aggregate/site/pom.xml 2011-06-16 23:03:45 UTC (rev 32153) @@ -15,7 +15,8 @@ <properties> <!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs which need to be called by Ant script later --> - <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_compos... + <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> + <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_compos... <inputRepos>1</inputRepos> </properties> @@ -109,4 +110,4 @@ </releases> </repository> </repositories> -</project> \ No newline at end of file +</project> Modified: trunk/build/aggregate/soa-site/pom.xml =================================================================== --- trunk/build/aggregate/soa-site/pom.xml 2011-06-16 22:39:25 UTC (rev 32152) +++ trunk/build/aggregate/soa-site/pom.xml 2011-06-16 23:03:45 UTC (rev 32153) @@ -15,7 +15,8 @@ <properties> <!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs which need to be called by Ant script later --> - <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_compos... + <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> + <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_compos... <inputRepos>1</inputRepos> </properties> Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2011-06-16 22:39:25 UTC (rev 32152) +++ trunk/build/parent/pom.xml 2011-06-16 23:03:45 UTC (rev 32153) @@ -35,11 +35,11 @@ <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e37RC2-wtp33RC2.target/</local.site> <!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) --> - <!-- for trunk use trunk; for 3.3_stable_branch, use 3.3.indigo --> + <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> <jbosstools-nightly-staging-composite>http://download.jboss.org/jbossto... <!-- 2b. or use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ --> - <!-- for trunk use trunk; for 3.3_stable_branch, use 3.3.indigo --> + <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/trunk/</local.composite> <!-- 3a. URL of latest JBT requirements composite mirror --> Modified: trunk/build/results/build.xml =================================================================== --- trunk/build/results/build.xml 2011-06-16 22:39:25 UTC (rev 32152) +++ trunk/build/results/build.xml 2011-06-16 23:03:45 UTC (rev 32153) @@ -116,7 +116,8 @@ <ant target="collect.zips" antfile="../aggregate/site/build.xml"> <property name="inputRepos" value="2" /> <property name="inputRepo1" value="file://${input.dir}/all/repo/" /> - <property name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/_composit... /> + <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> + <property name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/_composit... /> </ant> <ant target="collect.metadata" antfile="../aggregate/site/build.xml"> </ant> @@ -127,7 +128,8 @@ <property name="isTest" value="true" /> <ant target="collect.zips" antfile="../aggregate/site/build.xml"> <property name="inputRepos" value="1" /> - <property name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composit... /> + <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> + <property name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composit... /> </ant> <ant target="collect.metadata" antfile="../aggregate/site/build.xml"> </ant>