Repository: karaf Updated Branches: refs/heads/master de25865cf -> 536e12317
[KARAF-3812]Exception caused by featuresRepositories property being set incorrectly Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/536e1231 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/536e1231 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/536e1231 Branch: refs/heads/master Commit: 536e123174c8a46733b1dadaae43a4bafea56e45 Parents: de25865 Author: Freeman Fang <[email protected]> Authored: Mon Oct 26 15:46:26 2015 +0800 Committer: Freeman Fang <[email protected]> Committed: Mon Oct 26 15:46:26 2015 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/karaf/main/ConfigProperties.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/536e1231/main/src/main/java/org/apache/karaf/main/ConfigProperties.java ---------------------------------------------------------------------- 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 c830dae..83c9395 100644 --- a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java +++ b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java @@ -181,15 +181,16 @@ public class ConfigProperties { 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.karafInstances = Utils.getKarafDirectory(PROP_KARAF_INSTANCES, ENV_KARAF_INSTANCES, new File(karafHome, "instances"), false, false); Package p = Package.getPackage("org.apache.karaf.main"); if (p != null && p.getImplementationVersion() != null) System.setProperty(PROP_KARAF_VERSION, p.getImplementationVersion()); - System.setProperty(PROP_KARAF_HOME, karafHome.getPath()); - System.setProperty(PROP_KARAF_BASE, karafBase.getPath()); - System.setProperty(PROP_KARAF_DATA, karafData.getPath()); - System.setProperty(PROP_KARAF_INSTANCES, karafInstances.getPath()); + System.setProperty(PROP_KARAF_HOME, karafHome.toURI().getRawPath()); + System.setProperty(PROP_KARAF_BASE, karafBase.toURI().getRawPath()); + System.setProperty(PROP_KARAF_DATA, karafData.toURI().getRawPath()); + System.setProperty(PROP_KARAF_INSTANCES, karafInstances.toURI().getRawPath()); if (!karafEtc.exists()) { throw new FileNotFoundException("Karaf etc folder not found: " + karafEtc.getAbsolutePath());
