You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2015/01/03 17:36:27 UTC

svn commit: r1649218 [1/3] - in /felix/sandbox/pderop: dependencymanager-prototype/ dependencymanager/ dependencymanager/cnf/ dependencymanager/cnf/ext/ dependencymanager/cnf/localrepo/ dependencymanager/cnf/localrepo/org.apache.felix.eventadmin/ depen...

Author: pderop
Date: Sat Jan  3 16:36:25 2015
New Revision: 1649218

URL: http://svn.apache.org/r1649218
Log:
Renamed dependencynamager-prototype to dependencymanager.
Reworked tests in order to avoid starting org.apache.felix.dependencymanager.itest when running runtime itests.
Extracted samples and benchmark into dependencymanager-samples

Added:
    felix/sandbox/pderop/dependencymanager/
      - copied from r1648937, felix/sandbox/pderop/dependencymanager-prototype/
    felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/
    felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.runtime/
    felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.runtime/org.apache.felix.dependencymanager.runtime-3.2.0.jar   (with props)
    felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.shell/
    felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-3.2.0.jar   (with props)
    felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.2.0.jar   (with props)
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AbstractServiceDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AbstractServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterAndConsumerTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterAndConsumerTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithCallbackInstanceTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithCallbackInstanceTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithConfigurationAndMetaType.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithConfigurationAndMetaType.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithExtraDependenciesTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithExtraDependenciesTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyParallelTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithInstanceBoundDependencyParallelTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithInstanceBoundDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithModifiedInstanceBoundDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithModifiedInstanceBoundDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithPropagationTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithPropagationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithoutPropagationTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithoutPropagationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectBaseTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectBaseTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectChainTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectChainTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectDynamicsTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectDynamicsTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceParallelTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectRaceParallelTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectRaceTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyWithSwapCallbackTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectServiceDependencyWithSwapCallbackTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWhiteboardTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWhiteboardTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWithCallbacksServiceDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWithCallbacksServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWithPropagationTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWithPropagationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AutoConfigTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/BundleAdapterTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleAdapterTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/BundleDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ComponentTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ComponentTracker.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTracker.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/CompositionTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/CompositionTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ConfigurationDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/DynamicProxyAspectTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/DynamicProxyAspectTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2078_ServiceDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2078_ServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2344_ExtraDependencyWithAutoConfigTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2344_ExtraDependencyWithCallbackTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2344_ExtraDependencyWithCallbackTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2348_ResourceAdapterTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2348_ResourceAdapterTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2369_ExtraDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2369_ExtraDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2696_ConfigurationAndServiceDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2696_ConfigurationAndServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2875_ServiceDependencyWithoutServiceNameTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2875_ServiceDependencyWithoutServiceNameTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2955_ShellCommandTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2955_ShellCommandTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX3008_FilterIndexStartupTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX3008_FilterIndexStartupTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX3057_EmptyServiceReferenceArray.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX3057_EmptyServiceReferenceArray.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX4158_DependencyDeclarationTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4158_DependencyDeclarationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX4361_ConcurrentComponentListingTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4361_ConcurrentComponentListingTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX_4168AdapterWithDynamicallyAddedDependencies.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX_4168AdapterWithDynamicallyAddedDependencies.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationAdapterTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FactoryConfigurationAdapterTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FilterIndexResourceAdapterTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FilterIndexResourceAdapterTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/InstanceBoundDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/InstanceBoundDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ModifiedBundleDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ModifiedBundleDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/MultipleExtraDependenciesTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/MultipleExtraDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/MultipleExtraDependencyTest2.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest2.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/MultipleServiceDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/RemovedDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/RemovedDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest2.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest2.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceProvider.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceProvider.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyCallbackSignaturesTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyCallbackSignaturesTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyInjectionTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyInjectionTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyPropagateTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyPropagateTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyThroughCallbackInstanceTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyThroughCallbackInstanceTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceParallelTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceParallelTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceTrackerTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceTrackerTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceUpdateTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUpdateTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/TemporalServiceDependencyTest.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TemporalServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/Ensure.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/Ensure.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/ServiceUtil.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUtil.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java
      - copied, changed from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TestBase.java
