[JBOSGI-535] Update resource, wiring, resolver, repository APIs to R5

pom.xml

@@ -59,13 +59,13 @@
         <version.jboss.osgi.deployment>1.0.12.Final</version.jboss.osgi.deployment>
         <version.jboss.osgi.equinox>3.5.2.SP1</version.jboss.osgi.equinox>
         <version.jboss.osgi.felix>3.0.4</version.jboss.osgi.felix>
-        <version.jboss.osgi.framework>1.2.0.Beta2</version.jboss.osgi.framework>
+        <version.jboss.osgi.framework>1.2.0.CR1</version.jboss.osgi.framework>
         <version.jboss.osgi.javax.servlet>2.5.Final</version.jboss.osgi.javax.servlet>
         <version.jboss.osgi.jmx>1.0.11</version.jboss.osgi.jmx>
         <version.jboss.osgi.logging>1.0.0</version.jboss.osgi.logging>
         <version.jboss.osgi.metadata>2.0.3.Final</version.jboss.osgi.metadata>
-        <version.jboss.osgi.repository>1.1.0.Beta1</version.jboss.osgi.repository>
-        <version.jboss.osgi.resolver>2.0.0.Beta5</version.jboss.osgi.resolver>
+        <version.jboss.osgi.repository>1.1.0.CR1</version.jboss.osgi.repository>
+        <version.jboss.osgi.resolver>2.0.0.CR1</version.jboss.osgi.resolver>
         <version.jboss.osgi.spi>3.0.1.Final</version.jboss.osgi.spi>
         <version.jboss.osgi.testing>1.0.2</version.jboss.osgi.testing>
         <version.jboss.osgi.vfs>1.0.7.Final</version.jboss.osgi.vfs>

testsuite/example/src/main/java/org/jboss/test/osgi/RepositorySupport.java

@@ -29,15 +29,16 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.ServiceReference;
-import org.osgi.framework.resource.Capability;
-import org.osgi.framework.resource.Requirement;
+import org.osgi.resource.Capability;
+import org.osgi.resource.Requirement;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.service.repository.Repository;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Properties;
 
 /**
@@ -61,7 +62,7 @@ public static PackageAdmin getPackageAdmin(BundleContext syscontext) {
     public static Bundle installSupportBundle(BundleContext context, String coordinates) throws BundleException {
         Repository repository = getRepository(context);
         Requirement req = XRequirementBuilder.createArtifactRequirement(MavenCoordinates.parse(coordinates));
-        Collection<Capability> caps = repository.findProviders(req);
+        Collection<Capability> caps = repository.findProviders(Collections.singleton(req)).get(req);
         if (caps.isEmpty())
             throw new IllegalStateException("Cannot find capability for: " + req);
         Capability cap = caps.iterator().next();

testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java

@@ -41,7 +41,7 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.blueprint.container.BlueprintContainer;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.service.repository.Repository;

testsuite/example/src/test/java/org/jboss/test/osgi/example/configadmin/ConfigurationAdminTestCase.java

@@ -37,7 +37,7 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.cm.ConfigurationEvent;

testsuite/example/src/test/java/org/jboss/test/osgi/example/ds/DeclarativeServicesTestCase.java

@@ -35,7 +35,7 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.repository.Repository;
 import org.osgi.util.tracker.ServiceTracker;
 

testsuite/example/src/test/java/org/jboss/test/osgi/example/eventadmin/EventAdminTestCase.java

@@ -34,7 +34,7 @@
 import org.junit.runner.RunWith;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;
 import org.osgi.service.event.EventConstants;

testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java

@@ -38,7 +38,7 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.http.HttpService;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.service.repository.Repository;

testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/LifecycleInterceptorTestCase.java

@@ -46,7 +46,7 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.http.HttpService;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.service.repository.Repository;

testsuite/example/src/test/java/org/jboss/test/osgi/example/jbossas/JNDIIntegrationTestCase.java

@@ -44,7 +44,7 @@
 import org.junit.runner.RunWith;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.jndi.JNDIContextManager;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.service.repository.Repository;

testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/BundleStateTestCase.java

@@ -35,7 +35,7 @@
 import org.junit.runner.RunWith;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.jmx.framework.BundleStateMBean;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.service.repository.Repository;

testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/MBeanServerTestCase.java

@@ -39,7 +39,7 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.service.repository.Repository;
 import org.osgi.util.tracker.ServiceTracker;

testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java

@@ -44,7 +44,7 @@
 import org.junit.runner.RunWith;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.jndi.JNDIContextManager;
 import org.osgi.service.packageadmin.ExportedPackage;
 import org.osgi.service.packageadmin.PackageAdmin;

testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.java

@@ -39,7 +39,7 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.http.HttpService;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.service.repository.Repository;

testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java

@@ -38,7 +38,7 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.http.HttpService;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.service.repository.Repository;

testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DocumentBuilderTestCase.java

@@ -34,7 +34,7 @@
 import org.junit.runner.RunWith;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.repository.Repository;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java

@@ -34,7 +34,7 @@
 import org.junit.runner.RunWith;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.repository.Repository;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;

testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi508/JBOSGi508TestCase.java

@@ -41,7 +41,7 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
-import org.osgi.framework.resource.Resource;
+import org.osgi.resource.Resource;
 import org.osgi.service.repository.Repository;
 
 import javax.inject.Inject;