bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.100.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.equinox.internal.app.Activator
 Bundle-Localization: plugin

bundles/org.eclipse.equinox.app/pom.xml

@@ -14,12 +14,12 @@
   <parent>
     <artifactId>rt.equinox.bundles</artifactId>
     <groupId>org.eclipse.equinox.bundles</groupId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.app</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/app/IApplicationContext.java

@@ -37,6 +37,7 @@ public interface IApplicationContext {
 	 * while launching or running an application then the launcher will set this property 
 	 * automatically in order to display a message to the end user.  An application may
 	 * set this property for the following reasons:
+	 * </p>
 	 * <ul>
 	 *   <li>To provide the command line arguments to relaunch the eclipse platform.  See
 	 *   {@link IApplication#EXIT_RELAUNCH}</li>
@@ -47,7 +48,6 @@ public interface IApplicationContext {
 	 *   set to the empty <code>String</code>.  This is useful for 
 	 *   headless applications where error dialogs must never be displayed.</li>
 	 * </ul>
-	 * </p>
 	 * @since 1.3
 	 */
 	public static final String EXIT_DATA_PROPERTY = "eclipse.exitdata"; //$NON-NLS-1$

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/app/package.html

@@ -10,8 +10,7 @@ Provides core support for Eclipse application model.
 Package Specification</h2>
 <p>
 This package specifies API for defining Eclipse applications.
-<p>
+</p>
 @since 1.0
-<p>
 </body>
 </html>

bundles/org.eclipse.equinox.bidi.tests/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>tests-pom</artifactId>
     <groupId>org.eclipse.equinox.bundles</groupId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <relativePath>../../tests-pom/</relativePath>
   </parent>
   <groupId>org.eclipse.equinox</groupId>

bundles/org.eclipse.equinox.bidi/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.equinox.bidi;singleton:=true
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.300.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-ActivationPolicy: lazy

bundles/org.eclipse.equinox.bidi/pom.xml

@@ -14,11 +14,11 @@
   <parent>
     <artifactId>rt.equinox.bundles</artifactId>
     <groupId>org.eclipse.equinox.bundles</groupId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.bidi</artifactId>
-  <version>1.1.200-SNAPSHOT</version>
+  <version>1.1.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextProcessor.java

@@ -23,7 +23,7 @@ import org.eclipse.equinox.bidi.custom.StructuredTextTypeHandler;
  * ensure correct presentation, or to remove those characters to 
  * restore the original text
  * (for more explanations, please see the 
- * {@link org.eclipse.equinox.bidi package documentation</a>}.
+ * {@link org.eclipse.equinox.bidi package documentation}.
  * <p>
  * This class can be used without OSGi running (but only the structured text types declared
  * in {@link StructuredTextTypeHandlerFactory} are available in that mode).
@@ -70,9 +70,9 @@ public final class StructuredTextProcessor {
 	 * Each segment has the Unicode Bidi Algorithm applied to it,
 	 * but as a whole, the string is oriented left to right.
 	 * </p><p>
-	 * For example, a file path such as <tt>d:\myfolder\FOLDER\MYFILE.java</tt>
+	 * For example, a file path such as <code>d:\myfolder\FOLDER\MYFILE.java</code>
 	 * (where capital letters indicate RTL text) should render as
-	 * <tt>d:\myfolder\REDLOF\ELIFYM.java</tt>.
+	 * <code>d:\myfolder\REDLOF\ELIFYM.java</code>.
 	 * </p>
 	 * 
 	 * @param str the <i>lean</i> text to process

bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/IStructuredTextExpert.java

@@ -19,11 +19,11 @@ import org.eclipse.equinox.bidi.custom.StructuredTextTypeHandler;
  * Provides advanced methods for processing bidirectional text with 
  * a specific structure to ensure proper presentation.
  * For a general introduction to structured text, see the 
- * {@link <a href="../package-summary.html">org.eclipse.equinox.bidi
- * package documentation</a>}.
+ * {@link org.eclipse.equinox.bidi
+ * package documentation}.
  * For details about when the advanced methods are needed, see
- * {@link <a href="package-summary.html">this
- * package documentation</a>}.
+ * {@link org.eclipse.equinox.bidi.advanced this
+ * package documentation}.
  * <p>
  * Identifiers for several common handlers are included in 
  * {@link org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory}. For handlers 
@@ -63,17 +63,17 @@ import org.eclipse.equinox.bidi.custom.StructuredTextTypeHandler;
  * </p><p>
  * The following code shows how to transform a certain type of structured text
  * (directory and file paths) in order to obtain the <i>full</i>
- * text corresponding to the given <i>lean</i> text.
+ * text corresponding to the given <i>lean</i> text.</p>
  * <pre>
  *   IStructuredTextExpert expert = StructuredTextExpertFactory.getExpert(StructuredTextTypeHandlerFactory.FILE);
  *   String leanText = "D:\\\u05d0\u05d1\\\u05d2\\\u05d3.ext";
  *   String fullText = expert.leanToFullText(leanText);
  *   System.out.println("full text = " + fullText);
  * </pre>
- * </p><p>
+ * <p>
  * The following code shows how to transform successive lines of Java
  * code in order to obtain the <i>full</i>
- * text corresponding to the <i>lean</i> text of each line.
+ * text corresponding to the <i>lean</i> text of each line.</p>
  * <pre>
  *   IStructuredTextExpert expert = StructuredTextExpertFactory.getStatefulExpert(StructuredTextTypeHandlerFactory.JAVA);
  *   String leanText = "int i = 3; // first Java statement";
@@ -83,7 +83,7 @@ import org.eclipse.equinox.bidi.custom.StructuredTextTypeHandler;
  *   fullText = expert.leanToFullText(leanText,);
  *   System.out.println("full text = " + fullText);
  * </pre>
- * </p>
+ * 
  */
 public interface IStructuredTextExpert {
 

bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java

@@ -153,15 +153,15 @@ public class StructuredTextEnvironment {
 	 * will be displayed.
 	 * <p>
 	 * The orientation value is one of the following:
+	 * </p>
 	 * <ul>
 	 * <li>{@link #ORIENT_LTR ORIENT_LTR},</li>
 	 * <li>{@link #ORIENT_LTR ORIENT_RTL},</li>
 	 * <li>{@link #ORIENT_CONTEXTUAL_LTR ORIENT_CONTEXTUAL_LTR},</li>
 	 * <li>{@link #ORIENT_CONTEXTUAL_RTL ORIENT_CONTEXTUAL_RTL},</li>
 	 * <li>{@link #ORIENT_UNKNOWN ORIENT_UNKNOWN}, or</li>
-	 * <li>{@link #ORIENT_IGNORE ORIENT_IGNORE}</li>.
+	 * <li>{@link #ORIENT_IGNORE ORIENT_IGNORE}</li>
 	 * </ul>
-	 * </p>
 	 */
 	public int getOrientation() {
 		return orientation;

bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/package.html

@@ -9,10 +9,10 @@ In particular, the user should use the methods in the
 in the following cases:</p>
 <ul>
   <li>The structured type handler to use is not one of those
-      predefined in {@link <a href="../StructuredTextTypeHandlerFactory.html">
-      StructuredTextTypeHandlerFactory</a>}.</li>
-  <li>A non-default {@link <a href="StructuredTextEnvironment.html">
-      environment</a>} needs to be specified.</li>
+      predefined in <a href="../StructuredTextTypeHandlerFactory.html">
+      StructuredTextTypeHandlerFactory</a>.</li>
+  <li>A non-default <a href="StructuredTextEnvironment.html">
+      environment</a> needs to be specified.</li>
   <li>A call to a method processing a piece of text may create a state
       which affects the processing of the next piece of text.</li>
   <li>The user needs to manage the offsets where directional formatting
@@ -20,9 +20,9 @@ in the following cases:</p>
 </ul>
 <p>
 Note that the basic functions are provided in package
-{@link <a href="../package-summary.html">
-org.eclipse.equinox.bidi</a>} and its
-{@link <a href="../StructuredTextProcessor.html">StructuredTextProcessor</a>} class.
+<a href="../package-summary.html">
+org.eclipse.equinox.bidi</a> and its
+<a href="../StructuredTextProcessor.html">StructuredTextProcessor</a> class.
 </p><p>
 To access the more sophisticated methods for processing structured text,
 the user should proceed as follows:</p>

bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/package.html

@@ -40,13 +40,13 @@ In this package, text without directional formatting characters is
 called <b><i>lean</i></b> text while the text with added directional
 formatting characters is called <b><i>full</i></b> text.
 </p><p>
-The class {@link
-<a href="StructuredTextProcessor.html"><b>StructuredTextProcessor</b></a>}
+The class 
+<a href="StructuredTextProcessor.html"><b>StructuredTextProcessor</b></a>
 is the main tool for processing structured text.  It facilitates
 handling several types of structured text, each type being handled
 by a specific
-{@link <a href="custom/StructuredTextTypeHandler.html">
-<b><i>type handler</i></b></a>} :</p>
+<a href="./custom/StructuredTextTypeHandler.html">
+<b><i>type handler</i></b></a> :</p>
 <ul>
   <li>comma delimited list</li>
   <li>e-mail address</li>
@@ -60,8 +60,9 @@ by a specific
 </ul>
 <p>
 For each of these types, an identifier is defined in
-{@link <a href="StructuredTextTypeHandlerFactory.html">
-<b><i>StructuredTextTypeHandlerFactory</i></b></a>} :</p>
+ <a href="StructuredTextTypeHandlerFactory.html">
+<b><i>StructuredTextTypeHandlerFactory</i></b></a> :</p>
+<p>
 These identifiers can be used as argument in some methods of
 <b>StructuredTextProcessor</b> to specify the type of handler to apply.
 </p><p>
@@ -72,8 +73,8 @@ manner, when the following conditions are satisfied:
   <li>There exists an appropriate handler for the type of the
       structured text.</li>
   <li>There is no need to specify non-default conditions related
-      to the {@link <a href="advanced/StructuredTextEnvironment.html">
-      environment</a>}.</li>
+      to the <a href="advanced/StructuredTextEnvironment.html">
+      environment</a>.</li>
   <li>The only operations needed are to transform <i>lean</i> text
       into <i>full</i> text or vice versa.</li>
   <li>There is no interdependence between the processing of a
@@ -83,13 +84,13 @@ manner, when the following conditions are satisfied:
 <p>
 When their needs go beyond the conditions above,
 users can use classes in the
-{@link <a href="advanced/package-summary.html">
+<a href="advanced/package-summary.html">
 org.eclipse.equinox.bidi.advanced</a>}package.
 </p><p>
 Developers who want to develop new handlers to support types of
 structured text not currently supported can use components
-of the package {@link <a href="custom/package-summary.html">
-org.eclipse.equinox.bidi.custom</a>}.
+of the package <a href="custom/package-summary.html">
+org.eclipse.equinox.bidi.custom</a>.
 The source code of packages org.eclipse.equinox.bidi.* can serve as example of
 how to develop processors for currently unsupported types of structured text.
 </p><p>

bundles/org.eclipse.equinox.cm.test/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>rt.equinox.bundles</artifactId>
     <groupId>org.eclipse.equinox.bundles</groupId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.equinox</groupId>

bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF

@@ -4,10 +4,10 @@ Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.equinox.cm
-Bundle-Version: 1.3.100.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: org.eclipse.equinox.internal.cm.Activator
 Import-Package: org.osgi.framework;version="1.7.0",
- org.osgi.service.cm;version="[1.5,1.6)",
+ org.osgi.service.cm;version="[1.6,1.7)",
  org.osgi.service.log;version="1.3.0",
  org.osgi.service.event;version="1.0"; resolution:=optional,
  org.osgi.util.tracker;version="1.3.1"
@@ -15,5 +15,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Provide-Capability: 
  osgi.service;
   objectClass:List<String>="org.osgi.service.cm.ConfigurationAdmin";
-  uses:="org.osgi.service.cm"
+  uses:="org.osgi.service.cm",
+ osgi.implementation;
+  osgi.implementation="osgi.cm";
+  uses:="org.osgi.service.cm";
+  version:Version="1.6"
 Automatic-Module-Name: org.eclipse.equinox.cm

bundles/org.eclipse.equinox.cm/pom.xml

@@ -14,11 +14,11 @@
   <parent>
     <artifactId>rt.equinox.bundles</artifactId>
     <groupId>org.eclipse.equinox.bundles</groupId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.cm</artifactId>
-  <version>1.3.100-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/ConfigurationAdminFactory.java

 /*******************************************************************************
- * Copyright (c) 2005, 2018 Cognos Incorporated, IBM Corporation and others.
+ * Copyright (c) 2005, 2019 Cognos Incorporated, IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -28,6 +28,7 @@ import org.osgi.service.cm.ConfigurationPermission;
 public class ConfigurationAdminFactory implements ServiceFactory<ConfigurationAdmin>, BundleListener {
 
 	static private final Permission allConfigurationPermission = new ConfigurationPermission("*", ConfigurationPermission.CONFIGURE); //$NON-NLS-1$
+	static private final Permission allAttributePermission = new ConfigurationPermission("*", ConfigurationPermission.ATTRIBUTE); //$NON-NLS-1$
 	private final EventDispatcher eventDispatcher;
 	private final PluginManager pluginManager;
 	private final LogTracker log;
@@ -105,6 +106,17 @@ public class ConfigurationAdminFactory implements ServiceFactory<ConfigurationAd
 		return true;
 	}
 
+	public void checkAttributePermission(String location) throws SecurityException {
+		SecurityManager sm = System.getSecurityManager();
+		if (sm != null) {
+			if (location == null) {
+				sm.checkPermission(allAttributePermission);
+			} else {
+				sm.checkPermission(new ConfigurationPermission(location, ConfigurationPermission.ATTRIBUTE));
+			}
+		}
+	}
+
 	void log(int level, String message) {
 		log.log(level, message);
 	}
@@ -139,7 +151,7 @@ public class ConfigurationAdminFactory implements ServiceFactory<ConfigurationAd
 		}
 	}
 
-	void modifyConfiguration(ServiceReference<?> reference, Dictionary<String, Object> properties) {
-		pluginManager.modifyConfiguration(reference, properties);
+	Dictionary<String, Object> modifyConfiguration(ServiceReference<?> reference, ConfigurationImpl config) {
+		return pluginManager.modifyConfiguration(reference, config);
 	}
 }
\ No newline at end of file

bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/ConfigurationAdminImpl.java

 /*******************************************************************************
- * Copyright (c) 2005, 2018 Cognos Incorporated, IBM Corporation and others..
+ * Copyright (c) 2005, 2019 Cognos Incorporated, IBM Corporation and others..
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -39,32 +39,41 @@ class ConfigurationAdminImpl implements ConfigurationAdmin {
 
 	@Override
 	public Configuration createFactoryConfiguration(String factoryPid) {
-		return internalGetConfiguration(factoryPid, bundleLocation, true, true);
-
+		return internalGetConfiguration(factoryPid, bundleLocation, true, true, null);
 	}
 
 	@Override
 	public Configuration createFactoryConfiguration(String factoryPid, String location) {
-		return internalGetConfiguration(factoryPid, location, true, false);
+		return internalGetConfiguration(factoryPid, location, true, false, null);
 	}
 
 	@Override
 	public Configuration getConfiguration(String pid) {
-		return internalGetConfiguration(pid, bundleLocation, false, true);
+		return internalGetConfiguration(pid, bundleLocation, false, true, null);
 	}
 
 	@Override
 	public Configuration getConfiguration(String pid, String location) {
-		return internalGetConfiguration(pid, location, false, false);
+		return internalGetConfiguration(pid, location, false, false, null);
+	}
+
+	@Override
+	public Configuration getFactoryConfiguration(String factoryPid, String name) {
+		return internalGetConfiguration(factoryPid, bundleLocation, true, true, name);
+	}
+
+	@Override
+	public Configuration getFactoryConfiguration(String factoryPid, String name, String location) {
+		return internalGetConfiguration(factoryPid, location, true, false, name);
 	}
 
-	private Configuration internalGetConfiguration(String pid, String location, boolean factory, boolean bind) {
+	private Configuration internalGetConfiguration(String pid, String location, boolean factory, boolean bind, String name) {
 		checkPID(pid);
 		this.configurationAdminFactory.checkConfigurePermission(location, bundleLocation);
 
 		ConfigurationImpl config;
 		if (factory) {
-			config = configurationStore.createFactoryConfiguration(pid, location, bind);
+			config = configurationStore.getFactoryConfiguration(pid, location, bind, name);
 		} else {
 			config = configurationStore.getConfiguration(pid, location, bind);
 		}

bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/ConfigurationDictionary.java

@@ -146,8 +146,8 @@ public class ConfigurationDictionary extends Dictionary<String, Object> implemen
 				Object copyOfArray = Array.newInstance(value.getClass().getComponentType(), arrayLength);
 				System.arraycopy(value, 0, copyOfArray, 0, arrayLength);
 				result.configurationProperties.put(key, copyOfArray);
-			} else if (value instanceof Vector)
-				result.configurationProperties.put(key, ((Vector<?>) value).clone());
+			} else if (value instanceof Collection)
+				result.configurationProperties.put(key, new ArrayList<>((Collection<?>) value));
 			else
 				result.configurationProperties.put(key, value);
 		}

bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/ConfigurationImpl.java

 /*******************************************************************************
- * Copyright (c) 2005, 2018 Cognos Incorporated, IBM Corporation and others.
+ * Copyright (c) 2005, 2019 Cognos Incorporated, IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,8 +19,7 @@ import java.io.IOException;
 import java.lang.reflect.Array;
 import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
+import org.osgi.framework.*;
 import org.osgi.service.cm.*;
 
 /**
@@ -32,22 +31,26 @@ class ConfigurationImpl implements Configuration {
 	final static String LOCATION_BOUND = "org.eclipse.equinox.cm.location.bound"; //$NON-NLS-1$
 	final static String PROPERTIES_NULL = "org.eclipse.equinox.cm.properties.null"; //$NON-NLS-1$
 	final static String CHANGE_COUNT = "org.eclipse.equinox.cm.change.count"; //$NON-NLS-1$
+	final static String READ_ONLY = "org.eclipse.equinox.cm.readonly"; //$NON-NLS-1$
 
 	private final ConfigurationAdminFactory configurationAdminFactory;
 	private final ConfigurationStore configurationStore;
-	/** @GuardedBy this*/
-	private String bundleLocation;
 	private final String factoryPid;
 	private final String pid;
+	/** @GuardedBy lock*/
+	private String bundleLocation;
+	/** @GuardedBy lock*/
 	private ConfigurationDictionary dictionary;
-	/** @GuardedBy this*/
+	/** @GuardedBy lock*/
 	private boolean deleted = false;
-	/** @GuardedBy this*/
+	/** @GuardedBy lock*/
 	private boolean bound = false;
-	/** @GuardedBy this*/
+	/** @GuardedBy lock*/
 	private long changeCount;
-	/** @GuardedBy this*/
+	/** @GuardedBy lock*/
 	private Object storageToken;
+	/** @GuardedBy lock*/
+	private boolean readOnly = false;
 	private final ReentrantLock lock = new ReentrantLock();
 
 	public ConfigurationImpl(ConfigurationAdminFactory configurationAdminFactory, ConfigurationStore configurationStore, String factoryPid, String pid, String bundleLocation, boolean bind) {
@@ -70,6 +73,8 @@ class ConfigurationImpl implements Configuration {
 		this.bound = boundProp == null ? false : boundProp.booleanValue();
 		Long changeCountProp = (Long) dictionary.remove(CHANGE_COUNT);
 		this.changeCount = changeCountProp == null ? 0 : changeCountProp.longValue();
+		Boolean readOnlyProp = (Boolean) dictionary.remove(READ_ONLY);
+		this.readOnly = readOnlyProp == null ? false : readOnlyProp.booleanValue();
 		Boolean nullProps = (Boolean) dictionary.remove(PROPERTIES_NULL);
 		if (nullProps == null || !nullProps.booleanValue()) {
 			updateDictionary(dictionary);
@@ -91,8 +96,8 @@ class ConfigurationImpl implements Configuration {
 	}
 
 	boolean bind(String callerLocation) {
-		try {
 		lock();
+		try {
 			if (bundleLocation == null) {
 				bundleLocation = callerLocation;
 				bound = true;
@@ -111,8 +116,8 @@ class ConfigurationImpl implements Configuration {
 	}
 
 	boolean isBound() {
-		try {
 		lock();
+		try {
 			return bound;
 		} finally {
 			unlock();
@@ -120,8 +125,8 @@ class ConfigurationImpl implements Configuration {
 	}
 
 	void unbind(Bundle bundle) {
-		try {
 		lock();
+		try {
 			String callerLocation = ConfigurationAdminImpl.getLocation(bundle);
 			if (bound && callerLocation.equals(bundleLocation)) {
 				bundleLocation = null;
@@ -143,9 +148,10 @@ class ConfigurationImpl implements Configuration {
 	@Override
 	public void delete() {
 		Object deleteToken;
-		try {
 		lock();
+		try {
 			checkDeleted();
+			checkReadOnly();
 			deleted = true;
 			configurationAdminFactory.notifyConfigurationDeleted(this, factoryPid != null);
 			configurationAdminFactory.dispatchEvent(ConfigurationEvent.CM_DELETED, factoryPid, pid);
@@ -162,9 +168,15 @@ class ConfigurationImpl implements Configuration {
 			throw new IllegalStateException("deleted"); //$NON-NLS-1$
 	}
 
+	private void checkReadOnly() {
+		if (readOnly) {
+			throw new ReadOnlyConfigurationException("read only"); //$NON-NLS-1$
+		}
+	}
+
 	String getLocation() {
-		try {
 		lock();
+		try {
 			return bundleLocation;
 		} finally {
 			unlock();
@@ -173,8 +185,8 @@ class ConfigurationImpl implements Configuration {
 
 	@Override
 	public String getBundleLocation() {
-		try {
 		lock();
+		try {
 			checkDeleted();
 			configurationAdminFactory.checkConfigurePermission(bundleLocation, null);
 			if (bundleLocation != null)
@@ -186,8 +198,8 @@ class ConfigurationImpl implements Configuration {
 	}
 
 	String getFactoryPid(boolean checkDeleted) {
-		try {
 		lock();
+		try {
 			if (checkDeleted)
 				checkDeleted();
 			return factoryPid;
@@ -202,8 +214,8 @@ class ConfigurationImpl implements Configuration {
 	}
 
 	String getPid(boolean checkDeleted) {
-		try {
 		lock();
+		try {
 			if (checkDeleted)
 				checkDeleted();
 			return pid;
@@ -219,8 +231,8 @@ class ConfigurationImpl implements Configuration {
 
 	@Override
 	public Dictionary<String, Object> getProperties() {
-		try {
 		lock();
+		try {
 			checkDeleted();
 			if (dictionary == null)
 				return null;
@@ -234,8 +246,8 @@ class ConfigurationImpl implements Configuration {
 	}
 
 	Dictionary<String, Object> getAllProperties(boolean includeStorageKeys) {
-		try {
 		lock();
+		try {
 			if (deleted)
 				return null;
 			Dictionary<String, Object> copy = getProperties();
@@ -252,17 +264,21 @@ class ConfigurationImpl implements Configuration {
 		}
 	}
 
-	private static void fileAutoProperties(Dictionary<String, Object> dictionary, ConfigurationImpl config, boolean includeLoc, boolean includeStorageKey) {
+	static void fileAutoProperties(Dictionary<String, Object> dictionary, ConfigurationImpl config, boolean includeLoc, boolean includeStorageKey) {
 		dictionary.put(Constants.SERVICE_PID, config.getPid(false));
 		String factoryPid = config.getFactoryPid(false);
 		if (factoryPid != null) {
 			dictionary.put(ConfigurationAdmin.SERVICE_FACTORYPID, factoryPid);
+		} else {
+			dictionary.remove(ConfigurationAdmin.SERVICE_FACTORYPID);
 		}
 		if (includeLoc) {
 			String loc = config.getLocation();
 			if (loc != null) {
 				dictionary.put(ConfigurationAdmin.SERVICE_BUNDLELOCATION, loc);
 			}
+		} else {
+			dictionary.remove(ConfigurationAdmin.SERVICE_BUNDLELOCATION);
 		}
 		if (includeStorageKey) {
 			if (config.dictionary == null) {
@@ -272,13 +288,14 @@ class ConfigurationImpl implements Configuration {
 			if (config.isBound()) {
 				dictionary.put(LOCATION_BOUND, Boolean.TRUE);
 			}
+			dictionary.put(READ_ONLY, Boolean.valueOf(config.readOnly));
 		}
 	}
 
 	@Override
 	public void setBundleLocation(String bundleLocation) {
-		try {
 		lock();
+		try {
 			checkDeleted();
 			configurationAdminFactory.checkConfigurePermission(this.bundleLocation, null);
 			configurationAdminFactory.checkConfigurePermission(bundleLocation, null);
@@ -300,9 +317,10 @@ class ConfigurationImpl implements Configuration {
 
 	@Override
 	public void update() throws IOException {
-		try {
 		lock();
+		try {
 			checkDeleted();
+			checkReadOnly();
 			if (dictionary == null)
 				dictionary = new ConfigurationDictionary();
 			changeCount++;
@@ -315,17 +333,174 @@ class ConfigurationImpl implements Configuration {
 
 	@Override
 	public void update(Dictionary<String, ?> properties) throws IOException {
+		lock();
 		try {
+			doUpdate(properties, false);
+		} finally {
+			unlock();
+		}
+	}
+
+	@Override
+	public boolean updateIfDifferent(Dictionary<String, ?> properties) throws IOException {
 		lock();
+		try {
+			return doUpdate(properties, true);
+		} finally {
+			unlock();
+		}
+	}
+
+	private boolean same(Dictionary<String, ?> properties) {
+		if (dictionary == null) {
+			return false;
+		}
+		if (dictionary.size() != properties.size()) {
+			return false;
+		}
+
+		Enumeration<String> keys = properties.keys();
+		while (keys.hasMoreElements()) {
+			String key = keys.nextElement();
+			if (dictionary.get(key) == null) {
+				return false;
+			}
+			Object current = dictionary.get(key);
+			Object newValue = properties.get(key);
+			if (current.getClass().isArray()) {
+				if (!newValue.getClass().isArray()) {
+					return false;
+				}
+				if (!current.getClass().getComponentType().equals(newValue.getClass().getComponentType())) {
+					current = convertIfPossible(current);
+					newValue = convertIfPossible(newValue);
+					if (!current.getClass().getComponentType().equals(newValue.getClass().getComponentType())) {
+						return false;
+					}
+				}
+				Class<?> currentComponentType = current.getClass().getComponentType();
+				if (long.class.isAssignableFrom(currentComponentType)) {
+					if (!Arrays.equals((long[]) current, (long[]) newValue)) {
+						return false;
+					}
+				} else if (int.class.isAssignableFrom(currentComponentType)) {
+					if (!Arrays.equals((int[]) current, (int[]) newValue)) {
+						return false;
+					}
+				} else if (short.class.isAssignableFrom(currentComponentType)) {
+					if (!Arrays.equals((short[]) current, (short[]) newValue)) {
+						return false;
+					}
+				} else if (char.class.isAssignableFrom(currentComponentType)) {
+					if (!Arrays.equals((char[]) current, (char[]) newValue)) {
+						return false;
+					}
+				} else if (byte.class.isAssignableFrom(currentComponentType)) {
+					if (!Arrays.equals((byte[]) current, (byte[]) newValue)) {
+						return false;
+					}
+				} else if (double.class.isAssignableFrom(currentComponentType)) {
+					if (!Arrays.equals((double[]) current, (double[]) newValue)) {
+						return false;
+					}
+				} else if (float.class.isAssignableFrom(currentComponentType)) {
+					if (!Arrays.equals((float[]) current, (float[]) newValue)) {
+						return false;
+					}
+				} else if (boolean.class.isAssignableFrom(currentComponentType)) {
+					if (!Arrays.equals((boolean[]) current, (boolean[]) newValue)) {
+						return false;
+					}
+				} else {
+					if (!Arrays.equals((Object[]) current, (Object[]) newValue)) {
+						return false;
+					}
+				}
+
+			} else {
+				if (!current.equals(newValue)) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	private Object convertIfPossible(Object array) {
+		Class<?> componentType = array.getClass().getComponentType();
+		if (Long.class.isAssignableFrom(componentType)) {
+			Long[] original = (Long[]) array;
+			long[] converted = new long[original.length];
+			for (int i = 0; i < original.length; i++) {
+				converted[i] = original[i];
+			}
+			return converted;
+		} else if (Integer.class.isAssignableFrom(componentType)) {
+			Integer[] original = (Integer[]) array;
+			int[] converted = new int[original.length];
+			for (int i = 0; i < original.length; i++) {
+				converted[i] = original[i];
+			}
+			return converted;
+		} else if (Short.class.isAssignableFrom(componentType)) {
+			Short[] original = (Short[]) array;
+			short[] converted = new short[original.length];
+			for (int i = 0; i < original.length; i++) {
+				converted[i] = original[i];
+			}
+			return converted;
+		} else if (Character.class.isAssignableFrom(componentType)) {
+			Character[] original = (Character[]) array;
+			char[] converted = new char[original.length];
+			for (int i = 0; i < original.length; i++) {
+				converted[i] = original[i];
+			}
+			return converted;
+		} else if (Byte.class.isAssignableFrom(componentType)) {
+			Byte[] original = (Byte[]) array;
+			byte[] converted = new byte[original.length];
+			for (int i = 0; i < original.length; i++) {
+				converted[i] = original[i];
+			}
+			return converted;
+		} else if (Double.class.isAssignableFrom(componentType)) {
+			Double[] original = (Double[]) array;
+			double[] converted = new double[original.length];
+			for (int i = 0; i < original.length; i++) {
+				converted[i] = original[i];
+			}
+			return converted;
+		} else if (Float.class.isAssignableFrom(componentType)) {
+			Float[] original = (Float[]) array;
+			float[] converted = new float[original.length];
+			for (int i = 0; i < original.length; i++) {
+				converted[i] = original[i];
+			}
+			return converted;
+		} else if (Boolean.class.isAssignableFrom(componentType)) {
+			Boolean[] original = (Boolean[]) array;
+			boolean[] converted = new boolean[original.length];
+			for (int i = 0; i < original.length; i++) {
+				converted[i] = original[i];
+			}
+			return converted;
+
+		}
+		return array;
+	}
+
+	private boolean doUpdate(Dictionary<String, ?> properties, boolean checkSame) throws IOException {
 		checkDeleted();
+		checkReadOnly();
+		if (checkSame && same(properties)) {
+			return false;
+		}
 		updateDictionary(properties);
 		changeCount++;
 		save();
 		configurationAdminFactory.notifyConfigurationUpdated(this, factoryPid != null);
 		configurationAdminFactory.dispatchEvent(ConfigurationEvent.CM_UPDATED, factoryPid, pid);
-		} finally {
-			unlock();
-		}
+		return true;
 	}
 
 	private void save() throws IOException {
@@ -370,8 +545,8 @@ class ConfigurationImpl implements Configuration {
 	}
 
 	boolean isDeleted() {
-		try {
 		lock();
+		try {
 			return deleted;
 		} finally {
 			unlock();
@@ -380,12 +555,62 @@ class ConfigurationImpl implements Configuration {
 
 	@Override
 	public long getChangeCount() {
-		try {
 		lock();
+		try {
 			checkDeleted();
 			return changeCount;
 		} finally {
 			unlock();
 		}
 	}
+
+	@Override
+	public Dictionary<String, Object> getProcessedProperties(ServiceReference<?> reference) {
+		return configurationAdminFactory.modifyConfiguration(reference, this);
+	}
+
+	@Override
+	public void addAttributes(ConfigurationAttribute... attrs) throws IOException {
+		lock();
+		try {
+			configurationAdminFactory.checkAttributePermission(bundleLocation);
+			for (ConfigurationAttribute attr : attrs) {
+				if (ConfigurationAttribute.READ_ONLY.equals(attr)) {
+					readOnly = true;
+				}
+			}
+			save();
+		} finally {
+			unlock();
+		}
+	}
+
+	@Override
+	public Set<ConfigurationAttribute> getAttributes() {
+		lock();
+		try {
+			if (readOnly) {
+				return EnumSet.of(ConfigurationAttribute.READ_ONLY);
+			}
+			return Collections.emptySet();
+		} finally {
+			unlock();
+		}
+	}
+
+	@Override
+	public void removeAttributes(ConfigurationAttribute... attrs) throws IOException {
+		lock();
+		try {
+			configurationAdminFactory.checkAttributePermission(bundleLocation);
+			for (ConfigurationAttribute attr : attrs) {
+				if (ConfigurationAttribute.READ_ONLY.equals(attr)) {
+					readOnly = false;
+				}
+			}
+			save();
+		} finally {
+			unlock();
+		}
+	}
 }
\ No newline at end of file

bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/ConfigurationStore.java

 /*******************************************************************************
- * Copyright (c) 2005, 2018 Cognos Incorporated, IBM Corporation and others.
+ * Copyright (c) 2005, 2019 Cognos Incorporated, IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -177,8 +177,18 @@ class ConfigurationStore {
 		return config;
 	}
 
-	public synchronized ConfigurationImpl createFactoryConfiguration(String factoryPid, String location, boolean bind) {
-		String pid = factoryPid + "-" + new Date().getTime() + "-" + createdPidCount++; //$NON-NLS-1$ //$NON-NLS-2$
+	public synchronized ConfigurationImpl getFactoryConfiguration(String factoryPid, String location, boolean bind, String name) {
+		String pid;
+		if (name == null) {
+			pid = factoryPid + "-" + new Date().getTime() + "-" + createdPidCount++; //$NON-NLS-1$ //$NON-NLS-2$
+		} else {
+			pid = factoryPid + "~" + name; //$NON-NLS-1$
+			ConfigurationImpl config = configurations.get(pid);
+			if (config != null) {
+				return config;
+			}
+		}
+
 		ConfigurationImpl config = new ConfigurationImpl(configurationAdminFactory, this, factoryPid, pid, location, bind);
 		configurations.put(pid, config);
 		return config;