You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2009/07/07 11:59:08 UTC

svn commit: r791775 - /sling/trunk/contrib/extensions/jcrinstall/osgi/src/main/java/org/apache/sling/osgi/installer/impl/Activator.java

Author: bdelacretaz
Date: Tue Jul  7 09:59:08 2009
New Revision: 791775

URL: http://svn.apache.org/viewvc?rev=791775&view=rev
Log:
SLING-904 - register OsgiControllerImpl as OsgiControllerServices, testDeferredConfigInstall was failing

Modified:
    sling/trunk/contrib/extensions/jcrinstall/osgi/src/main/java/org/apache/sling/osgi/installer/impl/Activator.java

Modified: sling/trunk/contrib/extensions/jcrinstall/osgi/src/main/java/org/apache/sling/osgi/installer/impl/Activator.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/jcrinstall/osgi/src/main/java/org/apache/sling/osgi/installer/impl/Activator.java?rev=791775&r1=791774&r2=791775&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/jcrinstall/osgi/src/main/java/org/apache/sling/osgi/installer/impl/Activator.java (original)
+++ sling/trunk/contrib/extensions/jcrinstall/osgi/src/main/java/org/apache/sling/osgi/installer/impl/Activator.java Tue Jul  7 09:59:08 2009
@@ -21,6 +21,7 @@
 import java.util.Hashtable;
 
 import org.apache.sling.osgi.installer.OsgiController;
+import org.apache.sling.osgi.installer.OsgiControllerServices;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -65,7 +66,11 @@
                 (PackageAdmin)this.packageAdminTracker.getService(),
                 (StartLevel)this.startLevelTracker.getService(),
                 (LogService)this.logServiceTracker.getService());
-        serviceReg = context.registerService(new String[] {OsgiController.class.getName()}, service, props);
+        final String [] serviceInterfaces = {
+        		OsgiController.class.getName(),
+        		OsgiControllerServices.class.getName()
+        };
+        serviceReg = context.registerService(serviceInterfaces, service, props);
     }
 
     /**