Removed:
    felix/sandbox/pderop/dependencymanager-prototype/
    felix/sandbox/pderop/dependencymanager/cnf/localrepo/org.apache.felix.eventadmin/
    felix/sandbox/pderop/dependencymanager/cnf/localrepo/org.apache.felix.http.api/
    felix/sandbox/pderop/dependencymanager/cnf/localrepo/org.apache.felix.http.servlet-api/
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.benchmark/
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AbstractServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterAndConsumerTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithCallbackInstanceTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithConfigurationAndMetaType.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithExtraDependenciesTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithInstanceBoundDependencyParallelTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithInstanceBoundDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithModifiedInstanceBoundDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithPropagationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithoutPropagationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectBaseTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectChainTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectDynamicsTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectRaceParallelTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectRaceTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectServiceDependencyWithSwapCallbackTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWhiteboardTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWithCallbacksServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWithPropagationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleAdapterTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/BundleDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ComponentTracker.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/CompositionTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ConfigurationDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/DynamicProxyAspectTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/Ensure.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2078_ServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2344_ExtraDependencyWithAutoConfigTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2344_ExtraDependencyWithCallbackTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2348_ResourceAdapterTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2369_ExtraDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2696_ConfigurationAndServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2875_ServiceDependencyWithoutServiceNameTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX2955_ShellCommandTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX3008_FilterIndexStartupTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX3057_EmptyServiceReferenceArray.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4158_DependencyDeclarationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX4361_ConcurrentComponentListingTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FELIX_4168AdapterWithDynamicallyAddedDependencies.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FactoryConfigurationAdapterTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/FilterIndexResourceAdapterTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/InstanceBoundDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ModifiedBundleDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependencyTest2.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/RemovedDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterDependencyAddAndRemoveTest2.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceAdapterTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ResourceProvider.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyCallbackSignaturesTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyInjectionTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyPropagateTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceDependencyThroughCallbackInstanceTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceParallelTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceTrackerTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUpdateTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceUtil.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TemporalServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/TestBase.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.samples/
Modified:
    felix/sandbox/pderop/dependencymanager/README
    felix/sandbox/pderop/dependencymanager/cnf/build.bnd
    felix/sandbox/pderop/dependencymanager/cnf/ext/repositories.bnd
    felix/sandbox/pderop/dependencymanager/cnf/localrepo/index.xml
    felix/sandbox/pderop/dependencymanager/cnf/localrepo/index.xml.sha
    felix/sandbox/pderop/dependencymanager/cnf/releaserepo/index.xml
    felix/sandbox/pderop/dependencymanager/cnf/releaserepo/index.xml.sha
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/AdapterAnnotation.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/AdapterServiceTestWithPublisher.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/AspectAnnotation.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/AspectLifecycleAnnotation.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/AspectLifecycleWithDynamicProxyAnnotation.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/BundleAdapterServiceTestWithPublisher.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/BundleDependencyAnnotation.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ComponentFactoryAnnotation.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ComponentFactoryServiceTestWthPublisher.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/CompositeAnnotations.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ExtraAdapterServiceProperties.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ExtraComponentFactoryServiceProperties.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ExtraFactoryServiceProperties.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ExtraServiceProperties.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/FactoryConfigurationAdapterAnnotation.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/FactoryServiceTestWthPublisher.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/Felix4050.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/Felix4357.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/MultipleAnnotations.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/PropagateAnnotation.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ResourceAdapterServiceTestWithPublisher.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ResourceAnnotation.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ServiceFactoryAnnotation.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/ServiceTestWthPublisher.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/SimpleAnnotations.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/components/TemporalAnnotations.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AdapterAnnotationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectAnnotationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectLifecycleAnnotationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/BundleDependencyAnnotationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ComponentFactoryAnnotationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/CompositeAnnotationsTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ExtraServicePropertiesTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/FactoryConfigurationAdapterAnnotationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix4050Test.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/Felix4357Test.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/MultipleAnnotationsTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/PropagateAnnotationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/PublisherAnnotationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ResourceAnnotationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/ServiceFactoryAnnotationTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/SimpleAnnotationsTest.java
    felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/src/org/apache/felix/dm/runtime/itest/tests/TemporalAnnotationsTest.java

