ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r995244 [1/2] - in /incubator/ace/trunk: ./ ace-client-automation/src/main/java/org/apache/ace/client/automation/ ace-client-repository-configuration/src/main/java/org/apache/ace/client/repository/helper/configuration/impl/ ace-client-repos...
Date Wed, 08 Sep 2010 20:43:04 GMT
Author: marrs
Date: Wed Sep  8 20:43:00 2010
New Revision: 995244

URL: http://svn.apache.org/viewvc?rev=995244&view=rev
Log:
Refactored all bundles to work with the latest dependency manager snapshot again.

Modified:
    incubator/ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java
    incubator/ace/trunk/ace-client-repository-configuration/src/main/java/org/apache/ace/client/repository/helper/configuration/impl/Activator.java
    incubator/ace/trunk/ace-client-repository-helper-bundle/src/main/java/org/apache/ace/client/repository/helper/bundle/impl/Activator.java
    incubator/ace/trunk/ace-client-repository-helper-user/src/main/java/org/apache/ace/client/repository/helper/user/impl/Activator.java
    incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java
    incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
    incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
    incubator/ace/trunk/ace-configurator-serveruseradmin/src/main/java/org/apache/ace/configurator/serveruseradmin/Activator.java
    incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/Activator.java
    incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java
    incubator/ace/trunk/ace-consolelogger/src/main/java/org/apache/ace/consolelogger/Activator.java
    incubator/ace/trunk/ace-deployment-deploymentadmin/src/main/java/org/apache/ace/deployment/deploymentadmin/Activator.java
    incubator/ace/trunk/ace-deployment-provider-filebased/src/main/java/org/apache/ace/deployment/provider/filebased/Activator.java
    incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/Activator.java
    incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/Activator.java
    incubator/ace/trunk/ace-deployment-streamgenerator/src/main/java/org/apache/ace/deployment/streamgenerator/impl/Activator.java
    incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
    incubator/ace/trunk/ace-discovery-property/src/main/java/org/apache/ace/discovery/property/Activator.java
    incubator/ace/trunk/ace-discovery-upnp/src/main/java/org/apache/ace/discovery/upnp/Activator.java
    incubator/ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/impl/Activator.java
    incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java
    incubator/ace/trunk/ace-httplistener/src/main/java/org/apache/ace/http/listener/Activator.java
    incubator/ace/trunk/ace-identification-ifconfig/src/main/java/org/apache/ace/identification/ifconfig/Activator.java
    incubator/ace/trunk/ace-identification-property/src/main/java/org/apache/ace/identification/property/Activator.java
    incubator/ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/Activator.java
    incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/Activator.java
    incubator/ace/trunk/ace-log-task/src/main/java/org/apache/ace/server/log/task/Activator.java
    incubator/ace/trunk/ace-obr-metadata/src/main/java/org/apache/ace/obr/metadata/bindex/Activator.java
    incubator/ace/trunk/ace-obr-servlet/src/main/java/org/apache/ace/obr/servlet/Activator.java
    incubator/ace/trunk/ace-obr-storage/src/main/java/org/apache/ace/obr/storage/file/Activator.java
    incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/Activator.java
    incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/RepositoryFactory.java
    incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/Activator.java
    incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java
    incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServlet.java
    incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/Activator.java
    incubator/ace/trunk/ace-resourceprocessor-useradmin/src/main/java/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java
    incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/Activator.java
    incubator/ace/trunk/ace-server-action-popupmessage/src/main/java/org/apache/ace/server/action/popupmessage/Activator.java
    incubator/ace/trunk/ace-server-log-store/src/main/java/org/apache/ace/server/log/store/impl/Activator.java
    incubator/ace/trunk/ace-target-devserver/pom.xml
    incubator/ace/trunk/ace-webconsole-plugin/src/main/java/org/apache/ace/webconsole/plugin/Activator.java
    incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/server/Activator.java
    incubator/ace/trunk/legacy/core/src/org/apache/ace/consolelogger/Activator.java
    incubator/ace/trunk/legacy/gateway/src/org/apache/ace/configurator/Activator.java
    incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java
    incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/task/Activator.java
    incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/property/Activator.java
    incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/upnp/Activator.java
    incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/Activator.java
    incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java
    incubator/ace/trunk/legacy/gateway/src/org/apache/ace/identification/ifconfig/Activator.java
    incubator/ace/trunk/legacy/gateway/src/org/apache/ace/identification/property/Activator.java
    incubator/ace/trunk/legacy/gateway/src/org/apache/ace/ma/webstart/Activator.java
    incubator/ace/trunk/legacy/gateway/src/org/apache/ace/scheduler/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/client/automation/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/helper/bundle/impl/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/helper/configuration/impl/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/helper/user/impl/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/configurator/useradmin/task/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/provider/filebased/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/servlet/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/http/listener/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/location/upnp/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/obr/metadata/bindex/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/obr/servlet/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/obr/storage/file/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/impl/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/impl/RepositoryFactory.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/servlet/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/task/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/server/action/popupmessage/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/store/impl/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/task/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/ace/webconsole/plugin/Activator.java
    incubator/ace/trunk/legacy/server/src/org/apache/felix/deployment/rp/autoconf/Activator.java
    incubator/ace/trunk/legacy/test/src/org/apache/ace/test/bundlestop/Activator.java
    incubator/ace/trunk/legacy/test/src/org/apache/ace/test/deployment/Activator.java
    incubator/ace/trunk/legacy/test/src/org/apache/ace/test/http/listener/Activator.java
    incubator/ace/trunk/legacy/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java
    incubator/ace/trunk/legacy/test/src/org/apache/ace/test/log/Activator.java
    incubator/ace/trunk/legacy/test/src/org/apache/ace/test/mockautoconf/Activator.java
    incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repository/Activator.java
    incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repositoryadmin/Activator.java
    incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java
    incubator/ace/trunk/legacy/test/src/org/apache/ace/test/useradminconfigurator/Activator.java
    incubator/ace/trunk/legacy/webui/src/org/apache/ace/server/Activator.java
    incubator/ace/trunk/pom.xml

Modified: incubator/ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java (original)
+++ incubator/ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java Wed Sep  8 20:43:00 2010
@@ -37,7 +37,7 @@ public class Activator extends Dependenc
      */
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(AutoGatewayOperator.class)
             .add(createConfigurationDependency().setPid(AutoGatewayOperator.PID))
             .add(createServiceDependency().setRequired(true).setService(UserAdmin.class))

