You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2018/01/31 05:22:54 UTC
svn commit: r1822741 - in /felix/trunk/osgi-r7/configadmin/src/main/java/org:
apache/felix/cm/impl/ConfigurationAdapter.java
osgi/service/cm/Configuration.java osgi/service/cm/ConfigurationAdmin.java
Author: cziegeler
Date: Wed Jan 31 05:22:54 2018
New Revision: 1822741
URL: http://svn.apache.org/viewvc?rev=1822741&view=rev
Log:
Update to latest R7 api
Modified:
felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/Configuration.java
felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java
Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java?rev=1822741&r1=1822740&r2=1822741&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java Wed Jan 31 05:22:54 2018
@@ -22,6 +22,7 @@ package org.apache.felix.cm.impl;
import java.io.IOException;
import java.util.Dictionary;
import java.util.EnumSet;
+import java.util.Set;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
@@ -241,7 +242,7 @@ public class ConfigurationAdapter implem
* @see org.osgi.service.cm.Configuration#getAttributes()
*/
@Override
- public EnumSet<ConfigurationAttribute> getAttributes()
+ public Set<ConfigurationAttribute> getAttributes()
{
checkDeleted();
if ( delegatee.isLocked() )
Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/Configuration.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/Configuration.java?rev=1822741&r1=1822740&r2=1822741&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/Configuration.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/Configuration.java Wed Jan 31 05:22:54 2018
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2001, 2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2001, 2018). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.osgi.service.cm;
import java.io.IOException;
import java.util.Dictionary;
-import java.util.EnumSet;
+import java.util.Set;
import org.osgi.annotation.versioning.ProviderType;
import org.osgi.framework.Filter;
@@ -80,7 +80,7 @@ public interface Configuration {
/**
* The configuration is read only.
*/
- READ_ONLY
+ READ_ONLY;
}
/**
@@ -336,7 +336,7 @@ public interface Configuration {
* @throws IllegalStateException If this configuration has been deleted.
* @since 1.6
*/
- public EnumSet<ConfigurationAttribute> getAttributes();
+ public Set<ConfigurationAttribute> getAttributes();
/**
* Remove attributes from this configuration.
Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java?rev=1822741&r1=1822740&r2=1822741&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java Wed Jan 31 05:22:54 2018
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2001, 2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2001, 2018). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -243,7 +243,7 @@ public interface ConfigurationAdmin {
* Get an existing or new {@code Configuration} object from the persistent
* store. The PID for this {@code Configuration} object is generated from
* the provided factory PID and the name by starting with the factory PID
- * appending the character ~ (tilde) and then appending the name.
+ * appending a tilde ({@code '~'} \u007E), and then appending the name.
* <p>
* If a {@code Configuration} with this PID already exists in Configuration
* Admin service return it. The location parameter is ignored in this case
@@ -279,9 +279,10 @@ public interface ConfigurationAdmin {
* Get an existing or new {@code Configuration} object from the persistent
* store. The PID for this {@code Configuration} object is generated from
* the provided factory PID and the name by starting with the factory PID
- * appending the character ~ (tilde) and then appending the name. If the
- * {@code Configuration} object for this PID does not exist, create a new
- * {@code Configuration} object for that PID, where properties are
+ * appending a tilde ({@code '~'} \u007E), and then appending the name.
+ * <p>
+ * If a {@code Configuration} object for this PID does not exist, create a
+ * new {@code Configuration} object for that PID, where properties are
* {@code null}. Bind its location to the calling bundle's location.
* <p>
* Otherwise, if the location of the existing {@code Configuration} object