Modified: felix/sandbox/pderop/dependencymanager/README
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/README?rev=1649218&r1=1648937&r2=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager/README (original)
+++ felix/sandbox/pderop/dependencymanager/README Sat Jan  3 16:36:25 2015
@@ -3,58 +3,44 @@ Dependency Manager 4.0.0 general README
 * misc documentations:
 
 - org.apache.felix.dependencymanager/design.txt
-- org.apache.felix.dependencymanager.benchmark/README
 - doc/A_Glance_At_DependencyManager.odp gives a quick overview of Dependency Manager, including new features.
 
-* to compile under eclipse/bndtools
+* to compile and run tests under eclipse/bndtools
 
-- Install either Eclipse Kepler SR2 (+ Java8 support which is needed by benchmark sub project) or Eclipse Luna.
-- Install java7/Java8 JREs in Eclipse (Window -> Preferences -> Java -> Installed JREs). 
-  (Use JRE 1.7 as the default JRE; the Jdk1.8 is only required for the org.apache.felix.dependencymanager.benchmark project)
+- Install either Eclipse Kepler SR2 or Eclipse Luna.
 - Open BndTools perpective.
-- Import Dependency Manager into Eclipse.
-
-* To run tests (under eclipse/bndtools)
-
+- Import Dependency Manager into Eclipse, and compile everything
 - Click on org.apache.felix.dependencymanager project and run it as "JUnit test".
 - Click on org.apache.felix.dependencymanager.shell and run it as "JUnit test"
 - Click on org.apache.felix.dependencymanager.itest and run it as "Bnd OSGi Test Launcer (Junit)".
 - Click on org.apache.felix.dependencymanager.runtime.itest and run it as ""Bnd OSGi Test Launcer (Junit)".
 
-* To execute samples (under eclipse/bndtools)
-
-- Click on org.apache.felix.dependencymanager.samples and run it as "Bnd OSGi Run Launcher"
-
-* To execute the benchmark (under eclipse/bndtools; requires Jdk1.8)
-
-- Click on org.apache.felix.dependencymanager.benchmark and run it as ""Bnd OSGi Run Launcher"
-More informations on the benchmark can be found from org.apache.felix.dependencymanager.benchmark/README file.
-
-* to compile with gradle:
+* to compile and test with gradle:
 
 - Install Jdk1.7
 - Install gradle (at least 2.1)
-- compile Dependendency Manager bundles (core,shell,runtime,annotations):
-  
-  gradle org.apache.felix.dependencymanager:jar org.apache.felix.dependencymanager.shell:jar org.apache.felix.dependencymanager.runtime:jar org.apache.felix.dependencymanager.annotation:jar
-
-- Then compile the samples (optional)
- 
-  gradle gradle org.apache.felix.dependencymanager.samples:jar
+- If you need to configure an http proxy, edit gradle.properties and set the following properties:
 
-- Then compile the benchmark (optional):
+  systemProp.http.proxyHost
+  systemProp.http.proxyPort
+  systemProp.https.proxyHost
+  systemProp.https.proxyPort
 
-  install jdk1.8
-  gradle org.apache.felix.dependencymanager.benchmark:jar
+- Compile Dependendency Manager annotations bndtools plugin:
+  
+  gradle org.apache.felix.dependencymanager.annotation:jar
 
-* to run tests (junit + integration tests) with gradle:
+- Then compile everything:
+ 
+  gradle jar
 
 - run junit tests:
 
-  gradle org.apache.felix.dependencymanager:test org.apache.felix.dependencymanager.shell:test
+  gradle test
+
+- run integration tests:
 
