incubator-ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r924516 - in /incubator/ace/trunk: ace-client-automation/src/main/java/org/apache/ace/client/automation/ ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ ace-client-repository-impl/src/main/java/org/apache/ace...
Date Wed, 17 Mar 2010 22:05:59 GMT
Author: marrs
Date: Wed Mar 17 22:05:58 2010
New Revision: 924516

URL: http://svn.apache.org/viewvc?rev=924516&view=rev
Log:
More fixes after migrating to dependency manager 3.

Modified:
    incubator/ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java
    incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java
    incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
    incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/Activator.java
    incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
    incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/Activator.java
    incubator/ace/trunk/ace-consolelogger/pom.xml
    incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/Activator.java
    incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/Activator.java
    incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
    incubator/ace/trunk/ace-deployment/src/main/java/org/apache/ace/deployment/deploymentadmin/Activator.java
    incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java
    incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/Activator.java
    incubator/ace/trunk/ace-obr-servlet/src/main/java/org/apache/ace/obr/servlet/Activator.java
    incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/Activator.java
    incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/Activator.java
    incubator/ace/trunk/ace-repository/src/main/java/org/apache/ace/repository/impl/Activator.java
    incubator/ace/trunk/ace-repository/src/main/java/org/apache/ace/repository/impl/RepositoryFactory.java
    incubator/ace/trunk/pom/pom.xml

Modified: incubator/ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java
(original)
+++ incubator/ace/trunk/ace-client-automation/src/main/java/org/apache/ace/client/automation/Activator.java
Wed Mar 17 22:05:58 2010
@@ -22,8 +22,8 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.repository.DeploymentVersionRepository;
 import org.apache.ace.client.repository.repository.GatewayRepository;
 import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;
 import org.osgi.service.useradmin.UserAdmin;

Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java
(original)
+++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java
Wed Mar 17 22:05:58 2010
@@ -40,9 +40,9 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
 import org.apache.ace.client.repository.stateful.impl.StatefulGatewayRepositoryImpl;
 import org.apache.ace.server.log.store.LogStore;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.event.EventAdmin;

Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
(original)
+++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
Wed Mar 17 22:05:58 2010
@@ -59,11 +59,11 @@ import org.apache.ace.repository.ext.Cac
 import org.apache.ace.repository.impl.CachedRepositoryImpl;
 import org.apache.ace.repository.impl.FilebasedBackupRepository;
 import org.apache.ace.repository.impl.RemoteRepository;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Logger;
-import org.apache.felix.dependencymanager.Service;
-import org.apache.felix.dependencymanager.ServiceDependency;
-import org.apache.felix.dependencymanager.ServiceImpl;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.dependencies.ServiceDependency;
+import org.apache.felix.dm.impl.Logger;
+import org.apache.felix.dm.impl.ServiceImpl;
+import org.apache.felix.dm.service.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.event.EventConstants;
@@ -174,15 +174,15 @@ 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 = createService()
+        Service artifactRepoService = m_manager.createService()
             .setInterface(ArtifactRepository.class.getName(), m_sessionProps)
             .setImplementation(m_artifactRepositoryImpl)
-            .add(createServiceDependency().setService(LogService.class).setRequired(false))
-            .add(createServiceDependency().setService(ArtifactHelper.class).setRequired(false).setAutoConfig(false).setCallbacks(this,
"addArtifactHelper", "removeArtifactHelper"));
+            .add(m_manager.createServiceDependency().setService(LogService.class).setRequired(false))
+            .add(m_manager.createServiceDependency().setService(ArtifactHelper.class).setRequired(false).setAutoConfig(false).setCallbacks(this,
"addArtifactHelper", "removeArtifactHelper"));
         Dictionary topic = new Hashtable();
         topic.put(EventConstants.EVENT_TOPIC, new String[] {});
         topic.put(EventConstants.EVENT_FILTER, "(" + SessionFactory.SERVICE_SID + "=" + m_sessionID
+ ")");
-        Service artifactHandlerService = createService()
+        Service artifactHandlerService = m_manager.createService()
             .setInterface(EventHandler.class.getName(), topic)
             .setImplementation(m_artifactRepositoryImpl);
         m_manager.add(artifactRepoService);
@@ -214,21 +214,6 @@ public class RepositoryAdminImpl impleme
 
         return result;
     }
-    private ServiceDependency createServiceDependency() {
-        return new ServiceDependency(m_context, createLogger());
-    }
-
-    private synchronized Logger createLogger() {
-        if (m_logger == null) {
-            m_logger = new Logger(m_context);
-        }
-        return m_logger;
-    }
-
-    private Service createService() {
-        return new ServiceImpl(m_context, m_manager, createLogger());
-    }
-
     /**
      * Pulls all repository services; is used to make sure the repositories go away before
the RepositoryAdmin does.
      */
