Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 19B4E200C26 for ; Fri, 10 Feb 2017 09:29:15 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 18814160B5B; Fri, 10 Feb 2017 08:29:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6B059160B5C for ; Fri, 10 Feb 2017 09:29:14 +0100 (CET) Received: (qmail 88001 invoked by uid 500); 10 Feb 2017 08:29:13 -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 87958 invoked by uid 99); 10 Feb 2017 08:29:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Feb 2017 08:29:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3C5D5DFC60; Fri, 10 Feb 2017 08:29:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gnodet@apache.org To: commits@karaf.apache.org Date: Fri, 10 Feb 2017 08:29:16 -0000 Message-Id: In-Reply-To: <1efdcdfaba2041a9ade26a4ee9240969@git.apache.org> References: <1efdcdfaba2041a9ade26a4ee9240969@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] karaf git commit: [KARAF-4983] Improve osgi.ee capabilities archived-at: Fri, 10 Feb 2017 08:29:15 -0000 [KARAF-4983] Improve osgi.ee capabilities Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d8be3376 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d8be3376 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d8be3376 Branch: refs/heads/master Commit: d8be33762939e8b8194adfe9d37eca4eb02f1e85 Parents: 36f82e5 Author: Guillaume Nodet Authored: Fri Feb 10 08:58:33 2017 +0100 Committer: Guillaume Nodet Committed: Fri Feb 10 08:58:33 2017 +0100 ---------------------------------------------------------------------- .../resources/etc/config.properties | 29 +++++++------------- 1 file changed, 10 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d8be3376/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 d862396..63af64e 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 @@ -123,21 +123,17 @@ equinox-capabilities= \ osgi.service;objectClass:List=org.eclipse.osgi.service.urlconversion.URLConverter;protocol:List="bundleentry,bundleresource" eecap-9= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9" + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0", \ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0" eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8" -eecap-1.7= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7" -eecap-1.6= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6" -eecap-1.5= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5" -eecap-1.4= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4" -eecap-1.3= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3" -eecap-1.2= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1", \ - osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2" + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8", \ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8" # # javax.transaction is needed to avoid class loader constraint violation when using javax.sql @@ -164,11 +160,6 @@ org.osgi.framework.bootdelegation=\ # # -# OSGi Execution Environment -# -org.osgi.framework.executionenvironment=J2SE-1.7,JavaSE-1.7,J2SE-1.6,JavaSE-1.6,J2SE-1.5,JavaSE-1.5,J2SE-1.4,JavaSE-1.4,J2SE-1.3,JavaSE-1.3,J2SE-1.2,,JavaSE-1.2,CDC-1.1/Foundation-1.1,CDC-1.0/Foundation-1.0,J2ME,OSGi/Minimum-1.1,OSGi/Minimum-1.0 - -# # Set the parent classloader for the bundle to the classloader that loads the Framework (i.e. everything in lib/*.jar) # org.osgi.framework.bundle.parent=framework