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 2016/09/16 06:19:13 UTC
svn commit: r1760999 - in /felix/trunk/configadmin: ./
src/main/java/org/apache/felix/cm/ src/main/java/org/apache/felix/cm/file/
src/main/java/org/apache/felix/cm/impl/
Author: cziegeler
Date: Fri Sep 16 06:19:13 2016
New Revision: 1760999
URL: http://svn.apache.org/viewvc?rev=1760999&view=rev
Log:
FELIX-5288 - Implement RFC 227 (R7 Update)
Modified:
felix/trunk/configadmin/pom.xml
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/NotCachablePersistenceManager.java
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/PersistenceManager.java
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/file/package-info.java
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/package-info.java
Modified: felix/trunk/configadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/pom.xml?rev=1760999&r1=1760998&r2=1760999&view=diff
==============================================================================
--- felix/trunk/configadmin/pom.xml (original)
+++ felix/trunk/configadmin/pom.xml Fri Sep 16 06:19:13 2016
@@ -32,7 +32,7 @@
<name>Apache Felix Configuration Admin Service</name>
<description>
- Implementation of the OSGi Configuration Admin Service Specification 1.5
+ Implementation of the OSGi Configuration Admin Service Specification 1.6
</description>
<scm>
@@ -97,14 +97,6 @@
<scope>provided</scope>
</dependency>
- <!-- BND export annotations -->
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bndlib</artifactId>
- <version>1.50.0</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Integration Testing with Pax Exam -->
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/NotCachablePersistenceManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/NotCachablePersistenceManager.java?rev=1760999&r1=1760998&r2=1760999&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/NotCachablePersistenceManager.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/NotCachablePersistenceManager.java Fri Sep 16 06:19:13 2016
@@ -18,6 +18,7 @@
*/
package org.apache.felix.cm;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* <code>NotCachablePersistenceManager</code> is a marker interface which
@@ -33,6 +34,7 @@ package org.apache.felix.cm;
*
* @since 1.1
*/
+@ConsumerType
public interface NotCachablePersistenceManager extends PersistenceManager
{
}
Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/PersistenceManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/PersistenceManager.java?rev=1760999&r1=1760998&r2=1760999&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/PersistenceManager.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/PersistenceManager.java Fri Sep 16 06:19:13 2016
@@ -23,6 +23,8 @@ import java.io.IOException;
import java.util.Dictionary;
import java.util.Enumeration;
+import org.osgi.annotation.versioning.ConsumerType;
+
/**
* The <code>PersistenceManager</code> interface defines the API to be
@@ -48,6 +50,7 @@ import java.util.Enumeration;
* used. If no pesistence manager service has been registered, the platfrom
* file system based implementation is used.
*/
+@ConsumerType
public interface PersistenceManager
{
Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/file/package-info.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/file/package-info.java?rev=1760999&r1=1760998&r2=1760999&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/file/package-info.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/file/package-info.java Fri Sep 16 06:19:13 2016
@@ -17,12 +17,9 @@
* under the License.
*/
-@Version("1.0")
-@Export(optional = "provide:=true")
+@org.osgi.annotation.versioning.Version("1.0.1")
package org.apache.felix.cm.file;
-import aQute.bnd.annotation.Export;
-import aQute.bnd.annotation.Version;
Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java?rev=1760999&r1=1760998&r2=1760999&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java Fri Sep 16 06:19:13 2016
@@ -197,6 +197,7 @@ public class ConfigurationManager implem
// flag indicating whether the manager is considered alive
private volatile boolean isActive;
+ @Override
public void start( BundleContext bundleContext )
{
// track the log service using a ServiceTracker
@@ -278,7 +279,7 @@ public class ConfigurationManager implem
ConfigurationAdminFactory caf = new ConfigurationAdminFactory( this );
Hashtable props = new Hashtable();
props.put( Constants.SERVICE_PID, "org.apache.felix.cm.ConfigurationAdmin" );
- props.put( Constants.SERVICE_DESCRIPTION, "Configuration Admin Service Specification 1.5 Implementation" );
+ props.put( Constants.SERVICE_DESCRIPTION, "Configuration Admin Service Specification 1.6 Implementation" );
props.put( Constants.SERVICE_VENDOR, "Apache Software Foundation" );
configurationAdminRegistration = bundleContext.registerService( ConfigurationAdmin.class.getName(), caf, props );
@@ -293,6 +294,7 @@ public class ConfigurationManager implem
}
+ @Override
public void stop( BundleContext bundleContext )
{
@@ -786,6 +788,7 @@ public class ConfigurationManager implem
// ---------- BundleListener -----------------------------------------------
+ @Override
public void bundleChanged( BundleEvent event )
{
if ( event.getType() == BundleEvent.UNINSTALLED && handleBundleEvents )
@@ -1399,6 +1402,7 @@ public class ConfigurationManager implem
}
+ @Override
public void run()
{
for ( String pid : this.pids )
@@ -1484,6 +1488,7 @@ public class ConfigurationManager implem
}
+ @Override
public void run()
{
for ( String factoryPid : this.factoryPids )
@@ -1724,6 +1729,7 @@ public class ConfigurationManager implem
}
+ @Override
public void run()
{
log( LogService.LOG_DEBUG, "Updating configuration {0} to revision #{1}", new Object[]
@@ -1813,6 +1819,7 @@ public class ConfigurationManager implem
}
+ @Override
public void run()
{
List<ServiceReference<?>> srList = this.getHelper().getServices( getTargetedServicePid() );
@@ -1886,6 +1893,7 @@ public class ConfigurationManager implem
}
+ @Override
public void run()
{
List<ServiceReference<?>> srList = this.getHelper().getServices( getTargetedServicePid() );
@@ -2016,6 +2024,7 @@ public class ConfigurationManager implem
}
+ @Override
public void run()
{
for ( int i = 0; i < listeners.length; i++ )
Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/package-info.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/package-info.java?rev=1760999&r1=1760998&r2=1760999&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/package-info.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/package-info.java Fri Sep 16 06:19:13 2016
@@ -17,12 +17,9 @@
* under the License.
*/
-@Version("1.1")
-@Export(optional = "provide:=true")
+@org.osgi.annotation.versioning.Version("1.1.1")
package org.apache.felix.cm;
-import aQute.bnd.annotation.Export;
-import aQute.bnd.annotation.Version;