ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r995244 [2/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
Modified: incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -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)));
@@ -92,7 +92,7 @@ public class Activator extends Dependenc
             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/legacy/gateway/src/org/apache/ace/identification/ifconfig/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/identification/ifconfig/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/identification/ifconfig/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/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/legacy/gateway/src/org/apache/ace/identification/property/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/identification/property/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/identification/property/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/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/legacy/gateway/src/org/apache/ace/ma/webstart/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/ma/webstart/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/ma/webstart/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/ma/webstart/Activator.java Wed Sep  8 20:43:00 2010
@@ -88,12 +88,12 @@ public class Activator extends Dependenc
     }
 
     public void init(BundleContext context, DependencyManager manager) throws Exception {
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Identification.class.getName(), null)
             .setImplementation(SystemPropertyIdentification.class)
             );
 
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Discovery.class.getName(), null)
             .setImplementation(SystemPropertyDiscovery.class)
             );
@@ -102,7 +102,7 @@ public class Activator extends Dependenc
         // service factories configured by config admin here
         Properties logProps = new Properties();
         logProps.put("name", "auditlog");
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(LogStore.class.getName(), logProps)
             .setImplementation(new LogStoreImpl(new File(context.getDataFile(""), "audit")))
             .add(createServiceDependency().setService(Identification.class).setRequired(true))
@@ -110,7 +110,7 @@ public class Activator extends Dependenc
             );
 
         // same for the log service and sync task
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Log.class.getName(), logProps)
             .setImplementation(LogImpl.class)
             .add(createServiceDependency().setService(LogStore.class, "(&(" + Constants.OBJECTCLASS + "=" + LogStore.class.getName() + ")(name=auditlog))").setRequired(true))
@@ -121,7 +121,7 @@ public class Activator extends Dependenc
         properties.put(SchedulerConstants.SCHEDULER_NAME_KEY, "auditlog");
         properties.put(SchedulerConstants.SCHEDULER_RECIPE, "2000");
 
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(Runnable.class.getName(), properties)
             .setImplementation(new LogSyncTask("auditlog"))
             .add(createServiceDependency().setService(LogStore.class, "(&(" + Constants.OBJECTCLASS + "=" + LogStore.class.getName() + ")(name=auditlog))").setRequired(true))

Modified: incubator/ace/trunk/legacy/gateway/src/org/apache/ace/scheduler/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/scheduler/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/scheduler/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/scheduler/Activator.java Wed Sep  8 20:43:00 2010
@@ -43,7 +43,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/legacy/server/src/org/apache/ace/client/automation/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/client/automation/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/client/automation/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/client/repository/helper/bundle/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/helper/bundle/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/helper/bundle/impl/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/client/repository/helper/configuration/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/helper/configuration/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/helper/configuration/impl/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/client/repository/helper/user/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/helper/user/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/helper/user/impl/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/client/repository/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -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)
         );
@@ -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/legacy/server/src/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java Wed Sep  8 20:43:00 2010
@@ -169,7 +169,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()
+        Service artifactRepoService = m_manager.createComponent()
             .setInterface(ArtifactRepository.class.getName(), m_sessionProps)
             .setImplementation(m_artifactRepositoryImpl)
             .add(m_manager.createServiceDependency().setService(LogService.class).setRequired(false))
@@ -177,7 +177,7 @@ 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()
+        Service artifactHandlerService = m_manager.createComponent()
             .setInterface(EventHandler.class.getName(), topic)
             .setImplementation(m_artifactRepositoryImpl);
         m_manager.add(artifactRepoService);
