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/02/20 10:53:50 UTC
svn commit: r1783737 - in /felix/trunk/osgi-r7/configadmin: pom.xml
src/main/java/org/apache/felix/cm/impl/CoordinatorUtil.java
src/main/resources/OSGI-INF/permissions.perm
Author: cziegeler
Date: Mon Feb 20 10:53:50 2017
New Revision: 1783737
URL: http://svn.apache.org/viewvc?rev=1783737&view=rev
Log:
FELIX-5351 : 5.7 Coordinations
Modified:
felix/trunk/osgi-r7/configadmin/pom.xml
felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/CoordinatorUtil.java
felix/trunk/osgi-r7/configadmin/src/main/resources/OSGI-INF/permissions.perm
Modified: felix/trunk/osgi-r7/configadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/pom.xml?rev=1783737&r1=1783736&r2=1783737&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/pom.xml (original)
+++ felix/trunk/osgi-r7/configadmin/pom.xml Mon Feb 20 10:53:50 2017
@@ -188,7 +188,7 @@
</Export-Package>
<Import-Package>
org.osgi.service.cm,
- org.osgi.service.coordinator;resolution:=optional,
+ org.osgi.service.coordinator;resolution:=optional,
org.osgi.service.log;resolution:=optional,
*
</Import-Package>
@@ -204,9 +204,6 @@
<Require-Capability><![CDATA[
osgi.service;filter:="(objectClass=org.osgi.service.log.LogService)";effective:=active;resolution:=optional
]]></Require-Capability>
- <Embed-Dependency>
- org.osgi.core;inline=org/osgi/util/tracker/ServiceTracker*|org/osgi/util/tracker/AbstractTracked.class
- </Embed-Dependency>
</instructions>
</configuration>
<executions>
Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/CoordinatorUtil.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/CoordinatorUtil.java?rev=1783737&r1=1783736&r2=1783737&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/CoordinatorUtil.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/CoordinatorUtil.java Mon Feb 20 10:53:50 2017
@@ -30,6 +30,7 @@ import org.osgi.service.coordinator.Part
*/
public class CoordinatorUtil
{
+
public static final class Notifier implements Participant
{
private final List<Runnable> runnables = new ArrayList<Runnable>();
@@ -86,6 +87,7 @@ public class CoordinatorUtil
if ( n == null )
{
n = new Notifier(thread);
+ c.addParticipant(n);
}
n.add(task);
return true;
Modified: felix/trunk/osgi-r7/configadmin/src/main/resources/OSGI-INF/permissions.perm
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/resources/OSGI-INF/permissions.perm?rev=1783737&r1=1783736&r2=1783737&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/resources/OSGI-INF/permissions.perm (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/resources/OSGI-INF/permissions.perm Mon Feb 20 10:53:50 2017
@@ -22,6 +22,7 @@
# -> MANIFEST.MF
(org.osgi.framework.PackagePermission "org.osgi.service.log" "import")
(org.osgi.framework.PackagePermission "org.osgi.framework" "import")
+(org.osgi.framework.PackagePermission "org.osgi.util.tracker" "import")
(org.osgi.framework.PackagePermission "org.osgi.service.cm" "import,exportonly")
(org.osgi.framework.PackagePermission "org.apache.felix.cm" "import,exportonly")
(org.osgi.framework.PackagePermission "org.apache.felix.cm.file" "import,exportonly")
@@ -48,3 +49,8 @@
# -> BaseTracker.getAccessControlContext
(java.security.SecurityPermission "createAccessControlContext")
+
+# Coordinator Support
+(org.osgi.framework.PackagePermission "org.osgi.service.coordinator" "import")
+(org.osgi.framework.ServicePermission "org.osgi.service.coordinator.*" "get")
+(org.osgi.service.coordinator.CoordinationPermission "*" "initiate,participate")