svn commit: r1592462 - in /felix/trunk/bundlerepository/src: main/java/org/apache/felix/bundlerepository/impl/FelixRequirementAdapter.java test/java/org/apache/felix/bundlerepository/impl/FelixRequirementAdapterTest.java

[davidb]

Author: davidb
Date: Mon May  5 07:55:31 2014
New Revision: 1592462

URL: http://svn.apache.org/r1592462
Log:
[OBR] Properly translate service requirements between OBR and spec compliant 
namespaces

Modified:
    
felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixRequirementAdapter.java
    
felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/FelixRequirementAdapterTest.java

Modified: 
felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixRequirementAdapter.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixRequirementAdapter.java?rev=1592462&r1=1592461&r2=1592462&view=diff
==============================================================================
--- 
felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixRequirementAdapter.java
 (original)
+++ 
felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/FelixRequirementAdapter.java
 Mon May  5 07:55:31 2014
@@ -79,8 +79,8 @@ public class FelixRequirementAdapter imp
          * (3) objectClass capitalised
          * (4) The namespaces must be translated.
          */
-        String filter = 
requirement.getFilter().replaceAll("\\(mandatory\\:\\<\\*[^\\)]*\\)", "")
-                .replaceAll("\\(service\\=[^\\)]*\\)", 
"").replaceAll("objectclass", "objectClass");
+        String filter = 
requirement.getFilter().replaceAll("\\(mandatory\\:\\<\\*[^\\)]*\\)", "").
+                replaceAll("objectclass", "objectClass");
 
         for (String ns : NamespaceTranslator.getTranslatedFelixNamespaces())
         {

Modified: 
felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/FelixRequirementAdapterTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/FelixRequirementAdapterTest.java?rev=1592462&r1=1592461&r2=1592462&view=diff
==============================================================================
--- 
felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/FelixRequirementAdapterTest.java
 (original)
+++ 
felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/impl/FelixRequirementAdapterTest.java
 Mon May  5 07:55:31 2014
@@ -36,6 +36,7 @@ public class FelixRequirementAdapterTest
         assertFilter("(package=x.y.z)", "(osgi.wiring.package=x.y.z)");
         // TODO should this be symbolicname?
         assertFilter("( bundle = abc  )", "(osgi.wiring.bundle= abc  )");
+        assertFilter("(service=xyz)", "(osgi.service=xyz)");
         assertFilter("(|(bundle=x)(&(bundle=y)(fragment=z)))",
                 
"(|(osgi.wiring.bundle=x)(&(osgi.wiring.bundle=y)(osgi.wiring.host=z)))");
     }