Buckminster Git migration - rmap changes

3 files changed, 53 insertions, 59 deletions

diff --git a/features/org.eclipse.epp.allpackages.juno.feature/build.xml b/features/org.eclipse.epp.allpackages.juno.feature/build.xml
index 9fa10700..cb4a04a4 100644
--- a/features/org.eclipse.epp.allpackages.juno.feature/build.xml
+++ b/features/org.eclipse.epp.allpackages.juno.feature/build.xml
@@ -69,7 +69,7 @@
 				<arg value="-i" />
 				<arg value="org.eclipse.buckminster.core.headless.feature.feature.group" />
 				<arg value="-i" />
-				<arg value="org.eclipse.buckminster.cvs.headless.feature.feature.group" />
+				<arg value="org.eclipse.buckminster.git.headless.feature.feature.group" />
 				<arg value="-i" />
 				<arg value="org.eclipse.buckminster.pde.headless.feature.feature.group" />
 			</args>
diff --git a/features/org.eclipse.epp.allpackages.juno.feature/eclipse.build.sh b/features/org.eclipse.epp.allpackages.juno.feature/eclipse.build.sh
deleted file mode 100755
index 82f456a0..00000000
--- a/features/org.eclipse.epp.allpackages.juno.feature/eclipse.build.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Script with build.eclipse.org specific settings
-#
-export JAVA_HOME=/shared/common/ibm-java2-ppc-50
-export ANT_HOME=/shared/common/apache-ant-1.7.1
-$ANT_HOME/bin/ant
diff --git a/features/org.eclipse.epp.allpackages.juno.feature/epp.rmap b/features/org.eclipse.epp.allpackages.juno.feature/epp.rmap
index a8db62ea..d79e3ba4 100644
--- a/features/org.eclipse.epp.allpackages.juno.feature/epp.rmap
+++ b/features/org.eclipse.epp.allpackages.juno.feature/epp.rmap
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rmap xmlns="http://www.eclipse.org/buckminster/RMap-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:mp="http://www.eclipse.org/buckminster/MavenProvider-1.0"
-	xmlns:pmp="http://www.eclipse.org/buckminster/PDEMapProvider-1.0"
-	xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0">
-
-	<searchPath name="org.eclipse.epp.allpackages.juno">
-		<provider readerType="cvs" componentTypes="eclipse.feature" mutable="true" source="true">
-			<uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/features/{0}">
-				<bc:propertyRef key="buckminster.component" />
-			</uri>
-		</provider>
-	</searchPath>
-
-	<searchPath name="org.eclipse.epp.packages">
-		<provider readerType="cvs" componentTypes="osgi.bundle" mutable="true" source="true">
-			<uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/{0}">
-				<bc:propertyRef key="buckminster.component" />
-			</uri>
-		</provider>
-	</searchPath>
-
-	<searchPath name="org.eclipse.epp.packages.feature">
-		<provider readerType="cvs" componentTypes="eclipse.feature" mutable="true" source="true">
-			<uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/{0}">
-				<bc:propertyRef key="buckminster.component" />
-			</uri>
-		</provider>
-	</searchPath>
-
-	<searchPath name="juno">
-		<provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="false">
-			<uri format="{0}?importType=binary">
-				<bc:propertyRef key="juno.site" />
-			</uri>
-		</provider>
-	</searchPath>
-
-  <searchPath name="platform">
-    <provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="false">
-      <uri format="{0}?importType=binary">
-        <bc:propertyRef key="platform.site" />
-      </uri>
-    </provider>
-  </searchPath>
-
-	<locator searchPathRef="org.eclipse.epp.allpackages.juno" pattern="^org\.eclipse\.epp\.allpackages\..*$"/>
-	<locator searchPathRef="org.eclipse.epp.packages.feature" pattern="^org\.eclipse\.epp\.package\..*\.feature$"/>
-	<locator searchPathRef="org.eclipse.epp.packages" pattern="^org\.eclipse\.epp\.package\..*$"/>
-    <locator searchPathRef="platform" failOnError="false" />
-	<locator searchPathRef="juno"/>
-
-</rmap>
+<rm:rmap xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
+  <rm:locator pattern="^org\.eclipse\.epp\.allpackages\..*$" searchPathRef="org.eclipse.epp.allpackages.juno"/>
+  <rm:locator pattern="^org\.eclipse\.epp\.package\..*\.feature$" searchPathRef="org.eclipse.epp.packages.feature"/>
+  <rm:locator pattern="^org\.eclipse\.epp\.package\..*$" searchPathRef="org.eclipse.epp.packages"/>
+  <rm:locator searchPathRef="platform" failOnError="false"/>
+  <rm:locator searchPathRef="juno"/>
+  <rm:searchPath name="org.eclipse.epp.allpackages.juno">
+    <rm:provider componentTypes="eclipse.feature" readerType="git">
+      <rm:property key="git.remote.uri" value="git://git.eclipse.org/gitroot/epp/org.eclipse.epp.packages.git"/>
+      <rm:uri format="{0},features/{1}">
+        <bc:propertyRef key="workspace.root"/>
+        <bc:propertyRef key="buckminster.component"/>
+      </rm:uri>
+    </rm:provider>
+  </rm:searchPath>
+  <rm:searchPath name="org.eclipse.epp.packages">
+    <rm:provider componentTypes="osgi.bundle" readerType="git">
+      <rm:property key="git.remote.uri" value="git://git.eclipse.org/gitroot/epp/org.eclipse.epp.packages.git"/>
+      <rm:uri format="{0},packages/{1}">
+        <bc:propertyRef key="workspace.root"/>
+        <bc:propertyRef key="buckminster.component"/>
+      </rm:uri>
+    </rm:provider>
+  </rm:searchPath>
+  <rm:searchPath name="org.eclipse.epp.packages.feature">
+    <rm:provider componentTypes="eclipse.feature" readerType="git">
+      <rm:property key="git.remote.uri" value="git://git.eclipse.org/gitroot/epp/org.eclipse.epp.packages.git"/>
+      <rm:uri format="{0},packages/{1}">
+        <bc:propertyRef key="workspace.root"/>
+        <bc:propertyRef key="buckminster.component"/>
+      </rm:uri>
+    </rm:provider>
+  </rm:searchPath>
+  <rm:searchPath name="juno">
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
+      <rm:property key="buckminster.mutable" value="false"/>
+      <rm:property key="buckminster.source" value="false"/>
+      <rm:uri format="{0}?importType=binary">
+        <bc:propertyRef key="juno.site"/>
+      </rm:uri>
+    </rm:provider>
+  </rm:searchPath>
+  <rm:searchPath name="platform">
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
+      <rm:property key="buckminster.mutable" value="false"/>
+      <rm:property key="buckminster.source" value="false"/>
+      <rm:uri format="{0}?importType=binary">
+        <bc:propertyRef key="platform.site"/>
+      </rm:uri>
+    </rm:provider>
+  </rm:searchPath>
+</rm:rmap>