-- run integration tests (the following will run the core + runtime itests):
+  gradle check
 
-  gradle org.apache.felix.dependencymanager.runtime.itest:check
 
  

Modified: felix/sandbox/pderop/dependencymanager/cnf/build.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/cnf/build.bnd?rev=1649218&r1=1648937&r2=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager/cnf/build.bnd (original)
+++ felix/sandbox/pderop/dependencymanager/cnf/build.bnd Sat Jan  3 16:36:25 2015
@@ -48,8 +48,7 @@ javac.target:          1.7
 
 
 ## To enable baselining, uncomment the following lines:
-# -baseline: *
-
+-baseline: *
 
 ## If you use git, you might want to uncomment the following lines:
 # Git-Descriptor:       ${system-allow-fail;git describe --dirty --always}

Modified: felix/sandbox/pderop/dependencymanager/cnf/ext/repositories.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/cnf/ext/repositories.bnd?rev=1649218&r1=1648937&r2=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager/cnf/ext/repositories.bnd (original)
+++ felix/sandbox/pderop/dependencymanager/cnf/ext/repositories.bnd Sat Jan  3 16:36:25 2015
@@ -2,11 +2,7 @@
 	aQute.bnd.deployer.repository.LocalIndexedRepo; name=Release;      local=${workspace}/cnf/releaserepo;pretty=true,\
 	aQute.bnd.deployer.repository.LocalIndexedRepo; name=Local;        local=${workspace}/cnf/localrepo;pretty=true,\
 	aQute.bnd.deployer.repository.FixedIndexedRepo; name=Bndtools Hub; locations=https://raw.githubusercontent.com/bndtools/bundle-hub/master/index.xml.gz,\
-	aQute.lib.deployer.FileRepo;                    name=Build;        location=${workspace}/cnf/buildrepo;latest=false,\
-	aQute.bnd.deployer.repository.FixedIndexedRepo; name=Felix Obr;    locations=http://felix.apache.org/obr/releases.xml	
+	aQute.lib.deployer.FileRepo;                    name=Build;        location=${workspace}/cnf/buildrepo;latest=false
 
-#-baseline: *
-#-baselinerepo: Felix Obr
-#-sources: false
 -releaserepo: Release
 

Modified: felix/sandbox/pderop/dependencymanager/cnf/localrepo/index.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/cnf/localrepo/index.xml?rev=1649218&r1=1648937&r2=1649218&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager/cnf/localrepo/index.xml.sha
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/cnf/localrepo/index.xml.sha?rev=1649218&r1=1648937&r2=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager/cnf/localrepo/index.xml.sha (original)
+++ felix/sandbox/pderop/dependencymanager/cnf/localrepo/index.xml.sha Sat Jan  3 16:36:25 2015
@@ -1 +1 @@
-09a12ca8f1b8f15ad30c28c3ba3059a0704aab4369f13a87d0e152326baf0980
\ No newline at end of file
+dd98c845e38baf2adc778ec248bf2dc1369485cf31ddb40f0669140d3e061dcd
\ No newline at end of file

Modified: felix/sandbox/pderop/dependencymanager/cnf/releaserepo/index.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/cnf/releaserepo/index.xml?rev=1649218&r1=1648937&r2=1649218&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager/cnf/releaserepo/index.xml.sha
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/cnf/releaserepo/index.xml.sha?rev=1649218&r1=1648937&r2=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager/cnf/releaserepo/index.xml.sha (original)
+++ felix/sandbox/pderop/dependencymanager/cnf/releaserepo/index.xml.sha Sat Jan  3 16:36:25 2015
@@ -1 +1 @@
-4180f5ad6088518f5550ad49107569399ccf033d55c5e1eb6a710e5389018339
\ No newline at end of file
+181c649881b4553693e21c3b9439314af3006861ae52ad002da26139f2b244ba
\ No newline at end of file

