New dependencies. No SVN!

3 files changed, 59 insertions, 35 deletions

diff --git a/releng/org.eclipse.amp.releng/buckminster.cspec b/releng/org.eclipse.amp.releng/buckminster.cspec
index 91f21bfd..82f253e7 100644
--- a/releng/org.eclipse.amp.releng/buckminster.cspec
+++ b/releng/org.eclipse.amp.releng/buckminster.cspec
@@ -2,16 +2,10 @@
 <cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.amp.releng" componentType="buckminster" version="0.9.0.qualifier">
     <cs:dependencies>
         <cs:dependency name="org.apache.commons.collections" componentType="osgi.bundle"/>
-        <cs:dependency name="org.eclipse.birt.chart.device.extension" componentType="osgi.bundle"/>
-        <cs:dependency name="org.eclipse.birt.chart.device.swt" componentType="osgi.bundle"/>
-        <cs:dependency name="org.eclipse.birt.chart.engine" componentType="osgi.bundle"/>
-        <cs:dependency name="org.eclipse.birt.chart.engine.extension" componentType="osgi.bundle"/>
-        <cs:dependency name="org.eclipse.birt.chart.ui" componentType="osgi.bundle"/>
-        <cs:dependency name="org.eclipse.birt.chart.ui.extension" componentType="osgi.bundle"/>
-        <cs:dependency name="org.eclipse.birt.core" componentType="osgi.bundle"/>
-        <cs:dependency name="org.eclipse.birt.core.ui" componentType="osgi.bundle"/>
-        <cs:dependency name="org.eclipse.emf" componentType="eclipse.feature"/>
+        <cs:dependency name="org.eclipse.emf.sdk" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.gef" componentType="eclipse.feature"/>
+        <cs:dependency name="org.eclipse.jdt" componentType="eclipse.feature"/>
+        <cs:dependency name="org.eclipse.pde" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.swtbot" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.swtbot.eclipse" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.swtbot.eclipse.gef" componentType="eclipse.feature"/>
@@ -19,10 +13,8 @@
         <cs:dependency name="org.eclipse.xtend" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.xtext.sdk" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.zest" componentType="eclipse.feature"/>
-        <cs:dependency name="org.junit" componentType="osgi.bundle"/>
-        <cs:dependency name="org.junit4" componentType="osgi.bundle"/>
-        <cs:dependency name="org.eclipse.jdt" componentType="eclipse.feature"/>
-        <cs:dependency name="org.eclipse.pde" componentType="eclipse.feature"/>
+        <cs:dependency name="org.eclipse.birt" componentType="eclipse.feature"/>
+        <cs:dependency name="org.mozilla.javascript" componentType="osgi.bundle"/>
     </cs:dependencies>
     <cs:actions>
         <cs:public name="setup.promoter" actor="ant">
diff --git a/releng/org.eclipse.amp.releng/releng/amp-platform.rmap b/releng/org.eclipse.amp.releng/releng/amp-platform.rmap
index 92d55474..d58c229c 100644
--- a/releng/org.eclipse.amp.releng/releng/amp-platform.rmap
+++ b/releng/org.eclipse.amp.releng/releng/amp-platform.rmap
@@ -10,8 +10,14 @@
   <rm:locator pattern="^org\.ascape\.core" searchPathRef="ascape.external"/>
   <rm:locator pattern="repast\.simphony\.score" searchPathRef="repast"/>
   <rm:locator pattern="^org\.eclipse\.swtbot(\..+)?" searchPathRef="swtbot"/>
+  <rm:locator pattern="^org\.eclipse\.birt(\..+)?" searchPathRef="birt"/>
+  <rm:locator pattern="^org\.mozilla(\..+)?" searchPathRef="birt"/>
   <rm:locator searchPathRef="eclipse" failOnError="false"/>
   <rm:locator searchPathRef="platform" failOnError="false"/>
+  <rm:locator pattern="^org\.eclipse\.emf(\..+)?" searchPathRef="emf"/>
+  <rm:locator pattern="^org\.eclipse\.xtext(\..+)?" searchPathRef="xtext"/>
+  <rm:locator pattern="^org\.eclipse\.xpand(\..+)?" searchPathRef="xpand"/>
+  <rm:locator pattern="^org\.eclipse\.xtend(\..+)?" searchPathRef="xpand"/>
   <rm:locator pattern="^org\.antlr(\..+)?$" searchPathRef="orbit" failOnError="false"/>
   <rm:locator pattern="^org\.antlr(\..+)?$" searchPathRef="itemis"/>
   <rm:locator pattern="^de\.itemis(\..+)?$" searchPathRef="itemis"/>
@@ -41,14 +47,14 @@
 	</rm:searchPath>
   <rm:searchPath name="eclipse">
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
-      <rm:uri format="{0}/releases/staging?importType=binary">
+      <rm:uri format="{0}/releases/indigo?importType=binary">
         <bc:propertyRef key="eclipse.download"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
   <rm:searchPath name="platform">
     <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-      <rm:uri format="{0}/eclipse/updates/3.7milestones">
+      <rm:uri format="{0}/eclipse/updates/3.7">
         <bc:propertyRef key="eclipse.download"/>
       </rm:uri>
     </rm:provider>
@@ -82,20 +88,28 @@
       <rm:uri format="http://lwjgl.org/update"/>
     </rm:provider>
   </rm:searchPath>
