felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1532429 [1/3] - in /felix/trunk/dependencymanager/test2: ./ src/main/java/org/apache/felix/dependencymanager/test2/components/ src/main/java/org/apache/felix/dm/test/components/ src/test/java/org/apache/felix/dependencymanager/test2/integr...
Date Tue, 15 Oct 2013 16:57:44 GMT
Author: pderop
Date: Tue Oct 15 16:57:40 2013
New Revision: 1532429

URL: http://svn.apache.org/r1532429
Log:
Use same java package prefix as it was in initial version

Added:
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleDependencyAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Ensure.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Ensure.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Felix4050.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Felix4050.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/MultipleAnnotations.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/PropagateAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceFactoryAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/TemporalAnnotations.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Utils.java
      - copied, changed from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/CompositeAnnotationsTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ExtraServicePropertiesTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/Felix4050Test.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/MultipleAnnotationsTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PropagateAnnotationTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PublisherAnnotationTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ResourceAnnotationTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ServiceFactoryAnnotationTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/SimpleAnnotationsTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/TemporalAnnotationsTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AbstractServiceDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AbstractServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterAndConsumerTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterAndConsumerTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectCallbacksTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithExtraDependenciesTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithExtraDependenciesTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithInstanceBoundDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithInstanceBoundDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectAwareServiceDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectAwareServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectBaseTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectChainTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectChainTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectDynamicsTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectDynamicsTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectWhiteboardTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectWhiteboardTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/BundleDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/BundleDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ComponentLifeCycleTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ComponentLifeCycleTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CompositionTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CompositionTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ConfigurationDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ConfigurationDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CustomDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CustomDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/DynamicProxyAspectTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/DynamicProxyAspectTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2078_ServiceDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2078_ServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2348_ResourceAdapterTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2369_ExtraDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2369_ExtraDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2955_ShellCommandTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2955_ShellCommandTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3008_FilterIndexStartupTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3057_EmptyServiceReferenceArray.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3057_EmptyServiceReferenceArray.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3186_AspectAdapterTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3186_AspectAdapterTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FactoryConfigurationAdapterTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FactoryConfigurationAdapterTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FilterIndexResourceAdapterTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FilterIndexResourceAdapterTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependenciesTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependenciesTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyComponentLifeCycleTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyComponentLifeCycleTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyInjectionTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyPropagateTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyPropagateTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyThroughCallbackInstanceTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyThroughCallbackInstanceTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceTrackerTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceTrackerTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceUpdateTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/SharingDependenciesWithMultipleServicesTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/SharingDependenciesWithMultipleServicesTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/TemporalServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
      - copied, changed from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java
Removed:
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleDependencyAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Ensure.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Felix4050.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/MultipleAnnotations.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/PropagateAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceFactoryAnnotation.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/TemporalAnnotations.java
    felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AbstractServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterAndConsumerTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithExtraDependenciesTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithInstanceBoundDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectAwareServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectChainTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectDynamicsTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectWhiteboardTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/BundleDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ComponentLifeCycleTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CompositionTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ConfigurationDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CustomDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/DynamicProxyAspectTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2078_ServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2348_ResourceAdapterTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2369_ExtraDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2955_ShellCommandTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3008_FilterIndexStartupTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3057_EmptyServiceReferenceArray.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3186_AspectAdapterTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FactoryConfigurationAdapterTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FilterIndexResourceAdapterTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependenciesTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyComponentLifeCycleTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyInjectionTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyPropagateTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyThroughCallbackInstanceTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceTrackerTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceUpdateTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/SharingDependenciesWithMultipleServicesTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/TemporalServiceDependencyTest.java
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java
Modified:
    felix/trunk/dependencymanager/test2/pom.xml

Modified: felix/trunk/dependencymanager/test2/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/pom.xml?rev=1532429&r1=1532428&r2=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/pom.xml (original)
+++ felix/trunk/dependencymanager/test2/pom.xml Tue Oct 15 16:57:40 2013
@@ -24,11 +24,11 @@
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.apache.felix.dependencymanager.test2</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>org.apache.felix.dependencymanager.test</artifactId>
+	<version>3.0.1-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 
-	<name>Apache Felix Dependency Manager Integration Tests 2</name>
+	<name>Apache Felix Dependency Manager Integration Tests</name>
 
 	<properties>
 		<bundle.build.name>