@@ -242,14 +227,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 = createService()
+        Service repositoryService = m_manager.createService()
             .setInterface(iface.getName(), m_sessionProps)
             .setImplementation(imp)
-            .add(createServiceDependency().setService(LogService.class).setRequired(false));
+            .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 = createService()
+        Service handlerService = m_manager.createService()
             .setInterface(EventHandler.class.getName(), topic)
             .setImplementation(imp);
 

Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/Activator.java
(original)
+++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/Activator.java
Wed Mar 17 22:05:58 2010
@@ -20,6 +20,7 @@ package org.apache.ace.client.repository
 
 import java.util.Dictionary;
 import java.util.Hashtable;
+
 import org.apache.ace.client.repository.RepositoryAdmin;
 import org.apache.ace.client.repository.helper.bundle.BundleHelper;
 import org.apache.ace.client.repository.object.Artifact2GroupAssociation;
@@ -35,8 +36,8 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.repository.GatewayRepository;
 import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
 import org.apache.ace.server.log.store.LogStore;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.event.EventAdmin;

Modified: incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
(original)
+++ incubator/ace/trunk/ace-client-repository-useradmin/src/main/java/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
Wed Mar 17 22:05:58 2010
@@ -19,8 +19,8 @@
 package org.apache.ace.client.repositoryuseradmin.impl;
 
 import org.apache.ace.client.repositoryuseradmin.RepositoryUserAdmin;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;
 import org.osgi.service.prefs.PreferencesService;

Modified: incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/Activator.java
(original)
+++ incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/Activator.java
Wed Mar 17 22:05:58 2010
@@ -19,9 +19,10 @@
 package org.apache.ace.configurator.useradmin.task;
 
 import java.util.Properties;
+
 import org.apache.ace.resourceprocessor.useradmin.UserAdminConfigurator;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;
 

Modified: incubator/ace/trunk/ace-consolelogger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-consolelogger/pom.xml?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-consolelogger/pom.xml (original)
+++ incubator/ace/trunk/ace-consolelogger/pom.xml Wed Mar 17 22:05:58 2010
@@ -61,7 +61,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/Activator.java
(original)
+++ incubator/ace/trunk/ace-deployment-provider-repositorybased/src/main/java/org/apache/ace/deployment/provider/repositorybased/Activator.java
Wed Mar 17 22:05:58 2010
@@ -19,8 +19,8 @@
 package org.apache.ace.deployment.provider.repositorybased;
 
 import org.apache.ace.deployment.provider.DeploymentProvider;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;
 

Modified: incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/Activator.java
(original)
+++ incubator/ace/trunk/ace-deployment-servlet/src/main/java/org/apache/ace/deployment/servlet/Activator.java
Wed Mar 17 22:05:58 2010
@@ -19,10 +19,11 @@
 package org.apache.ace.deployment.servlet;
 
 import javax.servlet.http.HttpServlet;
+
 import org.apache.ace.deployment.provider.DeploymentProvider;
 import org.apache.ace.deployment.streamgenerator.StreamGenerator;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;
 

Modified: incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
(original)
+++ incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/Activator.java
Wed Mar 17 22:05:58 2010
@@ -20,12 +20,13 @@ package org.apache.ace.deployment.task;
 
 import java.util.Dictionary;
 import java.util.Properties;
+
 import org.apache.ace.deployment.Deployment;
 import org.apache.ace.discovery.Discovery;
 import org.apache.ace.identification.Identification;
 import org.apache.ace.scheduler.constants.SchedulerConstants;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.event.EventAdmin;
 import org.osgi.service.log.LogService;

Modified: incubator/ace/trunk/ace-deployment/src/main/java/org/apache/ace/deployment/deploymentadmin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment/src/main/java/org/apache/ace/deployment/deploymentadmin/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment/src/main/java/org/apache/ace/deployment/deploymentadmin/Activator.java
(original)
+++ incubator/ace/trunk/ace-deployment/src/main/java/org/apache/ace/deployment/deploymentadmin/Activator.java
Wed Mar 17 22:05:58 2010
@@ -19,8 +19,8 @@
 package org.apache.ace.deployment.deploymentadmin;
 
 import org.apache.ace.deployment.Deployment;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.deploymentadmin.DeploymentAdmin;
 import org.osgi.service.log.LogService;

