From 45eeee20739a05b815ecc16a244c108a5eb45a25 Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Wed, 6 Apr 2011 13:35:19 +0000
Subject: [PATCH] fixed buckminster config after unicase to eclipse transition
---
fortiss-std-env/buckminster/af3-micro.cquery | 2 ++
fortiss-std-env/buckminster/fortiss.rmap | 16 ++++++++++------
.../buckminster/tooling-kernel-2-0.cquery | 4 +++-
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/fortiss-std-env/buckminster/af3-micro.cquery b/fortiss-std-env/buckminster/af3-micro.cquery
index 5de2c4c..22e4286 100644
--- a/fortiss-std-env/buckminster/af3-micro.cquery
+++ b/fortiss-std-env/buckminster/af3-micro.cquery
@@ -6,4 +6,6 @@
<cq:advisorNode namePattern="^org\.unicase\..*" componentType="osgi.bundle" sourceLevel="REJECT"/>
<cq:advisorNode namePattern="^org\.fortiss\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
<cq:advisorNode namePattern="^edu\.tum\.cs\.cope\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
+ <cq:advisorNode namePattern="^org\.eclipse\.emf\.emfstore\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
+ <cq:advisorNode namePattern="^org\.eclipse\.emf\.ecp\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
</cq:componentQuery>
diff --git a/fortiss-std-env/buckminster/fortiss.rmap b/fortiss-std-env/buckminster/fortiss.rmap
index 494d4f9..e53be52 100644
--- a/fortiss-std-env/buckminster/fortiss.rmap
+++ b/fortiss-std-env/buckminster/fortiss.rmap
@@ -49,17 +49,19 @@
<rm:searchPath name="emfstore">
<rm:provider
- readerType="p2"
- componentTypes="osgi.bundle,eclipse.feature"
- source="false" mutable="false">
- <rm:uri format="http://unicase.googlecode.com/svn/updatesite/emfstoreNightly"/>
+ readerType="svn"
+ componentTypes="osgi.bundle"
+ source="true" mutable="false">
+ <rm:uri format="http://unicase.googlecode.com/svn/trunk/core/{0}">
+ <bc:propertyRef key="buckminster.component"/>
+ </rm:uri>
</rm:provider>
-
+
<rm:provider
readerType="svn"
componentTypes="osgi.bundle"
source="true" mutable="false">
- <rm:uri format="http://unicase.googlecode.com/svn/trunk/core/{0}">
+ <rm:uri format="http://unicase.googlecode.com/svn/trunk/emfstore/{0}">
<bc:propertyRef key="buckminster.component"/>
</rm:uri>
</rm:provider>
@@ -120,6 +122,8 @@
<rm:locator pattern="^org\.fortiss\..*" searchPathRef="fortiss"/>
<rm:locator pattern="^org\.unicase\..*" searchPathRef="emfstore"/>
+ <rm:locator pattern="^org\.eclipse\.emf\.emfstore\..*" searchPathRef="emfstore"/>
+ <rm:locator pattern="^org\.eclipse\.emf\.ecp\..*" searchPathRef="emfstore"/>
<rm:locator pattern="^org\.conqat\..*" searchPathRef="conqat"/>
<rm:locator pattern="^edu\.tum\.cs\.cope\..*" searchPathRef="cope"/>
<rm:locator searchPathRef="helios"/>
diff --git a/fortiss-std-env/buckminster/tooling-kernel-2-0.cquery b/fortiss-std-env/buckminster/tooling-kernel-2-0.cquery
index dfd94a7..5776d8b 100644
--- a/fortiss-std-env/buckminster/tooling-kernel-2-0.cquery
+++ b/fortiss-std-env/buckminster/tooling-kernel-2-0.cquery
@@ -3,7 +3,9 @@
<cq:documentation xmlns="http://www.w3.org/1999/xhtml">Buckminster materialization of the tooling kernel 2.0 workspace.</cq:documentation>
<cq:rootRequest name="org.fortiss.tooling.kernel_feature" componentType="eclipse.feature"/>
<cq:advisorNode namePattern="^org\.conqat\..*" componentType="osgi.bundle" sourceLevel="REJECT"/>
- <cq:advisorNode namePattern="^org\.unicase\..*" componentType="osgi.bundle" sourceLevel="REJECT"/>
+ <cq:advisorNode namePattern="^org\.unicase\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
<cq:advisorNode namePattern="^org\.fortiss\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
<cq:advisorNode namePattern="^edu\.tum\.cs\.cope\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
+ <cq:advisorNode namePattern="^org\.eclipse\.emf\.emfstore\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
+ <cq:advisorNode namePattern="^org\.eclipse\.emf\.ecp\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
</cq:componentQuery>
--
GitLab