diff --git a/dependencymanager/test/annotation/LICENSE b/dependencymanager/test/annotation/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/dependencymanager/test/annotation/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/dependencymanager/test/annotation/NOTICE b/dependencymanager/test/annotation/NOTICE
deleted file mode 100644
index cfc3633..0000000
--- a/dependencymanager/test/annotation/NOTICE
+++ /dev/null
@@ -1,26 +0,0 @@
-Apache Felix Dependency Manager
-Copyright 2009 The Apache Software Foundation
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-
-III. License Summary
-- Apache License 2.0
diff --git a/dependencymanager/test/annotation/pom.xml b/dependencymanager/test/annotation/pom.xml
deleted file mode 100644
index 13620bb..0000000
--- a/dependencymanager/test/annotation/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.0.4</version>
-    <relativePath>../../../pom/pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <name>Apache Felix Dependency Manager Annotation Tests</name>
-  <artifactId>org.apache.felix.dependencymanager.test.annotation</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>4.1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>4.1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
-	<extensions>true</extensions>
-        <configuration>
-          <instructions>
-	    <Bundle-Name>test.annotation.component</Bundle-Name>
-	    <Bundle-SymbolicName>org.apache.felix.dependencymanager.test.annotation</Bundle-SymbolicName>
-	    <Import-Package>*</Import-Package>
-	    <Export-Package>org.apache.felix.dm.test.annotation</Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
-        <executions>
-	  <execution>
-            <goals>
-              <goal>scan</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/AspectLifecycleTest.java b/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/AspectLifecycleTest.java
deleted file mode 100644
index f95ff94..0000000
--- a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/AspectLifecycleTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.felix.dm.test.annotation;
-
-import org.apache.felix.dm.annotation.api.AspectService;
-import org.apache.felix.dm.annotation.api.Destroy;
-import org.apache.felix.dm.annotation.api.Init;
-import org.apache.felix.dm.annotation.api.Param;
-import org.apache.felix.dm.annotation.api.Service;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.annotation.api.Stop;
-import org.osgi.framework.Constants;
-
-/**
- * Tests an aspect service, and ensure that its lifecycle methods are properly invoked (init/start/stop/destroy)
- */
-@Service
-public class AspectLifecycleTest
-{
-    public interface ServiceInterface
-    {
-        public void run();
-    }
-
-    @ServiceDependency
-    void bind(ServiceInterface service)
-    {
-        service.run();
-    }
-
-    @Service
-    public static class ServiceProvider implements ServiceInterface
-    {
-        @ServiceDependency(filter = "(test=aspectLifecycle.ServiceProvider)")
-        protected Sequencer m_sequencer;
-
-        public void run()
-        {
-            m_sequencer.step(1);
-        }
-    }
-
-    @AspectService(filter = "(!(" + Constants.SERVICE_RANKING + "=*))", properties = { @Param(name = Constants.SERVICE_RANKING, value = "1") })
-    public static class ServiceProviderAspect implements ServiceInterface
-    {
-        protected boolean m_initCalled; 
-        protected Sequencer m_sequencer;
-        
-        @ServiceDependency(filter = "(test=aspectLifecycle.ServiceProviderAspect)")
-        protected void bind(Sequencer sequencer) {
-            m_sequencer = sequencer;
-            m_sequencer.step(2);
-        }
-
-        @Init
-        void init() {
-            m_initCalled = true;
-        }
-        
-        @Start
-        void start() {
-            if (! m_initCalled) {
-                throw new IllegalStateException("start method called, but init method was not called");
-            }
-            m_sequencer.step(3);
-        }
-        
-        public void run()
-        {
-            m_sequencer.step(4);
-        }
-        
-        @Stop()
-        void stop() {
-            m_sequencer.step(5);
-        }
-        
-        @Destroy
-        void destroy() {
-            m_sequencer.step(6);
-        }
-    }
-}
diff --git a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/AspectTest.java b/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/AspectTest.java
deleted file mode 100644
index 1ee6ecc..0000000
--- a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/AspectTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.felix.dm.test.annotation;
-
-import org.apache.felix.dm.annotation.api.AspectService;
-import org.apache.felix.dm.annotation.api.Param;
-import org.apache.felix.dm.annotation.api.Service;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.osgi.framework.Constants;
-
-@Service
-public class AspectTest
-{
-    public interface ServiceInterface
-    {
-        public void run();
-    }
-
-    @ServiceDependency
-    void bind(ServiceInterface service)
-    {
-        service.run();
-    }
-
-    @Service
-    public static class ServiceProvider implements ServiceInterface
-    {
-        @ServiceDependency(filter = "(test=aspect.ServiceProvider)")
-        protected Sequencer m_sequencer;
-
-        public void run()
-        {
-            m_sequencer.step(1);
-        }
-    }
-
-    @AspectService(filter = "(!(" + Constants.SERVICE_RANKING + "=*))", properties = { @Param(name = Constants.SERVICE_RANKING, value = "1") })
-    public static class ServiceProviderAspect implements ServiceInterface
-    {
-        @ServiceDependency(filter = "(test=aspect.ServiceProviderAspect)")
-        protected Sequencer m_sequencer;
-
-        public void run()
-        {
-            m_sequencer.step(2);
-        }
-    }
-}
diff --git a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/ConsumerTest.java b/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/ConsumerTest.java
deleted file mode 100644
index c67338f..0000000
--- a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/ConsumerTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.felix.dm.test.annotation;
-
-import org.apache.felix.dm.annotation.api.Service;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.annotation.api.Stop;
-
-@Service
-public class ConsumerTest
-{
-    @ServiceDependency
-    Runnable m_runnable;
-    
-    @ServiceDependency(filter="(test=simple)")
-    Sequencer m_sequencer;
-
-    @Start
-    protected void start() {
-        m_sequencer.step(2);
-        m_runnable.run();
-    }
-    
-    @Stop
-    protected void stop() {
-        m_sequencer.step(4);
-    }
-}
diff --git a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/FactoryTest.java b/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/FactoryTest.java
deleted file mode 100644
index d4df9be..0000000
--- a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/FactoryTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.felix.dm.test.annotation;
-
-import org.apache.felix.dm.annotation.api.Service;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.annotation.api.Start;
-
-/**
- * Validate DependencyManager Factories declarared with annotations.
- */
-@Service(factory=FactoryTest.Factory.class, factoryMethod="createFactoryTest")
-public class FactoryTest
-{
-    String m_id;
-    
-    @ServiceDependency(filter="(test=factory)")
-    Sequencer m_sequencer;
-    
-    public FactoryTest(String id)
-    {
-        m_id = id;
-    }
-    
-    @Start
-    void start() {
-        if (! "factory".equals(m_id)) {
-            throw new IllegalStateException();
-        }
-        m_sequencer.step(1);
-    }
-    
-    public static class Factory
-    {
-        public FactoryTest createFactoryTest()
-        {
-            return new FactoryTest("factory");
-        }
-    }
-}
diff --git a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/MultipleAnnotationTest.java b/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/MultipleAnnotationTest.java
deleted file mode 100644
index 190525c..0000000
--- a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/MultipleAnnotationTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.felix.dm.test.annotation;
-
-import org.apache.felix.dm.annotation.api.Composition;
-import org.apache.felix.dm.annotation.api.Param;
-import org.apache.felix.dm.annotation.api.Service;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.annotation.api.Stop;
-
-public class MultipleAnnotationTest
-{
-    public static class Factory
-    {
-        public ServiceConsumer createServiceConsumer()
-        {
-            return new ServiceConsumer();
-        }
-
-        public ServiceProvider createServiceProvider()
-        {
-            return new ServiceProvider();
-        }
-
-        public ServiceProvider2 createServiceProvider2()
-        {
-            return new ServiceProvider2();
-        }
-    }
-
-    public interface ServiceInterface
-    {
-        public void doService();
-    }
-
-    @Service(factory = Factory.class, factoryMethod = "createServiceConsumer")
-    static class ServiceConsumer
-    {
-        @ServiceDependency(filter = "(test=multiple)")
-        volatile Sequencer m_sequencer;
-
-        @ServiceDependency(filter = "(foo=bar)")
-        volatile ServiceInterface m_service;
-
-        @Start
-        void start()
-        {
-            m_sequencer.step(6);
-            m_service.doService();
-        }
-
-        @Stop
-        void stop()
-        {
-            m_sequencer.step(8);
-        }
-    }
-
-    @Service(properties = { @Param(name = "foo", value = "bar") }, factory = Factory.class, factoryMethod = "createServiceProvider")
-    static class ServiceProvider implements ServiceInterface
-    {
-        @ServiceDependency(filter = "(test=multiple)")
-        Sequencer m_sequencer;
-        
-        ServiceProvider2 m_serviceProvider2;
-
-        @ServiceDependency(removed = "unbind")
-        void bind(ServiceProvider2 provider2)
-        {
-            m_serviceProvider2 = provider2;
-        }
-
-        void unbind(ServiceProvider2 provider2)
-        {
-            m_sequencer.step(10);
-        }
-
-        @Start
-        void start()
-        {
-            if (m_serviceProvider2 != null) {
-                m_sequencer.step(4);
-            }
-            m_sequencer.step(5);
-        }
-
-        @Stop
-        void stop()
-        {
-            m_sequencer.step(9);
-        }
-
-        public void doService()
-        {
-            m_sequencer.step(7);
-        }
-    }
-
-    @Service(provide = { ServiceProvider2.class }, factory = Factory.class, factoryMethod = "createServiceProvider2")
-    static class ServiceProvider2
-    {
-        Composite m_composite = new Composite();
-        Sequencer m_sequencer;
-
-        @ServiceDependency(required = false, filter = "(foo=bar)")
-        Runnable m_runnable;
-
-        @ServiceDependency(service = Sequencer.class, filter = "(test=multiple)")
-        void bind(Sequencer seq)
-        {
-            m_sequencer = seq;
-            m_sequencer.step(1);
-        }
-
-        @Start
-        void start()
-        {
-            m_sequencer.step(3);
-            m_runnable.run();
-        }
-
-        @Stop
-        void stop()
-        {
-            m_sequencer.step(11);
-        }
-
-        @Composition
-        Object[] getComposition()
-        {
-            return new Object[] { this, m_composite };
-        }
-    }
-
-    static class Composite
-    {
-        void bind(Sequencer seq)
-        {
-            seq.step(2);
-        }
-    }
-}
diff --git a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/ProducerTest.java b/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/ProducerTest.java
deleted file mode 100644
index 4053161..0000000
--- a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/ProducerTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.felix.dm.test.annotation;
-
-import org.apache.felix.dm.annotation.api.Service;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.annotation.api.Stop;
-
-@Service
-public class ProducerTest implements Runnable
-{
-    @ServiceDependency(filter="(test=simple)")
-    Sequencer m_sequencer;
-    
-    @Start
-    protected void start() {
-        m_sequencer.step(1);
-    }
-    
-    @Stop
-    protected void stop() {
-        m_sequencer.step(5);
-    }
-    
-    public void run()
-    {
-        m_sequencer.step(3);
-    }
-}
diff --git a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/Sequencer.java b/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/Sequencer.java
deleted file mode 100644
index 9e38ff4..0000000
--- a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/Sequencer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.felix.dm.test.annotation;
-
-/**
- * This service is actually injected by the AnnotationTest testcase, and just wrap the Ensure class.
- */
-public interface Sequencer
-{
-    void step(int step);
-    void waitForStep(int nr, int timeout);
-}
diff --git a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/TemporalServiceDependencyTest.java b/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/TemporalServiceDependencyTest.java
deleted file mode 100644
index ec3b0ac..0000000
--- a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/TemporalServiceDependencyTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.felix.dm.test.annotation;
-
-import org.apache.felix.dm.annotation.api.Service;
-import org.apache.felix.dm.annotation.api.ServiceDependency;
-import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.annotation.api.Stop;
-import org.apache.felix.dm.annotation.api.TemporalServiceDependency;
-
-@Service(provide={})
-public class TemporalServiceDependencyTest implements Runnable
-{
-    Thread m_thread;
-    
-    @ServiceDependency(filter="(test=temporal)")
-    Sequencer m_sequencer;
-    
-    @TemporalServiceDependency(timeout=1000L,filter="(test=temporal)")
-    Runnable m_service;
-    
-    @Start
-    protected void start() {
-        m_thread = new Thread(this);
-        m_thread.start();
-    }
-    
-    @Stop
-    protected void stop() { 
-        m_thread.interrupt();
-        try
-        {
-            m_thread.join();
-        }
-        catch (InterruptedException e)
-        {
-        }
-    }
-
-    public void run()
-    {
-        m_service.run();
-        m_sequencer.waitForStep(2, 15000);
-        m_service.run(); // we should block here
-        m_sequencer.waitForStep(4, 15000);
-        try {
-            m_service.run(); // should raise IllegalStateException
-        } catch (IllegalStateException e) {
-            m_sequencer.step(5);
-        }
-    }
-}