Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 31776 invoked from network); 8 Sep 2010 19:41:10 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Sep 2010 19:41:10 -0000 Received: (qmail 93142 invoked by uid 500); 8 Sep 2010 19:41:10 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 93103 invoked by uid 500); 8 Sep 2010 19:41:09 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 93096 invoked by uid 99); 8 Sep 2010 19:41:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Sep 2010 19:41:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Sep 2010 19:41:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D44F323889DA; Wed, 8 Sep 2010 19:40:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r995219 [1/2] - in /felix/trunk/dependencymanager: annotation/src/main/java/org/apache/felix/dm/annotation/api/ annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/ runtime/src/main/java/org/apache/felix/dm/runtime/ samples.a... Date: Wed, 08 Sep 2010 19:40:38 -0000 To: commits@felix.apache.org From: pderop@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100908194038.D44F323889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pderop Date: Wed Sep 8 19:40:35 2010 New Revision: 995219 URL: http://svn.apache.org/viewvc?rev=995219&view=rev Log: Renamed @Service annotation into @Component annotation. Added missing "name" attribute in some dependencies. Added: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Component.java - copied, changed from r995087, felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Service.java felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AbstractBuilder.java - copied, changed from r995087, felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceComponentBuilder.java felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ComponentBuilder.java - copied, changed from r995087, felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Composite.java - copied, changed from r995087, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Component.java Removed: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Service.java felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceComponentBuilder.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Component.java Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/BundleDependency.java felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Property.java felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ResourceDependency.java felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/EntryType.java felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParser.java felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java felix/trunk/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/SpellChecker.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/AdapterTest.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProvider.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProvider2.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/AspectTest.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/ServiceProvider.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/AspectLifecycleTest.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProvider.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycledynamicproxy/AspectLifecycleTest.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycledynamicproxy/ServiceProvider.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/bundledependency/Consumer.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/bundledependency/ServiceConsumer.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/CompositeService.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Dependency1.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Dependency2.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAdapterServiceProperties.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAspectServiceProperties.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraFactoryServiceProperties.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraServiceProperties.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency1.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency2.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyService.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyServiceFactory.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factoryconfadapter/ServiceClient.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceConsumer.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider2.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/propagate/ServiceDependencyPropagateTest.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/AdapterServiceTestWithPublisher.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/BundleAdapterServiceTestWithPublisher.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/FactoryConfigurationAdapterServiceTestWithPublisher.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/FactoryServiceTestWthPublisher.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/ResourceAdapterServiceTestWithPublisher.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/ServiceTestWthPublisher.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceConsumer.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceProvider.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ServiceConsumer.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/simple/Consumer.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/simple/Producer.java felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/temporal/TemporalTest.java Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/BundleDependency.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/BundleDependency.java?rev=995219&r1=995218&r2=995219&view=diff ============================================================================== --- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/BundleDependency.java (original) +++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/BundleDependency.java Wed Sep 8 19:40:35 2010 @@ -62,4 +62,14 @@ public @interface BundleDependency * the service properties. */ boolean propagate() default false; + + /** + * The name used when dynamically configuring this dependency from the init method. + * Specifying this attribute allows to dynamically configure the dependency + * filter and required flag from the Service's init method. + * All unnamed dependencies will be injected before the init() method; so from the init() method, you can + * then pick up whatever information needed from already injected (unnamed) dependencies, and configure dynamically + * your named dependencies, which will then be calculated once the init() method returns. + */ + String name() default ""; } Copied: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Component.java (from r995087, felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Service.java) URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Component.java?p2=felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Component.java&p1=felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Service.java&r1=995087&r2=995219&rev=995219&view=diff ============================================================================== --- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Service.java (original) +++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Component.java Wed Sep 8 19:40:35 2010 @@ -24,40 +24,43 @@ import java.lang.annotation.RetentionPol import java.lang.annotation.Target; /** - * Annotates an OSGi Service class with its dependencies. + * Annotates an OSGi Component class with its dependencies. Components are the main building + * blocks for OSGi applications. They can publish themselves as a service, and/or they can have + * dependencies. These dependencies will influence their life cycle as component will only be + * activated when all required dependencies are available. * By default, all directly implemented interfaces are registered into the OSGi registry, - * and the Service is instantiated automatically, when the Service' bundle is started and - * when the Service dependencies are available. If you need to take control of when and how - * much Service instances must be created, then you can use the factorySet - * Service attribute.

- * If a factorySet attribute is set, the Service is not started automatically + * and the component is instantiated automatically, when the component bundle is started and + * when the component dependencies are available. If you need to take control of when and how + * much component instances must be created, then you can use the factorySet + * annotation attribute.

