svn commit: r1728568 - in /felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api: Activator.java DynamicDependency.java

[pderop]

Author: pderop
Date: Thu Feb  4 23:34:17 2016
New Revision: 1728568

URL: http://svn.apache.org/viewvc?rev=1728568&view=rev
Log:
FELIX-5177: Support injecting configuration proxies.

Modified:
    
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/Activator.java
    
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/DynamicDependency.java

Modified: 
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/Activator.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/Activator.java?rev=1728568&r1=1728567&r2=1728568&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/Activator.java
 (original)
+++ 
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/Activator.java
 Thu Feb  4 23:34:17 2016
@@ -48,7 +48,7 @@ public class Activator extends Dependenc
                dm.add(createComponent()
                                .setImplementation(DynamicDependency.class)
                                
.add(createServiceDependency().setService(LogService.class).setRequired(true))
-                               
.add(createConfigurationDependency().setPid(DynamicDependencyConfiguration.class.getName()))
+                               
.add(createConfigurationDependency().setPid(DynamicDependencyConfiguration.class.getName()).setCallback("updated",
 DynamicDependencyConfiguration.class))
                                
.add(createServiceDependency().setService(EventAdmin.class).setRequired(true)));
        }
 

Modified: 
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/DynamicDependency.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/DynamicDependency.java?rev=1728568&r1=1728567&r2=1728568&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/DynamicDependency.java
 (original)
+++ 
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/DynamicDependency.java
 Thu Feb  4 23:34:17 2016
@@ -49,10 +49,8 @@ public class DynamicDependency {
        /**
         * This is the first callback: we are injected with our configuration.
         */
-       public void updated(Dictionary<String, Object> properties) throws 
ConfigurationException {
-        // We use the bnd "Configurable" helper in order to get an 
implementation for our DictionaryConfiguration interface.
-               if (properties != null) {
-                   DynamicDependencyConfiguration cnf = 
Configurable.createConfigurable(DynamicDependencyConfiguration.class, 
properties);
+       public void updated(DynamicDependencyConfiguration cnf) throws 
ConfigurationException {
+               if (cnf != null) {
                    storageType = cnf.storageType();
                    storageRequired = cnf.storageRequired();
                }