Modified: incubator/ace/trunk/ace-client-repository-configuration/src/main/java/org/apache/ace/client/repository/helper/configuration/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-configuration/src/main/java/org/apache/ace/client/repository/helper/configuration/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-configuration/src/main/java/org/apache/ace/client/repository/helper/configuration/impl/Activator.java (original)
+++ incubator/ace/trunk/ace-client-repository-configuration/src/main/java/org/apache/ace/client/repository/helper/configuration/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -39,10 +39,10 @@ public class Activator extends Dependenc
         Dictionary<String, String> props = new Hashtable<String, String>();
         props.put(ArtifactObject.KEY_MIMETYPE, ConfigurationHelper.MIMETYPE);
         ConfigurationHelperImpl helperImpl = new ConfigurationHelperImpl();
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ArtifactHelper.class.getName(), props)
             .setImplementation(helperImpl));
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ArtifactRecognizer.class.getName(), null)
             .setImplementation(helperImpl));
     }

Modified: incubator/ace/trunk/ace-client-repository-helper-bundle/src/main/java/org/apache/ace/client/repository/helper/bundle/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-helper-bundle/src/main/java/org/apache/ace/client/repository/helper/bundle/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-helper-bundle/src/main/java/org/apache/ace/client/repository/helper/bundle/impl/Activator.java (original)
+++ incubator/ace/trunk/ace-client-repository-helper-bundle/src/main/java/org/apache/ace/client/repository/helper/bundle/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -39,13 +39,13 @@ public class Activator extends Dependenc
         Dictionary<String, String> props = new Hashtable<String, String>();
         props.put(ArtifactObject.KEY_MIMETYPE, BundleHelper.MIMETYPE);
         BundleHelperImpl helperImpl = new BundleHelperImpl();
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ArtifactHelper.class.getName(), props)
             .setImplementation(helperImpl));
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ArtifactRecognizer.class.getName(), null)
             .setImplementation(helperImpl));
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(BundleHelper.class.getName(), null)
             .setImplementation(helperImpl));
     }

Modified: incubator/ace/trunk/ace-client-repository-helper-user/src/main/java/org/apache/ace/client/repository/helper/user/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-helper-user/src/main/java/org/apache/ace/client/repository/helper/user/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-helper-user/src/main/java/org/apache/ace/client/repository/helper/user/impl/Activator.java (original)
+++ incubator/ace/trunk/ace-client-repository-helper-user/src/main/java/org/apache/ace/client/repository/helper/user/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -39,12 +39,12 @@ public class Activator extends Dependenc
         Properties props = new Properties();
         props.put(ArtifactObject.KEY_MIMETYPE, UserAdminHelper.MIMETYPE);
         UserHelperImpl helperImpl = new UserHelperImpl();
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ArtifactHelper.class.getName(), props)
             .setImplementation(helperImpl));
         props = new Properties();
         props.put(Constants.SERVICE_RANKING, 10);
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ArtifactRecognizer.class.getName(), props)
             .setImplementation(helperImpl));
     }

Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java (original)
+++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -40,9 +40,9 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
 import org.apache.ace.client.repository.stateful.impl.StatefulGatewayRepositoryImpl;
 import org.apache.ace.server.log.store.LogStore;
+import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.event.EventAdmin;
@@ -61,7 +61,7 @@ public class Activator extends Dependenc
     @Override
     public synchronized void init(BundleContext context, DependencyManager manager) throws Exception {
         m_dependencyManager = manager;
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(SessionFactory.class.getName(), null)
             .setImplementation(this)
         );
