felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1598994 [1/2] - in /felix/sandbox/pderop/dependencymanager-prototype/dm: ./ src/dm/ src/org/ src/org/apache/ src/org/apache/felix/ src/org/apache/felix/dm/ src/org/apache/felix/dm/context/ src/org/apache/felix/dm/impl/ src/org/apache/felix...
Date Sun, 01 Jun 2014 15:20:23 GMT
Author: pderop
Date: Sun Jun  1 15:20:21 2014
New Revision: 1598994

URL: http://svn.apache.org/r1598994
Log:
renamed dm top level package to org.apache.felix.dm

Added:
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/BundleDependency.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/BundleDependency.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/Component.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/Component.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentDeclaration.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentDeclaration.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentDependencyDeclaration.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentDependencyDeclaration.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentState.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentState.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentStateListener.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentStateListener.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ConfigurationDependency.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ConfigurationDependency.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/Dependency.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/Dependency.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/DependencyActivatorBase.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/DependencyActivatorBase.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/DependencyManager.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/DependencyManager.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/FilterIndex.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/FilterIndex.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/PropertyMetaData.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/PropertyMetaData.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceDependency.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ResourceDependency.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceHandler.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ResourceHandler.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceUtil.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ResourceUtil.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ServiceDependency.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ServiceDependency.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/
      - copied from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/context/
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AbstractDecorator.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/AbstractDecorator.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AdapterServiceImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/AdapterServiceImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AspectServiceImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/AspectServiceImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleAdapterImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/BundleAdapterImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleDependencyImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/BundleDependencyImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleEventImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/BundleEventImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ComponentImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ComponentImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ConfigurationDependencyImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/DefaultNullObject.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/DefaultNullObject.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/DependencyImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/DependencyImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/EventImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/EventImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/FactoryConfigurationAdapterImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/FactoryConfigurationAdapterImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/FilterComponent.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/FilterComponent.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/InvocationUtil.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/InvocationUtil.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/Logger.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/Logger.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceAdapterImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ResourceAdapterImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceDependencyImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ResourceDependencyImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceEventImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ResourceEventImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/SerialExecutor.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/SerialExecutor.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceDependencyImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceEventImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceEventImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceRegistrationImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceRegistrationImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceUtil.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceUtil.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/TemporalServiceDependencyImpl.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/TemporalServiceDependencyImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AbstractFactoryFilterIndex.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/AbstractFactoryFilterIndex.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AdapterFilterIndex.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/AdapterFilterIndex.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AspectFilterIndex.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/AspectFilterIndex.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/BundleContextInterceptor.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/BundleContextInterceptor.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/BundleContextInterceptorBase.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/BundleContextInterceptorBase.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/FilterIndexBundleContext.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/FilterIndexBundleContext.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/ServiceRegistryCache.java
      - copied, changed from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/ServiceRegistryCache.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/multiproperty/
      - copied from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/multiproperty/
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/metatype/
      - copied from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/metatype/
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/packageinfo
      - copied unchanged from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/packageinfo
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/tracker/
      - copied from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/tracker/
    felix/sandbox/pderop/dependencymanager-prototype/dm/test/org/
    felix/sandbox/pderop/dependencymanager-prototype/dm/test/org/apache/
    felix/sandbox/pderop/dependencymanager-prototype/dm/test/org/apache/felix/
    felix/sandbox/pderop/dependencymanager-prototype/dm/test/org/apache/felix/dm/
    felix/sandbox/pderop/dependencymanager-prototype/dm/test/org/apache/felix/dm/tracker/
      - copied from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/test/tracker/
Removed:
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/tracker/
    felix/sandbox/pderop/dependencymanager-prototype/dm/test/tracker/
