Author: nickboldt Date: 2010-12-02 22:34:00 -0500 (Thu, 02 Dec 2010) New Revision: 27132 Modified: branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml Log: revert to using a collection of sites until component zip aggregator can use composite site instead Modified: branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml 2010-12-02 23:48:47 UTC (rev 27131) +++ branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml 2010-12-03 03:34:00 UTC (rev 27132) @@ -16,18 +16,12 @@ <properties> <!-- add more inputRepo# here, then reference below; need variables so that these can be referred to in Ant script later --> - <!-- <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/jbossto... - <inputRepo2>http://download.jboss.org/jbosstools/builds/staging/pi4soa-... - <inputRepo3>http://download.jboss.org/jbosstools/builds/staging/jbossto... - <inputRepo4>http://download.jboss.org/jbosstools/builds/staging/jbossto... - <inputRepo5>http://download.jboss.org/jbosstools/builds/staging/jbossto... - <inputRepo6>http://download.jboss.org/jbosstools/builds/staging/jbossto... - <inputRepo7>http://download.jboss.org/jbosstools/builds/staging/jbossto... - <inputRepo8>http://download.jboss.org/jbosstools/builds/staging/jbossto... - <inputRepos>1,2,3,4,5,6,7,8</inputRepos> --> - <!-- use a single composite site so adding more jobs' output is easier --> - <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_compos... - <inputRepos>1</inputRepos> + <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/jbossto... + <inputRepo2>http://download.jboss.org/jbosstools/builds/staging/jbossto... + <inputRepo3>http://download.jboss.org/jbosstools/builds/staging/jbossto... + <inputRepo4>http://download.jboss.org/jbosstools/builds/staging/jbossto... + <inputRepo5>http://download.jboss.org/jbosstools/builds/staging/jbossto... + <inputRepos>1,2,3,4,5</inputRepos> </properties> <build> @@ -44,11 +38,10 @@ <quiet>true</quiet> <tasks> <property name="inputRepo1" value="${inputRepo1}" /> - <!-- <property name="inputRepo2" value="${inputRepo2}" /> <property - name="inputRepo3" value="${inputRepo3}" /> <property name="inputRepo4" value="${inputRepo4}" - /> <property name="inputRepo5" value="${inputRepo5}" /> <property name="inputRepo6" - value="${inputRepo6}" /> <property name="inputRepo7" value="${inputRepo7}" - /> <property name="inputRepo8" value="${inputRepo8}" /> --> + <property name="inputRepo2" value="${inputRepo2}" /> + <property name="inputRepo3" value="${inputRepo3}" /> + <property name="inputRepo4" value="${inputRepo4}" /> + <property name="inputRepo5" value="${inputRepo5}" /> <property name="inputRepos" value="${inputRepos}" /> <!-- called AFTER generating update site + zip to add in extra content --> @@ -98,22 +91,47 @@ <enabled>true</enabled> </snapshots> </repository> - <!-- <repository> <id>inputRepo1</id> <url>${inputRepo1}/all/repo/</url> - <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> </repository> - <repository> <id>inputRepo2</id> <url>${inputRepo2}/all/repo/</url> <layout>p2</layout> - <snapshots> <enabled>true</enabled> </snapshots> </repository> <repository> - <id>inputRepo3</id> <url>${inputRepo3}/all/repo/</url> <layout>p2</layout> - <snapshots> <enabled>true</enabled> </snapshots> </repository> <repository> - <id>inputRepo4</id> <url>${inputRepo4}/all/repo/</url> <layout>p2</layout> - <snapshots> <enabled>true</enabled> </snapshots> </repository> <repository> - <id>inputRepo5</id> <url>${inputRepo5}/tools/</url> <layout>p2</layout> <snapshots> - <enabled>true</enabled> </snapshots> </repository> <repository> <id>inputRepo6</id> - <url>${inputRepo6}/tools/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> - </snapshots> </repository> <repository> <id>inputRepo7</id> <url>${inputRepo7}/tools/</url> - <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> </repository> - <repository> <id>inputRepo8</id> <url>${inputRepo8}/tools/</url> <layout>p2</layout> - <snapshots> <enabled>true</enabled> </snapshots> </repository> --> <repository> + <id>inputRepo1</id> + <url>${inputRepo1}/all/repo/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>inputRepo2</id> + <url>${inputRepo2}/all/repo/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>inputRepo3</id> + <url>${inputRepo3}/all/repo/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>inputRepo4</id> + <url>${inputRepo4}/all/repo/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>inputRepo5</id> + <url>${inputRepo5}/tools/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> <id>helios</id> <url>http://download.eclipse.org/releases/helios/</url> <layout>p2</layout>