@@ -223,14 +223,14 @@ public class RepositoryAdminImpl impleme
 
     @SuppressWarnings("unchecked")
     private <T extends RepositoryObject> Service[] registerRepository(Class<? extends ObjectRepository<T>> iface, ObjectRepositoryImpl<?, T> imp, String[] topics) {
-        Service repositoryService = m_manager.createService()
+        Service 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()
+        Service handlerService = m_manager.createComponent()
             .setInterface(EventHandler.class.getName(), topic)
             .setImplementation(imp);
 

Modified: incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -53,7 +53,7 @@ public class Activator extends Dependenc
     @Override
     public synchronized void init(BundleContext context, DependencyManager manager) throws Exception {
         StatefulGatewayRepositoryImpl statefulGatewayRepositoryImpl = new StatefulGatewayRepositoryImpl();
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(StatefulGatewayRepository.class.getName(), null)
             .setImplementation(statefulGatewayRepositoryImpl)
             .add(createServiceDependency().setService(ArtifactRepository.class).setRequired(true))
@@ -74,7 +74,7 @@ public class Activator extends Dependenc
             GatewayObject.TOPIC_ALL,
             DeploymentVersionObject.TOPIC_ALL,
             RepositoryAdmin.TOPIC_REFRESH, RepositoryAdmin.TOPIC_LOGIN});
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(EventHandler.class.getName(), topic)
             .setImplementation(statefulGatewayRepositoryImpl));
     }

Modified: incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/configurator/useradmin/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/configurator/useradmin/task/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/configurator/useradmin/task/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/deployment/provider/filebased/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/provider/filebased/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/provider/filebased/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/deployment/servlet/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/servlet/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/servlet/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/http/listener/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/http/listener/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/http/listener/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/location/upnp/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/location/upnp/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/location/upnp/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/obr/metadata/bindex/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/obr/metadata/bindex/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/obr/metadata/bindex/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/obr/servlet/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/obr/servlet/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/obr/servlet/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/obr/storage/file/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/obr/storage/file/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/obr/storage/file/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/repository/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/impl/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/repository/impl/RepositoryFactory.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/impl/RepositoryFactory.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/impl/RepositoryFactory.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/impl/RepositoryFactory.java Wed Sep  8 20:43:00 2010
@@ -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/legacy/server/src/org/apache/ace/repository/servlet/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/servlet/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/servlet/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/repository/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/task/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/task/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/task/Activator.java Wed Sep  8 20:43:00 2010
@@ -33,7 +33,7 @@ public class Activator extends Dependenc
         // TODO we need to fix these property constants
         props.put("taskName", RepositoryReplicationTask.class.getName());
         props.put("description", "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/legacy/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/server/action/popupmessage/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/server/action/popupmessage/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/server/action/popupmessage/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/ace/server/log/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/Activator.java Wed Sep  8 20:43:00 2010
@@ -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)));    }
@@ -83,7 +83,7 @@ public class Activator extends Dependenc
         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/legacy/server/src/org/apache/ace/server/log/store/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/store/impl/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/store/impl/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/store/impl/Activator.java Wed Sep  8 20:43:00 2010
@@ -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)));
@@ -92,7 +92,7 @@ public class Activator extends Dependenc
             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/legacy/server/src/org/apache/ace/server/log/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/task/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/task/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/task/Activator.java Wed Sep  8 20:43:00 2010
@@ -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)));
@@ -81,7 +81,7 @@ public class Activator extends Dependenc
             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/legacy/server/src/org/apache/ace/webconsole/plugin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/webconsole/plugin/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/webconsole/plugin/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/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/legacy/server/src/org/apache/felix/deployment/rp/autoconf/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/felix/deployment/rp/autoconf/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/felix/deployment/rp/autoconf/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/felix/deployment/rp/autoconf/Activator.java Wed Sep  8 20:43:00 2010