+ * If a factorySet attribute is set, the component is not started automatically * during bundle startup, and a java.util.Set<Dictionary> - * object is registered into the OSGi registry on behalf of the Service. This Set will act + * object is registered into the OSGi registry on behalf of the component. This Set will act * as a Factory API, and another component may use this Set and add some configuration - * dictionaries in it, in order to fire some Service activations (there is one Service - * instantiated per dictionary, which is passed to Service instances via a configurable + * dictionaries in it, in order to fire some component activations (there is one component + * instantiated per dictionary, which is passed to component instances via a configurable * callback method). * *

Usage Examples

* - *

Here is a sample showing a X service, which depends on a configuration dependency:

+ *

Here is a sample showing a X component, which depends on a configuration dependency:

*

* * 
  * /**
- *   * This Service will be activated once the bundle is started and when all required dependencies
+ *   * This component will be activated once the bundle is started and when all required dependencies
  *   * are available.
  *   */
- * @Service
+ * @Component
  * class X implements Z {
  *     @ConfigurationDependency(pid="MyPid")
  *     void configure(Dictionary conf) {
- *          // Configure or reconfigure our service.
+ *          // Configure or reconfigure our component.
  *     }
  *   
  *     @Start
  *     void start() {
- *         // Our Service is starting and is about to be registered in the OSGi registry as a Z service.
+ *         // Our component is starting and is about to be registered in the OSGi registry as a Z service.
  *     }
  *   
  *     public void doService() {
@@ -67,20 +70,20 @@ import java.lang.annotation.Target;
  *
*
* - * Here is a sample showing how a Y service may dynamically instantiate several X Service instances, + * Here is a sample showing how a Y component may dynamically instantiate several X component instances, * using the {@link #factorySet()} attribute:

*

* * 
  *  /**
- *    * All Service instances will be created/updated/removed by the "Y" Service
+ *    * All component instances will be created/updated/removed by the "Y" component
  *    */
- *  @Service(factorySet="MyServiceFactory", factoryConfigure="configure")
+ *  @Component(factorySet="MyComponentFactory", factoryConfigure="configure")
  *  class X implements Z {                 
  *      void configure(Dictionary conf) {
- *          // Configure or reconfigure our service. The conf is provided by the factory,
+ *          // Configure or reconfigure our component. The conf is provided by the factory,
  *          // and all public properties (which don't start with a dot) are propagated with the
- *          // Service properties specified in the properties's Service attribute.
+ *          // service properties specified in the properties annotation attribute.
  *      }
  * 
  *      @ServiceDependency
@@ -90,7 +93,7 @@ import java.lang.annotation.Target;
  *      
  *      @Start
  *      void start() {
- *          // Our Service is starting and is about to be registered in the OSGi registry as a Z service.
+ *          // Our component is starting and is about to be registered in the OSGi registry as a Z service.
  *      } 
  *      
  *      public void doService() {
@@ -99,28 +102,28 @@ import java.lang.annotation.Target;
  *  }
  * 
  *  /**
- *    * This class will instantiate some X Service instances
+ *    * This class will instantiate some X component instances
  *    */
- *  @Service 
+ *  @Component 
  *  class Y {
- *      @ServiceDependency(filter="(dm.factory.name=MyServiceFactory)")
- *      Set<Dictionary> _XFactory; // This Set acts as a Factory API for creating X Service instances.
+ *      @ServiceDependency(filter="(dm.factory.name=MyComponentFactory)")
+ *      Set<Dictionary> _XFactory; // This Set acts as a Factory API for creating X component instances.
  *    
  *      @Start
  *      void start() {
- *          // Instantiate a X Service instance
+ *          // Instantiate a X component instance
  *          Dictionary x1 = new Hashtable() {{ put("foo", "bar1"); }};
  *          _XFactory.add(x1);
  *      
- *          // Instantiate another X Service instance
+ *          // Instantiate another X component instance
  *          Dictionary x2 = new Hashtable() {{ put("foo", "bar2"); }};
  *          _XFactory.add(x2);
  *      
- *          // Update the first X Service instance
+ *          // Update the first X component instance
  *          x1.put("foo", "bar1_modified");
  *          _XFactory.add(x1);
  *      
- *          // Destroy X Services (Notice that invoking XFactory.clear() will destroy all X Service instances)
+ *          // Destroy x1/x2 components (Notice that invoking XFactory.clear() will destroy all X component  instances).
  *          _XFactory.remove(x1);
  *          _XFactory.remove(x2); 
  *      }
@@ -131,7 +134,7 @@ import java.lang.annotation.Target;
  */
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.TYPE)
-public @interface Service
+public @interface Component
 {
     /**
      * Sets list of provided interfaces. By default, the directly implemented interfaces are provided.
@@ -144,34 +147,34 @@ public @interface Service
     Property[] properties() default {};
 
     /**
-     * Returns the name of the Factory Set used to dynamically instantiate this Service.
-     * When you set this attribute, a java.util.Set<java.lang.Dictionary> Service will 
+     * Returns the name of the Factory Set used to dynamically instantiate this component.
+     * When you set this attribute, a java.util.Set<java.lang.Dictionary> OSGi Service will 
      * be provided with a dm.factory.name service property matching your specified factorySet attribute.
-     * This Set will be provided once the Service's bundle is started, even if required dependencies are not available, and the
-     * Set will be unregistered from the OSGi registry once the Service's bundle is stopped or being updated.

-     * So, basically, another component may then be injected with this set in order to dynamically instantiate some Service instances:
+     * This Set will be provided once the component bundle is started, even if required dependencies are not available, and the
+     * Set will be unregistered from the OSGi registry once the component bundle is stopped or being updated.

+     * So, basically, another component may then be injected with this set in order to dynamically instantiate some component instances:
      * 
    
-     * 
  •  Each time a new Dictionary is added into the Set, then a new instance of the annotated service will be instantiated.
    • 
-     * 
  •  Each time an existing Dictionary is re-added into the Set, then the corresponding Service instance will be updated.
    • 
-     * 
  •  Each time an existing Dictionary is removed from the Set, then the corresponding Service instance will be destroyed.
    • 
+     * 
  •  Each time a new Dictionary is added into the Set, then a new instance of the annotated component will be instantiated.
    • 
+     * 
  •  Each time an existing Dictionary is re-added into the Set, then the corresponding component instance will be updated.
    • 
+     * 
  •  Each time an existing Dictionary is removed from the Set, then the corresponding component instance will be destroyed.
    • 
      * 

      * 
-     * 
The dictionary registered in the Set will be provided to the created Service instance using a callback method that you can 
-     * optionally specify in the {@link Service#factoryConfigure()} attribute. Each public properties from that dictionary 
-     * (which don't start with a dot) will be propagated along with the annotated Service properties.
+     * 
The dictionary registered in the Set will be provided to the created component instance using a callback method that you can 
+     * optionally specify in the {@link Component#factoryConfigure()} attribute. Each public properties from that dictionary 
+     * (which don't start with a dot) will be propagated along with the annotated component service properties.
      */
     String factorySet() default "";
 
     /**
      * Sets "configure" callback method name to be called with the factory configuration. This attribute only makes sense if the 
-     * {@link #factorySet()} attribute is used. If specified, then this attribute references a Service callback method, which is called 
-     * for providing the configuration supplied by the factory that instantiated this Service. The current Service properties will be 
+     * {@link #factorySet()} attribute is used. If specified, then this attribute references a callback method, which is called 
+     * for providing the configuration supplied by the factory that instantiated this component. The current component service properties will be 
      * also updated with all public properties (which don't start with a dot).
      */
     String factoryConfigure() default "";
     
     /**
-     * Sets the static method used to create the Service implementation instance.
+     * Sets the static method used to create the components implementation instance.
      */
     String factoryMethod() default "";    
 }

Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Property.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Property.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Property.java (original)
+++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Property.java Wed Sep  8 19:40:35 2010
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
 
 /**
  * Annotation used to describe a property key-value pair. It is used when
- * declaring {@link Service#properties()} attribute.
+ * declaring {@link Component#properties()} attribute.
  */
 @Retention(RetentionPolicy.CLASS)
 @Target( { ElementType.ANNOTATION_TYPE })

Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ResourceDependency.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ResourceDependency.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ResourceDependency.java (original)
+++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ResourceDependency.java Wed Sep  8 19:40:35 2010
@@ -64,4 +64,14 @@ public @interface ResourceDependency
      * @return
      */
     boolean propagate() default false;
+    
+    /**
+     * The name used when dynamically configuring this dependency from the init method.
+     * Specifying this attribute allows to dynamically configure the dependency 
+     * filter and required flag from the Service's init method.
+     * All unnamed dependencies will be injected before the init() method; so from the init() method, you can
+     * then pick up whatever information needed from already injected (unnamed) dependencies, and configure dynamically
+     * your named dependencies, which will then be calculated once the init() method returns.
+     */
+    String name() default "";   
 }

Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java (original)
+++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java Wed Sep  8 19:40:35 2010
@@ -39,7 +39,7 @@ import org.apache.felix.dm.annotation.ap
 import org.apache.felix.dm.annotation.api.LifecycleController;
 import org.apache.felix.dm.annotation.api.ResourceAdapterService;
 import org.apache.felix.dm.annotation.api.ResourceDependency;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.annotation.api.Stop;
@@ -64,7 +64,7 @@ public class AnnotationCollector extends
     private final static String A_COMPOSITION = "L" + Composition.class.getName().replace('.', '/') + ";";
     private final static String A_LIFCLE_CTRL = "L" + LifecycleController.class.getName().replace('.', '/')+ ";";
 
-    private final static String A_SERVICE = "L" + Service.class.getName().replace('.', '/') + ";";
+    private final static String A_COMPONENT = "L" + Component.class.getName().replace('.', '/') + ";";
     private final static String A_SERVICE_DEP = "L" + ServiceDependency.class.getName().replace('.', '/') + ";";
     private final static String A_CONFIGURATION_DEPENDENCY = "L" + ConfigurationDependency.class.getName().replace('.', '/') + ";";
     private final static String A_BUNDLE_DEPENDENCY = "L" + BundleDependency.class.getName().replace('.', '/') + ";";
@@ -177,9 +177,9 @@ public class AnnotationCollector extends
     {
         m_reporter.trace("Parsed annotation: %s", annotation);
 
-        if (annotation.getName().equals(A_SERVICE))
+        if (annotation.getName().equals(A_COMPONENT))
         {
-            parseServiceAnnotation(annotation);
+            parseComponentAnnotation(annotation);
         }
         else if (annotation.getName().equals(A_ASPECT_SERVICE))
         {
@@ -243,13 +243,9 @@ public class AnnotationCollector extends
         }
     }
 
-    /**
-     * Parses a Service annotation.
-     * @param annotation The Service annotation.
-     */
-    private void parseServiceAnnotation(Annotation annotation)
+    private void parseComponentAnnotation(Annotation annotation)
     {
-        EntryWriter writer = new EntryWriter(EntryType.Service);
+        EntryWriter writer = new EntryWriter(EntryType.Component);
         m_writers.add(writer);
 
         // Register previously parsed Init/Start/Stop/Destroy/Composition annotations
@@ -383,11 +379,7 @@ public class AnnotationCollector extends
         writer.putString(annotation, EntryParam.removed, null); 
         
         // name attribute
-        writer.putString(annotation, EntryParam.name, null);
-        String name = annotation.get(EntryParam.name.toString());
-        if (name != null && ! m_dependencyNames.add(name)) {
-            throw new IllegalArgumentException("Duplicate dependency name " + name + " in ServiceDependency annotation from class " + m_className);
-        }
+        parseDependencyName(writer, annotation);
         
         // propagate attribute
         writer.putString(annotation, EntryParam.propagate, null);
@@ -642,6 +634,7 @@ public class AnnotationCollector extends
         writer.putString(annotation, EntryParam.required, null);
         writer.putString(annotation, EntryParam.stateMask, null);
         writer.putString(annotation, EntryParam.propagate, null);
+        parseDependencyName(writer, annotation);
     }
 
     private void parseRersourceDependencyAnnotation(Annotation annotation)
@@ -662,8 +655,27 @@ public class AnnotationCollector extends
         writer.putString(annotation, EntryParam.required, null);
         writer.putString(annotation, EntryParam.propagate, null);
         writer.putString(annotation, EntryParam.factoryMethod, null);
+        parseDependencyName(writer, annotation);
     }
 
+    /**
+     * Parse the name of a given dependency.
+     * @param writer The writer where to write the dependency name
+     * @param annotation the dependency to be parsed
+     */
+    private void parseDependencyName(EntryWriter writer, Annotation annotation)
+    {
+        String name = annotation.get(EntryParam.name.toString());
+        if (name != null) 
+        {
+            if(! m_dependencyNames.add(name))
+            {
+                throw new IllegalArgumentException("Duplicate dependency name " + name + " in Dependency " + annotation + " from class " + m_className);
+            }
+            writer.put(EntryParam.name, name);
+        }
+    }
+    
     private void parseLifecycleAnnotation(Annotation annotation)
     {
         Patterns.parseField(m_field, m_descriptor, Patterns.Runnable);
@@ -841,7 +853,7 @@ public class AnnotationCollector extends
         }
 
         // We must have at least a Service annotation.
-        checkServiceDeclared(EntryType.Service, EntryType.AspectService, EntryType.AdapterService,
+        checkServiceDeclared(EntryType.Component, EntryType.AspectService, EntryType.AdapterService,
             EntryType.BundleAdapterService,
             EntryType.ResourceAdapterService, EntryType.FactoryConfigurationAdapterService);
         

Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java (original)
+++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/DescriptorGenerator.java Wed Sep  8 19:40:35 2010
@@ -27,7 +27,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 
 import aQute.lib.osgi.Analyzer;
 import aQute.lib.osgi.Clazz;

Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/EntryType.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/EntryType.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/EntryType.java (original)
+++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/EntryType.java Wed Sep  8 19:40:35 2010
@@ -5,7 +5,7 @@ package org.apache.felix.dm.annotation.p
  */
 public enum EntryType
 {
-    Service, 
+    Component, 
     AspectService,
     AdapterService,
     BundleAdapterService,

Copied: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AbstractBuilder.java (from r995087, felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceComponentBuilder.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AbstractBuilder.java?p2=felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AbstractBuilder.java&p1=felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceComponentBuilder.java&r1=995087&r2=995219&rev=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceComponentBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AbstractBuilder.java Wed Sep  8 19:40:35 2010
@@ -18,21 +18,18 @@
  */
 package org.apache.felix.dm.runtime;
 
-import java.util.Arrays;
-import java.util.Dictionary;
 import java.util.List;
 
+import org.apache.felix.dm.Component;
 import org.apache.felix.dm.Dependency;
 import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.Component;
 import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;
 
 /**
- * The builder which creates a DependencyManager Service (a Service and all its derived classes (Aspect/Adapters).
+ * base class for all kind of DM component builders (for Component, Aspect, Adapters ...).
  */
-public abstract class ServiceComponentBuilder
+public abstract class AbstractBuilder
 {
     /**
      * Returns the service component type.
@@ -44,7 +41,7 @@ public abstract class ServiceComponentBu
      * @param serviceMetaData the service component metadata parsed from the descriptor file.
      * @param serviceDependencies the service component dependencies metadata parsed from the descriptor file.
      */
-    abstract void buildService(MetaData serviceMetaData, List serviceDependencies, Bundle b,
+    abstract void build(MetaData serviceMetaData, List serviceDependencies, Bundle b,
         DependencyManager dm)
         throws Exception;
 

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java Wed Sep  8 19:40:35 2010
@@ -28,7 +28,7 @@ import org.osgi.framework.Bundle;
 /**
  * Builded called when the JSON parser find an adapter service descriptor.
  */
-public class AdapterServiceBuilder extends ServiceComponentBuilder
+public class AdapterServiceBuilder extends AbstractBuilder
 {
     /** The type attribute specified in the JSON descriptor */
     private final static String TYPE = "AdapterService";
@@ -40,7 +40,7 @@ public class AdapterServiceBuilder exten
     }
 
     @Override
-    public void buildService(MetaData srvMeta, List depsMeta, Bundle b, DependencyManager dm)
+    public void build(MetaData srvMeta, List depsMeta, Bundle b, DependencyManager dm)
         throws Exception
     {
         Class adapterImplClass = b.loadClass(srvMeta.getString(Params.impl));

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java Wed Sep  8 19:40:35 2010
@@ -26,7 +26,7 @@ import org.apache.felix.dm.Component;
 import org.osgi.framework.Bundle;
 import org.osgi.service.log.LogService;
 
-public class AspectServiceBuilder extends ServiceComponentBuilder
+public class AspectServiceBuilder extends AbstractBuilder
 {
     private final static String TYPE = "AspectService";
 
@@ -37,7 +37,7 @@ public class AspectServiceBuilder extend
     }
 
     @Override
-    public void buildService(MetaData srvMeta, List depsMeta, Bundle b, DependencyManager dm) 
+    public void build(MetaData srvMeta, List depsMeta, Bundle b, DependencyManager dm) 
         throws Exception
     {
         Log.instance().log(LogService.LOG_INFO,

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java Wed Sep  8 19:40:35 2010
@@ -25,7 +25,7 @@ import org.apache.felix.dm.DependencyMan
 import org.apache.felix.dm.Component;
 import org.osgi.framework.Bundle;
 
-public class BundleAdapterServiceBuilder extends ServiceComponentBuilder
+public class BundleAdapterServiceBuilder extends AbstractBuilder
 {
     private final static String TYPE = "BundleAdapterService";
 
@@ -36,7 +36,7 @@ public class BundleAdapterServiceBuilder
     }
 
     @Override
-    public void buildService(MetaData srvMeta, List depsMeta, Bundle b, DependencyManager dm) 
+    public void build(MetaData srvMeta, List depsMeta, Bundle b, DependencyManager dm) 
         throws Exception
     {
         int stateMask = srvMeta.getInt(Params.stateMask, Bundle.INSTALLED | Bundle.RESOLVED | Bundle.ACTIVE);

Copied: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ComponentBuilder.java (from r995087, felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ComponentBuilder.java?p2=felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ComponentBuilder.java&p1=felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java&r1=995087&r2=995219&rev=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ComponentBuilder.java Wed Sep  8 19:40:35 2010
@@ -28,9 +28,12 @@ import org.apache.felix.dm.Component;
 import org.osgi.framework.Bundle;
 import org.osgi.service.log.LogService;
 
-public class ServiceBuilder extends ServiceComponentBuilder
+/**
+ * Builds a DependencyManager Component.
+ */
+public class ComponentBuilder extends AbstractBuilder
 {
-    private final static String TYPE = "Service";
+    private final static String TYPE = "Component";
     private final static String DM_FACTORY_NAME = "dm.factory.name";
 
     @Override
@@ -40,7 +43,7 @@ public class ServiceBuilder extends Serv
     }
 
     @Override
-    public void buildService(MetaData srvMeta, List depsMeta, Bundle b, DependencyManager dm)
+    public void build(MetaData srvMeta, List depsMeta, Bundle b, DependencyManager dm)
         throws Exception
     {
         Component service = dm.createComponent();
@@ -50,7 +53,7 @@ public class ServiceBuilder extends Serv
         if (factory == null)
         {
             Log.instance().log(LogService.LOG_INFO, 
-                               "ServiceBuilder: building service %s with dependencies %s",
+                               "ComponentBuilder: building service %s with dependencies %s",
                                srvMeta, depsMeta);
 
             String impl = srvMeta.getString(Params.impl);
@@ -79,7 +82,7 @@ public class ServiceBuilder extends Serv
         else
         {
             Log.instance().log(LogService.LOG_INFO, 
-                               "ServiceBuilder: providing factory set for service %s with dependencies %s",
+                               "ComponentBuilder: providing factory set for service %s with dependencies %s",
                                srvMeta, depsMeta);
 
             // We don't instantiate the service, but instead we provide a Set in the registry.

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DependencyManagerRuntime.java Wed Sep  8 19:40:35 2010
@@ -58,7 +58,7 @@ public class DependencyManagerRuntime im
         
         // Instantiates our descriptor parser, and register our service builders into it.
         m_parser = new DescriptorParser();
-        m_parser.addBuilder(new ServiceBuilder());
+        m_parser.addBuilder(new ComponentBuilder());
         m_parser.addBuilder(new AspectServiceBuilder());
         m_parser.addBuilder(new AdapterServiceBuilder());
         m_parser.addBuilder(new BundleAdapterServiceBuilder());

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParser.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParser.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParser.java Wed Sep  8 19:40:35 2010
@@ -36,9 +36,9 @@ import org.osgi.service.log.LogService;
  */
 public class DescriptorParser
 {
-    private Map m_builders = new HashMap();
+    private Map m_builders = new HashMap();
 
-    public void addBuilder(ServiceComponentBuilder sb)
+    public void addBuilder(AbstractBuilder sb)
     {
         m_builders.put(sb.getType(), sb);
     }
@@ -54,7 +54,7 @@ public class DescriptorParser
         JSONMetaData serviceMetaData = new JSONMetaData(json);
 
         String type = (String) json.get("type");
-        ServiceComponentBuilder builder = m_builders.get(type);
+        AbstractBuilder builder = m_builders.get(type);
         if (builder == null)
         {
             throw new IllegalArgumentException("Invalid descriptor"
@@ -71,6 +71,6 @@ public class DescriptorParser
         }
 
         // and Invoke the builder
-        builder.buildService(serviceMetaData, serviceDependencies, b, dm);
+        builder.build(serviceMetaData, serviceDependencies, b, dm);
     }
 }

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java Wed Sep  8 19:40:35 2010
@@ -25,7 +25,7 @@ import org.apache.felix.dm.DependencyMan
 import org.apache.felix.dm.Component;
 import org.osgi.framework.Bundle;
 
-public class FactoryConfigurationAdapterServiceBuilder extends ServiceComponentBuilder
+public class FactoryConfigurationAdapterServiceBuilder extends AbstractBuilder
 {
     private final static String TYPE = "FactoryConfigurationAdapterService";
 
@@ -36,7 +36,7 @@ public class FactoryConfigurationAdapter
     }
 
     @Override
-    public void buildService(MetaData srvMeta, List depsMeta, Bundle b, DependencyManager dm) 
+    public void build(MetaData srvMeta, List depsMeta, Bundle b, DependencyManager dm) 
         throws Exception
     {
         Class implClass = b.loadClass(srvMeta.getString(Params.impl));

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java Wed Sep  8 19:40:35 2010
@@ -25,7 +25,7 @@ import org.apache.felix.dm.DependencyMan
 import org.apache.felix.dm.Component;
 import org.osgi.framework.Bundle;
 
-public class ResourceAdapterServiceBuilder extends ServiceComponentBuilder
+public class ResourceAdapterServiceBuilder extends AbstractBuilder
 {
     private final static String TYPE = "ResourceAdapterService";
 
@@ -36,7 +36,7 @@ public class ResourceAdapterServiceBuild
     }
 
     @Override
-    public void buildService(MetaData srvMeta, List depsMeta, Bundle b, DependencyManager dm) 
+    public void build(MetaData srvMeta, List depsMeta, Bundle b, DependencyManager dm) 
         throws Exception
     {
         String filter = srvMeta.getString(Params.filter, null);

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java Wed Sep  8 19:40:35 2010
@@ -310,7 +310,6 @@ public class ServiceLifecycleHandler
     private void callbackComposites(Component service, String callback)
         throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
     {
-        Object serviceInstance = service.getService();
         Object[] composites = service.getCompositionInstances();
         for (Object composite: composites)
         {

Modified: felix/trunk/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/SpellChecker.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/SpellChecker.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/SpellChecker.java (original)
+++ felix/trunk/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/SpellChecker.java Wed Sep  8 19:40:35 2010
@@ -21,7 +21,7 @@ package org.apache.felix.dm.samples.anno
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.annotation.api.Stop;
@@ -35,9 +35,9 @@ import org.osgi.service.log.LogService;
  * To create a Dictionary Service, you have to go the the web console and define a "Dictionary Services" factory
  * configuration instance, which will fire an instantiation of the corresponding dictionary service.
  */
-@Service(provides={SpellChecker.class}, 
-         properties={@Property(name=CommandProcessor.COMMAND_SCOPE, value="dmsample.annotation"),
-                     @Property(name=CommandProcessor.COMMAND_FUNCTION, values={"spellcheck"})})
+@Component(provides={SpellChecker.class}, 
+           properties={@Property(name=CommandProcessor.COMMAND_SCOPE, value="dmsample.annotation"),
+                       @Property(name=CommandProcessor.COMMAND_FUNCTION, values={"spellcheck"})})
 public class SpellChecker
 {
     /**

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/AdapterTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/AdapterTest.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/AdapterTest.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/AdapterTest.java Wed Sep  8 19:40:35 2010
@@ -20,12 +20,12 @@ package org.apache.felix.dm.test.bundle.
 
 import java.util.Map;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
-@Service
+@Component
 public class AdapterTest
 {
     @ServiceDependency

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProvider.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProvider.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProvider.java Wed Sep  8 19:40:35 2010
@@ -19,11 +19,11 @@
 package org.apache.felix.dm.test.bundle.annotation.adapter;
 
 import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
-@Service(properties = { @Property(name = "param1", value = "value1") })
+@Component(properties = { @Property(name = "param1", value = "value1") })
 public class ServiceProvider implements ServiceInterface
 {
     @ServiceDependency

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProvider2.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProvider2.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProvider2.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProvider2.java Wed Sep  8 19:40:35 2010
@@ -18,11 +18,11 @@
  */
 package org.apache.felix.dm.test.bundle.annotation.adapter;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
-@Service
+@Component
 public class ServiceProvider2 implements ServiceInterface2
 {
     @ServiceDependency

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/AspectTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/AspectTest.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/AspectTest.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/AspectTest.java Wed Sep  8 19:40:35 2010
@@ -18,10 +18,10 @@
  */
 package org.apache.felix.dm.test.bundle.annotation.aspect;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 
-@Service
+@Component
 public class AspectTest
 {
     @ServiceDependency

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/ServiceProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/ServiceProvider.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/ServiceProvider.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/ServiceProvider.java Wed Sep  8 19:40:35 2010
@@ -18,11 +18,11 @@
  */
 package org.apache.felix.dm.test.bundle.annotation.aspect;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
-@Service
+@Component
 public class ServiceProvider implements ServiceInterface
 {
     @ServiceDependency(filter = "(test=aspect.ServiceProvider)")

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/AspectLifecycleTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/AspectLifecycleTest.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/AspectLifecycleTest.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/AspectLifecycleTest.java Wed Sep  8 19:40:35 2010
@@ -18,13 +18,13 @@
  */
 package org.apache.felix.dm.test.bundle.annotation.aspectlifecycle;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 
 /**
  * Tests an aspect service, and ensure that its lifecycle methods are properly invoked (init/start/stop/destroy)
  */
-@Service
+@Component
 public class AspectLifecycleTest
 {
     @ServiceDependency

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProvider.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProvider.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProvider.java Wed Sep  8 19:40:35 2010
@@ -18,11 +18,11 @@
  */
 package org.apache.felix.dm.test.bundle.annotation.aspectlifecycle;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
-@Service
+@Component
 public class ServiceProvider implements ServiceInterface
 {
     @ServiceDependency(filter = "(test=aspectLifecycle.ServiceProvider)")

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycledynamicproxy/AspectLifecycleTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycledynamicproxy/AspectLifecycleTest.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycledynamicproxy/AspectLifecycleTest.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycledynamicproxy/AspectLifecycleTest.java Wed Sep  8 19:40:35 2010
@@ -18,13 +18,13 @@
  */
 package org.apache.felix.dm.test.bundle.annotation.aspectlifecycledynamicproxy;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 
 /**
  * Tests an aspect service, and ensure that its lifecycle methods are properly invoked (init/start/stop/destroy)
  */
-@Service
+@Component
 public class AspectLifecycleTest
 {
     @ServiceDependency

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycledynamicproxy/ServiceProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycledynamicproxy/ServiceProvider.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycledynamicproxy/ServiceProvider.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycledynamicproxy/ServiceProvider.java Wed Sep  8 19:40:35 2010
@@ -18,11 +18,11 @@
  */
 package org.apache.felix.dm.test.bundle.annotation.aspectlifecycledynamicproxy;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
-@Service
+@Component
 public class ServiceProvider implements ServiceInterface
 {
     @ServiceDependency(filter = "(test=aspectLifecycle.ServiceProvider)")

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/bundledependency/Consumer.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/bundledependency/Consumer.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/bundledependency/Consumer.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/bundledependency/Consumer.java Wed Sep  8 19:40:35 2010
@@ -19,7 +19,7 @@
 package org.apache.felix.dm.test.bundle.annotation.bundledependency;
 
 import org.apache.felix.dm.annotation.api.Destroy;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.annotation.api.BundleDependency;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
@@ -30,7 +30,7 @@ import org.osgi.framework.Bundle;
 /**
  * Simple Consumer which has a BundleDependency dependency.
  */
-@Service
+@Component
 public class Consumer
 {
     protected volatile boolean m_added;

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/bundledependency/ServiceConsumer.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/bundledependency/ServiceConsumer.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/bundledependency/ServiceConsumer.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/bundledependency/ServiceConsumer.java Wed Sep  8 19:40:35 2010
@@ -18,7 +18,7 @@
 */
 package org.apache.felix.dm.test.bundle.annotation.bundledependency;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
@@ -26,7 +26,7 @@ import org.apache.felix.dm.test.bundle.a
 /**
  * ServiceInterface Consumer.
  */
-@Service
+@Component
 public class ServiceConsumer
 {
     @ServiceDependency(filter="(test=adapter)")

Copied: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Composite.java (from r995087, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Component.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Composite.java?p2=felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Composite.java&p1=felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Component.java&r1=995087&r2=995219&rev=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Component.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Composite.java Wed Sep  8 19:40:35 2010
@@ -16,7 +16,7 @@ import org.apache.felix.dm.test.bundle.a
 /**
  * The CompositeService is also made up of this Class.
  */
-public class Component
+public class Composite
 {
     // Injected dependency (from CompositeService)
     private Sequencer m_sequencer;

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/CompositeService.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/CompositeService.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/CompositeService.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/CompositeService.java Wed Sep  8 19:40:35 2010
@@ -17,7 +17,7 @@ import java.util.Map;
 import org.apache.felix.dm.annotation.api.Composition;
 import org.apache.felix.dm.annotation.api.Destroy;
 import org.apache.felix.dm.annotation.api.Init;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.annotation.api.Stop;
@@ -26,11 +26,11 @@ import org.apache.felix.dm.test.bundle.a
 /**
  * This service is also composed of the Component object.
  */
-@Service
+@Component
 public class CompositeService
 {
     /* We are composed of this object, which will also be injected with our dependencies */
-    private Component m_component = new Component();
+    private Composite m_composite = new Composite();
 
     /* This dependency filter will be configured from our init method */
     @ServiceDependency(name = "D")
@@ -63,7 +63,7 @@ public class CompositeService
     @Composition
     Object[] getComposition()
     {
-        return new Object[] { this, m_component };
+        return new Object[] { this, m_composite };
     }
 
     /** 

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Dependency1.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Dependency1.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Dependency1.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Dependency1.java Wed Sep  8 19:40:35 2010
@@ -12,11 +12,11 @@
 package org.apache.felix.dm.test.bundle.annotation.composite;
 
 import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
-@Service(properties = @Property(name = "foo", value = "bar1"))
+@Component(properties = @Property(name = "foo", value = "bar1"))
 public class Dependency1 implements Runnable
 {
     @ServiceDependency

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Dependency2.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Dependency2.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Dependency2.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/composite/Dependency2.java Wed Sep  8 19:40:35 2010
@@ -12,11 +12,11 @@
 package org.apache.felix.dm.test.bundle.annotation.composite;
 
 import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
-@Service(properties = @Property(name = "foo", value = "bar2"))
+@Component(properties = @Property(name = "foo", value = "bar2"))
 public class Dependency2 implements Runnable
 {
     @ServiceDependency

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAdapterServiceProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAdapterServiceProperties.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAdapterServiceProperties.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAdapterServiceProperties.java Wed Sep  8 19:40:35 2010
@@ -23,7 +23,7 @@ import java.util.Map;
 
 import org.apache.felix.dm.annotation.api.AdapterService;
 import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
@@ -43,7 +43,7 @@ public class ExtraAdapterServiceProperti
     }
 
 
-    @Service(properties={@Property(name="foo", value="bar")})
+    @Component(properties={@Property(name="foo", value="bar")})
     public static class ProviderImpl implements Provider
     {
     }
@@ -60,7 +60,7 @@ public class ExtraAdapterServiceProperti
         }
     }
     
-    @Service
+    @Component
     public static class Consumer
     {
         @ServiceDependency(filter="(test=ExtraAdapterServiceProperties)")

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAspectServiceProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAspectServiceProperties.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAspectServiceProperties.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAspectServiceProperties.java Wed Sep  8 19:40:35 2010
@@ -23,7 +23,7 @@ import java.util.Map;
 
 import org.apache.felix.dm.annotation.api.AspectService;
 import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
@@ -38,7 +38,7 @@ public class ExtraAspectServicePropertie
     {
     }
     
-    @Service(properties={@Property(name="foo", value="bar")})
+    @Component(properties={@Property(name="foo", value="bar")})
     public static class ProviderImpl implements Provider
     {
     }
@@ -53,7 +53,7 @@ public class ExtraAspectServicePropertie
         }
     }
     
-    @Service
+    @Component
     public static class Consumer
     {
         @ServiceDependency(filter="(test=ExtraAspectServiceProperties)")

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraFactoryServiceProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraFactoryServiceProperties.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraFactoryServiceProperties.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraFactoryServiceProperties.java Wed Sep  8 19:40:35 2010
@@ -25,7 +25,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
@@ -36,7 +36,7 @@ public class ExtraFactoryServiceProperti
     {
     }
 
-    @Service(properties={@Property(name="foo", value="bar")}, factorySet="MyFactory")
+    @Component(properties={@Property(name="foo", value="bar")}, factorySet="MyFactory")
     public static class ProviderImpl implements Provider
     {
         @Start
@@ -46,7 +46,7 @@ public class ExtraFactoryServiceProperti
         }
     }
     
-    @Service
+    @Component
     public static class ProviderImplFactory
     {
         @ServiceDependency
@@ -59,7 +59,7 @@ public class ExtraFactoryServiceProperti
         }
     }
     
-    @Service
+    @Component
     public static class Consumer
     {
         @ServiceDependency(filter="(test=ExtraFactoryServiceProperties)")

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraServiceProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraServiceProperties.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraServiceProperties.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraServiceProperties.java Wed Sep  8 19:40:35 2010
@@ -21,7 +21,7 @@ package org.apache.felix.dm.test.bundle.
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.Property;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.annotation.api.Start;
@@ -37,7 +37,7 @@ public class ExtraServiceProperties
     {
     }
 
-    @Service(properties={@Property(name="foo", value="bar")})
+    @Component(properties={@Property(name="foo", value="bar")})
     public static class ProviderImpl implements Provider
     {
         @Start
@@ -47,7 +47,7 @@ public class ExtraServiceProperties
         }
     }
     
-    @Service
+    @Component
     public static class Consumer
     {
         @ServiceDependency(filter="(test=ExtraServiceProperties)")

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency1.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency1.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency1.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency1.java Wed Sep  8 19:40:35 2010
@@ -19,9 +19,9 @@
 package org.apache.felix.dm.test.bundle.annotation.factory;
 
 import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 
-@Service(properties=@Property(name="foo", value="bar"))
+@Component(properties=@Property(name="foo", value="bar"))
 public class ExtraDependency1 implements Runnable
 {
     public void run()

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency2.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency2.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency2.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/ExtraDependency2.java Wed Sep  8 19:40:35 2010
@@ -19,9 +19,9 @@
 package org.apache.felix.dm.test.bundle.annotation.factory;
 
 import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 
-@Service(properties=@Property(name="foo", value="bar2"))
+@Component(properties=@Property(name="foo", value="bar2"))
 public class ExtraDependency2 implements Runnable
 {
     public void run()

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyService.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyService.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyService.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyService.java Wed Sep  8 19:40:35 2010
@@ -26,7 +26,7 @@ import junit.framework.Assert;
 
 import org.apache.felix.dm.annotation.api.Init;
 import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.annotation.api.Stop;
@@ -35,7 +35,7 @@ import org.apache.felix.dm.test.bundle.a
 /**
  * This service will be instantiated by our MyServiceFactory class.
  */
-@Service(factorySet = "MyServiceFactory", 
+@Component(factorySet = "MyServiceFactory", 
          factoryConfigure = "configure", properties = { @Property(name = "foo", value = "bar") })
 public class MyService implements MyServiceInterface
 {

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyServiceFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyServiceFactory.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyServiceFactory.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factory/MyServiceFactory.java Wed Sep  8 19:40:35 2010
@@ -25,13 +25,13 @@ import java.util.Set;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
 @SuppressWarnings("unchecked")
-@Service
+@Component
 public class MyServiceFactory
 {
     @ServiceDependency(filter = "(dm.factory.name=MyServiceFactory)")

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factoryconfadapter/ServiceClient.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factoryconfadapter/ServiceClient.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factoryconfadapter/ServiceClient.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/factoryconfadapter/ServiceClient.java Wed Sep  8 19:40:35 2010
@@ -20,10 +20,10 @@ package org.apache.felix.dm.test.bundle.
 
 import java.util.Map;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 
-@Service
+@Component
 public class ServiceClient
 {
     @ServiceDependency(changed="changeServiceProvider")

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceConsumer.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceConsumer.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceConsumer.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceConsumer.java Wed Sep  8 19:40:35 2010
@@ -18,13 +18,13 @@
  */
 package org.apache.felix.dm.test.bundle.annotation.multiple;
 
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.annotation.api.Stop;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
-@Service
+@Component
 public class ServiceConsumer
 {
     @ServiceDependency

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider.java Wed Sep  8 19:40:35 2010
@@ -19,13 +19,13 @@
 package org.apache.felix.dm.test.bundle.annotation.multiple;
 
 import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.annotation.api.Stop;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
-@Service(properties = { @Property(name = "foo", value = "bar") })
+@Component(properties = { @Property(name = "foo", value = "bar") })
 public class ServiceProvider implements ServiceInterface
 {
     @ServiceDependency

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider2.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider2.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider2.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider2.java Wed Sep  8 19:40:35 2010
@@ -19,13 +19,13 @@
 package org.apache.felix.dm.test.bundle.annotation.multiple;
 
 import org.apache.felix.dm.annotation.api.Composition;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.annotation.api.Stop;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
-@Service(provides = { ServiceProvider2.class }, factoryMethod="create")
+@Component(provides = { ServiceProvider2.class }, factoryMethod="create")
 public class ServiceProvider2
 {
     Composite m_composite = new Composite();

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/propagate/ServiceDependencyPropagateTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/propagate/ServiceDependencyPropagateTest.java?rev=995219&r1=995218&r2=995219&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/propagate/ServiceDependencyPropagateTest.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/propagate/ServiceDependencyPropagateTest.java Wed Sep  8 19:40:35 2010
@@ -21,7 +21,7 @@ package org.apache.felix.dm.test.bundle.
 import java.util.Map;
 
 import org.apache.felix.dm.annotation.api.Property;
-import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.annotation.api.Start;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
@@ -31,7 +31,7 @@ import org.apache.felix.dm.test.bundle.a
  */
 public class ServiceDependencyPropagateTest
 {
-    @Service
+    @Component
     public static class Consumer {
         private Map m_producerProps;
 
@@ -55,14 +55,14 @@ public class ServiceDependencyPropagateT
         }
     }
     
-    @Service(provides={Producer.class}, properties={@Property(name="foo", value="bar")})
+    @Component(provides={Producer.class}, properties={@Property(name="foo", value="bar")})
     public static class Producer {
         @ServiceDependency(propagate=true)
         Producer2 m_producer;
     }
     
 
-    @Service(provides={Producer2.class}, properties={@Property(name="foo2", value="bar2")})
+    @Component(provides={Producer2.class}, properties={@Property(name="foo2", value="bar2")})
     public static class Producer2 {
     }
 }