FELIX-5941: fixed some javadocs

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1842415 13f79535-47bb-0310-9956-ffa450edef68

dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/AdapterService.java

@@ -180,6 +180,8 @@
 
     /**
      * Specifies if adaptee service properties should be propagated to the adapter service.
+     * The component provided service properties take precedence over the propagated adaptee service properties, meaning
+     * that a give component service property overrides the same property present in the propagated adaptee service properties.
      * @return the service propagation flag
      */
     boolean propagate() default true;

dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/BundleAdapterService.java

@@ -89,6 +89,8 @@
 
     /**
      * Specifies if manifest headers from the bundle should be propagated to the service properties.
+     * The component service properties take precedence over the propagated bundle manifest headers.
+     * 
      * @return the propagation flag
      */
     boolean propagate() default true;

dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/BundleDependency.java

@@ -92,8 +92,10 @@
     int stateMask() default Bundle.INSTALLED | Bundle.RESOLVED | Bundle.ACTIVE;
 
     /**
-     * Specifies if the manifest headers from the bundle should be propagated to 
-     * the service properties.
+     * Specifies if the manifest headers from the bundle should be propagated to the service properties.
+     * The provided service properties take precedence over the propagated bundle manifest headers. 
+     * It means a bundle manifest header won't override a component service property having the same name.
+     * 
      * @return the propagation flag
      */
     boolean propagate() default false;

dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/ConfigurationDependency.java

@@ -185,7 +185,10 @@
 
     /**
      * Returns true if the configuration properties must be published along with the service. 
-     * Any additional service properties specified directly are merged with these.
+     * Any additional service properties specified directly are merged with these. The configuration
+     * dependency properties take precedence over the component service properties, meaning that a given configuration
+     * property will override the same property that is already present in the component service properties.
+     * 
      * @return true if configuration must be published along with the service, false if not.
      */
     boolean propagate() default false;

dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/ServiceDependency.java

@@ -231,6 +231,8 @@ public interface Any { }
     /**
      * Returns true if the dependency service properties must be published along with the service. 
      * Any additional service properties specified directly are merged with these.
+     * The component provided service properties take precedence over the propagated service dependency properties, meaning
+     * that a give component service property overrides the same property included in the propagated service dependency properties.
      * @return true if dependency service properties must be published along with the service, false if not.
      */
     boolean propagate() default false;    

dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/BundleComponent.java

@@ -110,7 +110,8 @@ public interface BundleComponent extends Component<BundleComponent> {
 	BundleComponent setBundleCallbackInstance(Object callbackInstance);
 
     /**
-     * Sets if the bundle manifest headers should be propagated to the bundle component adapter service consumer (true by default)
+     * Sets if the bundle manifest headers should be propagated to the bundle component adapter service consumer (true by default).
+     * The component service properties take precedence over the propagated bundle manifest headers.
      * @param propagate true if the bundle manifest headers should be propagated to the adapter service consumers
      * @return this BundleComponent
      */