Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C55DB106E2 for ; Tue, 15 Oct 2013 16:58:24 +0000 (UTC) Received: (qmail 58943 invoked by uid 500); 15 Oct 2013 16:58:23 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 58904 invoked by uid 500); 15 Oct 2013 16:58:23 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 58896 invoked by uid 99); 15 Oct 2013 16:58:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Oct 2013 16:58:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Oct 2013 16:58:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 105B42388AA6; Tue, 15 Oct 2013 16:57:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1532429 [2/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 -0000 To: commits@felix.apache.org From: pderop@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131015165748.105B42388AA6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java Tue Oct 15 16:57:40 2013 @@ -16,11 +16,11 @@ * 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.BundleDependencyAnnotation; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; +import org.apache.felix.dm.test.components.BundleDependencyAnnotation; +import org.apache.felix.dm.test.components.Ensure; +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/CompositeAnnotationsTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/CompositeAnnotationsTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/CompositeAnnotationsTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/CompositeAnnotationsTest.java Tue Oct 15 16:57:40 2013 @@ -16,13 +16,13 @@ * 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.CompositeAnnotations.C1; -import org.apache.felix.dependencymanager.test2.components.CompositeAnnotations.Dependency1; -import org.apache.felix.dependencymanager.test2.components.CompositeAnnotations.Dependency2; -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.CompositeAnnotations.C1; +import org.apache.felix.dm.test.components.CompositeAnnotations.Dependency1; +import org.apache.felix.dm.test.components.CompositeAnnotations.Dependency2; +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/ExtraServicePropertiesTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ExtraServicePropertiesTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ExtraServicePropertiesTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ExtraServicePropertiesTest.java Tue Oct 15 16:57:40 2013 @@ -16,14 +16,14 @@ * 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.Ensure; -import org.apache.felix.dependencymanager.test2.components.ExtraAdapterServiceProperties; -import org.apache.felix.dependencymanager.test2.components.ExtraAspectServiceProperties; -import org.apache.felix.dependencymanager.test2.components.ExtraFactoryServiceProperties; -import org.apache.felix.dependencymanager.test2.components.ExtraServiceProperties; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.components.ExtraAdapterServiceProperties; +import org.apache.felix.dm.test.components.ExtraAspectServiceProperties; +import org.apache.felix.dm.test.components.ExtraFactoryServiceProperties; +import org.apache.felix.dm.test.components.ExtraServiceProperties; +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/FactoryConfigurationAdapterAnnotationTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java Tue Oct 15 16:57:40 2013 @@ -16,16 +16,16 @@ * 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 java.io.IOException; import java.util.Hashtable; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.components.FactoryConfigurationAdapterAnnotation.ServiceProvider; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.components.FactoryConfigurationAdapterAnnotation.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/Felix4050Test.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/Felix4050Test.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/Felix4050Test.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/Felix4050Test.java Tue Oct 15 16:57:40 2013 @@ -16,11 +16,11 @@ * 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.Ensure; -import org.apache.felix.dependencymanager.test2.components.Felix4050; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.components.Felix4050; +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/MultipleAnnotationsTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/MultipleAnnotationsTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/MultipleAnnotationsTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/MultipleAnnotationsTest.java Tue Oct 15 16:57:40 2013 @@ -16,11 +16,11 @@ * 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.Ensure; -import org.apache.felix.dependencymanager.test2.components.MultipleAnnotations; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.components.MultipleAnnotations; +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/PropagateAnnotationTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PropagateAnnotationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PropagateAnnotationTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PropagateAnnotationTest.java Tue Oct 15 16:57:40 2013 @@ -16,11 +16,11 @@ * 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.Ensure; -import org.apache.felix.dependencymanager.test2.components.PropagateAnnotation; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.components.PropagateAnnotation; +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/PublisherAnnotationTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PublisherAnnotationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PublisherAnnotationTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PublisherAnnotationTest.java Tue Oct 15 16:57:40 2013 @@ -16,16 +16,16 @@ * 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.AdapterServiceTestWithPublisher; -import org.apache.felix.dependencymanager.test2.components.BundleAdapterServiceTestWithPublisher; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.components.FactoryConfigurationAdapterServiceTestWithPublisher; -import org.apache.felix.dependencymanager.test2.components.FactoryServiceTestWthPublisher; -import org.apache.felix.dependencymanager.test2.components.ResourceAdapterServiceTestWithPublisher; -import org.apache.felix.dependencymanager.test2.components.ServiceTestWthPublisher; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; +import org.apache.felix.dm.test.components.AdapterServiceTestWithPublisher; +import org.apache.felix.dm.test.components.BundleAdapterServiceTestWithPublisher; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.components.FactoryConfigurationAdapterServiceTestWithPublisher; +import org.apache.felix.dm.test.components.FactoryServiceTestWthPublisher; +import org.apache.felix.dm.test.components.ResourceAdapterServiceTestWithPublisher; +import org.apache.felix.dm.test.components.ServiceTestWthPublisher; +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/ResourceAnnotationTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ResourceAnnotationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ResourceAnnotationTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ResourceAnnotationTest.java Tue Oct 15 16:57:40 2013 @@ -16,11 +16,11 @@ * 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.Ensure; -import org.apache.felix.dependencymanager.test2.components.ResourceAnnotation; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.components.ResourceAnnotation; +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/ServiceFactoryAnnotationTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ServiceFactoryAnnotationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ServiceFactoryAnnotationTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ServiceFactoryAnnotationTest.java Tue Oct 15 16:57:40 2013 @@ -16,18 +16,18 @@ * 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 java.util.Hashtable; import java.util.Set; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.components.ServiceFactoryAnnotation; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.DependencyManager; import org.apache.felix.dm.annotation.api.Component; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.components.ServiceFactoryAnnotation; +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/SimpleAnnotationsTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/SimpleAnnotationsTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/SimpleAnnotationsTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/SimpleAnnotationsTest.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.Ensure; -import org.apache.felix.dependencymanager.test2.components.SimpleAnnotations.Consumer; -import org.apache.felix.dependencymanager.test2.components.SimpleAnnotations.Producer; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.components.SimpleAnnotations.Consumer; +import org.apache.felix.dm.test.components.SimpleAnnotations.Producer; +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/TemporalAnnotationsTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/TemporalAnnotationsTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/TemporalAnnotationsTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/TemporalAnnotationsTest.java Tue Oct 15 16:57:40 2013 @@ -16,14 +16,14 @@ * 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 java.util.Dictionary; import java.util.Hashtable; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.components.TemporalAnnotations; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.components.TemporalAnnotations; +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/api/AbstractServiceDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AbstractServiceDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AbstractServiceDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AbstractServiceDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AbstractServiceDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AbstractServiceDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AbstractServiceDependencyTest.java Tue Oct 15 16:57:40 2013 @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/AdapterAndConsumerTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterAndConsumerTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterAndConsumerTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterAndConsumerTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterAndConsumerTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterAndConsumerTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterAndConsumerTest.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.api; +package org.apache.felix.dm.test.integration.api; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/AdapterWithAspectCallbacksTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectCallbacksTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectCallbacksTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectCallbacksTest.java Tue Oct 15 16:57:40 2013 @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; import java.util.ArrayList; import java.util.Dictionary; import java.util.Hashtable; import java.util.List; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.integration.common.TestBase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.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.api; +package org.apache.felix.dm.test.integration.api; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/AdapterWithExtraDependenciesTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithExtraDependenciesTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithExtraDependenciesTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithExtraDependenciesTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithExtraDependenciesTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithExtraDependenciesTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithExtraDependenciesTest.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.api; +package org.apache.felix.dm.test.integration.api; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/AdapterWithInstanceBoundDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithInstanceBoundDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithInstanceBoundDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithInstanceBoundDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithInstanceBoundDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithInstanceBoundDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithInstanceBoundDependencyTest.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.api; +package org.apache.felix.dm.test.integration.api; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/AspectAwareServiceDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectAwareServiceDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectAwareServiceDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectAwareServiceDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectAwareServiceDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectAwareServiceDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectAwareServiceDependencyTest.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.api; +package org.apache.felix.dm.test.integration.api; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/AspectBaseTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectBaseTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectBaseTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectBaseTest.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.integration.api; +package org.apache.felix.dm.test.integration.api; import java.util.ArrayList; import java.util.List; @@ -24,11 +24,11 @@ import java.util.Properties; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; import org.apache.felix.dm.ServiceUtil; +import org.apache.felix.dm.test.components.Ensure; +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/api/AspectChainTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectChainTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectChainTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectChainTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectChainTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectChainTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectChainTest.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.api; +package org.apache.felix.dm.test.integration.api; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/AspectDynamicsTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectDynamicsTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectDynamicsTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectDynamicsTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectDynamicsTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectDynamicsTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectDynamicsTest.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.api; +package org.apache.felix.dm.test.integration.api; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/AspectRaceTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.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.integration.api; +package org.apache.felix.dm.test.integration.api; import java.util.HashSet; import java.util.Hashtable; @@ -28,10 +28,10 @@ import java.util.concurrent.TimeUnit; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/AspectWhiteboardTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectWhiteboardTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectWhiteboardTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectWhiteboardTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectWhiteboardTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectWhiteboardTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectWhiteboardTest.java Tue Oct 15 16:57:40 2013 @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; import java.util.ArrayList; import java.util.List; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; import org.apache.felix.dm.ServiceUtil; +import org.apache.felix.dm.test.components.Ensure; +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/api/BundleDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/BundleDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/BundleDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/BundleDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/BundleDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/BundleDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/BundleDependencyTest.java Tue Oct 15 16:57:40 2013 @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/ComponentLifeCycleTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ComponentLifeCycleTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ComponentLifeCycleTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ComponentLifeCycleTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ComponentLifeCycleTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ComponentLifeCycleTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ComponentLifeCycleTest.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.api; +package org.apache.felix.dm.test.integration.api; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.ComponentStateListener; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/CompositionTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CompositionTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CompositionTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CompositionTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CompositionTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CompositionTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CompositionTest.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.api; +package org.apache.felix.dm.test.integration.api; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/ConfigurationDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ConfigurationDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ConfigurationDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ConfigurationDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ConfigurationDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ConfigurationDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ConfigurationDependencyTest.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.integration.api; +package org.apache.felix.dm.test.integration.api; import java.io.IOException; import java.util.Dictionary; @@ -25,10 +25,10 @@ import java.util.Properties; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/CustomDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CustomDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CustomDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CustomDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CustomDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CustomDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CustomDependencyTest.java Tue Oct 15 16:57:40 2013 @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; import java.util.ArrayList; import java.util.Dictionary; import java.util.List; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Dependency; import org.apache.felix.dm.DependencyActivation; import org.apache.felix.dm.DependencyManager; import org.apache.felix.dm.DependencyService; +import org.apache.felix.dm.test.components.Ensure; +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/api/DynamicProxyAspectTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/DynamicProxyAspectTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/DynamicProxyAspectTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/DynamicProxyAspectTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/DynamicProxyAspectTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/DynamicProxyAspectTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/DynamicProxyAspectTest.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.integration.api; +package org.apache.felix.dm.test.integration.api; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; @@ -24,10 +24,10 @@ import java.lang.reflect.Proxy; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/FELIX2078_ServiceDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2078_ServiceDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2078_ServiceDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2078_ServiceDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2078_ServiceDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2078_ServiceDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2078_ServiceDependencyTest.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.api; +package org.apache.felix.dm.test.integration.api; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java Tue Oct 15 16:57:40 2013 @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/FELIX2344_ExtraDependencyWithCallbackTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java Tue Oct 15 16:57:40 2013 @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.integration.common.TestBase; import org.junit.Test; import org.junit.runner.RunWith; /** Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2348_ResourceAdapterTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2348_ResourceAdapterTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2348_ResourceAdapterTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.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.integration.api; +package org.apache.felix.dm.test.integration.api; import java.io.FileNotFoundException; import java.io.IOException; @@ -29,11 +29,11 @@ import java.util.Map.Entry; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.DependencyManager; import org.apache.felix.dm.ResourceHandler; import org.apache.felix.dm.ResourceUtil; +import org.apache.felix.dm.test.components.Ensure; +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/api/FELIX2369_ExtraDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2369_ExtraDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2369_ExtraDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2369_ExtraDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2369_ExtraDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2369_ExtraDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2369_ExtraDependencyTest.java Tue Oct 15 16:57:40 2013 @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; import java.util.Arrays; import java.util.List; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; import org.apache.felix.dm.ServiceDependency; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.integration.common.TestBase; import org.junit.Test; import org.junit.runner.RunWith; /** Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.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.integration.api; +package org.apache.felix.dm.test.integration.api; import java.io.IOException; import java.util.Dictionary; @@ -24,10 +24,10 @@ import java.util.Hashtable; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/FELIX2955_ShellCommandTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2955_ShellCommandTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2955_ShellCommandTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2955_ShellCommandTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2955_ShellCommandTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2955_ShellCommandTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2955_ShellCommandTest.java Tue Oct 15 16:57:40 2013 @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.integration.common.TestBase; import org.apache.felix.shell.ShellService; import org.junit.Test; import org.junit.runner.RunWith; Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3008_FilterIndexStartupTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3008_FilterIndexStartupTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3008_FilterIndexStartupTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java Tue Oct 15 16:57:40 2013 @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; //import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartupFor; //import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/FELIX3057_EmptyServiceReferenceArray.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3057_EmptyServiceReferenceArray.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3057_EmptyServiceReferenceArray.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3057_EmptyServiceReferenceArray.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3057_EmptyServiceReferenceArray.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3057_EmptyServiceReferenceArray.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3057_EmptyServiceReferenceArray.java Tue Oct 15 16:57:40 2013 @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; //import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartupFor; //import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.DependencyManager; +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/api/FELIX3186_AspectAdapterTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3186_AspectAdapterTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3186_AspectAdapterTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3186_AspectAdapterTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3186_AspectAdapterTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3186_AspectAdapterTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3186_AspectAdapterTest.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.api; +package org.apache.felix.dm.test.integration.api; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.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.integration.api; +package org.apache.felix.dm.test.integration.api; import java.io.IOException; import java.util.Dictionary; @@ -25,10 +25,10 @@ import java.util.Properties; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/FactoryConfigurationAdapterTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FactoryConfigurationAdapterTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FactoryConfigurationAdapterTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FactoryConfigurationAdapterTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FactoryConfigurationAdapterTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FactoryConfigurationAdapterTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FactoryConfigurationAdapterTest.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.integration.api; +package org.apache.felix.dm.test.integration.api; import java.io.IOException; import java.util.Dictionary; @@ -26,10 +26,10 @@ import java.util.Properties; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/FilterIndexResourceAdapterTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FilterIndexResourceAdapterTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FilterIndexResourceAdapterTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FilterIndexResourceAdapterTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FilterIndexResourceAdapterTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FilterIndexResourceAdapterTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FilterIndexResourceAdapterTest.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.integration.api; +package org.apache.felix.dm.test.integration.api; //import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartupFor; //import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption; @@ -31,12 +31,12 @@ import java.util.Map.Entry; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.DependencyManager; import org.apache.felix.dm.ResourceHandler; import org.apache.felix.dm.ResourceUtil; import org.apache.felix.dm.ServiceUtil; +import org.apache.felix.dm.test.components.Ensure; +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/api/MultipleExtraDependenciesTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependenciesTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependenciesTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependenciesTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependenciesTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependenciesTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependenciesTest.java Tue Oct 15 16:57:40 2013 @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; import java.util.ArrayList; import java.util.Hashtable; import java.util.List; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +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/api/MultipleExtraDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest.java Tue Oct 15 16:57:40 2013 @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.test2.integration.api; +package org.apache.felix.dm.test.integration.api; import java.util.Hashtable; -import org.apache.felix.dependencymanager.test2.components.Ensure; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.test.components.Ensure; +import org.apache.felix.dm.test.integration.common.TestBase; import org.junit.Test; import org.junit.runner.RunWith; /**