Modified:
    felix/sandbox/pderop/dependencymanager-prototype/dm/bnd.bnd
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/ComponentContext.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/DependencyContext.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/Event.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/multiproperty/Filter.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/multiproperty/MultiPropertyFilterIndex.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/multiproperty/Property.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/metatype/AttributeDefinitionImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/metatype/ObjectClassDefinitionImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/metatype/PropertyMetaDataImpl.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/metatype/Resource.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/tracker/AbstractCustomizerActionSet.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/tracker/AbstractTracked.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/tracker/BundleTracker.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/tracker/BundleTrackerCustomizer.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/tracker/ServiceTracker.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/tracker/ServiceTrackerCustomizer.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/test/org/apache/felix/dm/tracker/TrackedTest.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/test/test/ComponentTest.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/test/test/ConcurrencyTest.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/test/test/ConfigurationTest.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/test/test/SerialExecutorTest.java
    felix/sandbox/pderop/dependencymanager-prototype/dm/test/test/ServiceRaceTest.java

Modified: felix/sandbox/pderop/dependencymanager-prototype/dm/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/bnd.bnd?rev=1598994&r1=1598993&r2=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/bnd.bnd Sun Jun  1 15:20:21 2014
@@ -2,12 +2,12 @@
 	osgi.core;version=4.2,\
 	org.mockito.mockito-all
 Private-Package: \
-	dm.impl,\
-	dm.impl.index,\
-	dm.impl.index.multiproperty,\
-	dm.impl.metatype
+	org.apache.felix.dm.impl,\
+	org.apache.felix.dm.impl.index,\
+	org.apache.felix.dm.impl.index.multiproperty,\
+	org.apache.felix.dm.impl.metatype
 Export-Package: \
-	dm,\
-	tracker,\
-	dm.context
+	org.apache.felix.dm,\
+	org.apache.felix.dm.tracker,\
+	org.apache.felix.dm.context
 Import-Package: !org.junit,!org.mockito.*,*

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/BundleDependency.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/BundleDependency.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/BundleDependency.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/BundleDependency.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/BundleDependency.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/BundleDependency.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/BundleDependency.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm;
+package org.apache.felix.dm;
 
 import org.osgi.framework.Bundle;
 

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/Component.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/Component.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/Component.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/Component.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/Component.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/Component.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/Component.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm;
+package org.apache.felix.dm;
 
 import java.util.Dictionary;
 import java.util.concurrent.Executor;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentDeclaration.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentDeclaration.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentDeclaration.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentDeclaration.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentDeclaration.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentDeclaration.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentDeclaration.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm;
