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 2016/07/14 13:09:27 UTC
karaf-decanter git commit: [KARAF-4580] Fix elasticsearch path on
Windows
Repository: karaf-decanter
Updated Branches:
refs/heads/master 669ec42e6 -> 9f270e96f
[KARAF-4580] Fix elasticsearch path on Windows
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/9f270e96
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/9f270e96
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/9f270e96
Branch: refs/heads/master
Commit: 9f270e96fa38ee3d7bd50f192777d4a9ae6ce295
Parents: 669ec42
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Thu Jul 14 15:08:44 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Jul 14 15:08:44 2016 +0200
----------------------------------------------------------------------
.../apache/karaf/decanter/elasticsearch/EmbeddedNode.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/9f270e96/elasticsearch-2.x/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
----------------------------------------------------------------------
diff --git a/elasticsearch-2.x/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java b/elasticsearch-2.x/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
index e39ee57..3510e60 100644
--- a/elasticsearch-2.x/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
+++ b/elasticsearch-2.x/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
@@ -57,6 +57,8 @@ public class EmbeddedNode {
public static String HTTP_CORS_ALLOW_ORIGIN = "http.cors.allow-origin";
public static String INDEX_MAX_RESULT_WINDOW = "index.max_result_window";
+ private static final boolean IS_WINDOWS = System.getProperty("os.name").contains("indow");
+
@SuppressWarnings("unchecked")
@Activate
public void acticate(ComponentContext context) throws Exception {
@@ -99,7 +101,11 @@ public class EmbeddedNode {
settingsBuilder.put(NODE_NAME, getConfig(config, settings, NODE_NAME, getNodeName()));
settingsBuilder.put(NETWORK_HOST, getConfig(config, settings, NETWORK_HOST, "127.0.0.1"));
settingsBuilder.put(CLUSTER_ROUTING_SCHEDULE, getConfig(config, settings, CLUSTER_ROUTING_SCHEDULE, "50ms"));
- settingsBuilder.put(PATH_PLUGINS, getConfig(config, settings, PATH_PLUGINS, pluginsFile.getAbsolutePath()));
+ String pluginsPath = pluginsFile.getAbsolutePath();
+ if (IS_WINDOWS) {
+ pluginsPath = pluginsPath.substring(1);
+ }
+ settingsBuilder.put(PATH_PLUGINS, getConfig(config, settings, PATH_PLUGINS, pluginsPath));
settingsBuilder.put(HTTP_CORS_ENABLED, getConfig(config, settings, HTTP_CORS_ENABLED, "true"));
settingsBuilder.put(HTTP_CORS_ALLOW_ORIGIN, getConfig(config, settings, HTTP_CORS_ALLOW_ORIGIN, "/.*/"));
settingsBuilder.put(INDEX_MAX_RESULT_WINDOW, getConfig(config, settings, INDEX_MAX_RESULT_WINDOW, "2147483647"));