karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-3092] Remove the ${services-${karaf.framework}} from the org.osgi.framework.system.capabilities
Date Tue, 22 Jul 2014 12:19:00 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-2.3.x cc16671f7 -> fe50391ad


[KARAF-3092] Remove the ${services-${karaf.framework}} from the org.osgi.framework.system.capabilities


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fe50391a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fe50391a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fe50391a

Branch: refs/heads/karaf-2.3.x
Commit: fe50391adafc895443b334db0b2e53647fb2e406
Parents: cc16671
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Tue Jul 22 14:17:09 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Tue Jul 22 14:17:09 2014 +0200

----------------------------------------------------------------------
 .../src/main/filtered-resources/etc/config.properties             | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/fe50391a/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties b/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
index 80237f7..acbcadb 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
+++ b/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
@@ -123,8 +123,7 @@ org.osgi.framework.system.capabilities= \
  ${eecap-${java.specification.version}}, \
  service-reference;effective:=active;objectClass=org.osgi.service.packageadmin.PackageAdmin,
\
  service-reference;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel,
\
- service-reference;effective:=active;objectClass=org.osgi.service.url.URLHandlers, \
- ${services-${karaf.framework}}
+ service-reference;effective:=active;objectClass=org.osgi.service.url.URLHandlers
 
 services-felix= \
  service-reference;effective:=active;objectClass=org.apache.felix.framework.monitor.MonitoringService


Mime
View raw message