Modified: incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java
(original)
+++ incubator/ace/trunk/ace-gateway-log/src/main/java/org/apache/ace/gateway/log/Activator.java
Wed Mar 17 22:05:58 2010
@@ -22,15 +22,16 @@ import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+
 import org.apache.ace.discovery.Discovery;
 import org.apache.ace.gateway.log.store.LogStore;
 import org.apache.ace.gateway.log.task.LogSyncTask;
 import org.apache.ace.identification.Identification;
 import org.apache.ace.log.Log;
 import org.apache.ace.scheduler.constants.SchedulerConstants;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationException;

Modified: incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/Activator.java
(original)
+++ incubator/ace/trunk/ace-log-servlet/src/main/java/org/apache/ace/server/log/servlet/Activator.java
Wed Mar 17 22:05:58 2010
@@ -22,12 +22,14 @@ import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+
 import javax.servlet.http.HttpServlet;
+
 import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.server.log.store.LogStore;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationException;

Modified: incubator/ace/trunk/ace-obr-servlet/src/main/java/org/apache/ace/obr/servlet/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-obr-servlet/src/main/java/org/apache/ace/obr/servlet/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-obr-servlet/src/main/java/org/apache/ace/obr/servlet/Activator.java
(original)
+++ incubator/ace/trunk/ace-obr-servlet/src/main/java/org/apache/ace/obr/servlet/Activator.java
Wed Mar 17 22:05:58 2010
@@ -19,9 +19,10 @@
 package org.apache.ace.obr.servlet;
 
 import javax.servlet.http.HttpServlet;
+
 import org.apache.ace.obr.storage.BundleStore;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;
 

Modified: incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/Activator.java
(original)
+++ incubator/ace/trunk/ace-repository-servlet/src/main/java/org/apache/ace/repository/servlet/Activator.java
Wed Mar 17 22:05:58 2010
@@ -19,8 +19,9 @@
 package org.apache.ace.repository.servlet;
 
 import javax.servlet.http.HttpServlet;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;
 

Modified: incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/Activator.java
(original)
+++ incubator/ace/trunk/ace-repository-task/src/main/java/org/apache/ace/repository/task/Activator.java
Wed Mar 17 22:05:58 2010
@@ -19,9 +19,10 @@
 package org.apache.ace.repository.task;
 
 import java.util.Properties;
+
 import org.apache.ace.discovery.Discovery;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;
 

Modified: incubator/ace/trunk/ace-repository/src/main/java/org/apache/ace/repository/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository/src/main/java/org/apache/ace/repository/impl/Activator.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository/src/main/java/org/apache/ace/repository/impl/Activator.java
(original)
+++ incubator/ace/trunk/ace-repository/src/main/java/org/apache/ace/repository/impl/Activator.java
Wed Mar 17 22:05:58 2010
@@ -19,8 +19,9 @@
 package org.apache.ace.repository.impl;
 
 import java.util.Properties;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ManagedServiceFactory;

Modified: incubator/ace/trunk/ace-repository/src/main/java/org/apache/ace/repository/impl/RepositoryFactory.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-repository/src/main/java/org/apache/ace/repository/impl/RepositoryFactory.java?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/ace-repository/src/main/java/org/apache/ace/repository/impl/RepositoryFactory.java
(original)
+++ incubator/ace/trunk/ace-repository/src/main/java/org/apache/ace/repository/impl/RepositoryFactory.java
Wed Mar 17 22:05:58 2010
@@ -24,11 +24,12 @@ import java.io.IOException;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.ace.repository.Repository;
 import org.apache.ace.repository.RepositoryReplication;
 import org.apache.ace.repository.impl.constants.RepositoryConstants;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedServiceFactory;

Modified: incubator/ace/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom/pom.xml?rev=924516&r1=924515&r2=924516&view=diff
==============================================================================
--- incubator/ace/trunk/pom/pom.xml (original)
+++ incubator/ace/trunk/pom/pom.xml Wed Mar 17 22:05:58 2010
@@ -37,7 +37,7 @@
         <namespace>org.apache.ace</namespace>
         <gwtversion>1.7.1</gwtversion>
         <dependency.version.mockito>1.8.1</dependency.version.mockito>
-        <dependency.version.dependencymanager>2.0.1</dependency.version.dependencymanager>
+        <dependency.version.dependencymanager>3.0.0-SNAPSHOT</dependency.version.dependencymanager>
 
         <dependency.version.eventadmin>1.0.0</dependency.version.eventadmin>
         <dependency.version.configadmin>1.2.4</dependency.version.configadmin>



Mime
View raw message