You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ro...@apache.org on 2018/07/05 01:27:26 UTC

svn commit: r1835093 - /felix/trunk/log/pom.xml

Author: rotty3000
Date: Thu Jul  5 01:27:26 2018
New Revision: 1835093

URL: http://svn.apache.org/viewvc?rev=1835093&view=rev
Log:
[log] make resolving config admin service dependency possible

Signed-off-by: Raymond Auge <ro...@apache.org>

Modified:
    felix/trunk/log/pom.xml

Modified: felix/trunk/log/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/log/pom.xml?rev=1835093&r1=1835092&r2=1835093&view=diff
==============================================================================
--- felix/trunk/log/pom.xml (original)
+++ felix/trunk/log/pom.xml Thu Jul  5 01:27:26 2018
@@ -63,12 +63,14 @@
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Bundle-Activator>${pom.artifactId}.Activator</Bundle-Activator>
             <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-            <Export-Service>org.osgi.service.log.LogService,org.osgi.service.log.LogReaderService</Export-Service>
             <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
+            <Require-Capability><![CDATA[
+                osgi.service;filter:="(objectClass=org.osgi.service.cm.ConfigurationAdmin)";effective:=active
+            ]]></Require-Capability>
             <Provide-Capability><![CDATA[
-                osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.osgi.service.log,org.osgi.service.log.admin",
                 osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.osgi.service.log,org.osgi.service.log.admin",
-                osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.osgi.service.log,org.osgi.service.log.admin"
+                osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.osgi.service.log,org.osgi.service.log.admin",
+                osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.osgi.service.log,org.osgi.service.log.admin"
             ]]></Provide-Capability>
           </instructions>
         </configuration>