You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2014/06/01 18:02:08 UTC
svn commit: r1599006 - in
/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it: ./
src/dm/runtime/it/components/ src/dm/runtime/it/tests/
Author: pderop
Date: Sun Jun 1 16:02:06 2014
New Revision: 1599006
URL: http://svn.apache.org/r1599006
Log:
renamed dm.it project to org.apache.felix.dm.itest
Modified:
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/bnd.bnd
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AdapterAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AdapterServiceTestWithPublisher.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectLifecycleAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectLifecycleWithDynamicProxyAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/BundleAdapterServiceTestWithPublisher.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/BundleDependencyAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/CompositeAnnotations.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraAdapterServiceProperties.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraFactoryServiceProperties.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraServiceProperties.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryConfigurationAdapterAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryServiceTestWthPublisher.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/Felix4357.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/MultipleAnnotations.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/PropagateAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ResourceAdapterServiceTestWithPublisher.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ResourceAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ServiceFactoryAnnotation.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ServiceTestWthPublisher.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/SimpleAnnotations.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/TemporalAnnotations.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AdapterAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/BundleDependencyAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/CompositeAnnotationsTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ExtraServicePropertiesTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/FactoryConfigurationAdapterAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/Felix4357Test.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/MultipleAnnotationsTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PropagateAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PublisherAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ResourceAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ServiceFactoryAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/SimpleAnnotationsTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/TemporalAnnotationsTest.java
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/bnd.bnd?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/bnd.bnd Sun Jun 1 16:02:06 2014
@@ -1,22 +1,22 @@
--buildpath: \
+-buildpath: \
osgi.core;version='[4.2,5)',\
osgi.cmpn,\
org.mockito.mockito-all,\
org.apache.felix.dm;version=latest,\
dm.annotations;version=latest,\
- dm.it.api;version=latest,\
- junit.osgi;version=3.8
--runbundles: \
+ junit.osgi;version=3.8,\
+ org.apache.felix.dm.itest.api;version=latest
+-runbundles: \
org.mockito.mockito-all,\
org.apache.felix.dm;version=latest,\
dm.runtime;version=latest,\
- dm.it.api;version=latest,\
org.apache.felix.configadmin;version=1.8.1,\
org.apache.felix.metatype;version=1.0.4,\
osgi.cmpn;version=4.3.0,\
org.apache.felix.gogo.runtime;version=0.10.0,\
dm.runtime.it.components;version=latest,\
- dm.runtime.it.tests;version=latest
+ dm.runtime.it.tests;version=latest,\
+ org.apache.felix.dm.itest.api;version=latest
-runee:JavaSE-1.6
-runfw:org.apache.felix.framework
-runsystempackages: \
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AdapterAnnotation.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AdapterAnnotation.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AdapterAnnotation.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AdapterAnnotation.java Sun Jun 1 16:02:06 2014
@@ -21,6 +21,7 @@ package dm.runtime.it.components;
import java.util.Map;
import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.Ensure;
import org.osgi.framework.BundleContext;
import dm.annotation.api.AdapterService;
@@ -30,7 +31,6 @@ import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
import dm.annotation.api.Stop;
-import dm.it.Ensure;
public class AdapterAnnotation {
public interface S1 {
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AdapterServiceTestWithPublisher.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AdapterServiceTestWithPublisher.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AdapterServiceTestWithPublisher.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AdapterServiceTestWithPublisher.java Sun Jun 1 16:02:06 2014
@@ -21,6 +21,8 @@ package dm.runtime.it.components;
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.dm.itest.Ensure;
+
import dm.annotation.api.AdapterService;
import dm.annotation.api.Component;
import dm.annotation.api.Init;
@@ -28,7 +30,6 @@ import dm.annotation.api.LifecycleContro
import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
-import dm.it.Ensure;
/**
* Test an AdapterService which provides its interface using a @ServiceLifecycle.
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectAnnotation.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectAnnotation.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectAnnotation.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectAnnotation.java Sun Jun 1 16:02:06 2014
@@ -19,9 +19,9 @@
package dm.runtime.it.components;
import dm.annotation.api.*;
-import dm.it.Ensure;
import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.Ensure;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectLifecycleAnnotation.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectLifecycleAnnotation.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectLifecycleAnnotation.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectLifecycleAnnotation.java Sun Jun 1 16:02:06 2014
@@ -18,8 +18,9 @@
*/
package dm.runtime.it.components;
+import org.apache.felix.dm.itest.Ensure;
+
import dm.annotation.api.*;
-import dm.it.Ensure;
public class AspectLifecycleAnnotation {
public interface ServiceInterface {
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectLifecycleWithDynamicProxyAnnotation.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectLifecycleWithDynamicProxyAnnotation.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectLifecycleWithDynamicProxyAnnotation.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/AspectLifecycleWithDynamicProxyAnnotation.java Sun Jun 1 16:02:06 2014
@@ -22,8 +22,9 @@ import java.lang.reflect.InvocationHandl
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import org.apache.felix.dm.itest.Ensure;
+
import dm.annotation.api.*;
-import dm.it.Ensure;
public class AspectLifecycleWithDynamicProxyAnnotation {
public interface ServiceInterface {
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/BundleAdapterServiceTestWithPublisher.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/BundleAdapterServiceTestWithPublisher.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/BundleAdapterServiceTestWithPublisher.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/BundleAdapterServiceTestWithPublisher.java Sun Jun 1 16:02:06 2014
@@ -21,6 +21,7 @@ package dm.runtime.it.components;
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.dm.itest.Ensure;
import org.osgi.framework.Bundle;
import dm.annotation.api.BundleAdapterService;
@@ -30,7 +31,6 @@ import dm.annotation.api.LifecycleContro
import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
-import dm.it.Ensure;
/**
* Test a BundleAdapterService which provides its interface using a @ServiceLifecycle.
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/BundleDependencyAnnotation.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/BundleDependencyAnnotation.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/BundleDependencyAnnotation.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/BundleDependencyAnnotation.java Sun Jun 1 16:02:06 2014
@@ -21,6 +21,7 @@ package dm.runtime.it.components;
import static dm.runtime.it.components.Utils.DM_BSN;
import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.Ensure;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -32,7 +33,6 @@ import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
import dm.annotation.api.Stop;
-import dm.it.Ensure;
public class BundleDependencyAnnotation {
public static final String ENSURE_CONSUMER = "BundleDependencyAnnotation.consumer";
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/CompositeAnnotations.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/CompositeAnnotations.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/CompositeAnnotations.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/CompositeAnnotations.java Sun Jun 1 16:02:06 2014
@@ -21,6 +21,7 @@ package dm.runtime.it.components;
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.dm.itest.Ensure;
import org.osgi.framework.ServiceRegistration;
import dm.annotation.api.Component;
@@ -32,7 +33,6 @@ import dm.annotation.api.Registered;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
import dm.annotation.api.Stop;
-import dm.it.Ensure;
public class CompositeAnnotations {
public interface C1Service {
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraAdapterServiceProperties.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraAdapterServiceProperties.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraAdapterServiceProperties.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraAdapterServiceProperties.java Sun Jun 1 16:02:06 2014
@@ -21,12 +21,13 @@ package dm.runtime.it.components;
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.dm.itest.Ensure;
+
import dm.annotation.api.AdapterService;
import dm.annotation.api.Component;
import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
-import dm.it.Ensure;
/**
* This test validates that an adapter Service may specify some extra service properties
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraFactoryServiceProperties.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraFactoryServiceProperties.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraFactoryServiceProperties.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraFactoryServiceProperties.java Sun Jun 1 16:02:06 2014
@@ -24,11 +24,12 @@ import java.util.Hashtable;
import java.util.Map;
import java.util.Set;
+import org.apache.felix.dm.itest.Ensure;
+
import dm.annotation.api.Component;
import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
-import dm.it.Ensure;
public class ExtraFactoryServiceProperties {
public final static String FACTORYSET = "ExtraFactoryServiceProperties.FACTORYSET";
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraServiceProperties.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraServiceProperties.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraServiceProperties.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ExtraServiceProperties.java Sun Jun 1 16:02:06 2014
@@ -21,11 +21,12 @@ package dm.runtime.it.components;
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.dm.itest.Ensure;
+
import dm.annotation.api.Component;
import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
-import dm.it.Ensure;
/**
* This test validates that a basic Service may specify some extra service properties
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryConfigurationAdapterAnnotation.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryConfigurationAdapterAnnotation.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryConfigurationAdapterAnnotation.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryConfigurationAdapterAnnotation.java Sun Jun 1 16:02:06 2014
@@ -22,6 +22,7 @@ import java.util.Dictionary;
import java.util.Map;
import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.Ensure;
import org.osgi.framework.BundleContext;
import dm.annotation.api.Component;
@@ -32,7 +33,6 @@ import dm.annotation.api.Registered;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
import dm.annotation.api.Stop;
-import dm.it.Ensure;
public class FactoryConfigurationAdapterAnnotation {
public interface ServiceInterface {
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryConfigurationAdapterServiceTestWithPublisher.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryConfigurationAdapterServiceTestWithPublisher.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryConfigurationAdapterServiceTestWithPublisher.java Sun Jun 1 16:02:06 2014
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
+import org.apache.felix.dm.itest.Ensure;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -35,7 +36,6 @@ import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
import dm.annotation.api.Stop;
-import dm.it.Ensure;
/**
* Test a FactoryConfigurationAdapterService which provides its interface using a @ServiceLifecycle.
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryServiceTestWthPublisher.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryServiceTestWthPublisher.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryServiceTestWthPublisher.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/FactoryServiceTestWthPublisher.java Sun Jun 1 16:02:06 2014
@@ -24,13 +24,14 @@ import java.util.Hashtable;
import java.util.Map;
import java.util.Set;
+import org.apache.felix.dm.itest.Ensure;
+
import dm.annotation.api.Component;
import dm.annotation.api.Init;
import dm.annotation.api.LifecycleController;
import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
-import dm.it.Ensure;
/**
* A Service instantiated from a FactorySet, and which registers/unregisters its service,
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/Felix4357.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/Felix4357.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/Felix4357.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/Felix4357.java Sun Jun 1 16:02:06 2014
@@ -20,6 +20,7 @@ package dm.runtime.it.components;
import junit.framework.Assert;
+import org.apache.felix.dm.itest.Ensure;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -27,7 +28,6 @@ import dm.annotation.api.Component;
import dm.annotation.api.Property;
import dm.annotation.api.Registered;
import dm.annotation.api.ServiceDependency;
-import dm.it.Ensure;
/**
* Checks support of primitive types for @Property annotation.
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/MultipleAnnotations.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/MultipleAnnotations.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/MultipleAnnotations.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/MultipleAnnotations.java Sun Jun 1 16:02:06 2014
@@ -18,13 +18,14 @@
*/
package dm.runtime.it.components;
+import org.apache.felix.dm.itest.Ensure;
+
import dm.annotation.api.Component;
import dm.annotation.api.Composition;
import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
import dm.annotation.api.Stop;
-import dm.it.Ensure;
public class MultipleAnnotations {
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/PropagateAnnotation.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/PropagateAnnotation.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/PropagateAnnotation.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/PropagateAnnotation.java Sun Jun 1 16:02:06 2014
@@ -20,11 +20,12 @@ package dm.runtime.it.components;
import java.util.Map;
+import org.apache.felix.dm.itest.Ensure;
+
import dm.annotation.api.Component;
import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
-import dm.it.Ensure;
/**
* Verifies ServiceDependencyservice properties propagation.
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ResourceAdapterServiceTestWithPublisher.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ResourceAdapterServiceTestWithPublisher.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ResourceAdapterServiceTestWithPublisher.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ResourceAdapterServiceTestWithPublisher.java Sun Jun 1 16:02:06 2014
@@ -27,6 +27,7 @@ import junit.framework.Assert;
import org.apache.felix.dm.ResourceHandler;
import org.apache.felix.dm.ResourceUtil;
+import org.apache.felix.dm.itest.Ensure;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
@@ -40,7 +41,6 @@ import dm.annotation.api.Property;
import dm.annotation.api.ResourceAdapterService;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
-import dm.it.Ensure;
/**
* Test a ResourceAdapterService which provides its interface using a @ServiceLifecycle.
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ResourceAnnotation.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ResourceAnnotation.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ResourceAnnotation.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ResourceAnnotation.java Sun Jun 1 16:02:06 2014
@@ -28,6 +28,7 @@ import junit.framework.Assert;
import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.ResourceHandler;
import org.apache.felix.dm.ResourceUtil;
+import org.apache.felix.dm.itest.Ensure;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
@@ -42,7 +43,6 @@ import dm.annotation.api.ResourceDepende
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
import dm.annotation.api.Stop;
-import dm.it.Ensure;
public class ResourceAnnotation {
public final static String ENSURE_RESOURCE = "ResourceAnnotation.resource";
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ServiceFactoryAnnotation.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ServiceFactoryAnnotation.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ServiceFactoryAnnotation.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ServiceFactoryAnnotation.java Sun Jun 1 16:02:06 2014
@@ -22,6 +22,8 @@ import java.util.Dictionary;
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.dm.itest.Ensure;
+
import junit.framework.Assert;
import dm.annotation.api.Component;
import dm.annotation.api.Init;
@@ -29,7 +31,6 @@ import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
import dm.annotation.api.Stop;
-import dm.it.Ensure;
public class ServiceFactoryAnnotation {
public final static String FACTORY = "ServiceFactoryAnnotation.Factory";
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ServiceTestWthPublisher.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ServiceTestWthPublisher.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ServiceTestWthPublisher.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/ServiceTestWthPublisher.java Sun Jun 1 16:02:06 2014
@@ -21,13 +21,14 @@ package dm.runtime.it.components;
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.dm.itest.Ensure;
+
import dm.annotation.api.Component;
import dm.annotation.api.Init;
import dm.annotation.api.LifecycleController;
import dm.annotation.api.Property;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
-import dm.it.Ensure;
/**
* A Service that just registers/unregisters its service, using the @ServiceLifecycle annotation.
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/SimpleAnnotations.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/SimpleAnnotations.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/SimpleAnnotations.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/SimpleAnnotations.java Sun Jun 1 16:02:06 2014
@@ -19,6 +19,7 @@
package dm.runtime.it.components;
import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.Ensure;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.log.LogService;
@@ -33,7 +34,6 @@ import dm.annotation.api.ServiceDependen
import dm.annotation.api.Start;
import dm.annotation.api.Stop;
import dm.annotation.api.Unregistered;
-import dm.it.Ensure;
public class SimpleAnnotations {
/**
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/TemporalAnnotations.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/TemporalAnnotations.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/TemporalAnnotations.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/components/TemporalAnnotations.java Sun Jun 1 16:02:06 2014
@@ -18,11 +18,12 @@
*/
package dm.runtime.it.components;
+import org.apache.felix.dm.itest.Ensure;
+
import dm.annotation.api.Component;
import dm.annotation.api.ServiceDependency;
import dm.annotation.api.Start;
import dm.annotation.api.Stop;
-import dm.it.Ensure;
/**
* Service using an annotated Temporal Service dependency.
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AdapterAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AdapterAnnotationTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AdapterAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AdapterAnnotationTest.java Sun Jun 1 16:02:06 2014
@@ -18,10 +18,10 @@
*/
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.AdapterAnnotation.S1Impl;
import dm.runtime.it.components.AdapterAnnotation.S1ToS3AdapterAutoConfig;
import dm.runtime.it.components.AdapterAnnotation.S1ToS3AdapterAutoConfigField;
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectAnnotationTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectAnnotationTest.java Sun Jun 1 16:02:06 2014
@@ -18,10 +18,10 @@
*/
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.AspectAnnotation.ServiceAspect1;
import dm.runtime.it.components.AspectAnnotation.ServiceAspect2;
import dm.runtime.it.components.AspectAnnotation.ServiceAspect3;
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleAnnotationTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleAnnotationTest.java Sun Jun 1 16:02:06 2014
@@ -18,10 +18,10 @@
*/
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.AspectLifecycleAnnotation.ServiceProvider;
import dm.runtime.it.components.AspectLifecycleAnnotation.ServiceProviderAspect;
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java Sun Jun 1 16:02:06 2014
@@ -18,10 +18,10 @@
*/
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProvider;
import dm.runtime.it.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProviderAspect;
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/BundleDependencyAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/BundleDependencyAnnotationTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/BundleDependencyAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/BundleDependencyAnnotationTest.java Sun Jun 1 16:02:06 2014
@@ -19,10 +19,10 @@
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.BundleDependencyAnnotation;
import dm.runtime.it.components.Utils;
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/CompositeAnnotationsTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/CompositeAnnotationsTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/CompositeAnnotationsTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/CompositeAnnotationsTest.java Sun Jun 1 16:02:06 2014
@@ -18,10 +18,10 @@
*/
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.CompositeAnnotations.C1;
import dm.runtime.it.components.CompositeAnnotations.Dependency1;
import dm.runtime.it.components.CompositeAnnotations.Dependency2;
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ExtraServicePropertiesTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ExtraServicePropertiesTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ExtraServicePropertiesTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ExtraServicePropertiesTest.java Sun Jun 1 16:02:06 2014
@@ -18,10 +18,10 @@
*/
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.ExtraAdapterServiceProperties;
import dm.runtime.it.components.ExtraFactoryServiceProperties;
import dm.runtime.it.components.ExtraServiceProperties;
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/FactoryConfigurationAdapterAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/FactoryConfigurationAdapterAnnotationTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/FactoryConfigurationAdapterAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/FactoryConfigurationAdapterAnnotationTest.java Sun Jun 1 16:02:06 2014
@@ -23,11 +23,11 @@ import java.util.Hashtable;
import junit.framework.Assert;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.ConfigurationAdmin;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.FactoryConfigurationAdapterAnnotation.ServiceProvider;
/**
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/Felix4357Test.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/Felix4357Test.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/Felix4357Test.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/Felix4357Test.java Sun Jun 1 16:02:06 2014
@@ -18,10 +18,10 @@
*/
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.Felix4357;
/**
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/MultipleAnnotationsTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/MultipleAnnotationsTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/MultipleAnnotationsTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/MultipleAnnotationsTest.java Sun Jun 1 16:02:06 2014
@@ -18,10 +18,10 @@
*/
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.MultipleAnnotations;
import dm.runtime.it.components.Utils;
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PropagateAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PropagateAnnotationTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PropagateAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PropagateAnnotationTest.java Sun Jun 1 16:02:06 2014
@@ -18,10 +18,10 @@
*/
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.PropagateAnnotation;
/**
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PublisherAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PublisherAnnotationTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PublisherAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PublisherAnnotationTest.java Sun Jun 1 16:02:06 2014
@@ -18,10 +18,10 @@
*/
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.AdapterServiceTestWithPublisher;
import dm.runtime.it.components.BundleAdapterServiceTestWithPublisher;
import dm.runtime.it.components.FactoryConfigurationAdapterServiceTestWithPublisher;
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ResourceAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ResourceAnnotationTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ResourceAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ResourceAnnotationTest.java Sun Jun 1 16:02:06 2014
@@ -18,10 +18,10 @@
*/
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.ResourceAnnotation;
/**
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ServiceFactoryAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ServiceFactoryAnnotationTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ServiceFactoryAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ServiceFactoryAnnotationTest.java Sun Jun 1 16:02:06 2014
@@ -24,11 +24,11 @@ import java.util.Set;
import junit.framework.Assert;
import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
import dm.annotation.api.Component;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.ServiceFactoryAnnotation;
public class ServiceFactoryAnnotationTest extends TestBase {
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/SimpleAnnotationsTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/SimpleAnnotationsTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/SimpleAnnotationsTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/SimpleAnnotationsTest.java Sun Jun 1 16:02:06 2014
@@ -1,9 +1,9 @@
package dm.runtime.it.tests;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.SimpleAnnotations.Consumer;
import dm.runtime.it.components.SimpleAnnotations.Producer;
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/TemporalAnnotationsTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/TemporalAnnotationsTest.java?rev=1599006&r1=1599005&r2=1599006&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/TemporalAnnotationsTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/TemporalAnnotationsTest.java Sun Jun 1 16:02:06 2014
@@ -21,10 +21,10 @@ package dm.runtime.it.tests;
import java.util.Dictionary;
import java.util.Hashtable;
+import org.apache.felix.dm.itest.Ensure;
+import org.apache.felix.dm.itest.TestBase;
import org.osgi.framework.ServiceRegistration;
-import dm.it.Ensure;
-import dm.it.TestBase;
import dm.runtime.it.components.TemporalAnnotations;
/**