From 95fd57abde2c05a93b1e173be7bfdfbf4ece6a1f Mon Sep 17 00:00:00 2001 From: Thomas Diesler Date: Tue, 3 Apr 2012 11:08:56 +0200 Subject: [PATCH] [JBOSGI-535] Update resource, wiring, resolver, repository APIs to R5 --- pom.xml | 6 +++--- .../main/java/org/jboss/test/osgi/RepositorySupport.java | 7 ++++--- .../test/osgi/example/blueprint/BlueprintTestCase.java | 2 +- .../example/configadmin/ConfigurationAdminTestCase.java | 2 +- .../test/osgi/example/ds/DeclarativeServicesTestCase.java | 2 +- .../test/osgi/example/eventadmin/EventAdminTestCase.java | 2 +- .../jboss/test/osgi/example/http/HttpServiceTestCase.java | 2 +- .../example/interceptor/LifecycleInterceptorTestCase.java | 2 +- .../test/osgi/example/jbossas/JNDIIntegrationTestCase.java | 2 +- .../jboss/test/osgi/example/jmx/BundleStateTestCase.java | 2 +- .../jboss/test/osgi/example/jmx/MBeanServerTestCase.java | 2 +- .../org/jboss/test/osgi/example/jndi/JNDITestCase.java | 2 +- .../test/osgi/example/webapp/WebAppNegativeTestCase.java | 2 +- .../org/jboss/test/osgi/example/webapp/WebAppTestCase.java | 2 +- .../osgi/example/xml/parser/DocumentBuilderTestCase.java | 2 +- .../test/osgi/example/xml/parser/SAXParserTestCase.java | 2 +- .../org/jboss/test/osgi/jbosgi508/JBOSGi508TestCase.java | 2 +- 17 files changed, 22 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 6275583c..08107f65 100644 --- a/pom.xml +++ b/pom.xml @@ -59,13 +59,13 @@ 1.0.12.Final 3.5.2.SP1 3.0.4 - 1.2.0.Beta2 + 1.2.0.CR1 2.5.Final 1.0.11 1.0.0 2.0.3.Final - 1.1.0.Beta1 - 2.0.0.Beta5 + 1.1.0.CR1 + 2.0.0.CR1 3.0.1.Final 1.0.2 1.0.7.Final diff --git a/testsuite/example/src/main/java/org/jboss/test/osgi/RepositorySupport.java b/testsuite/example/src/main/java/org/jboss/test/osgi/RepositorySupport.java index 33243bd2..1f2f5778 100644 --- a/testsuite/example/src/main/java/org/jboss/test/osgi/RepositorySupport.java +++ b/testsuite/example/src/main/java/org/jboss/test/osgi/RepositorySupport.java @@ -29,8 +29,8 @@ 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; @@ -38,6 +38,7 @@ 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 caps = repository.findProviders(req); + Collection caps = repository.findProviders(Collections.singleton(req)).get(req); if (caps.isEmpty()) throw new IllegalStateException("Cannot find capability for: " + req); Capability cap = caps.iterator().next(); diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java index bd69adf4..270bf9c3 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/configadmin/ConfigurationAdminTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/configadmin/ConfigurationAdminTestCase.java index ecf7a0f9..c8702f13 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/configadmin/ConfigurationAdminTestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/ds/DeclarativeServicesTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/ds/DeclarativeServicesTestCase.java index 631bf31c..11b0cce3 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/ds/DeclarativeServicesTestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/eventadmin/EventAdminTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/eventadmin/EventAdminTestCase.java index 0dfc0a28..3d861290 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/eventadmin/EventAdminTestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java index 2438c86c..528feaf0 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/LifecycleInterceptorTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/LifecycleInterceptorTestCase.java index e74c1fab..9d10c5a5 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/LifecycleInterceptorTestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/jbossas/JNDIIntegrationTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/jbossas/JNDIIntegrationTestCase.java index 1214d802..c643e9f6 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/jbossas/JNDIIntegrationTestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/BundleStateTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/BundleStateTestCase.java index 03ce6f2c..248c6dda 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/BundleStateTestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/MBeanServerTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/MBeanServerTestCase.java index 108d1906..a54b6a9b 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/MBeanServerTestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java index 0d3cd468..609535e1 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.java index bb21e695..27164084 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java index 2fe885eb..51d2e2f0 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DocumentBuilderTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DocumentBuilderTestCase.java index e497e817..147991c5 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/DocumentBuilderTestCase.java +++ b/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; diff --git a/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java b/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java index d54d8e7b..ae2e65f4 100644 --- a/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/parser/SAXParserTestCase.java +++ b/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; diff --git a/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi508/JBOSGi508TestCase.java b/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi508/JBOSGi508TestCase.java index d2b8bcfc..8dd92adb 100644 --- a/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi508/JBOSGi508TestCase.java +++ b/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;