You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by an...@apache.org on 2010/03/04 21:51:50 UTC
svn commit: r919174 - in /incubator/ace/trunk/legacy: core/ext/ core/lib/
core/src/org/apache/ace/consolelogger/
gateway/src/org/apache/ace/configurator/
gateway/src/org/apache/ace/deployment/deploymentadmin/
gateway/src/org/apache/ace/deployment/task/...
Author: angelos
Date: Thu Mar 4 20:51:48 2010
New Revision: 919174
URL: http://svn.apache.org/viewvc?rev=919174&view=rev
Log:
Upgraded to the newest DependencyManager (3.0.0-SNAPSHOT). That also means we have a new snapshot version of org.apache.felix.deploymentadmin.
Added:
incubator/ace/trunk/legacy/core/lib/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar (with props)
Modified:
incubator/ace/trunk/legacy/core/ext/org.apache.felix.dependencymanager.jar
incubator/ace/trunk/legacy/core/ext/org.apache.felix.dependencymanager.shell.jar
incubator/ace/trunk/legacy/core/src/org/apache/ace/consolelogger/Activator.java
incubator/ace/trunk/legacy/gateway/src/org/apache/ace/configurator/Activator.java
incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java
incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/task/Activator.java
incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/property/Activator.java
incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/upnp/Activator.java
incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/Activator.java
incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java
incubator/ace/trunk/legacy/gateway/src/org/apache/ace/identification/ifconfig/Activator.java
incubator/ace/trunk/legacy/gateway/src/org/apache/ace/identification/property/Activator.java
incubator/ace/trunk/legacy/gateway/src/org/apache/ace/ma/webstart/Activator.java
incubator/ace/trunk/legacy/gateway/src/org/apache/ace/scheduler/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/client/automation/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/helper/bundle/impl/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/helper/configuration/impl/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/helper/user/impl/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/RepositoryObjectImpl.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/configurator/useradmin/task/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/provider/filebased/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/servlet/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/http/listener/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/location/upnp/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/obr/metadata/bindex/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/obr/servlet/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/obr/storage/file/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/impl/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/impl/RepositoryFactory.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/servlet/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/repository/task/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/server/action/popupmessage/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/store/impl/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/server/log/task/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/ace/webconsole/plugin/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/felix/deployment/rp/autoconf/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/Activator.java
incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java
incubator/ace/trunk/legacy/test/src/org/apache/ace/test/bundlestop/Activator.java
incubator/ace/trunk/legacy/test/src/org/apache/ace/test/deployment/Activator.java
incubator/ace/trunk/legacy/test/src/org/apache/ace/test/http/listener/Activator.java
incubator/ace/trunk/legacy/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java
incubator/ace/trunk/legacy/test/src/org/apache/ace/test/log/Activator.java
incubator/ace/trunk/legacy/test/src/org/apache/ace/test/mockautoconf/Activator.java
incubator/ace/trunk/legacy/test/src/org/apache/ace/test/osgi/dm/TestActivatorBase.java
incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repository/Activator.java
incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repositoryadmin/Activator.java
incubator/ace/trunk/legacy/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java
incubator/ace/trunk/legacy/test/src/org/apache/ace/test/useradminconfigurator/Activator.java
incubator/ace/trunk/legacy/webui/src/org/apache/ace/server/Activator.java
Modified: incubator/ace/trunk/legacy/core/ext/org.apache.felix.dependencymanager.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/core/ext/org.apache.felix.dependencymanager.jar?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ace/trunk/legacy/core/ext/org.apache.felix.dependencymanager.shell.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/core/ext/org.apache.felix.dependencymanager.shell.jar?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/ace/trunk/legacy/core/lib/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/core/lib/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar?rev=919174&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/ace/trunk/legacy/core/lib/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/ace/trunk/legacy/core/src/org/apache/ace/consolelogger/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/core/src/org/apache/ace/consolelogger/Activator.java?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/core/src/org/apache/ace/consolelogger/Activator.java (original)
+++ incubator/ace/trunk/legacy/core/src/org/apache/ace/consolelogger/Activator.java Thu Mar 4 20:51:48 2010
@@ -18,8 +18,8 @@
*/
package org.apache.ace.consolelogger;
-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/legacy/gateway/src/org/apache/ace/configurator/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/configurator/Activator.java?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/configurator/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/configurator/Activator.java Thu Mar 4 20:51:48 2010
@@ -20,8 +20,8 @@
import java.io.File;
-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.cm.ConfigurationAdmin;
import org.osgi.service.log.LogService;
Modified: incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java Thu Mar 4 20:51:48 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/legacy/gateway/src/org/apache/ace/deployment/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/task/Activator.java?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/task/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/deployment/task/Activator.java Thu Mar 4 20:51:48 2010
@@ -25,8 +25,8 @@
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/legacy/gateway/src/org/apache/ace/discovery/property/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/property/Activator.java?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/property/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/property/Activator.java Thu Mar 4 20:51:48 2010
@@ -23,8 +23,8 @@
import org.apache.ace.discovery.Discovery;
import org.apache.ace.discovery.property.constants.DiscoveryConstants;
-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.log.LogService;
Modified: incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/upnp/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/upnp/Activator.java?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/upnp/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/discovery/upnp/Activator.java Thu Mar 4 20:51:48 2010
@@ -19,8 +19,8 @@
package org.apache.ace.discovery.upnp;
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;
import org.osgi.service.upnp.UPnPDevice;
Modified: incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/Activator.java?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/Activator.java (original)
+++ incubator/ace/trunk/legacy/gateway/src/org/apache/ace/gateway/log/Activator.java Thu Mar 4 20:51:48 2010
@@ -29,9 +29,9 @@
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -26,9 +26,9 @@
import org.apache.ace.gateway.log.store.LogStore;
import org.apache.ace.identification.Identification;
-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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -19,8 +19,8 @@
package org.apache.ace.identification.ifconfig;
import org.apache.ace.identification.Identification;
-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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -20,8 +20,8 @@
import org.apache.ace.identification.Identification;
import org.apache.ace.identification.property.constants.IdentificationConstants;
-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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -30,8 +30,8 @@
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.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -21,8 +21,8 @@
import java.util.Properties;
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.framework.Constants;
import org.osgi.framework.ServiceReference;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -22,8 +22,8 @@
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -25,8 +25,8 @@
import org.apache.ace.client.repository.helper.ArtifactRecognizer;
import org.apache.ace.client.repository.helper.bundle.BundleHelper;
import org.apache.ace.client.repository.object.ArtifactObject;
-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;
/**
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -25,8 +25,8 @@
import org.apache.ace.client.repository.helper.ArtifactRecognizer;
import org.apache.ace.client.repository.helper.configuration.ConfigurationHelper;
import org.apache.ace.client.repository.object.ArtifactObject;
-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;
/**
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -24,8 +24,8 @@
import org.apache.ace.client.repository.helper.ArtifactRecognizer;
import org.apache.ace.client.repository.helper.user.UserAdminHelper;
import org.apache.ace.client.repository.object.ArtifactObject;
-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;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -40,9 +40,9 @@
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -59,11 +59,8 @@
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.service.Service;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.event.EventConstants;
@@ -111,7 +108,6 @@
private GatewayRepositoryImpl m_gatewayRepositoryImpl;
private License2GatewayAssociationRepositoryImpl m_license2GatewayAssociationRepositoryImpl;
private DeploymentVersionRepositoryImpl m_deploymentVersionRepositoryImpl;
- private Logger m_logger;
private ChangeNotifierManager m_changeNotifierManager;
private final String m_sessionID;
private final Properties m_sessionProps;
@@ -143,7 +139,6 @@
m_repositories = repositories;
}
- @SuppressWarnings("unchecked")
public void start() {
initialize(publishRepositories());
}
@@ -174,15 +169,15 @@
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,20 +209,6 @@
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 +223,14 @@
@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/legacy/server/src/org/apache/ace/client/repository/impl/RepositoryObjectImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/RepositoryObjectImpl.java?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/RepositoryObjectImpl.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/ace/client/repository/impl/RepositoryObjectImpl.java Thu Mar 4 20:51:48 2010
@@ -13,7 +13,6 @@
import java.util.Properties;
import java.util.Set;
-
import org.apache.ace.client.repository.Associatable;
import org.apache.ace.client.repository.Association;
import org.apache.ace.client.repository.RepositoryObject;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -36,8 +36,8 @@
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -20,8 +20,8 @@
import java.util.Dictionary;
-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.Role;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -21,8 +21,8 @@
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -19,8 +19,8 @@
package org.apache.ace.deployment.provider.filebased;
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -22,8 +22,8 @@
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -20,8 +20,8 @@
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;
public class Activator extends DependencyActivatorBase {
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -27,8 +27,8 @@
import javax.servlet.http.HttpServlet;
import org.apache.ace.http.listener.constants.HttpConstants;
-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.ServiceReference;
import org.osgi.service.http.HttpService;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -20,8 +20,8 @@
import org.apache.ace.location.LocationService;
import org.apache.ace.location.upnp.util.HostUtil;
-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.http.HttpService;
import org.osgi.service.upnp.UPnPDevice;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -19,8 +19,8 @@
package org.apache.ace.obr.metadata.bindex;
import org.apache.ace.obr.metadata.MetadataGenerator;
-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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -21,8 +21,8 @@
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -20,8 +20,8 @@
import org.apache.ace.obr.metadata.MetadataGenerator;
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -20,8 +20,8 @@
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -28,8 +28,8 @@
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -20,8 +20,8 @@
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -21,8 +21,8 @@
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -21,8 +21,8 @@
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.framework.Constants;
import org.osgi.service.deploymentadmin.spi.ResourceProcessor;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -21,8 +21,8 @@
import java.util.Properties;
import org.apache.ace.server.action.Action;
-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;
public class Activator extends DependencyActivatorBase {
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -27,9 +27,9 @@
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -25,9 +25,9 @@
import java.util.Properties;
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -26,9 +26,9 @@
import org.apache.ace.discovery.Discovery;
import org.apache.ace.log.LogSync;
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/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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -23,8 +23,8 @@
import javax.servlet.Servlet;
-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;
/**
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -21,9 +21,9 @@
import java.util.Dictionary;
import java.util.Properties;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
import org.apache.felix.deployment.rp.autoconf.impl.AutoConfResourceProcessor;
+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.ConfigurationAdmin;
Modified: incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/Activator.java?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/Activator.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/Activator.java Thu Mar 4 20:51:48 2010
@@ -21,10 +21,15 @@
import java.io.PrintStream;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Dictionary;
+import java.util.Hashtable;
import org.apache.felix.metatype.internal.l10n.BundleResources;
-import org.osgi.framework.*;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogService;
import org.osgi.service.metatype.MetaTypeService;
import org.osgi.util.tracker.ServiceTracker;
Modified: incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/LocalizedObjectClassDefinition.java Thu Mar 4 20:51:48 2010
@@ -22,7 +22,11 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
import org.apache.felix.metatype.AD;
import org.apache.felix.metatype.OCD;
Modified: incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java (original)
+++ incubator/ace/trunk/legacy/server/src/org/apache/felix/metatype/internal/ServiceMetaTypeInformation.java Thu Mar 4 20:51:48 2010
@@ -19,7 +19,14 @@
package org.apache.felix.metatype.internal;
-import org.osgi.framework.*;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogService;
import org.osgi.service.metatype.MetaTypeProvider;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -21,8 +21,8 @@
import java.util.Dictionary;
import java.util.Hashtable;
-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.EventConstants;
import org.osgi.service.event.EventHandler;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -19,7 +19,7 @@
package org.apache.ace.test.deployment;
import org.apache.ace.test.osgi.dm.TestActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.deploymentadmin.DeploymentAdmin;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -19,7 +19,7 @@
package org.apache.ace.test.http.listener;
import org.apache.ace.test.osgi.dm.TestActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.service.http.HttpService;
import org.osgi.service.log.LogService;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -32,8 +32,8 @@
import org.apache.ace.http.listener.constants.HttpConstants;
import org.apache.ace.test.constants.TestConstants;
-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.http.HttpService;
import org.testng.annotations.Factory;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -30,7 +30,7 @@
import org.apache.ace.server.log.store.LogStore;
import org.apache.ace.test.constants.TestConstants;
import org.apache.ace.test.osgi.dm.TestActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.service.cm.Configuration;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -20,8 +20,8 @@
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.deploymentadmin.spi.ResourceProcessor;
Modified: incubator/ace/trunk/legacy/test/src/org/apache/ace/test/osgi/dm/TestActivatorBase.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/test/src/org/apache/ace/test/osgi/dm/TestActivatorBase.java?rev=919174&r1=919173&r2=919174&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/test/src/org/apache/ace/test/osgi/dm/TestActivatorBase.java (original)
+++ incubator/ace/trunk/legacy/test/src/org/apache/ace/test/osgi/dm/TestActivatorBase.java Thu Mar 4 20:51:48 2010
@@ -25,10 +25,10 @@
import java.util.concurrent.TimeUnit;
import org.apache.ace.test.utils.TestUtils;
-import org.apache.felix.dependencymanager.DependencyActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
-import org.apache.felix.dependencymanager.ServiceStateListener;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.service.ServiceStateListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -19,7 +19,7 @@
package org.apache.ace.test.repository;
import org.apache.ace.test.osgi.dm.TestActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.http.HttpService;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -38,7 +38,7 @@
import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
import org.apache.ace.server.log.store.LogStore;
import org.apache.ace.test.osgi.dm.TestActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.service.cm.Configuration;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -86,8 +86,8 @@
import org.apache.ace.server.log.store.LogStore;
import org.apache.ace.test.constants.TestConstants;
import org.apache.ace.test.utils.TestUtils;
-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.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -25,7 +25,7 @@
import org.apache.ace.repository.impl.constants.RepositoryConstants;
import org.apache.ace.test.constants.TestConstants;
import org.apache.ace.test.osgi.dm.TestActivatorBase;
-import org.apache.felix.dependencymanager.DependencyManager;
+import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
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=919174&r1=919173&r2=919174&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 Thu Mar 4 20:51:48 2010
@@ -24,8 +24,8 @@
import javax.servlet.http.HttpSession;
import org.apache.ace.client.repository.SessionFactory;
-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.ServiceReference;
import org.osgi.service.log.LogService;