You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/02/10 08:29:14 UTC
[2/5] karaf git commit: [KARAF-4980] add OSGi capabilities for
services
[KARAF-4980] add OSGi capabilities for services
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/521a1115
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/521a1115
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/521a1115
Branch: refs/heads/master
Commit: 521a111593980ff06227c99034c6140e3db89ff9
Parents: a6eb965
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Feb 10 08:54:08 2017 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Feb 10 08:54:08 2017 +0100
----------------------------------------------------------------------
.../resources/etc/config.properties | 34 ++++++++++++++------
1 file changed, 24 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/521a1115/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
index d116026..2cfbfc6 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
@@ -95,20 +95,34 @@ org.osgi.framework.system.packages.extra= \
org.osgi.framework.system.capabilities= \
${eecap-${java.specification.version}}, \
${${karaf.framework}-capabilities}, \
- osgi.service;objectClass=org.apache.karaf.info.ServerInfo
+ ${karaf-capabilities}
+
+karaf-capabilities= \
+ osgi.service;objectClass:List<String>=org.apache.karaf.info.ServerInfo
felix-capabilities= \
- osgi.service;objectClass=org.osgi.service.packageadmin.PackageAdmin, \
- osgi.service;objectClass=org.osgi.service.resolver.Resolver, \
- osgi.service;objectClass=org.osgi.service.startlevel.StartLevel
+ osgi.service;objectClass:List<String>=org.osgi.service.packageadmin.PackageAdmin, \
+ osgi.service;objectClass:List<String>=org.osgi.service.resolver.Resolver, \
+ osgi.service;objectClass:List<String>=org.osgi.service.startlevel.StartLevel
equinox-capabilities= \
- osgi.service;objectClass=java.lang.ClassLoader;equinox.classloader.type=contextClassLoader, \
- osgi.service;objectClass=javax.xml.parsers.DocumentBuilderFactory, \
- osgi.service;objectClass=javax.xml.parsers.SAXParserFactory, \
- osgi.service;objectClass=org.eclipse.osgi.framework.log.FrameworkLog;performance=true, \
- osgi.service;objectClass=org.eclipse.osgi.service.security.TrustEngine;osgi.signedcontent.trust.engine=org.eclipse.osgi, \
- osgi.service;objectClass=org.eclipse.osgi.service.urlconversion.URLConverter;protocol:List<String>="bundleentry,bundleresource"
+ osgi.service;objectClass:List<String>=java.lang.ClassLoader;equinox.classloader.type=contextClassLoader, \
+ osgi.service;objectClass:List<String>=javax.xml.parsers.DocumentBuilderFactory, \
+ osgi.service;objectClass:List<String>=javax.xml.parsers.SAXParserFactory, \
+ osgi.service;objectClass:List<String>=org.eclipse.osgi.framework.log.FrameworkLog, \
+ osgi.service;objectClass:List<String>=org.eclipse.osgi.framework.log.FrameworkLog;performance=true, \
+ osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=eclipse.home.location, \
+ osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=osgi.configuration.area, \
+ osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=osgi.install.area, \
+ osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=osgi.instance.area, \
+ osgi.service;objectClass:List<String>=org.eclipse.osgi.service.datalocation.Location;type=osgi.user.area, \
+ osgi.service;objectClass:List<String>=org.eclipse.osgi.service.debug.DebugOptions, \
+ osgi.service;objectClass:List<String>=org.eclipse.osgi.service.environment.EnvironmentInfo, \
+ osgi.service;objectClass:List<String>=org.eclipse.osgi.service.localization.BundleLocalization, \
+ osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService,org.eclipse.equinox.log.ExtendedLogReaderService", \
+ osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.eclipse.equinox.log.ExtendedLogService", \
+ osgi.service;objectClass:List<String>=org.eclipse.osgi.service.security.TrustEngine;osgi.signedcontent.trust.engine=org.eclipse.osgi, \
+ osgi.service;objectClass:List<String>=org.eclipse.osgi.service.urlconversion.URLConverter;protocol:List<String>="bundleentry,bundleresource"
eecap-9= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9"