Fix service lookup issue related to services registered on behalf of …

…the system bundle
silveringsea · Feb 9, 2012 · 275a4e8 · 275a4e8
1 parent 4ba69e3
commit 275a4e8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/osgi/service/src/main/java/org/jboss/as/osgi/service/AutoInstallIntegration.java b/osgi/service/src/main/java/org/jboss/as/osgi/service/AutoInstallIntegration.java
@@ -151,7 +151,6 @@ public synchronized void start(StartContext context) throws StartException {
             List<OSGiCapability> configcaps = new ArrayList<OSGiCapability>();
             configcaps.add(new OSGiCapability("javax.api", null));
             configcaps.add(new OSGiCapability("org.osgi.enterprise", null));
-            configcaps.add(new OSGiCapability("org.jboss.osgi.repository", null));
             configcaps.addAll(injectedSubsystemState.getValue().getCapabilities());
             for (OSGiCapability moduleMetaData : configcaps) {
                 ServiceName serviceName = installModule(bundleManager, moduleMetaData);

diff --git a/osgi/service/src/main/java/org/jboss/as/osgi/service/FrameworkBootstrapService.java b/osgi/service/src/main/java/org/jboss/as/osgi/service/FrameworkBootstrapService.java
@@ -203,6 +203,7 @@ private void setupIntegrationProperties(StartContext context, Map<String, Object
             buffer.append("org.jboss.modules,");
             buffer.append("org.jboss.msc,");
             buffer.append("org.jboss.osgi.framework,");
+            buffer.append("org.jboss.osgi.repository,");
             buffer.append("org.slf4j");
             props.put(PROP_JBOSS_OSGI_SYSTEM_MODULES, buffer.toString());
         }
@@ -218,6 +219,11 @@ private void setupIntegrationProperties(StartContext context, Map<String, Object
             sysPackages.add("org.jboss.as.configadmin.service");
             sysPackages.add("org.jboss.as.osgi.service");
             sysPackages.add("org.jboss.logging;version=3.1.0");
+            sysPackages.add("org.jboss.osgi.repository;version=1.0");
+            sysPackages.add("org.jboss.osgi.resolver.v2;version=2.0");
+            sysPackages.add("org.osgi.service.repository;version=1.0");
+            sysPackages.add("org.osgi.framework.resource;version=1.0");
+            sysPackages.add("org.osgi.framework.wiring;version=1.1");
             sysPackages.add("org.slf4j;version=1.6.1");
             syspackages = sysPackages.toString();
             syspackages = syspackages.substring(1, syspackages.length() - 1);

diff --git a/pom.xml b/pom.xml
@@ -170,7 +170,7 @@
         <version.org.jboss.modules.jboss-modules>1.1.0.GA</version.org.jboss.modules.jboss-modules>
         <version.org.jboss.msc.jboss-msc>1.0.2.GA</version.org.jboss.msc.jboss-msc>
         <version.org.jboss.netty>3.2.6.Final</version.org.jboss.netty>
-        <version.org.jboss.osgi.framework>1.1.2</version.org.jboss.osgi.framework>
+        <version.org.jboss.osgi.framework>1.1.3</version.org.jboss.osgi.framework>
         <version.org.jboss.osgi.http>1.0.5</version.org.jboss.osgi.http>
         <version.org.jboss.osgi.logging>1.0.0</version.org.jboss.osgi.logging>
         <version.org.jboss.osgi.metadata>2.0.0</version.org.jboss.osgi.metadata>