Added: felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.runtime/org.apache.felix.dependencymanager.runtime-3.2.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.runtime/org.apache.felix.dependencymanager.runtime-3.2.0.jar?rev=1649218&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.runtime/org.apache.felix.dependencymanager.runtime-3.2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-3.2.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-3.2.0.jar?rev=1649218&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-3.2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.2.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.2.0.jar?rev=1649218&view=auto
==============================================================================
Binary file - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Modified: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd?rev=1649218&r1=1648937&r2=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd Sat Jan  3 16:36:25 2015
@@ -20,5 +20,7 @@
 	sun.reflect
 Test-Cases:  \
 	${classes;CONCRETE;EXTENDS;junit.framework.TestCase}
-Export-Package: \
-	org.apache.felix.dm.itest
\ No newline at end of file
+Private-Package:  \
+	org.apache.felix.dm.itest.api
+Export-Package:  \
+	org.apache.felix.dm.itest.util
\ No newline at end of file

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AbstractServiceDependencyTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AbstractServiceDependencyTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AbstractServiceDependencyTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AbstractServiceDependencyTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AbstractServiceDependencyTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AbstractServiceDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AbstractServiceDependencyTest.java Sat Jan  3 16:36:25 2015
@@ -16,12 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import junit.framework.Assert;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 
 public class AbstractServiceDependencyTest extends TestBase {
    public void testAbstractClassDependency() {

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterAndConsumerTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterAndConsumerTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterAndConsumerTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterAndConsumerTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterAndConsumerTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterAndConsumerTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterAndConsumerTest.java Sat Jan  3 16:36:25 2015
@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 
 public class AdapterAndConsumerTest extends TestBase {
     

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithCallbackInstanceTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithCallbackInstanceTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithCallbackInstanceTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithCallbackInstanceTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithCallbackInstanceTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithCallbackInstanceTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithCallbackInstanceTest.java Sat Jan  3 16:36:25 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import java.util.Hashtable;
 import java.util.Map;
@@ -25,6 +25,8 @@ import junit.framework.Assert;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 import org.osgi.framework.ServiceRegistration;
 
 public class AdapterWithCallbackInstanceTest extends TestBase {

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithConfigurationAndMetaType.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithConfigurationAndMetaType.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithConfigurationAndMetaType.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithConfigurationAndMetaType.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithConfigurationAndMetaType.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithConfigurationAndMetaType.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithConfigurationAndMetaType.java Sat Jan  3 16:36:25 2015
@@ -1,4 +1,4 @@
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import java.io.IOException;
 import java.util.Dictionary;
@@ -8,6 +8,8 @@ import junit.framework.Assert;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithExtraDependenciesTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithExtraDependenciesTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithExtraDependenciesTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithExtraDependenciesTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithExtraDependenciesTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithExtraDependenciesTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithExtraDependenciesTest.java Sat Jan  3 16:36:25 2015
@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 
 
 public class AdapterWithExtraDependenciesTest extends TestBase {

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyParallelTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithInstanceBoundDependencyParallelTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyParallelTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyParallelTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithInstanceBoundDependencyParallelTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithInstanceBoundDependencyParallelTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyParallelTest.java Sat Jan  3 16:36:25 2015
@@ -1,4 +1,4 @@
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 public class AdapterWithInstanceBoundDependencyParallelTest extends AdapterWithInstanceBoundDependencyTest {
     public AdapterWithInstanceBoundDependencyParallelTest() {

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithInstanceBoundDependencyTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithInstanceBoundDependencyTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithInstanceBoundDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyTest.java Sat Jan  3 16:36:25 2015
@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 
 
 public class AdapterWithInstanceBoundDependencyTest extends TestBase {

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithModifiedInstanceBoundDependencyTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithModifiedInstanceBoundDependencyTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithModifiedInstanceBoundDependencyTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithModifiedInstanceBoundDependencyTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithModifiedInstanceBoundDependencyTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithModifiedInstanceBoundDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithModifiedInstanceBoundDependencyTest.java Sat Jan  3 16:36:25 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -26,6 +26,8 @@ import junit.framework.Assert;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 
 /**
  * Test for FELIX-4334 issue.

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithPropagationTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithPropagationTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithPropagationTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithPropagationTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithPropagationTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithPropagationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithPropagationTest.java Sat Jan  3 16:36:25 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -26,6 +26,8 @@ import junit.framework.Assert;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 
 /**
  * Checks if a service adapter propagates its service properties, if 

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithoutPropagationTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithoutPropagationTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithoutPropagationTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithoutPropagationTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithoutPropagationTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AdapterWithoutPropagationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithoutPropagationTest.java Sat Jan  3 16:36:25 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -25,6 +25,8 @@ import junit.framework.Assert;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 import org.osgi.framework.ServiceRegistration;
 
 public class AdapterWithoutPropagationTest extends TestBase {

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectBaseTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectBaseTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectBaseTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectBaseTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectBaseTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectBaseTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectBaseTest.java Sat Jan  3 16:36:25 2015
@@ -1,4 +1,4 @@
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
@@ -8,6 +8,9 @@ import junit.framework.Assert;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.ServiceUtil;
+import org.apache.felix.dm.itest.util.TestBase;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectChainTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectChainTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectChainTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectChainTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectChainTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectChainTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectChainTest.java Sat Jan  3 16:36:25 2015
@@ -1,6 +1,8 @@
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 
 public class AspectChainTest extends TestBase {
 

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectDynamicsTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectDynamicsTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectDynamicsTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectDynamicsTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectDynamicsTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectDynamicsTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectDynamicsTest.java Sat Jan  3 16:36:25 2015
@@ -1,6 +1,8 @@
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 
 public class AspectDynamicsTest extends TestBase {
 

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceParallelTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectRaceParallelTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceParallelTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceParallelTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectRaceParallelTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectRaceParallelTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceParallelTest.java Sat Jan  3 16:36:25 2015
@@ -1,4 +1,4 @@
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 public class AspectRaceParallelTest extends AspectRaceTest {
     public AspectRaceParallelTest() {

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectRaceTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectRaceTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectRaceTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java Sat Jan  3 16:36:25 2015
@@ -1,4 +1,4 @@
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import java.util.HashSet;
 import java.util.Hashtable;
@@ -11,6 +11,8 @@ import java.util.concurrent.atomic.Atomi
 import junit.framework.Assert;
 
 import org.apache.felix.dm.Component;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectServiceDependencyTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectServiceDependencyTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectServiceDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyTest.java Sat Jan  3 16:36:25 2015
@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 
 
 public class AspectServiceDependencyTest extends TestBase {

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyWithSwapCallbackTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectServiceDependencyWithSwapCallbackTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyWithSwapCallbackTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyWithSwapCallbackTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectServiceDependencyWithSwapCallbackTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectServiceDependencyWithSwapCallbackTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyWithSwapCallbackTest.java Sat Jan  3 16:36:25 2015
@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 
 
 public class AspectServiceDependencyWithSwapCallbackTest extends TestBase {

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWhiteboardTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWhiteboardTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWhiteboardTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWhiteboardTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWhiteboardTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWhiteboardTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWhiteboardTest.java Sat Jan  3 16:36:25 2015
@@ -1,4 +1,4 @@
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -6,6 +6,9 @@ import junit.framework.Assert;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.ServiceUtil;
+import org.apache.felix.dm.itest.util.TestBase;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 

Copied: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWithCallbacksServiceDependencyTest.java (from r1648937, felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWithCallbacksServiceDependencyTest.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWithCallbacksServiceDependencyTest.java?p2=felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWithCallbacksServiceDependencyTest.java&p1=felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWithCallbacksServiceDependencyTest.java&r1=1648937&r2=1649218&rev=1649218&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AspectWithCallbacksServiceDependencyTest.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWithCallbacksServiceDependencyTest.java Sat Jan  3 16:36:25 2015
@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.itest;
+package org.apache.felix.dm.itest.api;
 
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
 
 
 public class AspectWithCallbacksServiceDependencyTest extends TestBase {