Return-Path: X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9E2BE1115B for ; Tue, 22 Jul 2014 12:19:01 +0000 (UTC) Received: (qmail 56659 invoked by uid 500); 22 Jul 2014 12:19:01 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 56629 invoked by uid 500); 22 Jul 2014 12:19:01 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 56620 invoked by uid 99); 22 Jul 2014 12:19:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jul 2014 12:19:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BE8B29AF01B; Tue, 22 Jul 2014 12:19:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: jbonofre@apache.org To: commits@karaf.apache.org Message-Id: <8ac2ec4a8cbe4be79a0b3485f5cc0dbe@git.apache.org> X-Mailer: ASF-Git Admin Mailer 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 +0000 (UTC) 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é Authored: Tue Jul 22 14:17:09 2014 +0200 Committer: Jean-Baptiste Onofré 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