[jbosstools-commits] JBoss Tools SVN: r23077 - trunk/build/aggregate.

[jbosstools-commits at lists.jboss.org]

Author: nickboldt
Date: 2010-06-28 23:36:20 -0400 (Mon, 28 Jun 2010)
New Revision: 23077

Modified:
   trunk/build/aggregate/aggregateRepos.jbosstools.properties
   trunk/build/aggregate/aggregateRepos.xml
Log:
fix resulting zip name; fix input update sites and assoc sites

Modified: trunk/build/aggregate/aggregateRepos.jbosstools.properties
===================================================================
--- trunk/build/aggregate/aggregateRepos.jbosstools.properties	2010-06-29 00:57:32 UTC (rev 23076)
+++ trunk/build/aggregate/aggregateRepos.jbosstools.properties	2010-06-29 03:36:20 UTC (rev 23077)
@@ -25,23 +25,26 @@
 # repos to aggregate - remote paths to a zip will be prefetched and treated as local repo archive
 # http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1-Update-SNAPSHOT.zip,\
 repos=\
-http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1.helios-Update-SNAPSHOT.zip,\
-http://hudson.qa.jboss.com/hudson/view/DevStudio_CBI/job/jbosstools-cbi-pi4soa/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/pi4soa-Update-N-SNAPSHOT.zip,\
+http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1-Update-SNAPSHOT.zip,\
+http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-cbi-pi4soa-Update-SNAPSHOT.zip,\
 http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-teiid-designer-Update-SNAPSHOT.zip
 
 # associate sites to add to the resulting repo 
 associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\
-http://download.eclipse.org/eclipse/updates/3.6milestones/,\
 http://download.eclipse.org/eclipse/updates/3.6/,\
-http://download.eclipse.org/birt/update-site/2.6-interim/,\
 http://download.eclipse.org/birt/update-site/2.6/,\
 http://download.eclipse.org/tptp/updates/galileo/,\
 http://m2eclipse.sonatype.org/sites/m2e/,\
 http://m2eclipse.sonatype.org/sites/m2e-extras/,\
-http://subclipse.tigris.org/update_1.6.x/,\ 
-http://download.eclipse.org/technology/subversive/0.7/update-site/,\ 
-http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/
+http://subclipse.tigris.org/update_1.6.x/,\
+http://download.eclipse.org/technology/subversive/0.7/update-site/,\
+http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/,\
+http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/updateSite/,\
+http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2
 
+#http://download.eclipse.org/birt/update-site/2.6-interim/,\
+#http://download.eclipse.org/eclipse/updates/3.6milestones/,\
+
 # category to feature mappings: need a list of unique categoryIDs, then the list of features to assign to each category
 categories=AllTools2,DataTools2
 AllTools2.features=org.pi4soa.core.feature,\

Modified: trunk/build/aggregate/aggregateRepos.xml
===================================================================
--- trunk/build/aggregate/aggregateRepos.xml	2010-06-29 00:57:32 UTC (rev 23076)
+++ trunk/build/aggregate/aggregateRepos.xml	2010-06-29 03:36:20 UTC (rev 23077)
@@ -572,7 +572,7 @@
 
 	<!-- zip up the generated repo -->
 	<target name="zip.repo">
-		<zip destfile="${working.dir}/repo-from-packed-plugins.zip"
+		<zip destfile="${working.dir}/aggregate-Update-SNAPSHOT.zip"
 		     basedir="${working.dir}/output/final"
 		     update="false"
 		/>