@@ -42,7 +42,7 @@ public class Activator extends Dependenc
     	Dictionary properties = new Properties();
         properties.put(Constants.SERVICE_PID, "org.osgi.deployment.rp.autoconf");
 
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(ResourceProcessor.class.getName(), properties)
             .setImplementation(AutoConfResourceProcessor.class)
             .add(createServiceDependency()

Modified: incubator/ace/trunk/legacy/test/src/org/apache/ace/test/bundlestop/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/test/src/org/apache/ace/test/bundlestop/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/test/src/org/apache/ace/test/bundlestop/Activator.java (original)
+++ incubator/ace/trunk/legacy/test/src/org/apache/ace/test/bundlestop/Activator.java Wed Sep  8 20:43:00 2010
@@ -41,7 +41,7 @@ public class Activator extends Dependenc
 
         SystemBundleStopper stopper = new SystemBundleStopper();
         context.addBundleListener(stopper);
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(EventHandler.class.getName(), properties)
             .setImplementation(stopper)
             .add(createServiceDependency()

Modified: incubator/ace/trunk/legacy/test/src/org/apache/ace/test/deployment/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/test/src/org/apache/ace/test/deployment/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/test/src/org/apache/ace/test/deployment/Activator.java (original)
+++ incubator/ace/trunk/legacy/test/src/org/apache/ace/test/deployment/Activator.java Wed Sep  8 20:43:00 2010
@@ -37,7 +37,7 @@ public class Activator extends TestActiv
 
     @Override
     protected void initServices(BundleContext context, DependencyManager manager) {
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(DeploymentIntegrationTest.class)
             .add(createServiceDependency().setService(HttpService.class).setRequired(true))
             .add(createServiceDependency().setService(ConfigurationAdmin.class).setRequired(true))

Modified: incubator/ace/trunk/legacy/test/src/org/apache/ace/test/http/listener/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/test/src/org/apache/ace/test/http/listener/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/test/src/org/apache/ace/test/http/listener/Activator.java (original)
+++ incubator/ace/trunk/legacy/test/src/org/apache/ace/test/http/listener/Activator.java Wed Sep  8 20:43:00 2010
@@ -31,7 +31,7 @@ public class Activator extends TestActiv
 
     @Override
     protected void initServices(BundleContext context, DependencyManager manager) {
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(ServletConfiguratorIntegrationTest.class)
             .add(createServiceDependency()
                 .setService(HttpService.class)

Modified: incubator/ace/trunk/legacy/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java (original)
+++ incubator/ace/trunk/legacy/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java Wed Sep  8 20:43:00 2010
@@ -74,12 +74,12 @@ public class ServletConfiguratorIntegrat
         m_echoServlet = new EchoServlet();
         Dictionary<String, String> dictionary = new Hashtable<String, String>();
         dictionary.put(HttpConstants.ENDPOINT, "/echoServlet");
-        m_echoServletService = m_dependencyManager.createService()
+        m_echoServletService = m_dependencyManager.createComponent()
             .setImplementation(m_echoServlet)
             .setInterface(HttpServlet.class.getName(), dictionary);
 
         m_mockHttp = new MockHttpService();
-        m_mockHttpService = m_dependencyManager.createService()
+        m_mockHttpService = m_dependencyManager.createComponent()
             .setImplementation(m_mockHttp)
             .setInterface(HttpService.class.getName(), null);
     }

Modified: incubator/ace/trunk/legacy/test/src/org/apache/ace/test/log/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/test/src/org/apache/ace/test/log/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/test/src/org/apache/ace/test/log/Activator.java (original)
+++ incubator/ace/trunk/legacy/test/src/org/apache/ace/test/log/Activator.java Wed Sep  8 20:43:00 2010
@@ -59,13 +59,13 @@ public class Activator extends TestActiv
     @Override
     protected void initServices(BundleContext context, DependencyManager manager) {
         // helper service that configures the system
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(this)
             .add(createServiceDependency().setService(ConfigurationAdmin.class).setRequired(true))
             .add(createServiceDependency().setService(LogService.class).setRequired(false))
         );
         // service containing the actual integration test
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(LogIntegrationTest.class)
             .add(createServiceDependency().setService(HttpService.class).setRequired(true))
             .add(createServiceDependency().setService(Log.class, "(&("+Constants.OBJECTCLASS+"="+Log.class.getName()+")(name=auditlog))").setRequired(true))

Modified: incubator/ace/trunk/legacy/test/src/org/apache/ace/test/mockautoconf/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/test/src/org/apache/ace/test/mockautoconf/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/test/src/org/apache/ace/test/mockautoconf/Activator.java (original)
+++ incubator/ace/trunk/legacy/test/src/org/apache/ace/test/mockautoconf/Activator.java Wed Sep  8 20:43:00 2010
@@ -36,7 +36,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(impl));
     }
 

Modified: incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repository/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repository/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repository/Activator.java (original)
+++ incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repository/Activator.java Wed Sep  8 20:43:00 2010
@@ -33,7 +33,7 @@ public class Activator extends TestActiv
 
     @Override
     protected void initServices(BundleContext context, DependencyManager manager) {
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(RepositoryTest.class)
             .add(createServiceDependency().setService(HttpService.class).setRequired(true))
             .add(createServiceDependency().setService(ConfigurationAdmin.class).setRequired(true))

Modified: incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repositoryadmin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repositoryadmin/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repositoryadmin/Activator.java (original)
+++ incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repositoryadmin/Activator.java Wed Sep  8 20:43:00 2010
@@ -56,7 +56,7 @@ public class Activator extends TestActiv
 
     @Override
     protected void initServices(BundleContext context, DependencyManager manager) {
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(this)
             .add(createServiceDependency().setService(SessionFactory.class).setRequired(true))
             .add(createServiceDependency().setService(ConfigurationAdmin.class).setRequired(true)));
@@ -67,7 +67,7 @@ public class Activator extends TestActiv
             RepositoryAdmin.PUBLIC_TOPIC_ROOT + "*",
             RepositoryAdmin.PRIVATE_TOPIC_ROOT + "*",
             StatefulGatewayObject.TOPIC_ALL});
-        manager.add(createService()
+        manager.add(createComponent()
             .setInterface(EventHandler.class.getName(), topics)
             .setImplementation(RepositoryAdminTest.class)
             .add(createServiceDependency().setService(HttpService.class).setRequired(true))

Modified: incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java (original)
+++ incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java Wed Sep  8 20:43:00 2010
@@ -1027,7 +1027,7 @@ public class RepositoryAdminTest impleme
         Properties serviceProps = new Properties();
         serviceProps.put(ArtifactHelper.KEY_MIMETYPE, "mymime");
 
-        Service myHelperService = m_depManager.createService()
+        Service myHelperService = m_depManager.createComponent()
             .setInterface(ArtifactHelper.class.getName(), serviceProps)
             .setImplementation(myHelper);
 
@@ -1457,7 +1457,7 @@ public class RepositoryAdminTest impleme
         Properties serviceProps = new Properties();
         serviceProps.put(ArtifactHelper.KEY_MIMETYPE, "mymime");
 
-        Service helperService = m_depManager.createService()
+        Service helperService = m_depManager.createComponent()
             .setInterface(ArtifactHelper.class.getName(), serviceProps)
             .setImplementation(helper);
 

Modified: incubator/ace/trunk/legacy/test/src/org/apache/ace/test/useradminconfigurator/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/test/src/org/apache/ace/test/useradminconfigurator/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/test/src/org/apache/ace/test/useradminconfigurator/Activator.java (original)
+++ incubator/ace/trunk/legacy/test/src/org/apache/ace/test/useradminconfigurator/Activator.java Wed Sep  8 20:43:00 2010
@@ -37,7 +37,7 @@ public class Activator extends TestActiv
 
     @Override
     protected void initServices(BundleContext context, DependencyManager manager) {
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(ConfiguratorTest.class)
             .add(createServiceDependency()
                 .setService(UserAdmin.class)
@@ -48,7 +48,7 @@ public class Activator extends TestActiv
 
         // We need to do some configuration for this test to run; therefore,
         // we (as activator) wait around for the ConfigurationAdmin.
-        manager.add(createService()
+        manager.add(createComponent()
             .setImplementation(this)
             .add(createServiceDependency()
                 .setService(ConfigurationAdmin.class)

Modified: incubator/ace/trunk/legacy/webui/src/org/apache/ace/server/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/webui/src/org/apache/ace/server/Activator.java?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/webui/src/org/apache/ace/server/Activator.java (original)
+++ incubator/ace/trunk/legacy/webui/src/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/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom.xml?rev=995244&r1=995243&r2=995244&view=diff
==============================================================================
--- incubator/ace/trunk/pom.xml (original)
+++ incubator/ace/trunk/pom.xml Wed Sep  8 20:43:00 2010
@@ -83,6 +83,10 @@
                 <module>ace-deployment-deploymentadmin</module>
                 <module>ace-deployment-task</module>
 
+				<!--
+                <module>ace-distribution-servlet</module>
+				-->
+
                 <module>ace-httplistener</module>
 
                 <module>ace-server-log-store</module>



Mime
View raw message