From commits-return-35836-archive-asf-public=cust-asf.ponee.io@karaf.apache.org Fri Mar 1 15:02:41 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0D200180647 for ; Fri, 1 Mar 2019 16:02:40 +0100 (CET) Received: (qmail 21129 invoked by uid 500); 1 Mar 2019 15:02:40 -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 21117 invoked by uid 99); 1 Mar 2019 15:02:40 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Mar 2019 15:02:40 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 73F6182E8A; Fri, 1 Mar 2019 15:02:39 +0000 (UTC) Date: Fri, 01 Mar 2019 15:02:39 +0000 To: "commits@karaf.apache.org" Subject: [karaf] branch master updated: [KARAF-6180] Pax-exam issues with logging config MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155145255936.25124.9757260232426252863@gitbox.apache.org> From: gnodet@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: karaf X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: beda373abf284b8d2e47e830f5609b5a2a894c9e X-Git-Newrev: dbebcc6bbfba743431d55e96043f0ba7dcec5810 X-Git-Rev: dbebcc6bbfba743431d55e96043f0ba7dcec5810 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/karaf.git The following commit(s) were added to refs/heads/master by this push: new dbebcc6 [KARAF-6180] Pax-exam issues with logging config dbebcc6 is described below commit dbebcc6bbfba743431d55e96043f0ba7dcec5810 Author: Guillaume Nodet AuthorDate: Fri Mar 1 16:02:24 2019 +0100 [KARAF-6180] Pax-exam issues with logging config --- .../java/org/apache/karaf/main/ConfigProperties.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java index f3b35e5..cb186d7 100644 --- a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java +++ b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java @@ -85,6 +85,18 @@ public class ConfigProperties { */ public static final String ENV_KARAF_ETC = "KARAF_ETC"; /** + * The system property for specifying the Karaf log directory. The log directory + * holds the log files. + */ + public static final String PROP_KARAF_LOG = "karaf.log"; + + public static final String PROP_KARAF_LOG_URI = "karaf.log.uri"; + /** + * The environment variable for specifying the Karaf log directory. The log directory + * holds the log files. + */ + public static final String ENV_KARAF_LOG = "KARAF_LOG"; + /** * The system property for specifying the Karaf data directory. The data directory * holds the bundles data and cache for a Karaf instance. */ @@ -171,6 +183,7 @@ public class ConfigProperties { File karafBase; File karafData; File karafEtc; + File karafLog; File karafInstances; Properties props; @@ -203,6 +216,7 @@ public class ConfigProperties { this.karafBase = Utils.getKarafDirectory(PROP_KARAF_BASE, ENV_KARAF_BASE, karafHome, false, true); this.karafData = Utils.getKarafDirectory(PROP_KARAF_DATA, ENV_KARAF_DATA, new File(karafBase, "data"), true, true); this.karafEtc = Utils.getKarafDirectory(PROP_KARAF_ETC, ENV_KARAF_ETC, new File(karafBase, "etc"), true, true); + this.karafLog = Utils.getKarafDirectory(PROP_KARAF_LOG, ENV_KARAF_LOG, new File(karafData, "log"), true, true); this.karafInstances = Utils.getKarafDirectory(PROP_KARAF_INSTANCES, ENV_KARAF_INSTANCES, new File(karafHome, "instances"), false, false); @@ -214,12 +228,14 @@ public class ConfigProperties { System.setProperty(PROP_KARAF_BASE, karafBase.getPath()); System.setProperty(PROP_KARAF_DATA, karafData.getPath()); System.setProperty(PROP_KARAF_ETC, karafEtc.getPath()); + System.setProperty(PROP_KARAF_LOG, karafLog.getPath()); System.setProperty(PROP_KARAF_INSTANCES, karafInstances.getPath()); System.setProperty(PROP_KARAF_HOME_URI, karafHome.toURI().toASCIIString()); System.setProperty(PROP_KARAF_BASE_URI, karafBase.toURI().toASCIIString()); System.setProperty(PROP_KARAF_DATA_URI, karafData.toURI().toASCIIString()); System.setProperty(PROP_KARAF_ETC_URI, karafEtc.toURI().toASCIIString()); + System.setProperty(PROP_KARAF_LOG_URI, karafLog.toURI().toASCIIString()); System.setProperty(PROP_KARAF_INSTANCES_URI, karafInstances.toURI().toASCIIString()); if (!karafEtc.exists()) {