@@ -146,8 +146,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-Name>Apache Felix Dependency Manager Annotations Tests</Bundle-Name>
-						<Bundle-SymbolicName>org.apache.felix.dependencymanager.test2.components</Bundle-SymbolicName>
-						<Export-Package>org.apache.felix.dependencymanager.test2.components</Export-Package>
+						<Bundle-SymbolicName>org.apache.felix.dependencymanager.test.components</Bundle-SymbolicName>
+						<Export-Package>org.apache.felix.dm.test.components</Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -161,7 +161,7 @@
 				</configuration>
 			</plugin>
 			
-			<!-- DM annotation plugin used to parse annotations from org.apache.felix.dependencymanager.test2.components artifact -->
+			<!-- DM annotation plugin used to parse annotations from org.apache.felix.dm.test.components artifact -->
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterAnnotation.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterAnnotation.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterAnnotation.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.Map;
 

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectAnnotation.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectAnnotation.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectAnnotation.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.annotation.api.AspectService;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import org.apache.felix.dm.annotation.api.AspectService;
 import org.apache.felix.dm.annotation.api.Component;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleDependencyAnnotation.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleDependencyAnnotation.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleDependencyAnnotation.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.annotation.api.BundleAdapterService;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Ensure.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Ensure.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Ensure.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Ensure.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Ensure.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Ensure.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Ensure.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.io.PrintStream;
 

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.Dictionary;
 import java.util.HashMap;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterAnnotation.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterAnnotation.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterAnnotation.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.Dictionary;
 import java.util.Map;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.io.IOException;
 import java.util.Dictionary;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.Dictionary;
 import java.util.HashMap;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Felix4050.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Felix4050.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Felix4050.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Felix4050.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Felix4050.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Felix4050.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Felix4050.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/MultipleAnnotations.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/MultipleAnnotations.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/MultipleAnnotations.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.Composition;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/PropagateAnnotation.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/PropagateAnnotation.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/PropagateAnnotation.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.Map;
 

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.net.URL;
 import java.util.HashMap;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAnnotation.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAnnotation.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAnnotation.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.net.URL;
 import java.util.HashMap;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceFactoryAnnotation.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceFactoryAnnotation.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceFactoryAnnotation.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.Dictionary;
 import java.util.HashMap;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.annotation.api.Component;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/TemporalAnnotations.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/TemporalAnnotations.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/TemporalAnnotations.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;

Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Utils.java (from r1532417, felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Utils.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Utils.java&p1=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java&r1=1532417&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Utils.java Tue Oct 15 16:57:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 public class Utils {
     public static void schedule(final Runnable task, final long n) {

Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java Tue Oct 15 16:57:40 2013
@@ -16,15 +16,15 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S1Impl;
-import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S1ToS3AdapterAutoConfig;
-import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S1ToS3AdapterAutoConfigField;
-import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S1ToS3AdapterCallback;
-import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S2Impl;
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.AdapterAnnotation.S1Impl;
+import org.apache.felix.dm.test.components.AdapterAnnotation.S1ToS3AdapterAutoConfig;
+import org.apache.felix.dm.test.components.AdapterAnnotation.S1ToS3AdapterAutoConfigField;
+import org.apache.felix.dm.test.components.AdapterAnnotation.S1ToS3AdapterCallback;
+import org.apache.felix.dm.test.components.AdapterAnnotation.S2Impl;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;

Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java Tue Oct 15 16:57:40 2013
@@ -16,15 +16,15 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceAspect1;
-import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceAspect2;
-import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceAspect3;
-import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceConsumer;
-import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceProvider;
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.AspectAnnotation.ServiceAspect1;
+import org.apache.felix.dm.test.components.AspectAnnotation.ServiceAspect2;
+import org.apache.felix.dm.test.components.AspectAnnotation.ServiceAspect3;
+import org.apache.felix.dm.test.components.AspectAnnotation.ServiceConsumer;
+import org.apache.felix.dm.test.components.AspectAnnotation.ServiceProvider;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;

Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java Tue Oct 15 16:57:40 2013
@@ -16,12 +16,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.AspectLifecycleAnnotation.ServiceProvider;
-import org.apache.felix.dependencymanager.test2.components.AspectLifecycleAnnotation.ServiceProviderAspect;
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.AspectLifecycleAnnotation.ServiceProvider;
+import org.apache.felix.dm.test.components.AspectLifecycleAnnotation.ServiceProviderAspect;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;

Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java Tue Oct 15 16:57:40 2013
@@ -16,12 +16,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProvider;
-import org.apache.felix.dependencymanager.test2.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProviderAspect;
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProvider;
+import org.apache.felix.dm.test.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProviderAspect;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;



Mime
View raw message