svn commit: r1153672 - in /felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test: recipes/resolver.b005.bnd src/org/apache/felix/framework/test/TestCapability.java

[ri...@apache.org]

Author: rickhall
Date: Wed Aug  3 21:21:31 2011
New Revision: 1153672

URL: http://svn.apache.org/viewvc?rev=1153672&view=rev
Log:
Minor mods to align with trunk.

Modified:
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/resolver.b005.bnd
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestCapability.java

Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/resolver.b005.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/resolver.b005.bnd?rev=1153672&r1=1153671&r2=1153672&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/resolver.b005.bnd (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/resolver.b005.bnd Wed Aug  3 21:21:31 2011
@@ -1,5 +1,6 @@
 Bundle-SymbolicName: org.apache.felix.framework.test.resolver.b005
 Export-Package: org.apache.felix.framework;-noimport:=true
+Import-Package: !*
 Fragment-Host: system.bundle; extension:=framework
 Include-Resource: org.apache.felix.framework/resource.txt; literal="resource.txt"
 

Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestCapability.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestCapability.java?rev=1153672&r1=1153671&r2=1153672&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestCapability.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestCapability.java Wed Aug  3 21:21:31 2011
@@ -24,6 +24,7 @@ import java.util.List;
 import org.apache.felix.framework.wiring.BundleCapabilityImpl;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
+import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.framework.wiring.BundleWire;
 import org.osgi.framework.wiring.BundleWiring;
 
@@ -186,7 +187,7 @@ public class TestCapability extends Feli
 
             // Check that bundle C is wired to bundles A and B.
             bw = m_bundles.get(C).adapt(BundleWiring.class);
-            wires = bw.getRequiredWires(BundleCapabilityImpl.PACKAGE_NAMESPACE);
+            wires = bw.getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
             assertEquals("Bundle should have one package wire.", 1, wires.size());
             assertEquals("Wrong provider.",
                 wires.get(0).getProviderWiring().getBundle(), m_bundles.get(A));
@@ -247,7 +248,7 @@ public class TestCapability extends Feli
 
             // Check that bundle D is wired to bundles A and C.
             bw = m_bundles.get(D).adapt(BundleWiring.class);
-            wires = bw.getRequiredWires(BundleCapabilityImpl.PACKAGE_NAMESPACE);
+            wires = bw.getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
             assertEquals("Bundle should have one package wire.", 1, wires.size());
             assertEquals("Wrong provider.",
                 wires.get(0).getProviderWiring().getBundle(), m_bundles.get(A));
@@ -287,4 +288,4 @@ public class TestCapability extends Feli
         m_bundles.clear();
         refreshFramework();
     }
-}
\ No newline at end of file
+}