From 5c3266eef63601827c9d12085ad4ae8de63fd26d Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Tue, 6 Dec 2011 00:40:14 +0800
Subject: [PATCH] IDEMPIERE-105 Move org.apache.xerces bundle to workspace
 lib/plugins as the springsource maven repository is missing the metadata for
 version 2.9.1 (transplanted from 1e82ba3dc8c2edeccbdccca03228a542f0ecc93b)

---
 org.adempiere.sdk-feature/adempiere.cquery | 4 +++-
 org.adempiere.sdk-feature/adempiere.rmap   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index f22a3c0b71..d9cbdbef7a 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -23,7 +23,9 @@
     <cq:advisorNode namePattern="^com\.springsource\.org\.apache\.taglibs\.standard$" componentType="osgi.bundle" versionOverride="[1.1.2.0,1.2.0.0)"/>
     <cq:advisorNode namePattern="^com\.springsource\.org\.apache\.xmlcommons$" componentType="osgi.bundle" versionOverride="[1.3.4,1.4.0)"/>
     <cq:advisorNode namePattern="^com\.springsource\.org\.apache\.xml\.serializer$" componentType="osgi.bundle" versionOverride="[2.7.1,2.8.0)"/>
-    <cq:advisorNode namePattern="^com\.springsource\.org\.apache\.xerces$" componentType="osgi.bundle" versionOverride="[2.9.1,3.0.0)"/>
+    <cq:advisorNode namePattern="^com\.springsource\.org\.apache\.xerces$" componentType="osgi.bundle" versionOverride="[2.9.1,3.0.0)">
+        <cq:property key="jar.version" value="2.9.1"/>
+    </cq:advisorNode>
     <cq:advisorNode namePattern="^com\.springsource\.org\.apache\.xml\.resolver$" componentType="osgi.bundle" versionOverride="[1.2.0,1.3.0)"/>
     <cq:advisorNode namePattern="^com\.springsource\.org\.apache\.commons\.collections$" componentType="osgi.bundle" versionOverride="[3.2.1,4.0.0)"/>
     <cq:advisorNode namePattern="^com\.springsource\.org\.apache\.commons\.net$" componentType="osgi.bundle" versionOverride="[2.0.0,3.0.0)"/>
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 63cca17862..18846d7c1b 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -14,6 +14,7 @@
   <rm:locator pattern="^org\.eclipse\.gemini(\..+)?" searchPathRef="gemini.maven" failOnError="false"/>
   <rm:locator pattern="^org\.eclipse\.virgo(\..+)?" searchPathRef="gemini.maven" failOnError="false"/>
   <rm:locator pattern="^com\.springsource(\..+)?" searchPathRef="spring.external.maven" failOnError="false"/>
+  <rm:locator pattern="^com\.springsource(\..+)?" searchPathRef="workspace.bundle.jar" failOnError="false"/>
   <rm:locator pattern="^org\.springframework(\..+)?" searchPathRef="spring.maven" failOnError="false"/>
   <rm:locator pattern="^org\.restlet(\..+)?" searchPathRef="restlet.maven" failOnError="false"/>
   <rm:locator searchPathRef="workspace.bundle.project" failOnError="false"/>