+package org.apache.felix.dm;
 
 import java.util.Dictionary;
 

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentDependencyDeclaration.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentDependencyDeclaration.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentDependencyDeclaration.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentDependencyDeclaration.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentDependencyDeclaration.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentDependencyDeclaration.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentDependencyDeclaration.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm;
+package org.apache.felix.dm;
 
 /**
  * Describes a component dependency. They form descriptions of dependencies

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentState.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentState.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentState.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentState.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentState.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentState.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentState.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm;
+package org.apache.felix.dm;
 
 public enum ComponentState {
 	INACTIVE, 

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentStateListener.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentStateListener.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentStateListener.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentStateListener.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentStateListener.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ComponentStateListener.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ComponentStateListener.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm;
+package org.apache.felix.dm;
 
 
 public interface ComponentStateListener {

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ConfigurationDependency.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ConfigurationDependency.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ConfigurationDependency.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ConfigurationDependency.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ConfigurationDependency.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ConfigurationDependency.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ConfigurationDependency.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm;
+package org.apache.felix.dm;
 
 
 public interface ConfigurationDependency extends Dependency, ComponentDependencyDeclaration {

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/Dependency.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/Dependency.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/Dependency.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/Dependency.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/Dependency.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/Dependency.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/Dependency.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm;
+package org.apache.felix.dm;
 
 import java.util.Dictionary;
 

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/DependencyActivatorBase.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/DependencyActivatorBase.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/DependencyActivatorBase.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/DependencyActivatorBase.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/DependencyActivatorBase.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/DependencyActivatorBase.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/DependencyActivatorBase.java Sun Jun  1 15:20:21 2014
@@ -16,13 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm;
+package org.apache.felix.dm;
 
+import org.apache.felix.dm.impl.Logger;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
-import dm.impl.Logger;
-
 /**
  * Base bundle activator class. Subclass this activator if you want to use dependency
  * management in your bundle. There are two methods you should implement:

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/DependencyManager.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/DependencyManager.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/DependencyManager.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/DependencyManager.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/DependencyManager.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/DependencyManager.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/DependencyManager.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm;
+package org.apache.felix.dm;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -26,30 +26,29 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.apache.felix.dm.context.ComponentContext;
+import org.apache.felix.dm.impl.AdapterServiceImpl;
+import org.apache.felix.dm.impl.AspectServiceImpl;
+import org.apache.felix.dm.impl.BundleAdapterImpl;
+import org.apache.felix.dm.impl.BundleDependencyImpl;
+import org.apache.felix.dm.impl.ComponentImpl;
+import org.apache.felix.dm.impl.ConfigurationDependencyImpl;
+import org.apache.felix.dm.impl.FactoryConfigurationAdapterImpl;
+import org.apache.felix.dm.impl.Logger;
+import org.apache.felix.dm.impl.ResourceAdapterImpl;
+import org.apache.felix.dm.impl.ResourceDependencyImpl;
+import org.apache.felix.dm.impl.ServiceDependencyImpl;
+import org.apache.felix.dm.impl.TemporalServiceDependencyImpl;
+import org.apache.felix.dm.impl.index.AdapterFilterIndex;
+import org.apache.felix.dm.impl.index.AspectFilterIndex;
+import org.apache.felix.dm.impl.index.ServiceRegistryCache;
+import org.apache.felix.dm.impl.index.multiproperty.MultiPropertyFilterIndex;
+import org.apache.felix.dm.impl.metatype.PropertyMetaDataImpl;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.FrameworkUtil;
 
-import dm.context.ComponentContext;
-import dm.impl.AdapterServiceImpl;
-import dm.impl.AspectServiceImpl;
-import dm.impl.BundleAdapterImpl;
-import dm.impl.BundleDependencyImpl;
-import dm.impl.ComponentImpl;
-import dm.impl.ConfigurationDependencyImpl;
-import dm.impl.FactoryConfigurationAdapterImpl;
-import dm.impl.Logger;
-import dm.impl.ResourceAdapterImpl;
-import dm.impl.ResourceDependencyImpl;
-import dm.impl.ServiceDependencyImpl;
-import dm.impl.TemporalServiceDependencyImpl;
-import dm.impl.index.AdapterFilterIndex;
-import dm.impl.index.AspectFilterIndex;
-import dm.impl.index.ServiceRegistryCache;
-import dm.impl.index.multiproperty.MultiPropertyFilterIndex;
-import dm.impl.metatype.PropertyMetaDataImpl;
-
 /**
  * The dependency manager manages all components and their dependencies. Using 
  * this API you can declare all components and their dependencies. Under normal

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/FilterIndex.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/FilterIndex.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/FilterIndex.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/FilterIndex.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/FilterIndex.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/FilterIndex.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/FilterIndex.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm;
+package org.apache.felix.dm;
 
 import java.util.List;
 

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/PropertyMetaData.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/PropertyMetaData.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/PropertyMetaData.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/PropertyMetaData.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/PropertyMetaData.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/PropertyMetaData.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/PropertyMetaData.java Sun Jun  1 15:20:21 2014
@@ -9,7 +9,7 @@
  * or implied. See the License for the specific language governing permissions and limitations
  * under the License.
  */
