Author: pderop
Date: Mon Nov 16 21:01:00 2015
New Revision: 1714676
URL: http://svn.apache.org/viewvc?rev=1714676&view=rev
Log:
modified the ConfigurationDependencyBuilderImpl class in order to use the new
ConfigurationDependency.setCallbacks(Object instance, String callback, boolean
needsInstance) signature (see FELIX-5104).
Modified:
felix/sandbox/pderop/dependencymanager.builder.java/cnf/localrepo/index.xml
felix/sandbox/pderop/dependencymanager.builder.java/cnf/localrepo/index.xml.sha
felix/sandbox/pderop/dependencymanager.builder.java/cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.2.0.jar
felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java.itest/bnd.bnd
felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java.samples/src/org/apache/felix/dependencymanager/samples/hello/README
felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java/src/org/apache/felix/dm/builder/java/impl/ConfigurationDependencyBuilderImpl.java
Modified:
felix/sandbox/pderop/dependencymanager.builder.java/cnf/localrepo/index.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.builder.java/cnf/localrepo/index.xml?rev=1714676&r1=1714675&r2=1714676&view=diff
==============================================================================
Binary files - no diff available.
Modified:
felix/sandbox/pderop/dependencymanager.builder.java/cnf/localrepo/index.xml.sha
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.builder.java/cnf/localrepo/index.xml.sha?rev=1714676&r1=1714675&r2=1714676&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager.builder.java/cnf/localrepo/index.xml.sha
(original)
+++
felix/sandbox/pderop/dependencymanager.builder.java/cnf/localrepo/index.xml.sha
Mon Nov 16 21:01:00 2015
@@ -1 +1 @@
-2dcca1ae80b42ec39813635ffa4259b44ddd5f47b8d2094a2ed9b07795ccb605
\ No newline at end of file
+e675822ca6020697bc6fae8c4217229af7fcc82d82d0c866b5075742afdfd9cc
\ No newline at end of file
Modified:
felix/sandbox/pderop/dependencymanager.builder.java/cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.2.0.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.builder.java/cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.2.0.jar?rev=1714676&r1=1714675&r2=1714676&view=diff
==============================================================================
Binary files - no diff available.
Modified:
felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java.itest/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java.itest/bnd.bnd?rev=1714676&r1=1714675&r2=1714676&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java.itest/bnd.bnd
(original)
+++
felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java.itest/bnd.bnd
Mon Nov 16 21:01:00 2015
@@ -1,11 +1,11 @@
-buildpath: \
- ${junit},\
org.apache.felix.dependencymanager;version=4.1,\
org.apache.felix.dependencymanager.shell;version=4.0,\
org.apache.felix.gogo.runtime;version=0.12,\
org.apache.felix.dependencymanager.builder.java;version=latest,\
osgi.core;version=6.0,\
- osgi.cmpn;version=6.0
+ osgi.cmpn;version=6.0,\
+ biz.aQute.junit;version=3.0.0
-runbundles: \
org.apache.felix.metatype;version=1.0.10,\
org.apache.felix.gogo.runtime;version=0.12.1,\
@@ -15,8 +15,7 @@
org.apache.felix.configadmin;version=1.8.4,\
org.apache.felix.dependencymanager.builder.java;version=latest,\
net.jodah.typetools;version=0.4.5,\
- biz.aQute.junit;version=1.3.0
-
+ biz.aQute.junit;version=3.0.0
-runee: JavaSE-1.8
-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
-runsystempackages: \
@@ -29,3 +28,4 @@ Test-Cases: \
${classes;CONCRETE;EXTENDS;junit.framework.TestCase}
javac.source: 1.8
javac.target: 1.8
+#-tester: biz.aQute.junit
\ No newline at end of file
Modified:
felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java.samples/src/org/apache/felix/dependencymanager/samples/hello/README
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java.samples/src/org/apache/felix/dependencymanager/samples/hello/README?rev=1714676&r1=1714675&r2=1714676&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java.samples/src/org/apache/felix/dependencymanager/samples/hello/README
(original)
+++
felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java.samples/src/org/apache/felix/dependencymanager/samples/hello/README
Mon Nov 16 21:01:00 2015
@@ -16,7 +16,7 @@
*/
This sample provides a DM Activator declaring one service consumer and a
service provider. The
-ServiceConsumer is also depending on a configuration pid (see
org.apache.felix.dependencymanager.samples.conf.Configurator).
+ServiceConsumer is also depending on a configuration pid (see
org.apache.felix.dependencymanager.samples.hello.Configurator).
To see logs, just type this under gogo shell:
g! log info|grep hello.annot
Modified:
felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java/src/org/apache/felix/dm/builder/java/impl/ConfigurationDependencyBuilderImpl.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java/src/org/apache/felix/dm/builder/java/impl/ConfigurationDependencyBuilderImpl.java?rev=1714676&r1=1714675&r2=1714676&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java/src/org/apache/felix/dm/builder/java/impl/ConfigurationDependencyBuilderImpl.java
(original)
+++
felix/sandbox/pderop/dependencymanager.builder.java/org.apache.felix.dependencymanager.builder.java/src/org/apache/felix/dm/builder/java/impl/ConfigurationDependencyBuilderImpl.java
Mon Nov 16 21:01:00 2015
@@ -80,7 +80,6 @@ public class ConfigurationDependencyBuil
dep.setCallback(new Object() {
@SuppressWarnings({ "unused", "unchecked" })
void updated(Component comp, Dictionary<String, Object> props)
{
- ((ComponentContext) comp).instantiateComponent();
Stream.of(comp.getInstances()).forEach(instance -> {
BiConsumer<Object, Dictionary<String, Object>>
updatedRef = (BiConsumer<Object, Dictionary<String, Object>>)
m_componentInstanceCallbackRefs.get(instance.getClass());
if (updatedRef != null) {
@@ -89,7 +88,7 @@ public class ConfigurationDependencyBuil
});
m_updatedConsumers.accept(props);
}
- }, "updated");
+ }, "updated", true /* we need component instances before updated
is called */);
} else if (m_updatedConsumersSet) {
// Some consumers have been configured, call them on any
updated properties.
dep.setCallback(new Object() {
