commit 1a71f830524b2be2c67f55f1f9eed4242ace3c7a
author Pierre De Rop <pderop@apache.org> Tue Oct 15 17:09:52 2013 +0000
committer Pierre De Rop <pderop@apache.org> Tue Oct 15 17:09:52 2013 +0000
tree c49370bd1bf0bf0d29cfd86475285df80936d07a
parent 2ebcc1fba4fd90073dccb352c8fe91512cd2c750

renamed test2 into test

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1532440 13f79535-47bb-0310-9956-ffa450edef68

dependencymanager/test/LICENSE

diff --git a/dependencymanager/test2/LICENSE b/dependencymanager/test/LICENSE
similarity index 100%
rename from dependencymanager/test2/LICENSE
rename to dependencymanager/test/LICENSE

dependencymanager/test/NOTICE

diff --git a/dependencymanager/test2/NOTICE b/dependencymanager/test/NOTICE
similarity index 100%
rename from dependencymanager/test2/NOTICE
rename to dependencymanager/test/NOTICE

dependencymanager/test/pom.xml

diff --git a/dependencymanager/test2/pom.xml b/dependencymanager/test/pom.xml
similarity index 100%
rename from dependencymanager/test2/pom.xml
rename to dependencymanager/test/pom.xml

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/Ensure.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Ensure.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/Ensure.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Ensure.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/Ensure.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/Felix4050.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Felix4050.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/Felix4050.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Felix4050.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/Felix4050.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java

dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/Utils.java

diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Utils.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/Utils.java
similarity index 100%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Utils.java
rename to dependencymanager/test/src/main/java/org/apache/felix/dm/test/components/Utils.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/CompositeAnnotationsTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/CompositeAnnotationsTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/CompositeAnnotationsTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/CompositeAnnotationsTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/CompositeAnnotationsTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/ExtraServicePropertiesTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ExtraServicePropertiesTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/ExtraServicePropertiesTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ExtraServicePropertiesTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/ExtraServicePropertiesTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/Felix4050Test.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/Felix4050Test.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/Felix4050Test.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/Felix4050Test.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/Felix4050Test.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/MultipleAnnotationsTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/MultipleAnnotationsTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/MultipleAnnotationsTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/MultipleAnnotationsTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/MultipleAnnotationsTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/PropagateAnnotationTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PropagateAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/PropagateAnnotationTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PropagateAnnotationTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/PropagateAnnotationTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/PublisherAnnotationTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PublisherAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/PublisherAnnotationTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PublisherAnnotationTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/PublisherAnnotationTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/ResourceAnnotationTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ResourceAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/ResourceAnnotationTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ResourceAnnotationTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/ResourceAnnotationTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/ServiceFactoryAnnotationTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ServiceFactoryAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/ServiceFactoryAnnotationTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ServiceFactoryAnnotationTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/ServiceFactoryAnnotationTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/SimpleAnnotationsTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/SimpleAnnotationsTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/SimpleAnnotationsTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/SimpleAnnotationsTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/SimpleAnnotationsTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/TemporalAnnotationsTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/TemporalAnnotationsTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/TemporalAnnotationsTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/TemporalAnnotationsTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/annotations/TemporalAnnotationsTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AbstractServiceDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AbstractServiceDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AbstractServiceDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AbstractServiceDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AbstractServiceDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterAndConsumerTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterAndConsumerTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterAndConsumerTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterAndConsumerTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterAndConsumerTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectCallbacksTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectCallbacksTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectCallbacksTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectCallbacksTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectCallbacksTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithExtraDependenciesTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithExtraDependenciesTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithExtraDependenciesTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithExtraDependenciesTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithExtraDependenciesTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithInstanceBoundDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithInstanceBoundDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithInstanceBoundDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithInstanceBoundDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithInstanceBoundDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectAwareServiceDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectAwareServiceDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectAwareServiceDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectAwareServiceDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectAwareServiceDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectBaseTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectBaseTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectBaseTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectBaseTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectBaseTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectChainTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectChainTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectChainTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectChainTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectChainTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectDynamicsTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectDynamicsTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectDynamicsTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectDynamicsTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectDynamicsTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectWhiteboardTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectWhiteboardTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectWhiteboardTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectWhiteboardTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/AspectWhiteboardTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/BundleDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/BundleDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/BundleDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/BundleDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/BundleDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ComponentLifeCycleTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ComponentLifeCycleTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ComponentLifeCycleTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ComponentLifeCycleTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ComponentLifeCycleTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/CompositionTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CompositionTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/CompositionTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CompositionTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/CompositionTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ConfigurationDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ConfigurationDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ConfigurationDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ConfigurationDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ConfigurationDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/CustomDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CustomDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/CustomDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CustomDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/CustomDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/DynamicProxyAspectTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/DynamicProxyAspectTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/DynamicProxyAspectTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/DynamicProxyAspectTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/DynamicProxyAspectTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2078_ServiceDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2078_ServiceDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2078_ServiceDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2078_ServiceDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2078_ServiceDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2369_ExtraDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2369_ExtraDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2369_ExtraDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2369_ExtraDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2369_ExtraDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2955_ShellCommandTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2955_ShellCommandTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2955_ShellCommandTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2955_ShellCommandTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2955_ShellCommandTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3057_EmptyServiceReferenceArray.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3057_EmptyServiceReferenceArray.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3057_EmptyServiceReferenceArray.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3057_EmptyServiceReferenceArray.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3057_EmptyServiceReferenceArray.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3186_AspectAdapterTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3186_AspectAdapterTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3186_AspectAdapterTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3186_AspectAdapterTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3186_AspectAdapterTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FactoryConfigurationAdapterTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FactoryConfigurationAdapterTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FactoryConfigurationAdapterTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FactoryConfigurationAdapterTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FactoryConfigurationAdapterTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FilterIndexResourceAdapterTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FilterIndexResourceAdapterTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FilterIndexResourceAdapterTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FilterIndexResourceAdapterTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/FilterIndexResourceAdapterTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependenciesTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependenciesTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependenciesTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependenciesTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependenciesTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyComponentLifeCycleTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyComponentLifeCycleTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyComponentLifeCycleTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyComponentLifeCycleTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyComponentLifeCycleTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyPropagateTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyPropagateTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyPropagateTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyPropagateTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyPropagateTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyThroughCallbackInstanceTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyThroughCallbackInstanceTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyThroughCallbackInstanceTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyThroughCallbackInstanceTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyThroughCallbackInstanceTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceTrackerTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceTrackerTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceTrackerTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceTrackerTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceTrackerTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/SharingDependenciesWithMultipleServicesTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/SharingDependenciesWithMultipleServicesTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/SharingDependenciesWithMultipleServicesTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/SharingDependenciesWithMultipleServicesTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/SharingDependenciesWithMultipleServicesTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.java

dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
similarity index 100%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
rename to dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java