-package dm;
+package org.apache.felix.dm;
 
 /**
  * This interface defines meta data regarding a given configuration property.

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceDependency.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ResourceDependency.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceDependency.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceDependency.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ResourceDependency.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ResourceDependency.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceDependency.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm;
+package org.apache.felix.dm;
 
 import java.net.URL;
 

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceHandler.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ResourceHandler.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceHandler.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceHandler.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ResourceHandler.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ResourceHandler.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceHandler.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm;
+package org.apache.felix.dm;
 
 import java.net.URL;
 import java.util.Dictionary;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceUtil.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ResourceUtil.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceUtil.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceUtil.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ResourceUtil.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ResourceUtil.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ResourceUtil.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm;
+package org.apache.felix.dm;
 
 import java.net.URL;
 import java.util.Dictionary;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ServiceDependency.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ServiceDependency.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ServiceDependency.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ServiceDependency.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ServiceDependency.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/ServiceDependency.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/ServiceDependency.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm;
+package org.apache.felix.dm;
 
 import org.osgi.framework.ServiceReference;
 

Modified: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/ComponentContext.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/ComponentContext.java?rev=1598994&r1=1598989&r2=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/ComponentContext.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/ComponentContext.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm.context;
+package org.apache.felix.dm.context;
 
 import java.util.List;
 import java.util.concurrent.Executor;

Modified: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/DependencyContext.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/DependencyContext.java?rev=1598994&r1=1598989&r2=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/DependencyContext.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/DependencyContext.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm.context;
+package org.apache.felix.dm.context;
 
 import java.util.Dictionary;
 

Modified: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/Event.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/Event.java?rev=1598994&r1=1598989&r2=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/Event.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/context/Event.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm.context;
+package org.apache.felix.dm.context;
 
 import org.osgi.framework.BundleContext;
 

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AbstractDecorator.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/AbstractDecorator.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AbstractDecorator.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AbstractDecorator.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/AbstractDecorator.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/AbstractDecorator.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AbstractDecorator.java Sun Jun  1 15:20:21 2014
@@ -16,25 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.net.URL;
 import java.util.Dictionary;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentStateListener;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.context.ComponentContext;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cm.ConfigurationException;
 
-import dm.Component;
-import dm.ComponentStateListener;
-import dm.Dependency;
-import dm.DependencyManager;
-import dm.context.ComponentContext;
-
 /**
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AdapterServiceImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/AdapterServiceImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AdapterServiceImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AdapterServiceImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/AdapterServiceImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/AdapterServiceImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AdapterServiceImpl.java Sun Jun  1 15:20:21 2014
@@ -16,23 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.List;
 
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentStateListener;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.context.DependencyContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 
-import dm.Component;
-import dm.ComponentStateListener;
-import dm.Dependency;
-import dm.DependencyManager;
-import dm.ServiceDependency;
-import dm.context.DependencyContext;
-
 /**
  * Adapter Service implementation. This class extends the FilterService in order to catch
  * some Service methods for configuring actual adapter service implementation.

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AspectServiceImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/AspectServiceImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AspectServiceImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AspectServiceImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/AspectServiceImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/AspectServiceImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/AspectServiceImpl.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.util.ArrayList;
 import java.util.Dictionary;
@@ -26,16 +26,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentStateListener;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.context.DependencyContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 
-import dm.Component;
-import dm.ComponentStateListener;
-import dm.Dependency;
-import dm.DependencyManager;
-import dm.ServiceDependency;
-import dm.context.DependencyContext;
-
 public class AspectServiceImpl extends FilterComponent {
 	
 	private final String m_add;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleAdapterImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/BundleAdapterImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleAdapterImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleAdapterImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/BundleAdapterImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/BundleAdapterImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleAdapterImpl.java Sun Jun  1 15:20:21 2014
@@ -1,17 +1,16 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentStateListener;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.context.DependencyContext;
 import org.osgi.framework.Bundle;
 
-import dm.Component;
-import dm.ComponentStateListener;
-import dm.Dependency;
-import dm.DependencyManager;
-import dm.context.DependencyContext;
-
 /**
  * Bundle Adapter Service implementation. This class extends the FilterService in order to catch
  * some Service methods for configuring actual adapter service implementation.

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleDependencyImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/BundleDependencyImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleDependencyImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleDependencyImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/BundleDependencyImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/BundleDependencyImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleDependencyImpl.java Sun Jun  1 15:20:21 2014
@@ -1,9 +1,15 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Proxy;
 import java.util.Dictionary;
 
+import org.apache.felix.dm.BundleDependency;
+import org.apache.felix.dm.ComponentDependencyDeclaration;
+import org.apache.felix.dm.context.DependencyContext;
+import org.apache.felix.dm.context.Event;
+import org.apache.felix.dm.tracker.BundleTracker;
+import org.apache.felix.dm.tracker.BundleTrackerCustomizer;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
@@ -11,13 +17,6 @@ import org.osgi.framework.Filter;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.log.LogService;
 
-import tracker.BundleTracker;
-import tracker.BundleTrackerCustomizer;
-import dm.BundleDependency;
-import dm.ComponentDependencyDeclaration;
-import dm.context.DependencyContext;
-import dm.context.Event;
-
 /**
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleEventImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/BundleEventImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleEventImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleEventImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/BundleEventImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/BundleEventImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/BundleEventImpl.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleEvent;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ComponentImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ComponentImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ComponentImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ComponentImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ComponentImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ComponentImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ComponentImpl.java Sun Jun  1 15:20:21 2014
@@ -1,9 +1,9 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
-import static dm.ComponentState.INACTIVE;
-import static dm.ComponentState.INSTANTIATED_AND_WAITING_FOR_REQUIRED;
-import static dm.ComponentState.TRACKING_OPTIONAL;
-import static dm.ComponentState.WAITING_FOR_REQUIRED;
+import static org.apache.felix.dm.ComponentState.INACTIVE;
+import static org.apache.felix.dm.ComponentState.INSTANTIATED_AND_WAITING_FOR_REQUIRED;
+import static org.apache.felix.dm.ComponentState.TRACKING_OPTIONAL;
+import static org.apache.felix.dm.ComponentState.WAITING_FOR_REQUIRED;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -25,20 +25,19 @@ import java.util.concurrent.CopyOnWriteA
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentDeclaration;
+import org.apache.felix.dm.ComponentDependencyDeclaration;
+import org.apache.felix.dm.ComponentState;
+import org.apache.felix.dm.ComponentStateListener;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.context.ComponentContext;
+import org.apache.felix.dm.context.DependencyContext;
+import org.apache.felix.dm.context.Event;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
-import dm.Component;
-import dm.ComponentDeclaration;
-import dm.ComponentDependencyDeclaration;
-import dm.ComponentState;
-import dm.ComponentStateListener;
-import dm.Dependency;
-import dm.DependencyManager;
-import dm.context.ComponentContext;
-import dm.context.DependencyContext;
-import dm.context.Event;
-
 public class ComponentImpl implements Component, ComponentContext, ComponentDeclaration {
 	private static final ServiceRegistration NULL_REGISTRATION = (ServiceRegistration) Proxy
 			.newProxyInstance(ComponentImpl.class.getClassLoader(),

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ConfigurationDependencyImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ConfigurationDependencyImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ConfigurationDependencyImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java Sun Jun  1 15:20:21 2014
@@ -1,22 +1,21 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Dictionary;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.felix.dm.ConfigurationDependency;
+import org.apache.felix.dm.PropertyMetaData;
+import org.apache.felix.dm.context.DependencyContext;
+import org.apache.felix.dm.context.Event;
+import org.apache.felix.dm.impl.metatype.MetaTypeProviderImpl;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedService;
 
-import dm.ConfigurationDependency;
-import dm.PropertyMetaData;
-import dm.context.DependencyContext;
-import dm.context.Event;
-import dm.impl.metatype.MetaTypeProviderImpl;
-
 public class ConfigurationDependencyImpl extends DependencyImpl<ConfigurationDependency> implements ConfigurationDependency, ManagedService {
     private Dictionary<?,?> m_settings;
     private String m_callback = "updated";

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/DefaultNullObject.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/DefaultNullObject.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/DefaultNullObject.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/DefaultNullObject.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/DefaultNullObject.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/DefaultNullObject.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/DefaultNullObject.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/DependencyImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/DependencyImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/DependencyImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/DependencyImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/DependencyImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/DependencyImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/DependencyImpl.java Sun Jun  1 15:20:21 2014
@@ -1,15 +1,14 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.util.Dictionary;
 
+import org.apache.felix.dm.ComponentDependencyDeclaration;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.context.ComponentContext;
+import org.apache.felix.dm.context.DependencyContext;
+import org.apache.felix.dm.context.Event;
 import org.osgi.framework.BundleContext;
 
-import dm.ComponentDependencyDeclaration;
-import dm.Dependency;
-import dm.context.ComponentContext;
-import dm.context.DependencyContext;
-import dm.context.Event;
-
 public class DependencyImpl<T extends Dependency> implements Dependency, DependencyContext {
 	protected volatile ComponentContext m_component;
 	protected volatile boolean m_available; // volatile because accessed by getState method

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/EventImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/EventImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/EventImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/EventImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/EventImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/EventImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/EventImpl.java Sun Jun  1 15:20:21 2014
@@ -1,9 +1,8 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
+import org.apache.felix.dm.context.Event;
 import org.osgi.framework.BundleContext;
 
-import dm.context.Event;
-
 /* in real life, this event might contain a service reference and service instance
  * or something similar
  */

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/FactoryConfigurationAdapterImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/FactoryConfigurationAdapterImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/FactoryConfigurationAdapterImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/FactoryConfigurationAdapterImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/FactoryConfigurationAdapterImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/FactoryConfigurationAdapterImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/FactoryConfigurationAdapterImpl.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -6,19 +6,18 @@ import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.Hashtable;
 
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.PropertyMetaData;
+import org.apache.felix.dm.context.DependencyContext;
+import org.apache.felix.dm.impl.metatype.MetaTypeProviderImpl;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ManagedServiceFactory;
 import org.osgi.service.metatype.MetaTypeProvider;
 import org.osgi.service.metatype.ObjectClassDefinition;
 
