Index: aggregateRepos.jbosstools.properties
===================================================================
--- aggregateRepos.jbosstools.properties (revision 6418)
+++ aggregateRepos.jbosstools.properties (working copy)
@@ -2,11 +2,11 @@
# basic config when used in JBT/JBDS build
eclipse.home=${clean.eclipse.home}
-working.dir=${product.build.directory}/buckminster.aggregator
+working.dir=${product.build.directory}/b3.aggregator
# basic config when testing on local - be sure to replace reference to ${updateZip} with local JBT/JBDS update site zip
-#eclipse.home=/home/nboldt/eclipse/35clean/eclipse
-#working.dir=/tmp/build.bucky.aggregator
+#eclipse.home=/home/nboldt/eclipse/36clean2/eclipse
+#working.dir=/tmp/build.b3.aggregator
# optional config when testing on local
#requirement.build.root=${working.dir}
#update.site.product.name=JBoss Tools
@@ -17,18 +17,15 @@
repoName=${update.site.product.name} ${update.site.description} Update Site
#product.versionTag=3.1.0.v200910281633N-RC1
-#TODO: switch to NEW way: eclipse 3.6 + b3 aggregator
-#buckminster.aggregator.repo=http://download.jboss.org/jbosstools/requirements/helios/b3.aggregator-repo-0.1.0.r01001_e36.zip
-#buckminster.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones/,http://download.eclipse.org/releases/helios/,http://download.jboss.org/jbosstools/requirements/helios/buckminster-repo-1.3.0.r11439_e36.zip
+# location from which to install b3 aggregator
+b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/helios/b3.aggregator-repo-0.1.0.r01001_e36.zip
+b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones/,http://download.eclipse.org/releases/helios/,http://download.jboss.org/jbosstools/requirements/helios/buckminster-repo-1.3.0.r11439_e36.zip
-# OLD way: eclipse 3.5 + bucky aggregator
-buckminster.aggregator.repo=http://repository.jboss.org/eclipse/galileo/repos/buckminster-updates-3.5_20100125-r11098.zip
-buckminster.backup.repos=http://download.eclipse.org/eclipse/updates/3.5/,http://download.eclipse.org/releases/galileo/
-
# repos to aggregate - local paths require jar:file:/path/to.zip!/
# repos to aggregate - remote paths to a zip will be prefetched and treated as local repo archive
#jar:file:${product.build.directory}/all/${updateZip}!/,\
#jar:file:${working.dir}/JBossTools-Update-3.1.0.v201002111546N-H238-CR2.zip!/,\
+# http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1-Update-SNAPSHOT.zip,\
repos=\
jar:file:${product.build.directory}/all/${updateZip}!/,\
http://hudson.qa.jboss.com/hudson/view/DevStudio_CBI/job/jbosstools-cbi-jbpm3/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/jbpm3-Update-N-SNAPSHOT.zip,\
@@ -41,9 +38,11 @@
#http://hudson.qa.jboss.com/hudson/view/DevStudio_CBI/job/jbosstools-cbi-jmx/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/JMX-Update-N-SNAPSHOT.zip
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/galileo/,\
-http://download.eclipse.org/birt/update-site/2.5/,\
-http://download.eclipse.org/eclipse/updates/3.5/,\
+associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\
+http://download.eclipse.org/birt/update-site/2.6-interim/,\
+http://download.eclipse.org/birt/update-site/2.6/,\
+http://download.eclipse.org/eclipse/updates/3.6milestones/,\
+http://download.eclipse.org/eclipse/updates/3.6/,\
http://m2eclipse.sonatype.org/sites/m2e/,\
http://m2eclipse.sonatype.org/sites/m2e-extras/,\
http://subclipse.tigris.org/update_1.6.x/,\
Index: aggregateRepos.jbds.properties
===================================================================
--- aggregateRepos.jbds.properties (revision 6406)
+++ aggregateRepos.jbds.properties (working copy)
@@ -2,11 +2,11 @@
# basic config when used in JBT/JBDS build
eclipse.home=${clean.eclipse.home}
-working.dir=${product.build.directory}/buckminster.aggregator
+working.dir=${product.build.directory}/b3.aggregator
# basic config when testing on local - be sure to replace reference to ${updateZip} with local JBT/JBDS update site zip
-#eclipse.home=/home/nboldt/eclipse/35clean/eclipse
-#working.dir=/tmp/build.bucky.aggregator
+#eclipse.home=/home/nboldt/eclipse/36clean2/eclipse
+#working.dir=/tmp/build.b3.aggregator
# optional config when testing on local
#requirement.build.root=${working.dir}
#update.site.product.name=JBoss Tools
@@ -17,17 +17,15 @@
repoName=${update.site.product.name} ${update.site.description} Update Site
#product.versionTag=3.1.0.v200910281633N-RC1
-# location from which to install Buckminster: from canned repo zip
-buckminster.aggregator.repo=http://repository.jboss.org/eclipse/galileo/repos/buckminster-updates-3.5_20100125-r11098.zip
-buckminster.backup.repos=http://download.eclipse.org/eclipse/updates/3.5/,http://download.eclipse.org/releases/galileo/
-# location from which to install Buckminster: from live repo site
-#buckminster.aggregator.repo=http://download.eclipse.org/tools/buckminster/updates-3.5/
-#buckminster.backup.repos=http://download.eclipse.org/eclipse/updates/3.5/,http://download.eclipse.org/releases/galileo/
+# location from which to install b3 aggregator
+b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/helios/b3.aggregator-repo-0.1.0.r01001_e36.zip
+b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones/,http://download.eclipse.org/releases/helios/,http://download.jboss.org/jbosstools/requirements/helios/buckminster-repo-1.3.0.r11439_e36.zip
# repos to aggregate - local paths require jar:file:/path/to.zip!/
# repos to aggregate - remote paths to a zip will be prefetched and treated as local repo archive
#jar:file:${product.build.directory}/all/${updateZip}!/,\
#jar:file:${working.dir}/JBossTools-Update-3.1.0.v201002111546N-H238-CR2.zip!/,\
+# http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1-Update-SNAPSHOT.zip,\
repos=\
jar:file:${product.build.directory}/all/${updateZip}!/,\
http://hudson.qa.jboss.com/hudson/view/DevStudio_CBI/job/jbosstools-cbi-jbpm3/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/jbpm3-Update-N-SNAPSHOT.zip
@@ -35,9 +33,11 @@
#http://hudson.qa.jboss.com/hudson/view/DevStudio_CBI/job/jbosstools-cbi-jmx/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/JMX-Update-N-SNAPSHOT.zip
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/galileo/,\
-http://download.eclipse.org/birt/update-site/2.5/,\
-http://download.eclipse.org/eclipse/updates/3.5/,\
+associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\
+http://download.eclipse.org/birt/update-site/2.6-interim/,\
+http://download.eclipse.org/birt/update-site/2.6/,\
+http://download.eclipse.org/eclipse/updates/3.6milestones/,\
+http://download.eclipse.org/eclipse/updates/3.6/,\
http://m2eclipse.sonatype.org/sites/m2e/,\
http://m2eclipse.sonatype.org/sites/m2e-extras/
Index: aggregateRepos.xml
===================================================================
--- aggregateRepos.xml (revision 6413)
+++ aggregateRepos.xml (working copy)
@@ -6,9 +6,9 @@
-
+
@@ -17,16 +17,16 @@
-
+
@@ -67,27 +67,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -101,13 +97,13 @@
-
+
-
+
-
-
@@ -167,9 +163,9 @@
- <?xml version="1.0" encoding="UTF-8"?>
+ <?xml version="1.0" encoding="UTF-8"?>
<aggregator:Aggregator xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:aggregator="http://www.eclipse.org/buckminster/2009/aggregator"
+ xmlns:aggregator="http://www.eclipse.org/b3/2010/aggregator/1.0.0"
buildmaster="//@contacts[email='nickboldt@gmail.com']"
label="${repoName}" buildRoot="${working.dir}/output"
packedStrategy="COPY" type="N" mavenResult="false">
@@ -180,45 +176,45 @@
- <configurations operatingSystem="linux" windowSystem="gtk"/>
+ <configurations operatingSystem="linux" windowSystem="gtk"/>
- <configurations operatingSystem="win32" windowSystem="win32"/>
+ <configurations operatingSystem="win32" windowSystem="win32"/>
- <configurations operatingSystem="linux" windowSystem="gtk" architecture="x86_64"/>
+ <configurations operatingSystem="linux" windowSystem="gtk" architecture="x86_64"/>
- <configurations operatingSystem="macosx" windowSystem="carbon" architecture="x86"/>
+ <configurations operatingSystem="macosx" windowSystem="carbon" architecture="x86"/>
- <configurations operatingSystem="macosx" windowSystem="cocoa" architecture="x86"/>
+ <configurations operatingSystem="macosx" windowSystem="cocoa" architecture="x86"/>
-
+
-
+
<contributions label="repos" contacts="//@contacts[email='nickboldt@gmail.com']">
@@ -243,9 +239,8 @@
regexp=".+/([^/]+.zip)"
replace="\1"
/>
-
+
<repositories location="@{repo}">
- <metadataRepository href="p2:@{repo}#//@metadataRepository"/>
@@ -317,7 +312,7 @@
- </repositories>
+ </repositories>
@@ -326,7 +321,7 @@
- </contributions>
+ </contributions>
@@ -342,7 +337,7 @@
override="true"
/>
- <customCategories
+ <customCategories
identifier="@{custom.category.id}"
label="${custom.category.label.@{custom.category.id}}"
description="${custom.category.description.@{custom.category.id}}"
@@ -362,17 +357,15 @@
-
- <validationRepositories location="@{associate.site}">
- <metadataRepository href="p2:@{associate.site}#//@metadataRepository"/>
- </validationRepositories>
+
+ <validationRepositories location="@{associate.site}" />
- </aggregator:Aggregator>
+ </aggregator:Aggregator>
@@ -490,14 +483,12 @@
- <features categories="${featureID.categories}">
- <installableUnit href="p2:jar:file:${repoFile}!/#//@metadataRepository/@installableUnits[id='${featureID}.feature.group',version='${featureVersion}']"/>
- </features>
+ <features categories="${featureID.categories}" name="${featureID}.feature.group" versionRange="${featureVersion}" />
- ${featureID}_${featureVersion}: add @repositories.${repoID}/@features.${featureID.num} to ${featureID.categories}
+ ${featureID}_${featureVersion}: add @repositories.${repoID}/@features.${featureID.num} to ${featureID.categories}
- ${featureID}_${featureVersion} already added.
+ ${featureID}_${featureVersion} already added.
-
-
-
+
+
+
+
@@ -588,7 +580,7 @@
-
+