Change-Id: Ida94f42b3e4b559b1ea34433bf656891bba6e64a

3 files changed, 24 insertions, 27 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng/build.properties b/plugins/org.eclipse.emf.cdo.releng/build.properties
index 2f5fb9957e..b219e35e0e 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng/build.properties
@@ -8,7 +8,7 @@
 #    Eike Stepper - initial API and implementation
 
 stream=4.1
-branch=trunk
+branch=master
 train=juno
 buckminster=3.7
 eclipse=3.8
@@ -18,7 +18,6 @@ weekly=I
 #	This build can be optimized by setting these properties externally:
 #platform = "Windows" | "Linux" | "Mac"
 
-git.repository=git://git.eclipse.org/gitroot/cdo/org.eclipse.emf.cdo.git
 eclipse.downloads=http://download.eclipse.org
 cloudsmith.downloads=http://download.cloudsmith.com
 
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.rmap b/plugins/org.eclipse.emf.cdo.releng/build.rmap
index 12b2261090..a30e9d92f1 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.rmap
+++ b/plugins/org.eclipse.emf.cdo.releng/build.rmap
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <rm:rmap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0"

-	xmlns:psf="http://www.eclipse.org/buckminster/PSFProvider-1.0"

-	xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">

+	xmlns:psf="http://www.eclipse.org/buckminster/PSFProvider-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">

 	

 	<!-- Properties -->

 	

 	<rm:property key="platform.version" mutable="true" value="3.8"/>

 	<rm:property key="emf.version" mutable="true" value="2.8"/>

 	<rm:property key="orbit.version" mutable="true" value="S20110907174232"/>

-

-	<rm:property key="git.repository" mutable="true" value="git://git.eclipse.org/gitroot/cdo/org.eclipse.emf.cdo.git"/>

+	

 	<rm:property key="git.clone" mutable="true" value="${user.home}/org.eclipse.emf.cdo.git"/>

 	<rm:property key="eclipse.downloads" mutable="true" value="http://download.eclipse.org"/>

 	<rm:property key="resolve.target.platform" mutable="true" value="true"/>

@@ -27,14 +25,14 @@
 	

 	<rm:searchPath name="git">

 		<rm:provider componentTypes="osgi.bundle" readerType="git">

-			<rm:property key="git.remote.uri" value="${git.repository}"/>

+			<rm:property key="git.remote.uri" value="git://git.eclipse.org/gitroot/cdo/org.eclipse.emf.cdo.git"/>

 			<rm:uri format="{0},plugins/{1}">

 				<bc:propertyRef key="git.clone"/>

 				<bc:propertyRef key="buckminster.component"/>

 			</rm:uri>

 		</rm:provider>

 		<rm:provider componentTypes="eclipse.feature" readerType="git">

-			<rm:property key="git.remote.uri" value="${git.repository}"/>

+			<rm:property key="git.remote.uri" value="git://git.eclipse.org/gitroot/cdo/org.eclipse.emf.cdo.git"/>

 			<rm:uri format="{0},features/{1}-feature">

 				<bc:propertyRef key="git.clone"/>

 				<bc:propertyRef key="buckminster.component"/>

@@ -51,7 +49,7 @@
 				<bc:propertyRef key="eclipse.downloads"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- MWE -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -61,7 +59,7 @@
 				<bc:propertyRef key="eclipse.downloads"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- EMFT -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -69,7 +67,7 @@
 				<bc:propertyRef key="eclipse.downloads"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- EcoreTools -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -77,7 +75,7 @@
 				<bc:propertyRef key="eclipse.downloads"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- EMF -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -86,7 +84,7 @@
 				<bc:propertyRef key="emf.version"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- GEF -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -102,7 +100,7 @@
 				<bc:propertyRef key="eclipse.downloads"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- GMP -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -110,7 +108,7 @@
 				<bc:propertyRef key="eclipse.downloads"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- OCL -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -118,7 +116,7 @@
 				<bc:propertyRef key="eclipse.downloads"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- QVTOML -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -126,7 +124,7 @@
 				<bc:propertyRef key="eclipse.downloads"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- XPAND -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -136,7 +134,7 @@
 				<bc:propertyRef key="eclipse.downloads"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- SWTBOT -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -147,7 +145,7 @@
 				<bc:propertyRef key="eclipse.downloads"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- ORBIT -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -156,7 +154,7 @@
 				<bc:propertyRef key="orbit.version"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- TENEO -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -164,7 +162,7 @@
 				<bc:propertyRef key="eclipse.downloads"/>

 			</rm:uri>

 		</rm:provider>

-

+		

 		<!-- EVLER.ORG -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

@@ -173,13 +171,13 @@
 			<!-- ############################################################### -->

 			<rm:uri format="http://www.elver.org/eclipse/update"/>

 		</rm:provider>

-

+		

 		<!-- SF.NET -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

 			<rm:uri format="http://net4j.sourceforge.net/update"/>

 		</rm:provider>

-

+		

 		<!-- PLATFORM -->

 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"

 			resolutionFilter="(resolve.target.platform=true)">

diff --git a/plugins/org.eclipse.emf.cdo.releng/build.xml b/plugins/org.eclipse.emf.cdo.releng/build.xml
index 5e884fc528..b64b14fa40 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.xml
+++ b/plugins/org.eclipse.emf.cdo.releng/build.xml
@@ -61,8 +61,8 @@
 					<jvmarg value="-Xmx4096m" />
 					<jvmarg value="-Declipse.p2.mirrors=false" />
 					<jvmarg value="-Declipse.p2.unsignedPolicy=allow" />
-					<jvmarg value="-Dgit.repository=${git.repository}"/>
-					<jvmarg value="-Dgit.clone=${git.clone}"/>
+					<jvmarg value="-Dgit.repository=${git.repository}" />
+					<jvmarg value="-Dgit.clone=${git.clone}" />
 					<arg value="-data" />
 					<arg value="@{workspace}" />
 					<arg value="--loglevel" />
@@ -168,7 +168,7 @@
 			<isset property="hudson.no_proxy" />
 		</condition>
 
-		<property name="git.clone" location="${hudson.WORKSPACE}/git"/>
+		<property name="git.clone" location="${hudson.WORKSPACE}/git" />
 		<property name="releng" location="${git.clone}/plugins/org.eclipse.emf.cdo.releng" />
 		<property name="test.report" location="${hudson.WORKSPACE}/test-report.xml" />
 
@@ -541,7 +541,7 @@
 	<target name="-generate.help">
 		<copy todir="${hudson.WORKSPACE}">
 			<fileset dir="${releng}">
-				<include name="help/**"/>
+				<include name="help/**" />
 			</fileset>
 		</copy>
 	</target>