Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.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 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.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; import org.ops4j.pax.exam.junit.PaxExam;
Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleServiceDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleServiceDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleServiceDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.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.Properties; -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/ResourceAdapterDependencyAddAndRemoveTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest.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.net.MalformedURLException; import java.net.URL; @@ -26,8 +26,6 @@ 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.Component; import org.apache.felix.dm.ComponentStateListener; import org.apache.felix.dm.Dependency; @@ -35,6 +33,8 @@ import org.apache.felix.dm.DependencyMan import org.apache.felix.dm.ResourceHandler; import org.apache.felix.dm.ResourceUtil; 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; import org.ops4j.pax.exam.junit.PaxExam; Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.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.net.MalformedURLException; import java.net.URL; @@ -27,8 +27,6 @@ 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.ComponentStateListener; import org.apache.felix.dm.Dependency; @@ -36,6 +34,8 @@ import org.apache.felix.dm.DependencyMan import org.apache.felix.dm.ResourceHandler; import org.apache.felix.dm.ResourceUtil; 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; import org.ops4j.pax.exam.junit.PaxExam; Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/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/ResourceDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceDependencyTest.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; @@ -29,12 +29,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.Component; 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/ServiceDependencyComponentLifeCycleTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyComponentLifeCycleTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyComponentLifeCycleTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyComponentLifeCycleTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyComponentLifeCycleTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyComponentLifeCycleTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyComponentLifeCycleTest.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 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.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; import org.ops4j.pax.exam.junit.PaxExam; Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyInjectionTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyInjectionTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyInjectionTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.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/ServiceDependencyPropagateTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyPropagateTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyPropagateTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyPropagateTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyPropagateTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyPropagateTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyPropagateTest.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.Dictionary; import java.util.Hashtable; import java.util.Map; -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/ServiceDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/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/ServiceDependencyThroughCallbackInstanceTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyThroughCallbackInstanceTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyThroughCallbackInstanceTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyThroughCallbackInstanceTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyThroughCallbackInstanceTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyThroughCallbackInstanceTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyThroughCallbackInstanceTest.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 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/ServiceTrackerTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceTrackerTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceTrackerTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceTrackerTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceTrackerTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceTrackerTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceTrackerTest.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 java.util.Hashtable; import junit.framework.Assert; -import org.apache.felix.dependencymanager.test2.integration.common.TestBase; import org.apache.felix.dm.DependencyManager; import org.apache.felix.dm.ServiceUtil; +import org.apache.felix.dm.test.integration.common.TestBase; import org.apache.felix.dm.tracker.ServiceTracker; import org.junit.Test; import org.junit.runner.RunWith; Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceUpdateTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceUpdateTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceUpdateTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.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.net.MalformedURLException; import java.net.URL; @@ -29,12 +29,12 @@ 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.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/SharingDependenciesWithMultipleServicesTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/SharingDependenciesWithMultipleServicesTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/SharingDependenciesWithMultipleServicesTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/SharingDependenciesWithMultipleServicesTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/SharingDependenciesWithMultipleServicesTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/SharingDependenciesWithMultipleServicesTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/SharingDependenciesWithMultipleServicesTest.java Tue Oct 15 16:57:40 2013 @@ -16,14 +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 java.net.URL; import java.util.Dictionary; 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.BundleDependency; import org.apache.felix.dm.Component; import org.apache.felix.dm.ConfigurationDependency; @@ -32,6 +30,8 @@ import org.apache.felix.dm.ResourceDepen import org.apache.felix.dm.ResourceHandler; import org.apache.felix.dm.ResourceUtil; 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; import org.ops4j.pax.exam.junit.PaxExam; Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/TemporalServiceDependencyTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/TemporalServiceDependencyTest.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/TemporalServiceDependencyTest.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.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/common/TestBase.java (from r1532423, felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java&p1=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java&r1=1532423&r2=1532429&rev=1532429&view=diff ============================================================================== --- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java (original) +++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.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.common; +package org.apache.felix.dm.test.integration.common; import static org.ops4j.pax.exam.CoreOptions.bundle; import static org.ops4j.pax.exam.CoreOptions.cleanCaches; @@ -35,7 +35,7 @@ import java.util.Hashtable; import javax.inject.Inject; -import org.apache.felix.dependencymanager.test2.components.Ensure; +import org.apache.felix.dm.test.components.Ensure; import org.junit.After; import org.junit.Before; import org.ops4j.pax.exam.Configuration; @@ -58,7 +58,6 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; public abstract class TestBase implements LogService, FrameworkListener { - public static final String OSGI_SPEC_VERSION = "4.2.0"; private final static int LOG_LEVEL = LogService.LOG_WARNING; private volatile boolean m_errorsLogged; @@ -67,7 +66,7 @@ public abstract class TestBase implement protected static final String BUNDLE_JAR_SYS_PROP = "project.bundle.file"; // the default bundle jar file name - protected static final String BUNDLE_JAR_DEFAULT = "target/org.apache.felix.dependencymanager.test2-3.0.2-SNAPSHOT.jar"; + protected static final String BUNDLE_JAR_DEFAULT = "target/org.apache.felix.dependencymanager.test-3.0.1-SNAPSHOT.jar"; // the JVM option to set to enable remote debugging protected static final String DEBUG_VM_OPTION = "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=30303"; @@ -129,7 +128,7 @@ public abstract class TestBase implement @ProbeBuilder public TestProbeBuilder buildProbe(TestProbeBuilder builder) { return builder.setHeader(Constants.IMPORT_PACKAGE, - "org.apache.felix.dependencymanager.test2.components"); + "org.apache.felix.dm.test.components"); } @Before @@ -141,7 +140,7 @@ public abstract class TestBase implement @After public void tearDown() throws BundleException { logService.unregister(); - context.removeFrameworkListener(this); + context.removeFrameworkListener(this); } /** @@ -183,7 +182,7 @@ public abstract class TestBase implement * Stops our test components bundle. */ protected void stopTestComponentsBundle() { - stopBundle("org.apache.felix.dependencymanager.test2.components"); + stopBundle("org.apache.felix.dependencymanager.test.components"); } /**
