You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2010/07/02 20:27:23 UTC
svn commit: r960082 [1/2] - in /felix/trunk/dependencymanager:
compat/src/main/java/org/apache/felix/dependencymanager/impl/ core/
core/src/main/java/org/apache/felix/dm/
core/src/main/java/org/apache/felix/dm/dependencies/
core/src/main/java/org/apach...
Author: marrs
Date: Fri Jul 2 18:27:21 2010
New Revision: 960082
URL: http://svn.apache.org/viewvc?rev=960082&view=rev
Log:
Refactored all exported packages into one, to simplify usage.
Added:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/BundleDependency.java
- copied, changed from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/BundleDependency.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ConfigurationDependency.java
- copied, changed from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ConfigurationDependency.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/Dependency.java
- copied, changed from r959632, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/Dependency.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/PropertyMetaData.java
- copied, changed from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/PropertyMetaData.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceDependency.java
- copied, changed from r960066, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ResourceDependency.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceHandler.java
- copied, changed from r960066, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceHandler.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceUtil.java
- copied, changed from r960066, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceUtil.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/Service.java
- copied, changed from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/service/Service.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponent.java
- copied, changed from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponent.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponentDependency.java
- copied, changed from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponentDependency.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceDependency.java
- copied, changed from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ServiceDependency.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceStateListener.java
- copied, changed from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/service/ServiceStateListener.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java
- copied, changed from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/util/ServiceUtil.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/TemporalServiceDependency.java
- copied, changed from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/TemporalServiceDependency.java
Removed:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/management/
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/service/
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/util/
Modified:
felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ConfigurationDependencyImpl.java
felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ServiceDependencyImpl.java
felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ServiceImpl.java
felix/trunk/dependencymanager/core/pom.xml
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyActivatorBase.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyManager.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectServiceImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/BundleAdapterServiceImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FactoryConfigurationAdapterServiceImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/State.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyBase.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyService.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/TemporalServiceDependencyImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/PropertyMetaDataImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/tracker/ServiceTracker.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyBuilder.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceComponentBuilder.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceFactory.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java
felix/trunk/dependencymanager/shell/src/main/java/org/apache/felix/dm/shell/DMCommand.java
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceProvider.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AbstractServiceDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterWithExtraDependenciesTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectChainTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectWhiteboardTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/BundleDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ComponentLifeCycleTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/CompositionTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ConfigurationDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/DynamicProxyAspectTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2078_ServiceDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithAutoConfigTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithCallbackTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2348_ResourceAdapterTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2369_ExtraDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FactoryConfigurationAdapterTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependencyTest2.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleServiceDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ResourceDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ServiceDependencyInjectionTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ServiceDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/TemporalServiceDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/AspectLifecycleAnnotationTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/AspectLifecycleWithDynamicProxyAnnotationTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/TemporalAnnotationTest.java
Modified: felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ConfigurationDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ConfigurationDependencyImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ConfigurationDependencyImpl.java (original)
+++ felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ConfigurationDependencyImpl.java Fri Jul 2 18:27:21 2010
@@ -45,7 +45,7 @@ import org.apache.felix.dependencymanage
*/
public class ConfigurationDependencyImpl extends ConfigurationDependency
{
- org.apache.felix.dm.dependencies.ConfigurationDependency m_delegate;
+ org.apache.felix.dm.ConfigurationDependency m_delegate;
public ConfigurationDependencyImpl(DependencyManager dm)
{
@@ -53,7 +53,7 @@ public class ConfigurationDependencyImpl
m_delegate = dmDelegate.createConfigurationDependency();
}
- public org.apache.felix.dm.dependencies.ConfigurationDependency getDelegate()
+ public org.apache.felix.dm.ConfigurationDependency getDelegate()
{
return m_delegate;
}
Modified: felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ServiceDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ServiceDependencyImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ServiceDependencyImpl.java (original)
+++ felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ServiceDependencyImpl.java Fri Jul 2 18:27:21 2010
@@ -24,7 +24,7 @@ import org.osgi.framework.ServiceReferen
public class ServiceDependencyImpl extends ServiceDependency
{
- org.apache.felix.dm.dependencies.ServiceDependency m_delegate;
+ org.apache.felix.dm.ServiceDependency m_delegate;
public ServiceDependencyImpl(DependencyManager dm)
{
@@ -32,7 +32,7 @@ public class ServiceDependencyImpl exten
m_delegate = dmDelegate.createServiceDependency();
}
- public org.apache.felix.dm.dependencies.ServiceDependency getDelegate()
+ public org.apache.felix.dm.ServiceDependency getDelegate()
{
return m_delegate;
}
Modified: felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ServiceImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ServiceImpl.java (original)
+++ felix/trunk/dependencymanager/compat/src/main/java/org/apache/felix/dependencymanager/impl/ServiceImpl.java Fri Jul 2 18:27:21 2010
@@ -37,7 +37,7 @@ import org.osgi.framework.ServiceRegistr
*/
public class ServiceImpl implements Service
{
- private org.apache.felix.dm.service.Service m_delegate;
+ private org.apache.felix.dm.Service m_delegate;
private Map m_stateListeners = new HashMap();
private ArrayList m_dependencies = new ArrayList();
@@ -88,24 +88,24 @@ public class ServiceImpl implements Serv
public void addStateListener(final ServiceStateListener listener)
{
- org.apache.felix.dm.service.ServiceStateListener wrappedListener = new org.apache.felix.dm.service.ServiceStateListener()
+ org.apache.felix.dm.ServiceStateListener wrappedListener = new org.apache.felix.dm.ServiceStateListener()
{
- public void started(org.apache.felix.dm.service.Service service)
+ public void started(org.apache.felix.dm.Service service)
{
listener.started(ServiceImpl.this);
}
- public void starting(org.apache.felix.dm.service.Service service)
+ public void starting(org.apache.felix.dm.Service service)
{
listener.starting(ServiceImpl.this);
}
- public void stopped(org.apache.felix.dm.service.Service service)
+ public void stopped(org.apache.felix.dm.Service service)
{
listener.stopped(ServiceImpl.this);
}
- public void stopping(org.apache.felix.dm.service.Service service)
+ public void stopping(org.apache.felix.dm.Service service)
{
listener.stopping(ServiceImpl.this);
}
@@ -119,10 +119,10 @@ public class ServiceImpl implements Serv
public void removeStateListener(ServiceStateListener listener)
{
- org.apache.felix.dm.service.ServiceStateListener wrappedListener = null;
+ org.apache.felix.dm.ServiceStateListener wrappedListener = null;
synchronized (m_stateListeners)
{
- wrappedListener = (org.apache.felix.dm.service.ServiceStateListener) m_stateListeners.remove(listener);
+ wrappedListener = (org.apache.felix.dm.ServiceStateListener) m_stateListeners.remove(listener);
}
if (wrappedListener != null)
{
Modified: felix/trunk/dependencymanager/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/pom.xml?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/pom.xml (original)
+++ felix/trunk/dependencymanager/core/pom.xml Fri Jul 2 18:27:21 2010
@@ -52,12 +52,12 @@
<Bundle-Name>Apache Felix Dependency Manager</Bundle-Name>
<Bundle-Description>A bundle that provides a run-time service dependency manager.</Bundle-Description>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Export-Package>org.apache.felix.dm;version="3.0.0",org.apache.felix.dm.service;version="3.0.0",org.apache.felix.dm.management;version="3.0.0",org.apache.felix.dm.dependencies;version="3.0.0",org.apache.felix.dm.resources;version="3.0.0",org.apache.felix.dm.util;version="3.0.0"</Export-Package>
- <Import-Package>!org.apache.felix.dm,!org.apache.felix.dm.service,!org.apache.felix.dm.management,!org.apache.felix.dm.dependencies,!org.apache.felix.dm.resources,*</Import-Package>
+ <Export-Package>org.apache.felix.dm;version="3.0.0"</Export-Package>
+ <Import-Package>!org.apache.felix.dm,*</Import-Package>
<Private-Package>org.apache.felix.dm.impl,org.apache.felix.dm.impl.dependencies,org.apache.felix.dm.impl.tracker,org.apache.felix.dm.impl.metatype</Private-Package>
- <!-- Uncomment this line to include source code in the bundle.- ->
+ <!-- Uncomment this line to include source code in the bundle.
<Include-Resource>src/main/java</Include-Resource>
- <!- - -->
+ -->
</instructions>
</configuration>
</plugin>
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/BundleDependency.java (from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/BundleDependency.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/BundleDependency.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/BundleDependency.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/BundleDependency.java&r1=958469&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/BundleDependency.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/BundleDependency.java Fri Jul 2 18:27:21 2010
@@ -9,9 +9,8 @@
* or implied. See the License for the specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
-import org.apache.felix.dm.management.ServiceComponentDependency;
import org.osgi.framework.Bundle;
public interface BundleDependency extends Dependency, ServiceComponentDependency
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ConfigurationDependency.java (from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ConfigurationDependency.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ConfigurationDependency.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ConfigurationDependency.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ConfigurationDependency.java&r1=958469&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ConfigurationDependency.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ConfigurationDependency.java Fri Jul 2 18:27:21 2010
@@ -9,9 +9,8 @@
* or implied. See the License for the specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
-import org.apache.felix.dm.management.ServiceComponentDependency;
/**
* Configuration dependency that can track the availability of a (valid) configuration. To use
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/Dependency.java (from r959632, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/Dependency.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/Dependency.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/Dependency.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/Dependency.java&r1=959632&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/Dependency.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/Dependency.java Fri Jul 2 18:27:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
import java.util.Dictionary;
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyActivatorBase.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyActivatorBase.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyActivatorBase.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyActivatorBase.java Fri Jul 2 18:27:21 2010
@@ -20,15 +20,8 @@ package org.apache.felix.dm;
import java.util.List;
-import org.apache.felix.dm.dependencies.BundleDependency;
-import org.apache.felix.dm.dependencies.ConfigurationDependency;
-import org.apache.felix.dm.dependencies.PropertyMetaData;
-import org.apache.felix.dm.dependencies.ResourceDependency;
-import org.apache.felix.dm.dependencies.ServiceDependency;
-import org.apache.felix.dm.dependencies.TemporalServiceDependency;
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.BundleActivator;
import org.osgi.framework.BundleContext;
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyManager.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyManager.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/DependencyManager.java Fri Jul 2 18:27:21 2010
@@ -22,12 +22,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.felix.dm.dependencies.BundleDependency;
-import org.apache.felix.dm.dependencies.ConfigurationDependency;
-import org.apache.felix.dm.dependencies.PropertyMetaData;
-import org.apache.felix.dm.dependencies.ResourceDependency;
-import org.apache.felix.dm.dependencies.ServiceDependency;
-import org.apache.felix.dm.dependencies.TemporalServiceDependency;
import org.apache.felix.dm.impl.AdapterServiceImpl;
import org.apache.felix.dm.impl.AspectServiceImpl;
import org.apache.felix.dm.impl.BundleAdapterServiceImpl;
@@ -41,7 +35,6 @@ import org.apache.felix.dm.impl.dependen
import org.apache.felix.dm.impl.dependencies.ServiceDependencyImpl;
import org.apache.felix.dm.impl.dependencies.TemporalServiceDependencyImpl;
import org.apache.felix.dm.impl.metatype.PropertyMetaDataImpl;
-import org.apache.felix.dm.service.Service;
import org.osgi.framework.BundleContext;
/**
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/PropertyMetaData.java (from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/PropertyMetaData.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/PropertyMetaData.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/PropertyMetaData.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/PropertyMetaData.java&r1=958469&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/PropertyMetaData.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/PropertyMetaData.java Fri Jul 2 18:27:21 2010
@@ -9,7 +9,7 @@
* or implied. See the License for the specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
/**
* This interface defines meta data regarding a given configuration property.
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceDependency.java (from r960066, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ResourceDependency.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceDependency.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceDependency.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ResourceDependency.java&r1=960066&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ResourceDependency.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceDependency.java Fri Jul 2 18:27:21 2010
@@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
import java.net.URL;
-import org.apache.felix.dm.resources.ResourceHandler;
public interface ResourceDependency extends Dependency, ResourceHandler {
/**
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceHandler.java (from r960066, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceHandler.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceHandler.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceHandler.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceHandler.java&r1=960066&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceHandler.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceHandler.java Fri Jul 2 18:27:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.resources;
+package org.apache.felix.dm;
import java.net.URL;
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceUtil.java (from r960066, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceUtil.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceUtil.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceUtil.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceUtil.java&r1=960066&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/resources/ResourceUtil.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ResourceUtil.java Fri Jul 2 18:27:21 2010
@@ -1,4 +1,4 @@
-package org.apache.felix.dm.resources;
+package org.apache.felix.dm;
import java.net.URL;
import java.util.Dictionary;
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/Service.java (from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/service/Service.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/Service.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/Service.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/service/Service.java&r1=958469&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/service/Service.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/Service.java Fri Jul 2 18:27:21 2010
@@ -16,13 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.service;
+package org.apache.felix.dm;
import java.util.Dictionary;
import java.util.List;
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
import org.osgi.framework.ServiceRegistration;
/**
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponent.java (from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponent.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponent.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponent.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponent.java&r1=958469&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponent.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponent.java Fri Jul 2 18:27:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.management;
+package org.apache.felix.dm;
/**
* Describes a service component. Service components form descriptions of services
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponentDependency.java (from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponentDependency.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponentDependency.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponentDependency.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponentDependency.java&r1=958469&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/management/ServiceComponentDependency.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceComponentDependency.java Fri Jul 2 18:27:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.management;
+package org.apache.felix.dm;
/**
* Describes a service component dependency. They form descriptions of dependencies
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceDependency.java (from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ServiceDependency.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceDependency.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceDependency.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ServiceDependency.java&r1=958469&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ServiceDependency.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceDependency.java Fri Jul 2 18:27:21 2010
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
-import org.apache.felix.dm.management.ServiceComponentDependency;
import org.osgi.framework.ServiceReference;
/**
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceStateListener.java (from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/service/ServiceStateListener.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceStateListener.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceStateListener.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/service/ServiceStateListener.java&r1=958469&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/service/ServiceStateListener.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceStateListener.java Fri Jul 2 18:27:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.service;
+package org.apache.felix.dm;
/**
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java (from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/util/ServiceUtil.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/util/ServiceUtil.java&r1=958469&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/util/ServiceUtil.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java Fri Jul 2 18:27:21 2010
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.util;
+package org.apache.felix.dm;
-import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
Copied: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/TemporalServiceDependency.java (from r958469, felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/TemporalServiceDependency.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/TemporalServiceDependency.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/TemporalServiceDependency.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/TemporalServiceDependency.java&r1=958469&r2=960082&rev=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/TemporalServiceDependency.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/TemporalServiceDependency.java Fri Jul 2 18:27:21 2010
@@ -9,7 +9,7 @@
* or implied. See the License for the specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.dependencies;
+package org.apache.felix.dm;
/**
* A Temporal Service dependency that can block the caller thread between service updates. Only
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java Fri Jul 2 18:27:21 2010
@@ -25,10 +25,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceStateListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.ConfigurationException;
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AdapterServiceImpl.java Fri Jul 2 18:27:21 2010
@@ -21,10 +21,10 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
+import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceStateListener;
import org.osgi.framework.ServiceReference;
/**
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectServiceImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectServiceImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AspectServiceImpl.java Fri Jul 2 18:27:21 2010
@@ -23,11 +23,11 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
+import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.dependencies.ServiceDependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.ServiceStateListener;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/BundleAdapterServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/BundleAdapterServiceImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/BundleAdapterServiceImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/BundleAdapterServiceImpl.java Fri Jul 2 18:27:21 2010
@@ -22,10 +22,10 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
+import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceStateListener;
import org.osgi.framework.Bundle;
/**
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FactoryConfigurationAdapterServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FactoryConfigurationAdapterServiceImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FactoryConfigurationAdapterServiceImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FactoryConfigurationAdapterServiceImpl.java Fri Jul 2 18:27:21 2010
@@ -26,11 +26,11 @@ import java.util.Hashtable;
import java.util.List;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.PropertyMetaData;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceStateListener;
import org.osgi.framework.Constants;
import org.osgi.service.cm.ManagedServiceFactory;
-import org.apache.felix.dm.dependencies.PropertyMetaData;
import org.apache.felix.dm.impl.metatype.MetaTypeProviderImpl;
import org.osgi.framework.BundleContext;
import org.osgi.service.metatype.MetaTypeProvider;
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java Fri Jul 2 18:27:21 2010
@@ -23,10 +23,10 @@ import java.util.Dictionary;
import java.util.Iterator;
import java.util.List;
+import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceStateListener;
import org.osgi.framework.ServiceRegistration;
/**
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java Fri Jul 2 18:27:21 2010
@@ -23,10 +23,10 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
+import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceStateListener;
/**
* Resource adapter service implementation. This class extends the FilterService in order to catch
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ServiceImpl.java Fri Jul 2 18:27:21 2010
@@ -32,14 +32,14 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceComponent;
+import org.apache.felix.dm.ServiceComponentDependency;
+import org.apache.felix.dm.ServiceStateListener;
import org.apache.felix.dm.impl.dependencies.DependencyActivation;
import org.apache.felix.dm.impl.dependencies.DependencyService;
-import org.apache.felix.dm.management.ServiceComponent;
-import org.apache.felix.dm.management.ServiceComponentDependency;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.service.ServiceStateListener;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/State.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/State.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/State.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/State.java Fri Jul 2 18:27:21 2010
@@ -20,7 +20,7 @@ package org.apache.felix.dm.impl;
import java.util.List;
-import org.apache.felix.dm.dependencies.Dependency;
+import org.apache.felix.dm.Dependency;
/**
* Encapsulates the current state of the dependencies of a service. A state is
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java Fri Jul 2 18:27:21 2010
@@ -23,13 +23,13 @@ import java.util.ArrayList;
import java.util.Dictionary;
import java.util.List;
-import org.apache.felix.dm.dependencies.BundleDependency;
-import org.apache.felix.dm.dependencies.Dependency;
+import org.apache.felix.dm.BundleDependency;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.ServiceComponentDependency;
import org.apache.felix.dm.impl.DefaultNullObject;
import org.apache.felix.dm.impl.Logger;
import org.apache.felix.dm.impl.tracker.BundleTracker;
import org.apache.felix.dm.impl.tracker.BundleTrackerCustomizer;
-import org.apache.felix.dm.management.ServiceComponentDependency;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java Fri Jul 2 18:27:21 2010
@@ -26,13 +26,13 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-import org.apache.felix.dm.dependencies.ConfigurationDependency;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.dependencies.PropertyMetaData;
+import org.apache.felix.dm.ConfigurationDependency;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.PropertyMetaData;
+import org.apache.felix.dm.ServiceComponentDependency;
import org.apache.felix.dm.impl.InvocationUtil;
import org.apache.felix.dm.impl.Logger;
import org.apache.felix.dm.impl.metatype.MetaTypeProviderImpl;
-import org.apache.felix.dm.management.ServiceComponentDependency;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyBase.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyBase.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyBase.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyBase.java Fri Jul 2 18:27:21 2010
@@ -1,6 +1,6 @@
package org.apache.felix.dm.impl.dependencies;
-import org.apache.felix.dm.dependencies.Dependency;
+import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.impl.Logger;
public abstract class DependencyBase implements Dependency, DependencyActivation {
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyService.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyService.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyService.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/DependencyService.java Fri Jul 2 18:27:21 2010
@@ -18,8 +18,8 @@
*/
package org.apache.felix.dm.impl.dependencies;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.Service;
public interface DependencyService {
/**
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java Fri Jul 2 18:27:21 2010
@@ -24,12 +24,12 @@ import java.util.Dictionary;
import java.util.List;
import java.util.Properties;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.dependencies.ResourceDependency;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.ResourceDependency;
+import org.apache.felix.dm.ResourceHandler;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceComponentDependency;
import org.apache.felix.dm.impl.Logger;
-import org.apache.felix.dm.management.ServiceComponentDependency;
-import org.apache.felix.dm.resources.ResourceHandler;
-import org.apache.felix.dm.service.Service;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java Fri Jul 2 18:27:21 2010
@@ -29,13 +29,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.dependencies.ServiceDependency;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.ServiceComponentDependency;
+import org.apache.felix.dm.ServiceDependency;
import org.apache.felix.dm.impl.DefaultNullObject;
import org.apache.felix.dm.impl.Logger;
import org.apache.felix.dm.impl.tracker.ServiceTracker;
import org.apache.felix.dm.impl.tracker.ServiceTrackerCustomizer;
-import org.apache.felix.dm.management.ServiceComponentDependency;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/TemporalServiceDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/TemporalServiceDependencyImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/TemporalServiceDependencyImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/TemporalServiceDependencyImpl.java Fri Jul 2 18:27:21 2010
@@ -16,7 +16,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import org.apache.felix.dm.DependencyActivatorBase;
-import org.apache.felix.dm.dependencies.TemporalServiceDependency;
+import org.apache.felix.dm.TemporalServiceDependency;
import org.apache.felix.dm.impl.Logger;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java Fri Jul 2 18:27:21 2010
@@ -32,7 +32,7 @@ import java.util.Properties;
import java.util.StringTokenizer;
import java.util.TreeSet;
-import org.apache.felix.dm.dependencies.PropertyMetaData;
+import org.apache.felix.dm.PropertyMetaData;
import org.apache.felix.dm.impl.Logger;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/PropertyMetaDataImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/PropertyMetaDataImpl.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/PropertyMetaDataImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/PropertyMetaDataImpl.java Fri Jul 2 18:27:21 2010
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.felix.dm.dependencies.PropertyMetaData;
+import org.apache.felix.dm.PropertyMetaData;
import org.osgi.service.metatype.AttributeDefinition;
/**
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/tracker/ServiceTracker.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/tracker/ServiceTracker.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/tracker/ServiceTracker.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/tracker/ServiceTracker.java Fri Jul 2 18:27:21 2010
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.util.ServiceUtil;
+import org.apache.felix.dm.ServiceUtil;
import org.osgi.framework.AllServiceListener;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java Fri Jul 2 18:27:21 2010
@@ -22,7 +22,7 @@ import java.util.Dictionary;
import java.util.List;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.osgi.framework.Bundle;
/**
Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java Fri Jul 2 18:27:21 2010
@@ -22,7 +22,7 @@ import java.util.Dictionary;
import java.util.List;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.osgi.framework.Bundle;
import org.osgi.service.log.LogService;
Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java Fri Jul 2 18:27:21 2010
@@ -22,7 +22,7 @@ import java.util.Dictionary;
import java.util.List;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.osgi.framework.Bundle;
public class BundleAdapterServiceBuilder extends ServiceComponentBuilder
Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyBuilder.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyBuilder.java Fri Jul 2 18:27:21 2010
@@ -18,13 +18,13 @@
*/
package org.apache.felix.dm.runtime;
+import org.apache.felix.dm.BundleDependency;
+import org.apache.felix.dm.ConfigurationDependency;
+import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.BundleDependency;
-import org.apache.felix.dm.dependencies.ConfigurationDependency;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.dependencies.ResourceDependency;
-import org.apache.felix.dm.dependencies.ServiceDependency;
-import org.apache.felix.dm.dependencies.TemporalServiceDependency;
+import org.apache.felix.dm.ResourceDependency;
+import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.TemporalServiceDependency;
import org.osgi.framework.Bundle;
/**
Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java Fri Jul 2 18:27:21 2010
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java Fri Jul 2 18:27:21 2010
@@ -22,7 +22,7 @@ import java.util.Dictionary;
import java.util.List;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.osgi.framework.Bundle;
public class FactoryConfigurationAdapterServiceBuilder extends ServiceComponentBuilder
Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java Fri Jul 2 18:27:21 2010
@@ -22,7 +22,7 @@ import java.util.Dictionary;
import java.util.List;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.osgi.framework.Bundle;
public class ResourceAdapterServiceBuilder extends ServiceComponentBuilder
Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java Fri Jul 2 18:27:21 2010
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Set;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.osgi.framework.Bundle;
import org.osgi.service.log.LogService;
Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceComponentBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceComponentBuilder.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceComponentBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceComponentBuilder.java Fri Jul 2 18:27:21 2010
@@ -20,9 +20,9 @@ package org.apache.felix.dm.runtime;
import java.util.List;
+import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.osgi.framework.Bundle;
import org.osgi.service.log.LogService;
Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceFactory.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceFactory.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceFactory.java Fri Jul 2 18:27:21 2010
@@ -27,9 +27,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.osgi.framework.Bundle;
import org.osgi.service.log.LogService;
Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java Fri Jul 2 18:27:21 2010
@@ -24,9 +24,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.dependencies.Dependency;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.osgi.framework.Bundle;
import org.osgi.service.log.LogService;
Modified: felix/trunk/dependencymanager/shell/src/main/java/org/apache/felix/dm/shell/DMCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/shell/src/main/java/org/apache/felix/dm/shell/DMCommand.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/shell/src/main/java/org/apache/felix/dm/shell/DMCommand.java (original)
+++ felix/trunk/dependencymanager/shell/src/main/java/org/apache/felix/dm/shell/DMCommand.java Fri Jul 2 18:27:21 2010
@@ -24,8 +24,8 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.StringTokenizer;
-import org.apache.felix.dm.management.ServiceComponent;
-import org.apache.felix.dm.management.ServiceComponentDependency;
+import org.apache.felix.dm.ServiceComponent;
+import org.apache.felix.dm.ServiceComponentDependency;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceProvider.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceProvider.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceProvider.java Fri Jul 2 18:27:21 2010
@@ -25,11 +25,11 @@ import java.util.Map.Entry;
import junit.framework.Assert;
+import org.apache.felix.dm.ResourceHandler;
+import org.apache.felix.dm.ResourceUtil;
import org.apache.felix.dm.annotation.api.Destroy;
import org.apache.felix.dm.annotation.api.Service;
import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.resources.ResourceHandler;
-import org.apache.felix.dm.resources.ResourceUtil;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AbstractServiceDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AbstractServiceDependencyTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AbstractServiceDependencyTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AbstractServiceDependencyTest.java Fri Jul 2 18:27:21 2010
@@ -24,7 +24,7 @@ import static org.ops4j.pax.exam.CoreOpt
import junit.framework.Assert;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterTest.java Fri Jul 2 18:27:21 2010
@@ -23,7 +23,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.provision;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterWithExtraDependenciesTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterWithExtraDependenciesTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterWithExtraDependenciesTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterWithExtraDependenciesTest.java Fri Jul 2 18:27:21 2010
@@ -5,7 +5,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.provision;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectChainTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectChainTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectChainTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectChainTest.java Fri Jul 2 18:27:21 2010
@@ -23,7 +23,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.provision;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectTest.java Fri Jul 2 18:27:21 2010
@@ -23,7 +23,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.provision;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectWhiteboardTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectWhiteboardTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectWhiteboardTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectWhiteboardTest.java Fri Jul 2 18:27:21 2010
@@ -28,8 +28,8 @@ import java.util.List;
import junit.framework.Assert;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
-import org.apache.felix.dm.util.ServiceUtil;
+import org.apache.felix.dm.Service;
+import org.apache.felix.dm.ServiceUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/BundleDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/BundleDependencyTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/BundleDependencyTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/BundleDependencyTest.java Fri Jul 2 18:27:21 2010
@@ -24,7 +24,7 @@ import static org.ops4j.pax.exam.CoreOpt
import junit.framework.Assert;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ComponentLifeCycleTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ComponentLifeCycleTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ComponentLifeCycleTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ComponentLifeCycleTest.java Fri Jul 2 18:27:21 2010
@@ -23,7 +23,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.provision;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/CompositionTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/CompositionTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/CompositionTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/CompositionTest.java Fri Jul 2 18:27:21 2010
@@ -23,7 +23,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.provision;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ConfigurationDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ConfigurationDependencyTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ConfigurationDependencyTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ConfigurationDependencyTest.java Fri Jul 2 18:27:21 2010
@@ -29,7 +29,7 @@ import java.util.Properties;
import junit.framework.Assert;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/DynamicProxyAspectTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/DynamicProxyAspectTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/DynamicProxyAspectTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/DynamicProxyAspectTest.java Fri Jul 2 18:27:21 2010
@@ -29,7 +29,7 @@ import java.lang.reflect.Proxy;
import junit.framework.Assert;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2078_ServiceDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2078_ServiceDependencyTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2078_ServiceDependencyTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2078_ServiceDependencyTest.java Fri Jul 2 18:27:21 2010
@@ -23,7 +23,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.provision;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithAutoConfigTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithAutoConfigTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithAutoConfigTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithAutoConfigTest.java Fri Jul 2 18:27:21 2010
@@ -24,7 +24,7 @@ import static org.ops4j.pax.exam.CoreOpt
import junit.framework.Assert;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithCallbackTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithCallbackTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithCallbackTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithCallbackTest.java Fri Jul 2 18:27:21 2010
@@ -24,7 +24,7 @@ import static org.ops4j.pax.exam.CoreOpt
import junit.framework.Assert;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2348_ResourceAdapterTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2348_ResourceAdapterTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2348_ResourceAdapterTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2348_ResourceAdapterTest.java Fri Jul 2 18:27:21 2010
@@ -34,8 +34,8 @@ import java.util.Map.Entry;
import junit.framework.Assert;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.resources.ResourceHandler;
-import org.apache.felix.dm.resources.ResourceUtil;
+import org.apache.felix.dm.ResourceHandler;
+import org.apache.felix.dm.ResourceUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2369_ExtraDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2369_ExtraDependencyTest.java?rev=960082&r1=960081&r2=960082&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2369_ExtraDependencyTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2369_ExtraDependencyTest.java Fri Jul 2 18:27:21 2010
@@ -24,7 +24,7 @@ import static org.ops4j.pax.exam.CoreOpt
import junit.framework.Assert;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;