Refactored all bundles to work with the latest dependency manager snapshot again.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ace/trunk/legacy@995244 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/org/apache/ace/consolelogger/Activator.java b/core/src/org/apache/ace/consolelogger/Activator.java
index 0eb5f75..f1631a1 100644
--- a/core/src/org/apache/ace/consolelogger/Activator.java
+++ b/core/src/org/apache/ace/consolelogger/Activator.java
@@ -25,7 +25,7 @@
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)
);
diff --git a/gateway/src/org/apache/ace/configurator/Activator.java b/gateway/src/org/apache/ace/configurator/Activator.java
index 60ea9e7..a3c6343 100644
--- a/gateway/src/org/apache/ace/configurator/Activator.java
+++ b/gateway/src/org/apache/ace/configurator/Activator.java
@@ -29,7 +29,7 @@
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),
diff --git a/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java b/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java
index ced6edb..2007592 100644
--- a/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java
+++ b/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java
@@ -27,7 +27,7 @@
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))
diff --git a/gateway/src/org/apache/ace/deployment/task/Activator.java b/gateway/src/org/apache/ace/deployment/task/Activator.java
index 63af8c2..0b6b6af 100644
--- a/gateway/src/org/apache/ace/deployment/task/Activator.java
+++ b/gateway/src/org/apache/ace/deployment/task/Activator.java
@@ -43,7 +43,7 @@
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 @@
.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))
diff --git a/gateway/src/org/apache/ace/discovery/property/Activator.java b/gateway/src/org/apache/ace/discovery/property/Activator.java
index 33b5bb4..bd7912d 100644
--- a/gateway/src/org/apache/ace/discovery/property/Activator.java
+++ b/gateway/src/org/apache/ace/discovery/property/Activator.java
@@ -34,7 +34,7 @@
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()
diff --git a/gateway/src/org/apache/ace/discovery/upnp/Activator.java b/gateway/src/org/apache/ace/discovery/upnp/Activator.java
index 44f7f75..b4b1697 100644
--- a/gateway/src/org/apache/ace/discovery/upnp/Activator.java
+++ b/gateway/src/org/apache/ace/discovery/upnp/Activator.java
@@ -33,7 +33,7 @@
.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()
diff --git a/gateway/src/org/apache/ace/gateway/log/Activator.java b/gateway/src/org/apache/ace/gateway/log/Activator.java
index 33665d4..e02cc22 100644
--- a/gateway/src/org/apache/ace/gateway/log/Activator.java
+++ b/gateway/src/org/apache/ace/gateway/log/Activator.java
@@ -51,7 +51,7 @@
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 @@
// 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 @@
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))
diff --git a/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java b/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java
index ea00844..34857e7 100644
--- a/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java
+++ b/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java
@@ -49,7 +49,7 @@
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 @@
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))
diff --git a/gateway/src/org/apache/ace/identification/ifconfig/Activator.java b/gateway/src/org/apache/ace/identification/ifconfig/Activator.java
index eaba4f6..5387855 100644
--- a/gateway/src/org/apache/ace/identification/ifconfig/Activator.java
+++ b/gateway/src/org/apache/ace/identification/ifconfig/Activator.java
@@ -27,7 +27,7 @@
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))
diff --git a/gateway/src/org/apache/ace/identification/property/Activator.java b/gateway/src/org/apache/ace/identification/property/Activator.java
index ed085a9..562d252 100644
--- a/gateway/src/org/apache/ace/identification/property/Activator.java
+++ b/gateway/src/org/apache/ace/identification/property/Activator.java
@@ -27,7 +27,7 @@
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()
diff --git a/gateway/src/org/apache/ace/ma/webstart/Activator.java b/gateway/src/org/apache/ace/ma/webstart/Activator.java
index c8380dc..b3d27e0 100644
--- a/gateway/src/org/apache/ace/ma/webstart/Activator.java
+++ b/gateway/src/org/apache/ace/ma/webstart/Activator.java
@@ -88,12 +88,12 @@
}
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 @@
// 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 @@
);
// 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 @@
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))
diff --git a/gateway/src/org/apache/ace/scheduler/Activator.java b/gateway/src/org/apache/ace/scheduler/Activator.java
index 5df4e47..f47895c 100644
--- a/gateway/src/org/apache/ace/scheduler/Activator.java
+++ b/gateway/src/org/apache/ace/scheduler/Activator.java
@@ -43,7 +43,7 @@
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()
diff --git a/server/src/org/apache/ace/client/automation/Activator.java b/server/src/org/apache/ace/client/automation/Activator.java
index ebbfdbd..4543429 100644
--- a/server/src/org/apache/ace/client/automation/Activator.java
+++ b/server/src/org/apache/ace/client/automation/Activator.java
@@ -37,7 +37,7 @@
*/
@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))
diff --git a/server/src/org/apache/ace/client/repository/helper/bundle/impl/Activator.java b/server/src/org/apache/ace/client/repository/helper/bundle/impl/Activator.java
index 60623a9..0584e82 100644
--- a/server/src/org/apache/ace/client/repository/helper/bundle/impl/Activator.java
+++ b/server/src/org/apache/ace/client/repository/helper/bundle/impl/Activator.java
@@ -39,13 +39,13 @@
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));
}
diff --git a/server/src/org/apache/ace/client/repository/helper/configuration/impl/Activator.java b/server/src/org/apache/ace/client/repository/helper/configuration/impl/Activator.java
index a1af3f8..66f484e 100644
--- a/server/src/org/apache/ace/client/repository/helper/configuration/impl/Activator.java
+++ b/server/src/org/apache/ace/client/repository/helper/configuration/impl/Activator.java
@@ -39,10 +39,10 @@
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));
}
diff --git a/server/src/org/apache/ace/client/repository/helper/user/impl/Activator.java b/server/src/org/apache/ace/client/repository/helper/user/impl/Activator.java
index ff9bcbb..3e7165c 100644
--- a/server/src/org/apache/ace/client/repository/helper/user/impl/Activator.java
+++ b/server/src/org/apache/ace/client/repository/helper/user/impl/Activator.java
@@ -39,12 +39,12 @@
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));
}
diff --git a/server/src/org/apache/ace/client/repository/impl/Activator.java b/server/src/org/apache/ace/client/repository/impl/Activator.java
index b02ee4b..27e238f 100644
--- a/server/src/org/apache/ace/client/repository/impl/Activator.java
+++ b/server/src/org/apache/ace/client/repository/impl/Activator.java
@@ -61,7 +61,7 @@
@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 @@
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 @@
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))
diff --git a/server/src/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java b/server/src/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
index 63282b3..397c94c 100644
--- a/server/src/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
+++ b/server/src/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
@@ -169,7 +169,7 @@
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 @@
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 @@
@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);
diff --git a/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java b/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java
index 327a218..b9201a8 100644
--- a/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java
+++ b/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java
@@ -53,7 +53,7 @@
@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 @@
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));
}
diff --git a/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java b/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
index f738795..05722c7 100644
--- a/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
+++ b/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
@@ -37,7 +37,7 @@
@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()
diff --git a/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java b/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java
index 135b09a..98117d5 100644
--- a/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java
+++ b/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java
@@ -42,7 +42,7 @@
@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)));
diff --git a/server/src/org/apache/ace/configurator/useradmin/task/Activator.java b/server/src/org/apache/ace/configurator/useradmin/task/Activator.java
index 0e065af..4080af2 100644
--- a/server/src/org/apache/ace/configurator/useradmin/task/Activator.java
+++ b/server/src/org/apache/ace/configurator/useradmin/task/Activator.java
@@ -36,7 +36,7 @@
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))
diff --git a/server/src/org/apache/ace/deployment/provider/filebased/Activator.java b/server/src/org/apache/ace/deployment/provider/filebased/Activator.java
index e98f629..07836a5 100644
--- a/server/src/org/apache/ace/deployment/provider/filebased/Activator.java
+++ b/server/src/org/apache/ace/deployment/provider/filebased/Activator.java
@@ -29,7 +29,7 @@
@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()
diff --git a/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java b/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java
index 1aa24a4..8e40f73 100644
--- a/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java
+++ b/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java
@@ -29,7 +29,7 @@
@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()
diff --git a/server/src/org/apache/ace/deployment/servlet/Activator.java b/server/src/org/apache/ace/deployment/servlet/Activator.java
index 7118ad0..7441af1 100644
--- a/server/src/org/apache/ace/deployment/servlet/Activator.java
+++ b/server/src/org/apache/ace/deployment/servlet/Activator.java
@@ -32,7 +32,7 @@
@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))
diff --git a/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java b/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java
index db67803..e0fdf03 100644
--- a/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java
+++ b/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java
@@ -27,7 +27,7 @@
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()
diff --git a/server/src/org/apache/ace/http/listener/Activator.java b/server/src/org/apache/ace/http/listener/Activator.java
index 8bb72fa..6976bae 100644
--- a/server/src/org/apache/ace/http/listener/Activator.java
+++ b/server/src/org/apache/ace/http/listener/Activator.java
@@ -56,7 +56,7 @@
@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)
diff --git a/server/src/org/apache/ace/location/upnp/Activator.java b/server/src/org/apache/ace/location/upnp/Activator.java
index 25a5bcb..3c27821 100644
--- a/server/src/org/apache/ace/location/upnp/Activator.java
+++ b/server/src/org/apache/ace/location/upnp/Activator.java
@@ -37,14 +37,14 @@
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")
diff --git a/server/src/org/apache/ace/obr/metadata/bindex/Activator.java b/server/src/org/apache/ace/obr/metadata/bindex/Activator.java
index 987afac..a35a852 100644
--- a/server/src/org/apache/ace/obr/metadata/bindex/Activator.java
+++ b/server/src/org/apache/ace/obr/metadata/bindex/Activator.java
@@ -28,7 +28,7 @@
@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()
diff --git a/server/src/org/apache/ace/obr/servlet/Activator.java b/server/src/org/apache/ace/obr/servlet/Activator.java
index 859eaab..6754d4c 100644
--- a/server/src/org/apache/ace/obr/servlet/Activator.java
+++ b/server/src/org/apache/ace/obr/servlet/Activator.java
@@ -31,7 +31,7 @@
@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()
diff --git a/server/src/org/apache/ace/obr/storage/file/Activator.java b/server/src/org/apache/ace/obr/storage/file/Activator.java
index 478b257..6ac5975 100644
--- a/server/src/org/apache/ace/obr/storage/file/Activator.java
+++ b/server/src/org/apache/ace/obr/storage/file/Activator.java
@@ -30,7 +30,7 @@
@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()
diff --git a/server/src/org/apache/ace/repository/impl/Activator.java b/server/src/org/apache/ace/repository/impl/Activator.java
index 61f92ea..21e7c1a 100644
--- a/server/src/org/apache/ace/repository/impl/Activator.java
+++ b/server/src/org/apache/ace/repository/impl/Activator.java
@@ -34,7 +34,7 @@
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))
diff --git a/server/src/org/apache/ace/repository/impl/RepositoryFactory.java b/server/src/org/apache/ace/repository/impl/RepositoryFactory.java
index 0572cf3..97a73ce 100644
--- a/server/src/org/apache/ace/repository/impl/RepositoryFactory.java
+++ b/server/src/org/apache/ace/repository/impl/RepositoryFactory.java
@@ -166,7 +166,7 @@
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));
diff --git a/server/src/org/apache/ace/repository/servlet/Activator.java b/server/src/org/apache/ace/repository/servlet/Activator.java
index a071e9b..afe301c 100644
--- a/server/src/org/apache/ace/repository/servlet/Activator.java
+++ b/server/src/org/apache/ace/repository/servlet/Activator.java
@@ -31,7 +31,7 @@
@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 @@
.setService(LogService.class)
.setRequired(false)));
- manager.add(createService()
+ manager.add(createComponent()
.setInterface(HttpServlet.class.getName(), null)
.setImplementation(RepositoryReplicationServlet.class)
.add(createConfigurationDependency()
diff --git a/server/src/org/apache/ace/repository/task/Activator.java b/server/src/org/apache/ace/repository/task/Activator.java
index 880cc59..e80993c 100644
--- a/server/src/org/apache/ace/repository/task/Activator.java
+++ b/server/src/org/apache/ace/repository/task/Activator.java
@@ -33,7 +33,7 @@
// 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))
diff --git a/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java b/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java
index 3711c74..77ed139 100644
--- a/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java
+++ b/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java
@@ -44,7 +44,7 @@
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 @@
.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)
diff --git a/server/src/org/apache/ace/server/action/popupmessage/Activator.java b/server/src/org/apache/ace/server/action/popupmessage/Activator.java
index 5eb8d3b..8fc1c05 100644
--- a/server/src/org/apache/ace/server/action/popupmessage/Activator.java
+++ b/server/src/org/apache/ace/server/action/popupmessage/Activator.java
@@ -31,7 +31,7 @@
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)
);
diff --git a/server/src/org/apache/ace/server/log/Activator.java b/server/src/org/apache/ace/server/log/Activator.java
index 7379354..2be59de 100644
--- a/server/src/org/apache/ace/server/log/Activator.java
+++ b/server/src/org/apache/ace/server/log/Activator.java
@@ -48,7 +48,7 @@
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 @@
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))
diff --git a/server/src/org/apache/ace/server/log/store/impl/Activator.java b/server/src/org/apache/ace/server/log/store/impl/Activator.java
index 00002b3..dd48003 100644
--- a/server/src/org/apache/ace/server/log/store/impl/Activator.java
+++ b/server/src/org/apache/ace/server/log/store/impl/Activator.java
@@ -49,7 +49,7 @@
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 @@
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));
diff --git a/server/src/org/apache/ace/server/log/task/Activator.java b/server/src/org/apache/ace/server/log/task/Activator.java
index 811b9d6..5a21e5c 100644
--- a/server/src/org/apache/ace/server/log/task/Activator.java
+++ b/server/src/org/apache/ace/server/log/task/Activator.java
@@ -47,7 +47,7 @@
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 @@
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))
diff --git a/server/src/org/apache/ace/webconsole/plugin/Activator.java b/server/src/org/apache/ace/webconsole/plugin/Activator.java
index 1c01a4c..45dd2a0 100644
--- a/server/src/org/apache/ace/webconsole/plugin/Activator.java
+++ b/server/src/org/apache/ace/webconsole/plugin/Activator.java
@@ -36,7 +36,7 @@
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())
);
diff --git a/server/src/org/apache/felix/deployment/rp/autoconf/Activator.java b/server/src/org/apache/felix/deployment/rp/autoconf/Activator.java
index 7669ddb..b079447 100644
--- a/server/src/org/apache/felix/deployment/rp/autoconf/Activator.java
+++ b/server/src/org/apache/felix/deployment/rp/autoconf/Activator.java
@@ -42,7 +42,7 @@
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()
diff --git a/test/src/org/apache/ace/test/bundlestop/Activator.java b/test/src/org/apache/ace/test/bundlestop/Activator.java
index f633b98..dc388b8 100644
--- a/test/src/org/apache/ace/test/bundlestop/Activator.java
+++ b/test/src/org/apache/ace/test/bundlestop/Activator.java
@@ -41,7 +41,7 @@
SystemBundleStopper stopper = new SystemBundleStopper();
context.addBundleListener(stopper);
- manager.add(createService()
+ manager.add(createComponent()
.setInterface(EventHandler.class.getName(), properties)
.setImplementation(stopper)
.add(createServiceDependency()
diff --git a/test/src/org/apache/ace/test/deployment/Activator.java b/test/src/org/apache/ace/test/deployment/Activator.java
index 0203952..2ddd2cf 100644
--- a/test/src/org/apache/ace/test/deployment/Activator.java
+++ b/test/src/org/apache/ace/test/deployment/Activator.java
@@ -37,7 +37,7 @@
@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))
diff --git a/test/src/org/apache/ace/test/http/listener/Activator.java b/test/src/org/apache/ace/test/http/listener/Activator.java
index dbf8151..e1d4c52 100644
--- a/test/src/org/apache/ace/test/http/listener/Activator.java
+++ b/test/src/org/apache/ace/test/http/listener/Activator.java
@@ -31,7 +31,7 @@
@Override
protected void initServices(BundleContext context, DependencyManager manager) {
- manager.add(createService()
+ manager.add(createComponent()
.setImplementation(ServletConfiguratorIntegrationTest.class)
.add(createServiceDependency()
.setService(HttpService.class)
diff --git a/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java b/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java
index d0a0b50..21913b7 100644
--- a/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java
+++ b/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java
@@ -74,12 +74,12 @@
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);
}
diff --git a/test/src/org/apache/ace/test/log/Activator.java b/test/src/org/apache/ace/test/log/Activator.java
index 2113ce1..2f4b4c7 100644
--- a/test/src/org/apache/ace/test/log/Activator.java
+++ b/test/src/org/apache/ace/test/log/Activator.java
@@ -59,13 +59,13 @@
@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))
diff --git a/test/src/org/apache/ace/test/mockautoconf/Activator.java b/test/src/org/apache/ace/test/mockautoconf/Activator.java
index 92bd870..a66ebbf 100644
--- a/test/src/org/apache/ace/test/mockautoconf/Activator.java
+++ b/test/src/org/apache/ace/test/mockautoconf/Activator.java
@@ -36,7 +36,7 @@
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));
}
diff --git a/test/src/org/apache/ace/test/repository/Activator.java b/test/src/org/apache/ace/test/repository/Activator.java
index b69310d..bc99364 100644
--- a/test/src/org/apache/ace/test/repository/Activator.java
+++ b/test/src/org/apache/ace/test/repository/Activator.java
@@ -33,7 +33,7 @@
@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))
diff --git a/test/src/org/apache/ace/test/repositoryadmin/Activator.java b/test/src/org/apache/ace/test/repositoryadmin/Activator.java
index d79abcf..f908c45 100644
--- a/test/src/org/apache/ace/test/repositoryadmin/Activator.java
+++ b/test/src/org/apache/ace/test/repositoryadmin/Activator.java
@@ -56,7 +56,7 @@
@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 @@
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))
diff --git a/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java b/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java
index e4b5f8d..6ffff5e 100644
--- a/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java
+++ b/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java
@@ -1027,7 +1027,7 @@
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 @@
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);
diff --git a/test/src/org/apache/ace/test/useradminconfigurator/Activator.java b/test/src/org/apache/ace/test/useradminconfigurator/Activator.java
index 768076e..d6dd0c9 100644
--- a/test/src/org/apache/ace/test/useradminconfigurator/Activator.java
+++ b/test/src/org/apache/ace/test/useradminconfigurator/Activator.java
@@ -37,7 +37,7 @@
@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 @@
// 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)
diff --git a/webui/src/org/apache/ace/server/Activator.java b/webui/src/org/apache/ace/server/Activator.java
index 2b18c29..b3dcf38 100644
--- a/webui/src/org/apache/ace/server/Activator.java
+++ b/webui/src/org/apache/ace/server/Activator.java
@@ -153,7 +153,7 @@
}
});
- manager.add(createService()
+ manager.add(createComponent()
.setImplementation(this)
.add(createServiceDependency().setRequired(true).setService(SessionFactory.class))
.add(createServiceDependency().setService(LogService.class).setRequired(false))
