You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/06/26 13:42:20 UTC
[14/21] git commit: Replace tilda with explicit home path reference
to be compatible with Windows.
Replace tilda with explicit home path reference to be compatible with Windows.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6aabbcaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6aabbcaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6aabbcaf
Branch: refs/heads/master
Commit: 6aabbcaf02e85013c5e9904dde3a32de79ce7eec
Parents: 984d2c1
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Jun 24 12:05:56 2014 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Wed Jun 25 18:28:56 2014 +0300
----------------------------------------------------------------------
core/src/main/java/brooklyn/config/BrooklynServerConfig.java | 5 +++--
utils/common/src/main/java/brooklyn/util/os/Os.java | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6aabbcaf/core/src/main/java/brooklyn/config/BrooklynServerConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/config/BrooklynServerConfig.java b/core/src/main/java/brooklyn/config/BrooklynServerConfig.java
index 3780664..6154ba6 100644
--- a/core/src/main/java/brooklyn/config/BrooklynServerConfig.java
+++ b/core/src/main/java/brooklyn/config/BrooklynServerConfig.java
@@ -23,7 +23,7 @@ public class BrooklynServerConfig {
/** provided for setting; consumers should use {@link #getMgmtBaseDir(ManagementContext)} */
public static final ConfigKey<String> MGMT_BASE_DIR = newStringConfigKey(
"brooklyn.base.dir", "Directory for reading and writing all brooklyn server data",
- Os.mergePaths("~", ".brooklyn"));
+ Os.fromHome(".brooklyn"));
@Deprecated /** @deprecated since 0.7.0 use BrooklynServerConfig routines */
// copied here so we don't have back-ref to BrooklynConfigKeys
@@ -128,6 +128,7 @@ public class BrooklynServerConfig {
public static final ConfigKey<String> BROOKLYN_CATALOG_URL = ConfigKeys.newStringConfigKey("brooklyn.catalog.url",
"The URL of a catalog.xml descriptor; absent for default (~/.brooklyn/catalog.xml), " +
- "or empty for no URL (use default scanner)", "file://~/.brooklyn/catalog.xml");
+ "or empty for no URL (use default scanner)",
+ new File(Os.fromHome(".brooklyn/catalog.xml")).toURI().toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6aabbcaf/utils/common/src/main/java/brooklyn/util/os/Os.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/os/Os.java b/utils/common/src/main/java/brooklyn/util/os/Os.java
index 4883cec..0652c3a 100644
--- a/utils/common/src/main/java/brooklyn/util/os/Os.java
+++ b/utils/common/src/main/java/brooklyn/util/os/Os.java
@@ -476,6 +476,10 @@ public class Os {
sep == SEPARATOR_WIN;
}
+ public static String fromHome(String path) {
+ return new File(Os.home(), path).getAbsolutePath();
+ }
+
public static String nativePath(String path) {
return new File(path).getPath();
}