svn commit: r225169 - /cocoon/trunk/src/java/org/apache/cocoon/core/osgi/ServiceManagerActivator.java

[sy...@apache.org]

Author: sylvain
Date: Mon Jul 25 12:47:25 2005
New Revision: 225169

URL: http://svn.apache.org/viewcvs?rev=225169&view=rev
Log:
Committed a bit too fast...

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/core/osgi/ServiceManagerActivator.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/core/osgi/ServiceManagerActivator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/osgi/ServiceManagerActivator.java?rev=225169&r1=225168&r2=225169&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/osgi/ServiceManagerActivator.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/osgi/ServiceManagerActivator.java Mon Jul 25 12:47:25 2005
@@ -23,7 +23,6 @@
 import org.apache.avalon.framework.context.DefaultContext;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.components.container.ComponentContext;
-import org.apache.cocoon.core.container.CoreServiceManager;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;
@@ -33,7 +32,7 @@
 
 //  Registering services must go through the ServiceFactory class wrapping the componentHandler
     
-    private CoreServiceManager manager;
+    private OSGiCoreServiceManager manager;
 
     public void start(final BundleContext ctx) throws Exception {
         
@@ -45,7 +44,7 @@
         ServiceManager parentManager = new OSGiServiceManager(ctx);
         
         // Create a regular manager
-        this.manager = new CoreServiceManager(parentManager, this.getClass().getClassLoader()) {
+        this.manager = new OSGiCoreServiceManager(parentManager, this.getClass().getClassLoader(), ctx) {
         };
         
         //---- LogEnabled