-import dm.Component;
-import dm.Dependency;
-import dm.DependencyManager;
-import dm.PropertyMetaData;
-import dm.context.DependencyContext;
-import dm.impl.metatype.MetaTypeProviderImpl;
-
 /**
  * Factory configuration adapter service implementation. This class extends the FilterService in order to catch
  * some Service methods for configuring actual adapter service implementation.

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/FilterComponent.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/FilterComponent.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/FilterComponent.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/FilterComponent.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/FilterComponent.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/FilterComponent.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/FilterComponent.java Sun Jun  1 15:20:21 2014
@@ -16,26 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.util.Dictionary;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.Executor;
 
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentDeclaration;
+import org.apache.felix.dm.ComponentDependencyDeclaration;
+import org.apache.felix.dm.ComponentStateListener;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.context.ComponentContext;
+import org.apache.felix.dm.context.DependencyContext;
+import org.apache.felix.dm.context.Event;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
-import dm.Component;
-import dm.ComponentDeclaration;
-import dm.ComponentDependencyDeclaration;
-import dm.ComponentStateListener;
-import dm.Dependency;
-import dm.DependencyManager;
-import dm.context.ComponentContext;
-import dm.context.DependencyContext;
-import dm.context.Event;
-
 /**
  * This class allows to filter a Component interface. All Aspect/Adapters extend this class
  * in order to add functionality to the default Component implementation.

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/InvocationUtil.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/InvocationUtil.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/InvocationUtil.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/InvocationUtil.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/InvocationUtil.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/InvocationUtil.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/InvocationUtil.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/Logger.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/Logger.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/Logger.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/Logger.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/Logger.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/Logger.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/Logger.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceAdapterImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ResourceAdapterImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceAdapterImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceAdapterImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ResourceAdapterImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ResourceAdapterImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceAdapterImpl.java Sun Jun  1 15:20:21 2014
@@ -1,16 +1,16 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
 
-import dm.Component;
-import dm.ComponentStateListener;
-import dm.Dependency;
-import dm.DependencyManager;
-import dm.ResourceDependency;
-import dm.context.DependencyContext;
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentStateListener;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.ResourceDependency;
+import org.apache.felix.dm.context.DependencyContext;
 
 /**
  * Resource adapter service implementation. This class extends the FilterService in order to catch

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceDependencyImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ResourceDependencyImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceDependencyImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceDependencyImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ResourceDependencyImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ResourceDependencyImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceDependencyImpl.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
@@ -6,17 +6,16 @@ import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.Properties;
 
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentDependencyDeclaration;
+import org.apache.felix.dm.ResourceDependency;
+import org.apache.felix.dm.ResourceHandler;
+import org.apache.felix.dm.context.DependencyContext;
+import org.apache.felix.dm.context.Event;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.log.LogService;
 
-import dm.Component;
-import dm.ComponentDependencyDeclaration;
-import dm.ResourceDependency;
-import dm.ResourceHandler;
-import dm.context.DependencyContext;
-import dm.context.Event;
-
 /**
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceEventImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ResourceEventImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceEventImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceEventImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ResourceEventImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ResourceEventImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ResourceEventImpl.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.net.URL;
 import java.util.Dictionary;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/SerialExecutor.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/SerialExecutor.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/SerialExecutor.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/SerialExecutor.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/SerialExecutor.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/SerialExecutor.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/SerialExecutor.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.util.LinkedList;
 import java.util.List;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceDependencyImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceDependencyImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceDependencyImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Proxy;
@@ -10,20 +10,19 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentDeclaration;
+import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.context.DependencyContext;
+import org.apache.felix.dm.context.Event;
+import org.apache.felix.dm.tracker.ServiceTracker;
+import org.apache.felix.dm.tracker.ServiceTrackerCustomizer;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogService;
 
-import tracker.ServiceTracker;
-import tracker.ServiceTrackerCustomizer;
-import dm.Component;
-import dm.ComponentDeclaration;
-import dm.ServiceDependency;
-import dm.context.DependencyContext;
-import dm.context.Event;
-
 public class ServiceDependencyImpl extends DependencyImpl<ServiceDependency> implements ServiceDependency, ServiceTrackerCustomizer {
 	protected volatile ServiceTracker m_tracker;
     private final Logger m_logger;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceEventImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceEventImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceEventImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceEventImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceEventImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceEventImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceEventImpl.java Sun Jun  1 15:20:21 2014
@@ -1,4 +1,4 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceRegistrationImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceRegistrationImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceRegistrationImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceRegistrationImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceRegistrationImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceRegistrationImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceRegistrationImpl.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.util.Dictionary;
 

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceUtil.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceUtil.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceUtil.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceUtil.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceUtil.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceUtil.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/ServiceUtil.java Sun Jun  1 15:20:21 2014
@@ -16,16 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.util.List;
 
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 
-import dm.DependencyManager;
-
 /**
  * OSGi service utilities.
  * 

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/TemporalServiceDependencyImpl.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/TemporalServiceDependencyImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/TemporalServiceDependencyImpl.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/TemporalServiceDependencyImpl.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/TemporalServiceDependencyImpl.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/TemporalServiceDependencyImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/TemporalServiceDependencyImpl.java Sun Jun  1 15:20:21 2014
@@ -1,16 +1,15 @@
-package dm.impl;
+package org.apache.felix.dm.impl;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.ServiceDependency;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 
-import dm.DependencyActivatorBase;
-import dm.ServiceDependency;
-
 /**
  * Temporal Service dependency implementation, used to hide temporary service dependency "outage".
  * Only works with a required dependency.

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AbstractFactoryFilterIndex.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/AbstractFactoryFilterIndex.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AbstractFactoryFilterIndex.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AbstractFactoryFilterIndex.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/AbstractFactoryFilterIndex.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/AbstractFactoryFilterIndex.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AbstractFactoryFilterIndex.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl.index;
+package org.apache.felix.dm.impl.index;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -24,11 +24,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.apache.felix.dm.impl.ServiceUtil;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 
-import dm.impl.ServiceUtil;
-
 /**
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AdapterFilterIndex.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/AdapterFilterIndex.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AdapterFilterIndex.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AdapterFilterIndex.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/AdapterFilterIndex.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/AdapterFilterIndex.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AdapterFilterIndex.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl.index;
+package org.apache.felix.dm.impl.index;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,6 +27,11 @@ import java.util.SortedSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.FilterIndex;
+import org.apache.felix.dm.impl.ServiceUtil;
+import org.apache.felix.dm.tracker.ServiceTracker;
+import org.apache.felix.dm.tracker.ServiceTrackerCustomizer;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
@@ -34,12 +39,6 @@ import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceListener;
 import org.osgi.framework.ServiceReference;
 
-import tracker.ServiceTracker;
-import tracker.ServiceTrackerCustomizer;
-import dm.DependencyManager;
-import dm.FilterIndex;
-import dm.impl.ServiceUtil;
-
 /**
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AspectFilterIndex.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/AspectFilterIndex.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AspectFilterIndex.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AspectFilterIndex.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/AspectFilterIndex.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/AspectFilterIndex.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/AspectFilterIndex.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl.index;
+package org.apache.felix.dm.impl.index;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,6 +29,11 @@ import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.TreeMap;
 
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.FilterIndex;
+import org.apache.felix.dm.impl.ServiceUtil;
+import org.apache.felix.dm.tracker.ServiceTracker;
+import org.apache.felix.dm.tracker.ServiceTrackerCustomizer;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
@@ -36,12 +41,6 @@ import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceListener;
 import org.osgi.framework.ServiceReference;
 
-import tracker.ServiceTracker;
-import tracker.ServiceTrackerCustomizer;
-import dm.DependencyManager;
-import dm.FilterIndex;
-import dm.impl.ServiceUtil;
-
 /**
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/BundleContextInterceptor.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/BundleContextInterceptor.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/BundleContextInterceptor.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/BundleContextInterceptor.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/BundleContextInterceptor.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/BundleContextInterceptor.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/BundleContextInterceptor.java Sun Jun  1 15:20:21 2014
@@ -16,12 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl.index;
+package org.apache.felix.dm.impl.index;
 
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.felix.dm.FilterIndex;
+import org.apache.felix.dm.impl.Logger;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
@@ -29,9 +31,6 @@ import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceListener;
 import org.osgi.framework.ServiceReference;
 
-import dm.FilterIndex;
-import dm.impl.Logger;
-
 /**
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/BundleContextInterceptorBase.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/BundleContextInterceptorBase.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/BundleContextInterceptorBase.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/BundleContextInterceptorBase.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/BundleContextInterceptorBase.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/BundleContextInterceptorBase.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/BundleContextInterceptorBase.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl.index;
+package org.apache.felix.dm.impl.index;
 
 import java.io.File;
 import java.io.InputStream;

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/FilterIndexBundleContext.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/FilterIndexBundleContext.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/FilterIndexBundleContext.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/FilterIndexBundleContext.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/FilterIndexBundleContext.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/FilterIndexBundleContext.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/FilterIndexBundleContext.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl.index;
+package org.apache.felix.dm.impl.index;
 
 import java.util.Map.Entry;
 

Copied: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/ServiceRegistryCache.java (from r1598989, felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/ServiceRegistryCache.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/ServiceRegistryCache.java?p2=felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/ServiceRegistryCache.java&p1=felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/ServiceRegistryCache.java&r1=1598989&r2=1598994&rev=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/index/ServiceRegistryCache.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/ServiceRegistryCache.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl.index;
+package org.apache.felix.dm.impl.index;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -24,13 +24,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.apache.felix.dm.FilterIndex;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceListener;
 import org.osgi.framework.ServiceRegistration;
 
-import dm.FilterIndex;
-
 /**
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */

Modified: felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/multiproperty/Filter.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/multiproperty/Filter.java?rev=1598994&r1=1598989&r2=1598994&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/multiproperty/Filter.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/org/apache/felix/dm/impl/index/multiproperty/Filter.java Sun Jun  1 15:20:21 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package dm.impl.index.multiproperty;
+package org.apache.felix.dm.impl.index.multiproperty;
 
 import java.util.HashMap;
 import java.util.Iterator;



Mime
View raw message