You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/09/14 10:54:48 UTC
karaf-cellar git commit: [KARAF-3991] Use karaf.etc property instead
of karaf.home
Repository: karaf-cellar
Updated Branches:
refs/heads/cellar-3.0.x 01ecd4568 -> 6860e3c0a
[KARAF-3991] Use karaf.etc property instead of karaf.home
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/6860e3c0
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/6860e3c0
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/6860e3c0
Branch: refs/heads/cellar-3.0.x
Commit: 6860e3c0a7d3af3790662b904dd7f542c05d37cd
Parents: 01ecd45
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Sep 14 10:54:18 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Sep 14 10:54:18 2015 +0200
----------------------------------------------------------------------
.../cellar/hazelcast/factory/HazelcastConfigurationManager.java | 3 ++-
.../cellar/hazelcast/factory/HazelcastServiceFactoryTest.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/6860e3c0/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
----------------------------------------------------------------------
diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
index 4f9aace..e1e62e6 100644
--- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
+++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
@@ -21,6 +21,7 @@ import org.apache.karaf.cellar.core.utils.CellarUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -35,7 +36,7 @@ public class HazelcastConfigurationManager {
private static final transient Logger LOGGER = LoggerFactory.getLogger(HazelcastServiceFactory.class);
- private String xmlConfigLocation = System.getProperty("karaf.home") + "/etc/hazelcast.xml";
+ private String xmlConfigLocation = System.getProperty("karaf.etc") + File.separator + "hazelcast.xml";
private Set<String> discoveredMemberSet = new LinkedHashSet<String>();
private List<DiscoveryService> discoveryServices;
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/6860e3c0/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java
----------------------------------------------------------------------
diff --git a/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java b/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java
index 120f65e..44243d8 100644
--- a/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java
+++ b/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java
@@ -31,7 +31,7 @@ public class HazelcastServiceFactoryTest {
// Joining a cluster may not work with the default configuration on
// networks where multicast is disabled. Use a custom hazelcast.xml
// configuration that disables multicast and enables tcp on 127.0.0.1
- System.setProperty("karaf.home", "src/test/resources");
+ System.setProperty("karaf.etc", "src/test/resources/etc");
HazelcastServiceFactory factory = new HazelcastServiceFactory();
factory.setConfigurationManager(new HazelcastConfigurationManager());
factory.init();