local mspec

6 files changed, 22 insertions, 46 deletions

diff --git a/releng/org.eclipse.emf.cdo.releng/build.cquery b/releng/org.eclipse.emf.cdo.releng/build.cquery
index dc917705ce..a718b4e4ea 100644
--- a/releng/org.eclipse.emf.cdo.releng/build.cquery
+++ b/releng/org.eclipse.emf.cdo.releng/build.cquery
@@ -5,5 +5,4 @@
     <cq:advisorNode namePattern=".*doc\.user" skipComponent="true"/>
     <cq:advisorNode namePattern="org\.eclipse\.emf\.cdo.*\.source" skipComponent="true"/>
     <cq:advisorNode namePattern="org\.eclipse\.net4j.*\.source" skipComponent="true"/>
-    <cq:advisorNode filter="(build.type=R)" branchTagPath="R2_0_maintenance,main"/>
 </cq:componentQuery>
diff --git a/releng/org.eclipse.emf.cdo.releng/build.properties b/releng/org.eclipse.emf.cdo.releng/build.properties
index 0d3a71a539..404f9eb752 100644
--- a/releng/org.eclipse.emf.cdo.releng/build.properties
+++ b/releng/org.eclipse.emf.cdo.releng/build.properties
@@ -1,5 +1,4 @@
 cvs.repository=:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling
-cvs.branch=HEAD
 
 buckminster.output.root=${workspace.root}/_temp
 
diff --git a/releng/org.eclipse.emf.cdo.releng/build.rmap b/releng/org.eclipse.emf.cdo.releng/build.rmap
index 2bf1bc39e8..02da72fd1a 100644
--- a/releng/org.eclipse.emf.cdo.releng/build.rmap
+++ b/releng/org.eclipse.emf.cdo.releng/build.rmap
@@ -28,173 +28,153 @@
 
   <rm:searchPath name="cdo.releng">
     <rm:provider componentTypes="buckminster,osgi.bundle" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/releng/{1},{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/releng/{1}">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
 
   <rm:searchPath name="cdo.doc">
     <rm:provider componentTypes="osgi.bundle" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/doc/{1},{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/doc/{1}">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
     <rm:provider componentTypes="eclipse.feature" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/features/{1}-feature,{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/features/{1}-feature">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
 
   <rm:searchPath name="cdo.examples.gastro">
     <rm:provider componentTypes="osgi.bundle" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/examples/{1},{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/examples/{1}">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
     <rm:provider componentTypes="eclipse.feature" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/examples/{1}-feature,{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/examples/{1}-feature">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
 
   <rm:searchPath name="cdo.hibernate">
     <rm:provider componentTypes="osgi.bundle" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/hibernate/{1},{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/hibernate/{1}">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
     <rm:provider componentTypes="eclipse.feature" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/hibernate/{1}-feature,{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/hibernate/{1}-feature">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
 
   <rm:searchPath name="cdo.examples">
     <rm:provider componentTypes="osgi.bundle" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/examples/{1},{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/examples/{1}">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
     <rm:provider componentTypes="eclipse.feature" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/features/{1}-feature,{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/features/{1}-feature">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
 
   <rm:searchPath name="cdo.tests">
     <rm:provider componentTypes="osgi.bundle" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/tests/{1},{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/tests/{1}">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
     <rm:provider componentTypes="eclipse.feature" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/features/{1}-feature,{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/features/{1}-feature">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
 
   <rm:searchPath name="cdo.featuresAndPlugins">
     <rm:provider componentTypes="osgi.bundle" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/plugins/{1},{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/plugins/{1}">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
     <rm:provider componentTypes="eclipse.feature" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/features/{1}-feature,{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/features/{1}-feature">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
 
   <rm:searchPath name="cdo.product">
     <rm:provider componentTypes="eclipse.feature" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/features/{1},{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.cdo/features/{1}">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
 
   <rm:searchPath name="net4j.examples">
     <rm:provider componentTypes="osgi.bundle" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.net4j/examples/{1},{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.net4j/examples/{1}">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
     <rm:provider componentTypes="eclipse.feature" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.net4j/features/{1}-feature,{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.net4j/features/{1}-feature">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
 
   <rm:searchPath name="net4j.tests">
     <rm:provider componentTypes="osgi.bundle" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.net4j/tests/{1},{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.net4j/tests/{1}">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
     <rm:provider componentTypes="eclipse.feature" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.net4j/features/{1}-feature,{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.net4j/features/{1}-feature">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
 
   <rm:searchPath name="net4j.featuresAndPlugins">
     <rm:provider componentTypes="osgi.bundle" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.net4j/plugins/{1},{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.net4j/plugins/{1}">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
     <rm:provider componentTypes="eclipse.feature" readerType="cvs">
-      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.net4j/features/{1}-feature,{2}">
+      <rm:uri format="{0},org.eclipse.emf/org.eclipse.emf.net4j/features/{1}-feature">
         <bc:propertyRef key="cvs.repository"/>
         <bc:propertyRef key="buckminster.component"/>
-        <bc:propertyRef key="cvs.branch"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
diff --git a/releng/org.eclipse.emf.cdo.releng/build.xml b/releng/org.eclipse.emf.cdo.releng/build.xml
index 59c82cc76d..9e8bba9690 100644
--- a/releng/org.eclipse.emf.cdo.releng/build.xml
+++ b/releng/org.eclipse.emf.cdo.releng/build.xml
@@ -222,9 +222,9 @@
 				<arg value="-l" />
 				<arg value="org.eclipse.emf.cdo.tests/CDO AllTests.launch" />
 				<arg value="-o" />
-				<arg value="result/testReport.xml" />
+				<arg value="${result}/testReport.xml" />
 				<arg value="--xml" />
-				<arg value="result/coverageReport.xml" />
+				<arg value="${result}/coverageReport.xml" />
 			</cmdargs>
 		</buckminster>
 	</target>
diff --git a/releng/org.eclipse.emf.cdo.releng/local.mspec b/releng/org.eclipse.emf.cdo.releng/local.mspec
index 65b9ab5f19..de9f84d6d0 100644
--- a/releng/org.eclipse.emf.cdo.releng/local.mspec
+++ b/releng/org.eclipse.emf.cdo.releng/local.mspec
@@ -4,7 +4,6 @@
   <mspec:property key="target.ws" value="*"/>
   <mspec:property key="target.arch" value="*"/>
   <mspec:property key="cvs.repository" value=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling"/>
-  <mspec:property key="cvs.branch" value="HEAD"/>
   <mspec:property key="eclipse.downloads" value="http://download.eclipse.org"/>
   <mspec:mspecNode materializer="workspace" filter="(buckminster.source=true)"/>
 </mspec:mspec>
diff --git a/releng/org.eclipse.emf.cdo.releng/local.properties b/releng/org.eclipse.emf.cdo.releng/local.properties
index 01c98ed4c0..b2666485f8 100644
--- a/releng/org.eclipse.emf.cdo.releng/local.properties
+++ b/releng/org.eclipse.emf.cdo.releng/local.properties
@@ -1,5 +1,4 @@
 cvs.repository=:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling
-cvs.branch=HEAD
 
 buckminster.output.root=${workspace.root}/_temp