-  	  <rm:searchPath name="gef3d">
-    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="svn">
-      <rm:uri format="http://dev.eclipse.org/svnroot/technology/org.eclipse.gef3d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-        <bc:propertyRef key="buckminster.component"/>
-      </rm:uri>
-    </rm:provider>
-  </rm:searchPath>
-  <rm:searchPath name="gef3d-build">
-    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="svn">
-      <rm:uri format="file:///svnroot/technology/org.eclipse.gef3d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-        <bc:propertyRef key="buckminster.component"/>
-      </rm:uri>
-    </rm:provider>
-  </rm:searchPath>
+	<rm:searchPath name="emf">
+		<rm:provider readerType="p2" componentTypes="eclipse.feature,osgi.bundle" mutable="false" source="false">
+			<rm:uri format="http://download.eclipse.org/modeling/emf/emf/updates/2.7.x" />
+		</rm:provider>
+	</rm:searchPath>
+	<rm:searchPath name="xtext">
+		<rm:provider readerType="p2" componentTypes="eclipse.feature,osgi.bundle" mutable="false" source="false">
+			<rm:uri format="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/" />
+		</rm:provider>
+	</rm:searchPath>
+	<rm:searchPath name="xpand">
+		<rm:provider readerType="p2" componentTypes="eclipse.feature,osgi.bundle" mutable="false" source="false">
+			<rm:uri format="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/" />
+		</rm:provider>
+	</rm:searchPath>
+	<rm:searchPath name="birt">
+		<rm:provider readerType="p2" componentTypes="eclipse.feature,osgi.bundle" mutable="false" source="false">
+			<rm:uri format="http://download.eclipse.org/birt/update-site/3.7/" />
+		</rm:provider>
+	</rm:searchPath>
+  
+  
 	<!-- NOTE: ***We need to get 1.0.2 which is no longer on Indigo.*** -->
 	<rm:searchPath name="itemis">
 		<rm:provider readerType="p2" componentTypes="eclipse.feature,osgi.bundle" mutable="false" source="false">
diff --git a/releng/org.eclipse.amp.releng/releng/amp.rmap b/releng/org.eclipse.amp.releng/releng/amp.rmap
index ab266075..0fce3810 100644
--- a/releng/org.eclipse.amp.releng/releng/amp.rmap
+++ b/releng/org.eclipse.amp.releng/releng/amp.rmap
@@ -2,6 +2,7 @@
 <rm:rmap xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0"
 	xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
 	<rm:property key="checkout.location" value="${workspace.root}/org.eclipse.amp.git" />
+	<rm:property key="gef3d.checkout.location" value="${workspace.root}/org.eclipse.gef3d.git" />
 	<rm:property key="eclipse.download" value="http://download.eclipse.org" />
 
 	<rm:locator pattern="^org\.eclipse\.amp\.build$"
@@ -37,6 +38,10 @@
 		searchPathRef="amp" />
 
 	<rm:locator pattern="^org\.eclipse\.gef3d(\..+)?"
+		searchPathRef="gef3d.local" failOnError="false" />
+	<rm:locator pattern="^org\.eclipse\.draw3d(\..+)?"
+		searchPathRef="gef3d.local" failOnError="false" />
+	<rm:locator pattern="^org\.eclipse\.gef3d(\..+)?"
 		searchPathRef="gef3d" failOnError="false" />
 	<rm:locator pattern="^org\.eclipse\.draw3d(\..+)?"
 		searchPathRef="gef3d" failOnError="false" />
@@ -269,17 +274,30 @@
 			<rm:property key="git.auto.fetch" value="true" />
 		</rm:provider>
 	</rm:searchPath>
-
+	
 	<rm:searchPath name="gef3d">
-		<rm:provider componentTypes="osgi.bundle,eclipse.feature"
-			readerType="svn" mutable="false">
-			<rm:uri
-				format="http://dev.eclipse.org/svnroot/technology/org.eclipse.gef3d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+		<rm:provider componentTypes="osgi.bundle" readerType="git"
+			resolutionFilter="">
+			<rm:uri format="{0},plugins/{1}">
+				<bc:propertyRef key="gef3d.checkout.location" />
 				<bc:propertyRef key="buckminster.component" />
 			</rm:uri>
+			<rm:property key="git.remote.uri"
+				value="git://git.eclipse.org/gitroot/gef3d/org.eclipse.gef3d.git" />
+			<rm:property key="git.remote.name" value="origin" />
+			<rm:property key="git.auto.fetch" value="true" />
 		</rm:provider>
 	</rm:searchPath>
-
+	
+	<rm:searchPath name="gef3d.local">
+		<rm:provider componentTypes="osgi.bundle" readerType="local">
+			<rm:uri format="{0}/plugins/{1}">
+				<bc:propertyRef key="checkout.location" />
+				<bc:propertyRef key="buckminster.component" />
+			</rm:uri>
+		</rm:provider>
+	</rm:searchPath>
+	
 	<!-- <rm:searchPath name="gef3d"> <rm:provider componentTypes="eclipse.feature,osgi.bundle" 
 		readerType="p2" source="false" mutable="false"> <rm:uri format="file:/Volumes/Resources/Developer/workspaces/gef3d/buckminster.build.output/org.eclipse.gef3d.releng_1.0.0-eclipse.feature/site.p2"/> 
 		</rm:provider> </rm:searchPath> -->