diff -rupN original/core/src/main/java/org/eclipse/gemini/blueprint/compendium/internal/cm/ManagedServiceFactoryFactoryBean.java patched/core/src/main/java/org/eclipse/gemini/blueprint/compendium/internal/cm/ManagedServiceFactoryFactoryBean.java
--- original/core/src/main/java/org/eclipse/gemini/blueprint/compendium/internal/cm/ManagedServiceFactoryFactoryBean.java 2013-05-29 12:41:55.000000000 +0400
+++ patched/core/src/main/java/org/eclipse/gemini/blueprint/compendium/internal/cm/ManagedServiceFactoryFactoryBean.java 2013-06-06 11:15:49.911192197 +0400
@@ -19,6 +19,7 @@ import java.util.Collections;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -180,6 +181,7 @@ public class ManagedServiceFactoryFactor
private ClassLoader classLoader;
private boolean autowireOnUpdate = false;
private String updateMethod;
+ private boolean propagateProperties = false;
/** update callback */
private UpdateCallback updateCallback;
@@ -308,15 +310,15 @@ public class ManagedServiceFactoryFactor
return;
beanFactory.registerBeanDefinition(pid, templateDefinition);
- initialInjectionProperties = props;
+ initialInjectionProperties = getProperties(props, false);
// create instance (causing the injection BPP to be applied)
Object bean = beanFactory.getBean(pid);
- registerService(pid, bean);
+ registerService(pid, bean, props);
}
}
- private void registerService(String pid, Object bean) {
- OsgiServiceFactoryBean exporter = createExporter(pid, bean);
+ private void registerService(String pid, Object bean, Map props) {
+ OsgiServiceFactoryBean exporter = createExporter(pid, bean, props);
serviceExporters.put(pid, exporter);
try {
serviceRegistrations.add(exporter.getObject());
@@ -325,7 +327,7 @@ public class ManagedServiceFactoryFactor
}
}
- private OsgiServiceFactoryBean createExporter(String beanName, Object bean) {
+ private OsgiServiceFactoryBean createExporter(String beanName, Object bean, Map props) {
OsgiServiceFactoryBean exporter = new OsgiServiceFactoryBean();
exporter.setInterfaceDetector(detector);
exporter.setBeanClassLoader(classLoader);
@@ -337,13 +339,7 @@ public class ManagedServiceFactoryFactor
exporter.setTarget(bean);
// add properties
- Properties props = new Properties();
- if (serviceProperties != null) {
- props.putAll(serviceProperties);
- }
- // add the service pid (to be able to identify the bean instance)
- props.put(Constants.SERVICE_PID, beanName);
- exporter.setServiceProperties(props);
+ exporter.setServiceProperties(getServiceProperties(beanName, props));
try {
exporter.afterPropertiesSet();
@@ -353,10 +349,51 @@ public class ManagedServiceFactoryFactor
return exporter;
}
+ private Properties getServiceProperties(String pid, Map props) {
+ Properties result = new Properties();
+ if (serviceProperties != null) {
+ result.putAll(serviceProperties);
+ }
+ // add the service pid (to be able to identify the bean instance)
+ result.put(Constants.SERVICE_PID, pid);
+ result.putAll(getProperties(props, true));
+ return result;
+ }
+
+ private static Properties getProperties(Map props, boolean forPropagation) {
+ Properties result = new Properties();
+ for (Object entryObj : props.entrySet()) {
+ Entry entry = (Entry) entryObj;
+ String key = (String) entry.getKey();
+ if (key.startsWith(".")) {
+ // this is a private property
+ if (!forPropagation) {
+ result.put(key.substring(1), entry.getValue());
+ }
+ } else {
+ // this is a public property
+ if (forPropagation || !result.containsKey(key)) {
+ result.put(key, entry.getValue());
+ }
+ }
+ }
+ return result;
+ }
+
private void updateInstance(String pid, Map props) {
+ if (autowireOnUpdate) {
+ OsgiServiceFactoryBean exporter = serviceExporters.get(pid);
+ try {
+ ServiceRegistration registration = (ServiceRegistration) exporter.getObject();
+ registration.setProperties(getServiceProperties(pid, props));
+ } catch (Exception ex) {
+ // log the exception and continue
+ log.error("Could not update service properties for pid " + pid, ex);
+ }
+ }
if (updateCallback != null) {
Object instance = beanFactory.getBean(pid);
- updateCallback.update(instance, props);
+ updateCallback.update(instance, getProperties(props, false));
}
}
@@ -494,6 +531,15 @@ public class ManagedServiceFactoryFactor
}
/**
+ * Sets whether property propagation should be performed or not.
+ *
+ * @param propagateProperties
+ */
+ public void setPropagateProperties(boolean propagateProperties) {
+ this.propagateProperties = propagateProperties;
+ }
+
+ /**
* Sets the properties used when exposing the target as an OSGi service. If the given argument implements (
* {@link ServicePropertiesChangeListener}), any updates to the properties will be reflected by the service
* registration.
diff -rupN original/core/src/main/resources/META-INF/spring.schemas patched/core/src/main/resources/META-INF/spring.schemas
--- original/core/src/main/resources/META-INF/spring.schemas 2013-05-29 12:41:55.000000000 +0400
+++ patched/core/src/main/resources/META-INF/spring.schemas 2013-06-06 07:35:01.897858408 +0400
@@ -13,6 +13,7 @@ http\://www.springframework.org/schema/o
http\://www.eclipse.org/gemini/blueprint/schema/blueprint/gemini-blueprint-1.0.xsd=org/eclipse/gemini/blueprint/config/gemini-blueprint-1.0.xsd
http\://www.eclipse.org/gemini/blueprint/schema/blueprint/gemini-blueprint.xsd=org/eclipse/gemini/blueprint/config/gemini-blueprint-1.0.xsd
http\://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium/gemini-blueprint-compendium-1.0.xsd=org/eclipse/gemini/blueprint/compendium/config/gemini-blueprint-compendium-1.0.xsd
-http\://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium/gemini-blueprint-compendium.xsd=org/eclipse/gemini/blueprint/compendium/config/gemini-blueprint-compendium-1.0.xsd
+http\://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium/gemini-blueprint-compendium-1.1.xsd=org/eclipse/gemini/blueprint/compendium/config/gemini-blueprint-compendium-1.1.xsd
+http\://www.eclipse.org/gemini/blueprint/schema/blueprint-compendium/gemini-blueprint-compendium.xsd=org/eclipse/gemini/blueprint/compendium/config/gemini-blueprint-compendium-1.1.xsd
# Blueprint namespaces
http\://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd=org/eclipse/gemini/blueprint/blueprint/config/blueprint-1.0.xsd
diff -rupN original/core/src/main/resources/org/eclipse/gemini/blueprint/compendium/config/gemini-blueprint-compendium-1.1.xsd patched/core/src/main/resources/org/eclipse/gemini/blueprint/compendium/config/gemini-blueprint-compendium-1.1.xsd
--- original/core/src/main/resources/org/eclipse/gemini/blueprint/compendium/config/gemini-blueprint-compendium-1.1.xsd 1970-01-01 03:00:00.000000000 +0300
+++ patched/core/src/main/resources/org/eclipse/gemini/blueprint/compendium/config/gemini-blueprint-compendium-1.1.xsd 2013-06-06 07:33:46.149855268 +0400
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ Pas de fin de ligne à la fin du fichier
diff -rupN original/integration-tests/tests/pom.xml patched/integration-tests/tests/pom.xml
--- original/integration-tests/tests/pom.xml 2013-05-29 12:41:55.000000000 +0400
+++ patched/integration-tests/tests/pom.xml 2013-05-30 09:38:24.333481069 +0400
@@ -21,7 +21,7 @@
org.apache.felix
org.apache.felix.configadmin
- 1.2.4
+ 1.2.8
provided
diff -rupN original/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertyplaceholder/PropertyPlaceholderTest.java patched/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertyplaceholder/PropertyPlaceholderTest.java
--- original/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertyplaceholder/PropertyPlaceholderTest.java 2013-05-29 12:41:55.000000000 +0400
+++ patched/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertyplaceholder/PropertyPlaceholderTest.java 2013-05-30 07:52:48.153899060 +0400
@@ -72,7 +72,7 @@ public class PropertyPlaceholderTest ext
protected String[] getTestBundlesNames() {
return new String[] {
// required by cm_all for logging
- "org.apache.felix, org.apache.felix.configadmin, 1.2.4" };
+ "org.apache.felix, org.apache.felix.configadmin, 1.2.8" };
}
protected void onSetUp() throws Exception {
diff -rupN original/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertypropagation/MyServiceImpl.java patched/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertypropagation/MyServiceImpl.java
--- original/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertypropagation/MyServiceImpl.java 1970-01-01 03:00:00.000000000 +0300
+++ patched/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertypropagation/MyServiceImpl.java 2013-05-29 20:41:36.494548135 +0400
@@ -0,0 +1,45 @@
+package org.eclipse.gemini.blueprint.iandt.propertypropagation;
+
+public class MyServiceImpl implements MyService {
+
+ private String property1;
+
+ private String property2;
+
+ private String property3;
+
+ private String property4;
+
+ public String getProperty1() {
+ return property1;
+ }
+
+ public void setProperty1(String property1) {
+ this.property1 = property1;
+ }
+
+ public String getProperty2() {
+ return property2;
+ }
+
+ public void setProperty2(String property2) {
+ this.property2 = property2;
+ }
+
+ public String getProperty3() {
+ return property3;
+ }
+
+ public void setProperty3(String property3) {
+ this.property3 = property3;
+ }
+
+ public String getProperty4() {
+ return property4;
+ }
+
+ public void setProperty4(String property4) {
+ this.property4 = property4;
+ }
+
+}
diff -rupN original/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertypropagation/MyService.java patched/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertypropagation/MyService.java
--- original/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertypropagation/MyService.java 1970-01-01 03:00:00.000000000 +0300
+++ patched/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertypropagation/MyService.java 2013-05-29 19:44:42.292435987 +0400
@@ -0,0 +1,13 @@
+package org.eclipse.gemini.blueprint.iandt.propertypropagation;
+
+public interface MyService {
+
+ String getProperty1();
+
+ String getProperty2();
+
+ String getProperty3();
+
+ String getProperty4();
+
+}
diff -rupN original/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertypropagation/PropertyPropagationTest.java patched/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertypropagation/PropertyPropagationTest.java
--- original/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertypropagation/PropertyPropagationTest.java 1970-01-01 03:00:00.000000000 +0300
+++ patched/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/propertypropagation/PropertyPropagationTest.java 2013-06-06 11:24:19.025992895 +0400
@@ -0,0 +1,140 @@
+package org.eclipse.gemini.blueprint.iandt.propertypropagation;
+
+import java.io.File;
+import java.io.FilePermission;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.PropertyPermission;
+
+import org.eclipse.gemini.blueprint.iandt.BaseIntegrationTest;
+import org.osgi.framework.AdminPermission;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.cm.ConfigurationPermission;
+import org.eclipse.gemini.blueprint.context.ConfigurableOsgiBundleApplicationContext;
+import org.eclipse.gemini.blueprint.context.support.OsgiBundleXmlApplicationContext;
+import org.eclipse.gemini.blueprint.util.OsgiServiceReferenceUtils;
+
+/**
+ * Integration test for property propagation.
+ *
+ * @author Alexander Shutyaev
+ */
+public class PropertyPropagationTest extends BaseIntegrationTest {
+
+ private final static String ID = "PropertyPropagationTest-123";
+
+ private final static Dictionary DICT = new Hashtable();
+
+ private Configuration config;
+
+ private ConfigurableOsgiBundleApplicationContext ctx;
+
+ private static String CONFIG_DIR = "test-config";
+
+ protected static void initializeDirectory(String dir) {
+ File directory = new File(dir);
+ remove(directory);
+ assertTrue(dir + " directory successfully created", directory.mkdirs());
+ }
+
+ private static void remove(File directory) {
+ if (directory.exists()) {
+ File[] files = directory.listFiles();
+ for (int i = 0; i < files.length; i++) {
+ File file = files[i];
+ if (file.isDirectory()) {
+ remove(file);
+ }
+ else {
+ assertTrue(file + " deleted", file.delete());
+ }
+ }
+ assertTrue(directory + " directory successfully cleared", directory.delete());
+ }
+ }
+
+ protected String[] getTestBundlesNames() {
+ return new String[] {
+ // required by cm_all for logging
+ "org.apache.felix, org.apache.felix.configadmin, 1.2.8" };
+ }
+
+ protected void onSetUp() throws Exception {
+ super.onSetUp();
+ DICT.put("property1", "value1");
+ DICT.put(".property2", "value2");
+ DICT.put("property3", "value3-public");
+ DICT.put(".property3", "value3-private");
+ System.setProperty("com.gatespace.bundle.cm.store", CONFIG_DIR);
+ System.setProperty("felix.cm.dir", CONFIG_DIR);
+ initializeDirectory(CONFIG_DIR);
+ prepareConfiguration();
+
+ String[] locations = new String[] { "org/eclipse/gemini/blueprint/iandt/propertypropagation/propagation.xml" };
+ ctx = new OsgiBundleXmlApplicationContext(locations);
+ ctx.setBundleContext(bundleContext);
+ ctx.refresh();
+ }
+
+ protected void onTearDown() throws Exception {
+ if (ctx != null)
+ ctx.close();
+ }
+
+ // add a default table into OSGi
+ private void prepareConfiguration() throws Exception {
+
+ ServiceReference ref = OsgiServiceReferenceUtils.getServiceReference(bundleContext,
+ ConfigurationAdmin.class.getName(), null);
+
+ ConfigurationAdmin admin = (ConfigurationAdmin) bundleContext.getService(ref);
+ config = admin.createFactoryConfiguration(ID, null);
+ config.update(DICT);
+ }
+
+ public void testPropertyPropagation() throws Exception {
+ Thread.sleep(1000L); // wait for service registration
+ ServiceReference ref = bundleContext.getServiceReference(MyService.class.getName());
+ MyService service = (MyService) bundleContext.getService(ref);
+ assertEquals("value1", ref.getProperty("property1"));
+ assertNull(ref.getProperty("property2"));
+ assertEquals("value3-public", ref.getProperty("property3"));
+ assertEquals("value4", ref.getProperty("property4"));
+ assertEquals("value1", service.getProperty1());
+ assertEquals("value2", service.getProperty2());
+ assertEquals("value3-private", service.getProperty3());
+ assertNull(service.getProperty4());
+ // update configuration
+ DICT.put("property1", "value1*");
+ DICT.put(".property2", "value2*");
+ DICT.put("property3", "value3-public*");
+ DICT.put(".property3", "value3-private*");
+ config.update(DICT);
+ Thread.sleep(1000L); // wait for update
+ assertEquals("value1*", ref.getProperty("property1"));
+ assertNull(ref.getProperty("property2"));
+ assertEquals("value3-public*", ref.getProperty("property3"));
+ assertEquals("value4", ref.getProperty("property4"));
+ assertEquals("value1*", service.getProperty1());
+ assertEquals("value2*", service.getProperty2());
+ assertEquals("value3-private*", service.getProperty3());
+ assertNull(service.getProperty4());
+ }
+
+ protected List getTestPermissions() {
+ List perms = super.getTestPermissions();
+ // export package
+ perms.add(new AdminPermission("*", AdminPermission.EXECUTE));
+ perms.add(new PropertyPermission("*", "write"));
+ perms.add(new PropertyPermission("*", "read"));
+ perms.add(new FilePermission("<>", "read"));
+ perms.add(new FilePermission("<>", "delete"));
+ perms.add(new FilePermission("<>", "write"));
+ perms.add(new ConfigurationPermission("*", ConfigurationPermission.CONFIGURE));
+ return perms;
+ }
+
+}
diff -rupN original/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/propertypropagation/propagation.xml patched/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/propertypropagation/propagation.xml
--- original/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/propertypropagation/propagation.xml 1970-01-01 03:00:00.000000000 +0300
+++ patched/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/propertypropagation/propagation.xml 2013-06-06 11:20:33.430523626 +0400
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
diff -rupN original/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/propertypropagation/PropertyPropagationTest-bundle.properties patched/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/propertypropagation/PropertyPropagationTest-bundle.properties
--- original/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/propertypropagation/PropertyPropagationTest-bundle.properties 1970-01-01 03:00:00.000000000 +0300
+++ patched/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/propertypropagation/PropertyPropagationTest-bundle.properties 2013-05-29 12:41:55.000000000 +0400
@@ -0,0 +1,3 @@
+root.dir=file:./target/test-classes
+include.patterns=/**/*.*
+libs=