@@ -75,8 +75,8 @@ public class Activator extends Dependenc
     private static class SessionData {
         public static SessionData EMPTY_SESSION = new SessionData();
 
-        private Service m_service;
-        private Service m_service2;
+        private Component m_service;
+        private Component m_service2;
     }
 
     public void createSession(String sessionID) {
@@ -109,7 +109,7 @@ public class Activator extends Dependenc
     private SessionData createSessionServices(String sessionID) {
         SessionData sd = new SessionData();
         RepositoryAdminImpl rai = new RepositoryAdminImpl(sessionID);
-        sd.m_service = createService()
+        sd.m_service = createComponent()
             .setInterface(RepositoryAdmin.class.getName(), rai.getSessionProps())
             .setImplementation(rai)
             .setComposition("getInstances")
@@ -133,7 +133,7 @@ public class Activator extends Dependenc
         topic.put(EventConstants.EVENT_FILTER, filter);
         topic.put(SessionFactory.SERVICE_SID, sessionID);
         StatefulGatewayRepositoryImpl statefulGatewayRepositoryImpl = new StatefulGatewayRepositoryImpl();
-        sd.m_service2 = createService()
+        sd.m_service2 = createComponent()
             .setInterface(new String[] { StatefulGatewayRepository.class.getName(), EventHandler.class.getName() }, topic)
             .setImplementation(statefulGatewayRepositoryImpl)
             .add(createServiceDependency().setService(ArtifactRepository.class, filter).setRequired(true))

Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java (original)
+++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java Wed Sep  8 20:43:00 2010
@@ -59,8 +59,8 @@ import org.apache.ace.repository.ext.Cac
 import org.apache.ace.repository.ext.impl.CachedRepositoryImpl;
 import org.apache.ace.repository.ext.impl.FilebasedBackupRepository;
 import org.apache.ace.repository.ext.impl.RemoteRepository;
+import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.event.EventConstants;
@@ -99,7 +99,7 @@ public class RepositoryAdminImpl impleme
     private RepositorySet[] m_repositorySets;
 
     private volatile DependencyManager m_manager;
-    List<Service[]> m_services;
+    List<Component[]> m_services;
     private ArtifactRepositoryImpl m_artifactRepositoryImpl;
     private GroupRepositoryImpl m_groupRepositoryImpl;
     private Artifact2GroupAssociationRepositoryImpl m_artifact2GroupAssociationRepositoryImpl;
@@ -170,7 +170,7 @@ public class RepositoryAdminImpl impleme
             m_deploymentVersionRepositoryImpl = new DeploymentVersionRepositoryImpl(m_changeNotifierManager.getConfiguredNotifier(RepositoryObject.PRIVATE_TOPIC_ROOT, RepositoryObject.PUBLIC_TOPIC_ROOT, DeploymentVersionObject.TOPIC_ENTITY_ROOT, m_sessionID));
         }
         // first, register the artifact repository manually; it needs some special care.
-        Service artifactRepoService = m_manager.createService()
+        Component artifactRepoService = m_manager.createComponent()
             .setInterface(ArtifactRepository.class.getName(), m_sessionProps)
             .setImplementation(m_artifactRepositoryImpl)
             .add(m_manager.createServiceDependency().setService(LogService.class).setRequired(false))
@@ -178,14 +178,14 @@ public class RepositoryAdminImpl impleme
         Dictionary topic = new Hashtable();
         topic.put(EventConstants.EVENT_TOPIC, new String[] {});
         topic.put(EventConstants.EVENT_FILTER, "(" + SessionFactory.SERVICE_SID + "=" + m_sessionID + ")");
-        Service artifactHandlerService = m_manager.createService()
+        Component artifactHandlerService = m_manager.createComponent()
             .setInterface(EventHandler.class.getName(), topic)
             .setImplementation(m_artifactRepositoryImpl);
         m_manager.add(artifactRepoService);
         m_manager.add(artifactHandlerService);
 
-        m_services = new ArrayList<Service[]>();
-        m_services.add(new Service[] {artifactRepoService, artifactHandlerService});
+        m_services = new ArrayList<Component[]>();
+        m_services.add(new Component[] {artifactRepoService, artifactHandlerService});
 
         // register all repositories are services. Keep the service objects around, we need them to pull the services later.
         m_services.add(registerRepository(Artifact2GroupAssociationRepository.class, m_artifact2GroupAssociationRepositoryImpl, new String[] {createPrivateObjectTopic(ArtifactObject.TOPIC_ENTITY_ROOT), createPrivateObjectTopic(GroupObject.TOPIC_ENTITY_ROOT)}));
@@ -214,29 +214,29 @@ public class RepositoryAdminImpl impleme
      * Pulls all repository services; is used to make sure the repositories go away before the RepositoryAdmin does.
      */
     synchronized void pullRepositories() {
-        for (Service[] services : m_services) {
-            for (Service service : services) {
+        for (Component[] services : m_services) {
+            for (Component service : services) {
                 m_manager.remove(service);
             }
         }
     }
 
     @SuppressWarnings("unchecked")
-    private <T extends RepositoryObject> Service[] registerRepository(Class<? extends ObjectRepository<T>> iface, ObjectRepositoryImpl<?, T> imp, String[] topics) {
-        Service repositoryService = m_manager.createService()
+    private <T extends RepositoryObject> Component[] registerRepository(Class<? extends ObjectRepository<T>> iface, ObjectRepositoryImpl<?, T> imp, String[] topics) {
+        Component repositoryService = m_manager.createComponent()
             .setInterface(iface.getName(), m_sessionProps)
             .setImplementation(imp)
             .add(m_manager.createServiceDependency().setService(LogService.class).setRequired(false));
         Dictionary topic = new Hashtable();
         topic.put(EventConstants.EVENT_TOPIC, topics);
         topic.put(EventConstants.EVENT_FILTER, "(" + SessionFactory.SERVICE_SID + "=" + m_sessionID + ")");
-        Service handlerService = m_manager.createService()
+        Component handlerService = m_manager.createComponent()
             .setInterface(EventHandler.class.getName(), topic)
             .setImplementation(imp);
 
         m_manager.add(repositoryService);
         m_manager.add(handlerService);
-        return new Service[] {repositoryService, handlerService};
+        return new Component[] {repositoryService, handlerService};
     }
 
     /**

Modified: incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/Activator.java (original)
+++ incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -37,7 +37,7 @@ public class Activator extends Dependenc
     @Override
     public void init(BundleContext context, DependencyManager manager) {
         m_impl = new RepositoryUserAdminImpl();
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(RepositoryUserAdmin.class.getName(), null)
             .setImplementation(m_impl)
             .add(createServiceDependency()

Modified: incubator/ace/trunk/ace-configurator-serveruseradmin/src/main/java/org/apache/ace/configurator/serveruseradmin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator-serveruseradmin/src/main/java/org/apache/ace/configurator/serveruseradmin/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator-serveruseradmin/src/main/java/org/apache/ace/configurator/serveruseradmin/Activator.java (original)
+++ incubator/ace/trunk/ace-configurator-serveruseradmin/src/main/java/org/apache/ace/configurator/serveruseradmin/Activator.java Wed Sep  8 20:43:00 2010
@@ -42,7 +42,7 @@ public class Activator extends Dependenc
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(this)
             .add(createServiceDependency().setService(UserAdmin.class).setRequired(true))
             .add(createServiceDependency().setService(LogService.class).setRequired(false)));

Modified: incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/Activator.java (original)
+++ incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/Activator.java Wed Sep  8 20:43:00 2010
@@ -36,7 +36,7 @@ public class Activator extends Dependenc
         Properties props = new Properties();
         props.put("taskName", UpdateUserAdminTask.PID);
         props.put("description", "Synchronizes the UserAdmin with the server.");
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Runnable.class.getName(), props)
             .setImplementation(UpdateUserAdminTask.class)
             .add(createServiceDependency().setService(UserAdminConfigurator.class).setRequired(true))

Modified: incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java (original)
+++ incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java Wed Sep  8 20:43:00 2010
@@ -29,7 +29,7 @@ import org.osgi.service.log.LogService;
 public class Activator extends DependencyActivatorBase {
 
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(new Configurator(new File(
                 getProperty(context.getProperty(Activator.class.getPackage().getName() + ".CONFIG_DIR"), "conf")),
                 getProperty(context.getProperty(Activator.class.getPackage().getName() + ".POLL_INTERVAL"), 2000),

Modified: incubator/ace/trunk/ace-consolelogger/src/main/java/org/apache/ace/consolelogger/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-consolelogger/src/main/java/org/apache/ace/consolelogger/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-consolelogger/src/main/java/org/apache/ace/consolelogger/Activator.java (original)
+++ incubator/ace/trunk/ace-consolelogger/src/main/java/org/apache/ace/consolelogger/Activator.java Wed Sep  8 20:43:00 2010
@@ -25,7 +25,7 @@ import org.osgi.service.log.LogService;
 
 public class Activator extends DependencyActivatorBase {
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(LogService.class.getName(), null)
             .setImplementation(Logger.class)
         );

Modified: incubator/ace/trunk/ace-deployment-deploymentadmin/src/main/java/org/apache/ace/deployment/deploymentadmin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-deploymentadmin/src/main/java/org/apache/ace/deployment/deploymentadmin/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-deploymentadmin/src/main/java/org/apache/ace/deployment/deploymentadmin/Activator.java (original)
+++ incubator/ace/trunk/ace-deployment-deploymentadmin/src/main/java/org/apache/ace/deployment/deploymentadmin/Activator.java Wed Sep  8 20:43:00 2010
@@ -27,7 +27,7 @@ import org.osgi.service.log.LogService;
 
 public class Activator extends DependencyActivatorBase {
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Deployment.class.getName(), null)
             .setImplementation(DeploymentAdminDeployer.class)
             .add(createServiceDependency().setService(DeploymentAdmin.class).setRequired(true))

Modified: incubator/ace/trunk/ace-deployment-provider-filebased/src/main/java/org/apache/ace/deployment/provider/filebased/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-filebased/src/main/java/org/apache/ace/deployment/provider/filebased/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-provider-filebased/src/main/java/org/apache/ace/deployment/provider/filebased/Activator.java (original)
+++ incubator/ace/trunk/ace-deployment-provider-filebased/src/main/java/org/apache/ace/deployment/provider/filebased/Activator.java Wed Sep  8 20:43:00 2010
@@ -29,7 +29,7 @@ public class Activator extends Dependenc
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(DeploymentProvider.class.getName(), null)
             .setImplementation(FileBasedProvider.class)
             .add(createConfigurationDependency()

Modified: incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/Activator.java (original)
+++ incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/Activator.java Wed Sep  8 20:43:00 2010
@@ -29,7 +29,7 @@ public class Activator extends Dependenc
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(DeploymentProvider.class.getName(), null)
             .setImplementation(RepositoryBasedProvider.class)
             .add(createConfigurationDependency()

Modified: incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/Activator.java (original)
+++ incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/Activator.java Wed Sep  8 20:43:00 2010
@@ -32,7 +32,7 @@ public class Activator extends Dependenc
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(HttpServlet.class.getName(), null)
             .setImplementation(DeploymentServlet.class)
             .add(createServiceDependency().setService(StreamGenerator.class).setRequired(true))

Modified: incubator/ace/trunk/ace-deployment-streamgenerator/src/main/java/org/apache/ace/deployment/streamgenerator/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-streamgenerator/src/main/java/org/apache/ace/deployment/streamgenerator/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-streamgenerator/src/main/java/org/apache/ace/deployment/streamgenerator/impl/Activator.java (original)
+++ incubator/ace/trunk/ace-deployment-streamgenerator/src/main/java/org/apache/ace/deployment/streamgenerator/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -27,7 +27,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends DependencyActivatorBase {
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(StreamGenerator.class.getName(), null)
             .setImplementation(StreamGeneratorImpl.class)
             .add(createServiceDependency()

Modified: incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java (original)
+++ incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java Wed Sep  8 20:43:00 2010
@@ -43,7 +43,7 @@ public class Activator extends Dependenc
         checkProperties.put(SchedulerConstants.SCHEDULER_NAME_KEY, DeploymentCheckTask.class.getName());
         checkProperties.put(SchedulerConstants.SCHEDULER_RECIPE, "5000");
 
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Runnable.class.getName(), updateProperties)
             .setImplementation(DeploymentUpdateTask.class)
             .add(createServiceDependency().setService(Deployment.class).setRequired(true))
@@ -52,7 +52,7 @@ public class Activator extends Dependenc
              .add(createServiceDependency().setService(EventAdmin.class).setRequired(false))
             .add(createServiceDependency().setService(LogService.class).setRequired(false)));
 
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Runnable.class.getName(), checkProperties)
             .setImplementation(DeploymentCheckTask.class)
             .add(createServiceDependency().setService(Deployment.class).setRequired(true))

Modified: incubator/ace/trunk/ace-discovery-property/src/main/java/org/apache/ace/discovery/property/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-property/src/main/java/org/apache/ace/discovery/property/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-discovery-property/src/main/java/org/apache/ace/discovery/property/Activator.java (original)
+++ incubator/ace/trunk/ace-discovery-property/src/main/java/org/apache/ace/discovery/property/Activator.java Wed Sep  8 20:43:00 2010
@@ -34,7 +34,7 @@ public class Activator extends Dependenc
     public void init(BundleContext context, DependencyManager manager) throws Exception {
         Dictionary properties = new Hashtable();
         properties.put(Constants.SERVICE_PID, DiscoveryConstants.DISCOVERY_PID);
-        manager.add(createService()
+        manager.add(createComponent()
                         .setInterface(new String[] {Discovery.class.getName()}, properties)
                         .setImplementation(PropertyBasedDiscovery.class)
                         .add(createConfigurationDependency()

Modified: incubator/ace/trunk/ace-discovery-upnp/src/main/java/org/apache/ace/discovery/upnp/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-discovery-upnp/src/main/java/org/apache/ace/discovery/upnp/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-discovery-upnp/src/main/java/org/apache/ace/discovery/upnp/Activator.java (original)
+++ incubator/ace/trunk/ace-discovery-upnp/src/main/java/org/apache/ace/discovery/upnp/Activator.java Wed Sep  8 20:43:00 2010
@@ -33,7 +33,7 @@ public class Activator extends Dependenc
             .append(UPnPDevice.TYPE).append("=")
             .append(UPnPBasedDiscovery.DEVICE_TYPE).append(")");
 
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(new String[] {Discovery.class.getName()}, null)
             .setImplementation(UPnPBasedDiscovery.class)
                 .add(createServiceDependency()

Modified: incubator/ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/impl/Activator.java (original)
+++ incubator/ace/trunk/ace-gateway-log-store/src/main/java/org/apache/ace/gateway/log/store/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -26,9 +26,9 @@ import java.util.Properties;
 
 import org.apache.ace.gateway.log.store.LogStore;
 import org.apache.ace.identification.Identification;
+import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationException;
@@ -49,7 +49,7 @@ public class Activator extends Dependenc
         m_manager = manager;
         Properties props = new Properties();
         props.put(Constants.SERVICE_PID, "org.apache.ace.gateway.log.store.factory");
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(this)
             .add(createServiceDependency().setService(LogService.class).setRequired(false)));
@@ -60,7 +60,7 @@ public class Activator extends Dependenc
     }
 
     public synchronized void deleted(String pid) {
-        Service log = (Service) m_instances.remove(pid);
+        Component log = (Component) m_instances.remove(pid);
         if (log != null) {
             m_manager.remove(log);
             delete(new File(m_context.getDataFile(""), pid));
@@ -87,12 +87,12 @@ public class Activator extends Dependenc
             throw new ConfigurationException(LOG_NAME, "Log name has to be specified.");
         }
 
-        Service service = (Service) m_instances.get(pid);
+        Component service = (Component) m_instances.get(pid);
         if (service == null) {
             Properties props = new Properties();
             props.put(LOG_NAME, name);
             File baseDir = new File(m_context.getDataFile(""), pid);
-            service = m_manager.createService()
+            service = m_manager.createComponent()
                 .setInterface(LogStore.class.getName(), props)
                 .setImplementation(new LogStoreImpl(baseDir))
                 .add(createServiceDependency().setService(Identification.class).setRequired(true))

Modified: incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java (original)
+++ incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java Wed Sep  8 20:43:00 2010
@@ -29,9 +29,9 @@ import org.apache.ace.gateway.log.task.L
 import org.apache.ace.identification.Identification;
 import org.apache.ace.log.Log;
 import org.apache.ace.scheduler.constants.SchedulerConstants;
+import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationException;
@@ -51,7 +51,7 @@ public class Activator extends Dependenc
         m_manager = manager;
         Properties props = new Properties();
         props.put(Constants.SERVICE_PID, "org.apache.ace.gateway.log.factory");
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(this)
             .add(createServiceDependency().setService(LogService.class).setRequired(false)));
@@ -61,11 +61,11 @@ public class Activator extends Dependenc
     }
 
     public synchronized void deleted(String pid) {
-        Service log = (Service) m_logInstances.remove(pid);
+        Component log = (Component) m_logInstances.remove(pid);
         if (log != null) {
             m_manager.remove(log);
         }
-        Service sync = (Service) m_syncInstances.remove(pid);
+        Component sync = (Component) m_syncInstances.remove(pid);
         if (sync != null) {
             m_manager.remove(sync);
         }
@@ -81,12 +81,12 @@ public class Activator extends Dependenc
             throw new ConfigurationException(LOG_NAME, "Log name has to be specified.");
         }
 
-        Service service = (Service) m_logInstances.get(pid);
+        Component service = (Component) m_logInstances.get(pid);
         if (service == null) {
             // publish log service
             Properties props = new Properties();
             props.put(LOG_NAME, name);
-            Service log = m_manager.createService()
+            Component log = m_manager.createComponent()
                 .setInterface(Log.class.getName(), props)
                 .setImplementation(LogImpl.class)
                 .add(createServiceDependency().setService(LogStore.class, "(&("+Constants.OBJECTCLASS+"="+LogStore.class.getName()+")(name=" + name + "))").setRequired(true))
@@ -97,7 +97,7 @@ public class Activator extends Dependenc
             properties.put(SchedulerConstants.SCHEDULER_DESCRIPTION_KEY, "Task that synchronizes log store with id=" + name + " on the gateway and server");
             properties.put(SchedulerConstants.SCHEDULER_NAME_KEY, name);
             properties.put(SchedulerConstants.SCHEDULER_RECIPE, "2000");
-            Service sync = m_manager.createService()
+            Component sync = m_manager.createComponent()
                 .setInterface(Runnable.class.getName(), properties)
                 .setImplementation(new LogSyncTask(name))
                 .add(createServiceDependency().setService(LogStore.class, "(&("+Constants.OBJECTCLASS+"="+LogStore.class.getName()+")(name=" + name + "))").setRequired(true))

Modified: incubator/ace/trunk/ace-httplistener/src/main/java/org/apache/ace/http/listener/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-httplistener/src/main/java/org/apache/ace/http/listener/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-httplistener/src/main/java/org/apache/ace/http/listener/Activator.java (original)
+++ incubator/ace/trunk/ace-httplistener/src/main/java/org/apache/ace/http/listener/Activator.java Wed Sep  8 20:43:00 2010
@@ -56,7 +56,7 @@ public class Activator extends Dependenc
     @Override
     public synchronized void init(BundleContext context, DependencyManager manager) throws Exception {
         m_context = context;
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(this)
             .add(createServiceDependency()
                 .setService(LogService.class)

Modified: incubator/ace/trunk/ace-identification-ifconfig/src/main/java/org/apache/ace/identification/ifconfig/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-ifconfig/src/main/java/org/apache/ace/identification/ifconfig/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-identification-ifconfig/src/main/java/org/apache/ace/identification/ifconfig/Activator.java (original)
+++ incubator/ace/trunk/ace-identification-ifconfig/src/main/java/org/apache/ace/identification/ifconfig/Activator.java Wed Sep  8 20:43:00 2010
@@ -27,7 +27,7 @@ import org.osgi.service.log.LogService;
 public class Activator extends DependencyActivatorBase {
 
     public synchronized void init(BundleContext context, DependencyManager manager) throws Exception {
-       manager.add(createService()
+       manager.add(createComponent()
             .setInterface(new String[] {Identification.class.getName()}, null)
             .setImplementation(IfconfigIdentification.class)
             .add(createServiceDependency().setService(LogService.class).setRequired(false))

Modified: incubator/ace/trunk/ace-identification-property/src/main/java/org/apache/ace/identification/property/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-identification-property/src/main/java/org/apache/ace/identification/property/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-identification-property/src/main/java/org/apache/ace/identification/property/Activator.java (original)
+++ incubator/ace/trunk/ace-identification-property/src/main/java/org/apache/ace/identification/property/Activator.java Wed Sep  8 20:43:00 2010
@@ -27,7 +27,7 @@ import org.osgi.service.log.LogService;
 
 public class Activator extends DependencyActivatorBase {
     public synchronized void init(BundleContext context, DependencyManager manager) throws Exception {
-       manager.add(createService()
+       manager.add(createComponent()
             .setInterface(new String[] {Identification.class.getName()}, null)
             .setImplementation(PropertyBasedIdentification.class)
             .add(createConfigurationDependency()

Modified: incubator/ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/Activator.java (original)
+++ incubator/ace/trunk/ace-location-upnp/src/main/java/org/apache/ace/location/upnp/Activator.java Wed Sep  8 20:43:00 2010
@@ -37,14 +37,14 @@ public class Activator extends Dependenc
 		ProvisioningDevice psDevice = new ProvisioningDevice(host, port);
 
 		//this service is configured with the correct settings
-		manager.add(createService()
+		manager.add(createComponent()
 		    .setImplementation(new LocationServiceImpl(host, port))
             .setInterface(LocationService.class.getName(), null)
             .add(createConfigurationDependency().setPid(LocationServiceImpl.PID))
 		    );
 
 		//this service depends on the highest ranked location service
-		manager.add(createService()
+		manager.add(createComponent()
 				.setImplementation(psDevice)
 				.setInterface(UPnPDevice.class.getName(), psDevice.getDescriptions(null))
 				.setComposition("getComposition")

Modified: incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/Activator.java (original)
+++ incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/Activator.java Wed Sep  8 20:43:00 2010
@@ -27,9 +27,9 @@ import javax.servlet.http.HttpServlet;
 
 import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.server.log.store.LogStore;
+import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationException;
@@ -39,7 +39,7 @@ import org.osgi.service.log.LogService;
 public class Activator extends DependencyActivatorBase implements ManagedServiceFactory {
     private static final String LOG_NAME = "name";
 
-    private final Map<String, Service> m_instances = new HashMap<String, Service>(); // String -> Service
+    private final Map<String, Component> m_instances = new HashMap<String, Component>(); // String -> Service
     private DependencyManager m_manager;
     private volatile LogService m_log;
 
@@ -48,7 +48,7 @@ public class Activator extends Dependenc
         m_manager = manager;
         Properties props = new Properties();
         props.put(Constants.SERVICE_PID, "org.apache.ace.server.log.servlet.factory");
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(this)
             .add(createServiceDependency().setService(LogService.class).setRequired(false)));    }
@@ -58,7 +58,7 @@ public class Activator extends Dependenc
     }
 
     public void deleted(String pid) {
-        Service log = m_instances.remove(pid);
+        Component log = m_instances.remove(pid);
         if (log != null) {
             m_manager.remove(log);
         }
@@ -79,11 +79,11 @@ public class Activator extends Dependenc
             throw new ConfigurationException(HttpConstants.ENDPOINT, "Servlet endpoint has to be specified.");
         }
 
-        Service service = m_instances.get(pid);
+        Component service = m_instances.get(pid);
         if (service == null) {
             Properties props = new Properties();
             props.put(HttpConstants.ENDPOINT, endpoint);
-            service = m_manager.createService()
+            service = m_manager.createComponent()
                 .setInterface(HttpServlet.class.getName(), props)
                 .setImplementation(new LogServlet(name))
                 .add(createServiceDependency().setService(LogService.class).setRequired(false))

Modified: incubator/ace/trunk/ace-log-task/src/main/java/org/apache/ace/server/log/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-task/src/main/java/org/apache/ace/server/log/task/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-log-task/src/main/java/org/apache/ace/server/log/task/Activator.java (original)
+++ incubator/ace/trunk/ace-log-task/src/main/java/org/apache/ace/server/log/task/Activator.java Wed Sep  8 20:43:00 2010
@@ -26,9 +26,9 @@ import java.util.Properties;
 import org.apache.ace.discovery.Discovery;
 import org.apache.ace.log.LogSync;
 import org.apache.ace.server.log.store.LogStore;
+import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationException;
@@ -39,7 +39,7 @@ public class Activator extends Dependenc
 
     private static final String LOG_NAME = "name";
     private DependencyManager m_manager;
-    private final Map<String, Service> m_instances = new HashMap<String, Service>();
+    private final Map<String, Component> m_instances = new HashMap<String, Component>();
     private volatile LogService m_log;
 
     @Override
@@ -47,7 +47,7 @@ public class Activator extends Dependenc
         m_manager = manager;
         Properties props = new Properties();
         props.put(Constants.SERVICE_PID, "org.apache.ace.server.log.task.factory");
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(this)
             .add(createServiceDependency().setService(LogService.class).setRequired(false)));
@@ -58,7 +58,7 @@ public class Activator extends Dependenc
     }
 
     public void deleted(String pid) {
-        Service service = m_instances.remove(pid);
+        Component service = m_instances.remove(pid);
         if (service != null) {
             m_manager.remove(service);
         }
@@ -75,13 +75,13 @@ public class Activator extends Dependenc
             throw new ConfigurationException(LOG_NAME, "Log name has to be specified.");
         }
 
-        Service service = m_instances.get(pid);
+        Component service = m_instances.get(pid);
         if (service == null) {
             Properties props = new Properties();
             props.put(LOG_NAME, name);
             props.put("taskName", LogSyncTask.class.getName());
             props.put("description", "Syncs log (name=" + name + ") with a server.");
-            service = m_manager.createService()
+            service = m_manager.createComponent()
                 .setInterface(new String[] { Runnable.class.getName(), LogSync.class.getName() }, props)
                 .setImplementation(new LogSyncTask(name, name))
                 .add(createServiceDependency().setService(LogStore.class, "(&("+Constants.OBJECTCLASS+"="+LogStore.class.getName()+")(name=" + name + "))").setRequired(true))

Modified: incubator/ace/trunk/ace-obr-metadata/src/main/java/org/apache/ace/obr/metadata/bindex/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-obr-metadata/src/main/java/org/apache/ace/obr/metadata/bindex/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-obr-metadata/src/main/java/org/apache/ace/obr/metadata/bindex/Activator.java (original)
+++ incubator/ace/trunk/ace-obr-metadata/src/main/java/org/apache/ace/obr/metadata/bindex/Activator.java Wed Sep  8 20:43:00 2010
@@ -28,7 +28,7 @@ public class Activator extends Dependenc
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(MetadataGenerator.class.getName(), null)
             .setImplementation(BIndexMetadataGenerator.class)
             .add(createServiceDependency()

Modified: incubator/ace/trunk/ace-obr-servlet/src/main/java/org/apache/ace/obr/servlet/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-obr-servlet/src/main/java/org/apache/ace/obr/servlet/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-obr-servlet/src/main/java/org/apache/ace/obr/servlet/Activator.java (original)
+++ incubator/ace/trunk/ace-obr-servlet/src/main/java/org/apache/ace/obr/servlet/Activator.java Wed Sep  8 20:43:00 2010
@@ -31,7 +31,7 @@ public class Activator extends Dependenc
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(HttpServlet.class.getName(), null)
             .setImplementation(BundleServlet.class)
             .add(createConfigurationDependency()

Modified: incubator/ace/trunk/ace-obr-storage/src/main/java/org/apache/ace/obr/storage/file/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-obr-storage/src/main/java/org/apache/ace/obr/storage/file/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-obr-storage/src/main/java/org/apache/ace/obr/storage/file/Activator.java (original)
+++ incubator/ace/trunk/ace-obr-storage/src/main/java/org/apache/ace/obr/storage/file/Activator.java Wed Sep  8 20:43:00 2010
@@ -30,7 +30,7 @@ public class Activator extends Dependenc
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(BundleStore.class.getName(), null)
             .setImplementation(BundleFileStore.class)
             .add(createConfigurationDependency()

Modified: incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/Activator.java (original)
+++ incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -34,7 +34,7 @@ public class Activator extends Dependenc
     public void init(BundleContext context, DependencyManager manager) throws Exception {
         Properties props = new Properties();
         props.put(Constants.SERVICE_PID, "org.apache.ace.server.repository.factory");
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(new RepositoryFactory(manager))
             .add(createServiceDependency().setService(PreferencesService.class).setRequired(true))

Modified: incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/RepositoryFactory.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/RepositoryFactory.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/RepositoryFactory.java (original)
+++ incubator/ace/trunk/ace-repository-impl/src/main/java/org/apache/ace/repository/impl/RepositoryFactory.java Wed Sep  8 20:43:00 2010
@@ -28,8 +28,8 @@ import java.util.Map;
 import org.apache.ace.repository.Repository;
 import org.apache.ace.repository.RepositoryReplication;
 import org.apache.ace.repository.impl.constants.RepositoryConstants;
+import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedServiceFactory;
@@ -52,7 +52,7 @@ public class RepositoryFactory implement
     private File m_baseDir;
     private Preferences m_prefs;
     private final DependencyManager m_manager;
-    private final Map<String, Service> m_instances = new HashMap<String, Service>();
+    private final Map<String, Component> m_instances = new HashMap<String, Component>();
 
     public RepositoryFactory(DependencyManager manager) {
         m_manager = manager;
@@ -60,7 +60,7 @@ public class RepositoryFactory implement
 
     public synchronized void deleted(String pid) {
         // pull service
-        Service service = m_instances.remove(pid);
+        Component service = m_instances.remove(pid);
         if (service != null) {
             m_manager.remove(service);
         }
@@ -153,7 +153,7 @@ public class RepositoryFactory implement
         node.put(RepositoryConstants.REPOSITORY_NAME, name);
         node.put(RepositoryConstants.REPOSITORY_CUSTOMER, customer);
 
-        Service service = m_instances.get(pid);
+        Component service = m_instances.get(pid);
         if (service == null) {
             // new instance
             File dir = new File(m_baseDir, pid);
@@ -166,7 +166,7 @@ public class RepositoryFactory implement
                     m_log.log(LogService.LOG_ERROR, "Unable to set initial contents of the repository.", e);
                 }
             }
-            service = m_manager.createService()
+            service = m_manager.createComponent()
                 .setInterface(new String[] {RepositoryReplication.class.getName(), Repository.class.getName()}, dict)
                 .setImplementation(store)
                 .add(m_manager.createServiceDependency().setService(LogService.class).setRequired(false));

Modified: incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/Activator.java (original)
+++ incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/Activator.java Wed Sep  8 20:43:00 2010
@@ -31,7 +31,7 @@ public class Activator extends Dependenc
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(HttpServlet.class.getName(), null)
             .setImplementation(RepositoryServlet.class)
             .add(createConfigurationDependency()
@@ -41,7 +41,7 @@ public class Activator extends Dependenc
                 .setService(LogService.class)
                 .setRequired(false)));
 
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(HttpServlet.class.getName(), null)
             .setImplementation(RepositoryReplicationServlet.class)
             .add(createConfigurationDependency()

Modified: incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java (original)
+++ incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java Wed Sep  8 20:43:00 2010
@@ -62,7 +62,7 @@ public class RepositoryReplicationServle
 
     @Override
     public String getServletInfo() {
-        return "LiQ Repository Replication Servlet";
+        return "Apache ACE Repository Replication Servlet";
     }
 
     @Override

Modified: incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServlet.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServlet.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServlet.java (original)
+++ incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/RepositoryServlet.java Wed Sep  8 20:43:00 2010
@@ -62,7 +62,7 @@ public class RepositoryServlet extends R
 
     @Override
     public String getServletInfo() {
-        return "LiQ Repository Servlet";
+        return "Apache ACE Repository Servlet";
     }
 
     @Override

Modified: incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/Activator.java (original)
+++ incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/Activator.java Wed Sep  8 20:43:00 2010
@@ -33,7 +33,7 @@ public class Activator extends Dependenc
         Properties props = new Properties();
         props.put(SchedulerConstants.SCHEDULER_NAME_KEY, RepositoryReplicationTask.class.getName());
         props.put(SchedulerConstants.SCHEDULER_DESCRIPTION_KEY, "Synchronizes repositories.");
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Runnable.class.getName(), props)
             .setImplementation(RepositoryReplicationTask.class)
             .add(createServiceDependency().setService(Discovery.class).setRequired(true))

Modified: incubator/ace/trunk/ace-resourceprocessor-useradmin/src/main/java/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-resourceprocessor-useradmin/src/main/java/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-resourceprocessor-useradmin/src/main/java/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java (original)
+++ incubator/ace/trunk/ace-resourceprocessor-useradmin/src/main/java/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -44,7 +44,7 @@ public class Activator extends Dependenc
 
         Properties props = new Properties();
         props.put(Constants.SERVICE_PID, PID);
-        manager.add(createService().setInterface(ResourceProcessor.class.getName(), props)
+        manager.add(createComponent().setInterface(ResourceProcessor.class.getName(), props)
                 .setImplementation(processor)
                 .add(createServiceDependency()
                     .setService(UserAdminConfigurator.class)
@@ -55,7 +55,7 @@ public class Activator extends Dependenc
                     .setRequired(false)));
 
 
-        manager.add(createService().setInterface(UserAdminConfigurator.class.getName(), null)
+        manager.add(createComponent().setInterface(UserAdminConfigurator.class.getName(), null)
             .setImplementation(userAdminStore)
             .add(createServiceDependency()
                 .setService(UserAdmin.class)

Modified: incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/Activator.java (original)
+++ incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/Activator.java Wed Sep  8 20:43:00 2010
@@ -42,7 +42,7 @@ public class Activator extends Dependenc
         m_scheduler = new Scheduler();
         Properties props = new Properties();
         props.put(Constants.SERVICE_PID, SchedulerConstants.SCHEDULER_PID);
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ManagedService.class.getName(), props)
             .setImplementation(m_scheduler)
             .add(createServiceDependency()

Modified: incubator/ace/trunk/ace-server-action-popupmessage/src/main/java/org/apache/ace/server/action/popupmessage/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-server-action-popupmessage/src/main/java/org/apache/ace/server/action/popupmessage/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-server-action-popupmessage/src/main/java/org/apache/ace/server/action/popupmessage/Activator.java (original)
+++ incubator/ace/trunk/ace-server-action-popupmessage/src/main/java/org/apache/ace/server/action/popupmessage/Activator.java Wed Sep  8 20:43:00 2010
@@ -31,7 +31,7 @@ public class Activator extends Dependenc
     public void init(BundleContext context, DependencyManager manager) {
         Properties props = new Properties();
         props.put(Action.ACTION_NAME, PopupMessageAction.NAME);
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Action.class.getName(), props)
             .setImplementation(PopupMessageAction.class)
             );

Modified: incubator/ace/trunk/ace-server-log-store/src/main/java/org/apache/ace/server/log/store/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-server-log-store/src/main/java/org/apache/ace/server/log/store/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-server-log-store/src/main/java/org/apache/ace/server/log/store/impl/Activator.java (original)
+++ incubator/ace/trunk/ace-server-log-store/src/main/java/org/apache/ace/server/log/store/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -25,9 +25,9 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.apache.ace.server.log.store.LogStore;
+import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationException;
@@ -39,7 +39,7 @@ public class Activator extends Dependenc
 
     private static final String LOG_NAME = "name";
     private DependencyManager m_manager;
-    private final Map<String, Service> m_instances = new HashMap<String, Service>();
+    private final Map<String, Component> m_instances = new HashMap<String, Component>();
     private BundleContext m_context;
     private volatile LogService m_log;
 
@@ -49,7 +49,7 @@ public class Activator extends Dependenc
         m_manager = manager;
         Properties props = new Properties();
         props.put(Constants.SERVICE_PID, "org.apache.ace.server.log.store.factory");
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(this)
             .add(createServiceDependency().setService(LogService.class).setRequired(false)));
@@ -60,7 +60,7 @@ public class Activator extends Dependenc
     }
 
     public void deleted(String pid) {
-        Service log = m_instances.remove(pid);
+        Component log = m_instances.remove(pid);
         if (log != null) {
             m_manager.remove(log);
             delete(new File(m_context.getDataFile(""), pid));
@@ -87,12 +87,12 @@ public class Activator extends Dependenc
             throw new ConfigurationException(LOG_NAME, "Log name has to be specified.");
         }
 
-        Service service = m_instances.get(pid);
+        Component service = m_instances.get(pid);
         if (service == null) {
             Properties props = new Properties();
             props.put(LOG_NAME, name);
             File baseDir = new File(m_context.getDataFile(""), pid);
-            service = m_manager.createService()
+            service = m_manager.createComponent()
                 .setInterface(LogStore.class.getName(), props)
                 .setImplementation(new LogStoreImpl(baseDir, name))
                 .add(createServiceDependency().setService(EventAdmin.class).setRequired(false));

Modified: incubator/ace/trunk/ace-target-devserver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/pom.xml?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-target-devserver/pom.xml (original)
+++ incubator/ace/trunk/ace-target-devserver/pom.xml Wed Sep  8 20:43:00 2010
@@ -285,6 +285,15 @@
             <scope>runtime</scope>
         </dependency>
 
+		<!--
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ace-distribution-servlet</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+		-->
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ace-httplistener</artifactId>

Modified: incubator/ace/trunk/ace-webconsole-plugin/src/main/java/org/apache/ace/webconsole/plugin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webconsole-plugin/src/main/java/org/apache/ace/webconsole/plugin/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webconsole-plugin/src/main/java/org/apache/ace/webconsole/plugin/Activator.java (original)
+++ incubator/ace/trunk/ace-webconsole-plugin/src/main/java/org/apache/ace/webconsole/plugin/Activator.java Wed Sep  8 20:43:00 2010
@@ -36,7 +36,7 @@ public class Activator extends Dependenc
         Dictionary dict = new Hashtable();
         dict.put( "felix.webconsole.label", WebUIConsoleServlet.LABEL );
         dict.put( "felix.webconsole.title", WebUIConsoleServlet.TITLE );
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Servlet.class.getName(), dict)
             .setImplementation(new WebUIConsoleServlet())
         );

Modified: incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/server/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/server/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/server/Activator.java (original)
+++ incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/server/Activator.java Wed Sep  8 20:43:00 2010
@@ -153,7 +153,7 @@ public class Activator extends Dependenc
             }
         });
         
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(this)
             .add(createServiceDependency().setRequired(true).setService(SessionFactory.class))
             .add(createServiceDependency().setService(LogService.class).setRequired(false))

Modified: incubator/ace/trunk/legacy/core/src/org/apache/ace/consolelogger/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/core/src/org/apache/ace/consolelogger/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/core/src/org/apache/ace/consolelogger/Activator.java (original)
+++ incubator/ace/trunk/legacy/core/src/org/apache/ace/consolelogger/Activator.java Wed Sep  8 20:43:00 2010
@@ -25,7 +25,7 @@ import org.osgi.service.log.LogService;
 
 public class Activator extends DependencyActivatorBase {
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(LogService.class.getName(), null)
             .setImplementation(Logger.class)
         );

Modified: incubator/ace/trunk/legacy/gateway/src/org/apache/ace/configurator/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/configurator/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/configurator/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/configurator/Activator.java Wed Sep  8 20:43:00 2010
@@ -29,7 +29,7 @@ import org.osgi.service.log.LogService;
 public class Activator extends DependencyActivatorBase {
 
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(new Configurator(new File(
                 getProperty(context.getProperty(Activator.class.getPackage().getName() + ".CONFIG_DIR"), "conf")),
                 getProperty(context.getProperty(Activator.class.getPackage().getName() + ".POLL_INTERVAL"), 2000),

Modified: incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java Wed Sep  8 20:43:00 2010
@@ -27,7 +27,7 @@ import org.osgi.service.log.LogService;
 
 public class Activator extends DependencyActivatorBase {
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Deployment.class.getName(), null)
             .setImplementation(DeploymentAdminDeployer.class)
             .add(createServiceDependency().setService(DeploymentAdmin.class).setRequired(true))

Modified: incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/task/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/task/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/task/Activator.java Wed Sep  8 20:43:00 2010
@@ -43,7 +43,7 @@ public class Activator extends Dependenc
         checkProperties.put(SchedulerConstants.SCHEDULER_NAME_KEY, DeploymentCheckTask.class.getName());
         checkProperties.put(SchedulerConstants.SCHEDULER_RECIPE, "5000");
 
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Runnable.class.getName(), updateProperties)
             .setImplementation(DeploymentUpdateTask.class)
             .add(createServiceDependency().setService(Deployment.class).setRequired(true))
@@ -52,7 +52,7 @@ public class Activator extends Dependenc
              .add(createServiceDependency().setService(EventAdmin.class).setRequired(false))
             .add(createServiceDependency().setService(LogService.class).setRequired(false)));
 
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Runnable.class.getName(), checkProperties)
             .setImplementation(DeploymentCheckTask.class)
             .add(createServiceDependency().setService(Deployment.class).setRequired(true))

Modified: incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/property/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/property/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/property/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/property/Activator.java Wed Sep  8 20:43:00 2010
@@ -34,7 +34,7 @@ public class Activator extends Dependenc
     public void init(BundleContext context, DependencyManager manager) throws Exception {
         Dictionary properties = new Hashtable();
         properties.put(Constants.SERVICE_PID, DiscoveryConstants.DISCOVERY_PID);
-        manager.add(createService()
+        manager.add(createComponent()
                         .setInterface(new String[] {Discovery.class.getName()}, properties)
                         .setImplementation(PropertyBasedDiscovery.class)
                         .add(createConfigurationDependency()

Modified: incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/upnp/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/upnp/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/upnp/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/upnp/Activator.java Wed Sep  8 20:43:00 2010
@@ -33,7 +33,7 @@ public class Activator extends Dependenc
             .append(UPnPDevice.TYPE).append("=")
             .append(UPnPBasedDiscovery.DEVICE_TYPE).append(")");
 
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(new String[] {Discovery.class.getName()}, null)
             .setImplementation(UPnPBasedDiscovery.class)
                 .add(createServiceDependency()

Modified: incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/Activator.java Wed Sep  8 20:43:00 2010
@@ -51,7 +51,7 @@ public class Activator extends Dependenc
         m_manager = manager;
         Properties props = new Properties();
         props.put(Constants.SERVICE_PID, "org.apache.ace.gateway.log.factory");
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(this)
             .add(createServiceDependency().setService(LogService.class).setRequired(false)));
@@ -86,7 +86,7 @@ public class Activator extends Dependenc
             // publish log service
             Properties props = new Properties();
             props.put(LOG_NAME, name);
-            Service log = m_manager.createService()
+            Service log = m_manager.createComponent()
                 .setInterface(Log.class.getName(), props)
                 .setImplementation(LogImpl.class)
                 .add(createServiceDependency().setService(LogStore.class, "(&("+Constants.OBJECTCLASS+"="+LogStore.class.getName()+")(name=" + name + "))").setRequired(true))
@@ -97,7 +97,7 @@ public class Activator extends Dependenc
             properties.put(SchedulerConstants.SCHEDULER_DESCRIPTION_KEY, "Task that synchronizes log store with id=" + name + " on the gateway and server");
             properties.put(SchedulerConstants.SCHEDULER_NAME_KEY, name);
             properties.put(SchedulerConstants.SCHEDULER_RECIPE, "2000");
-            Service sync = m_manager.createService()
+            Service sync = m_manager.createComponent()
                 .setInterface(Runnable.class.getName(), properties)
                 .setImplementation(new LogSyncTask(name))
                 .add(createServiceDependency().setService(LogStore.class, "(&("+Constants.OBJECTCLASS+"="+LogStore.class.getName()+")(name=" + name + "))").setRequired(true))



Mime
View raw message