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 2017/11/15 00:06:38 UTC
svn commit: r1815278 -
/felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/
Author: cziegeler
Date: Wed Nov 15 00:06:38 2017
New Revision: 1815278
URL: http://svn.apache.org/viewvc?rev=1815278&view=rev
Log:
Update to latest OSGi API. Rev 05584aa
Added:
felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationConstants.java (with props)
Modified:
felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java
felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java
felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ManagedService.java
felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java
felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ReadOnlyConfigurationException.java
felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/package-info.java
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=1815278&r1=1815277&r2=1815278&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 Nov 15 00:06:38 2017
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2001, 2016). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2001, 2017). 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.
Added: felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationConstants.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationConstants.java?rev=1815278&view=auto
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationConstants.java (added)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationConstants.java Wed Nov 15 00:06:38 2017
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) OSGi Alliance (2017). 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.cm;
+
+
+/**
+ * Defines standard constants for the Configuration Admin service.
+ *
+ * @author $Id$
+ */
+public final class ConfigurationConstants {
+ private ConfigurationConstants() {
+ // non-instantiable
+ }
+
+
+ /**
+ * The name of the implementation capability for the Configuration Admin
+ * specification
+ *
+ * @since 1.6
+ */
+ public static final String CONFIGURATION_ADMIN_IMPLEMENTATION = "osgi.cm";
+
+ /**
+ * The version of the implementation capability for the Configuration Admin
+ * specification
+ *
+ * @since 1.6
+ */
+ public static final String CONFIGURATION_ADMIN_SPECIFICATION_VERSION = "1.6.0";
+}
Propchange: felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationConstants.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationEvent.java?rev=1815278&r1=1815277&r2=1815278&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationEvent.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationEvent.java Wed Nov 15 00:06:38 2017
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2004, 2016). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2004, 2017). 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.
Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java?rev=1815278&r1=1815277&r2=1815278&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java Wed Nov 15 00:06:38 2017
@@ -101,10 +101,12 @@ public interface ConfigurationPlugin {
* <p>
* This method should not modify the properties unless the
* {@code service.cmRanking} of this plugin is in the range
- * {@code 0 <= service.cmRanking <= 1000}.
+ * {@code 0 <= service.cmRanking <= 1000}. Any modification
+ * from this plugin is ignored.
* <p>
* If this method throws any {@code Exception}, the Configuration Admin
- * service must catch it and should log it.
+ * service must catch it and should log it. Any modifications made by the
+ * plugin before the exception is thrown are applied.
*
* <p>
* A Configuration Plugin will only be called for properties from
Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ManagedService.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ManagedService.java?rev=1815278&r1=1815277&r2=1815278&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ManagedService.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ManagedService.java Wed Nov 15 00:06:38 2017
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2001, 2016). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2001, 2017). 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.
@@ -99,6 +99,9 @@ import org.osgi.annotation.versioning.Co
* dictionary, this is the configuration that is bound to the location of the
* registering bundle. However, when security is on, a Managed Service can have
* Configuration Permission to also be updated for other locations.
+ * <p>
+ * If a Managed Service is registered without the {@code service.pid} property,
+ * it will be ignored.
*
* @author $Id$
* @ThreadSafe
Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java?rev=1815278&r1=1815277&r2=1815278&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java Wed Nov 15 00:06:38 2017
@@ -87,6 +87,9 @@ import org.osgi.annotation.versioning.Co
* ...
* }
* </pre>
+ * <p>
+ * If a {@code ManagedServiceFactory} is registered without the {@code service.pid}
+ * property, it will be ignored.
*
* @author $Id$
* @ThreadSafe
Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ReadOnlyConfigurationException.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ReadOnlyConfigurationException.java?rev=1815278&r1=1815277&r2=1815278&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ReadOnlyConfigurationException.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/ReadOnlyConfigurationException.java Wed Nov 15 00:06:38 2017
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2001, 2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2016, 2017). 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.
Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/package-info.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/package-info.java?rev=1815278&r1=1815277&r2=1815278&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/package-info.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/osgi/service/cm/package-info.java Wed Nov 15 00:06:38 2017
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2010, 2016). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2010, 2017). 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.
@@ -33,7 +33,7 @@
* @author $Id$
*/
-@Version("1.6")
+@Version(ConfigurationConstants.CONFIGURATION_ADMIN_SPECIFICATION_VERSION)
package org.osgi.service.cm;
import org.osgi.annotation.versioning.Version;