brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [15/21] git commit: Replace static fallback folder which could be invalid in certain contexts with an invalid folder name which will cause errors when being used. The invalid name will hint the user at the potential problem.
Date Thu, 26 Jun 2014 11:42:21 GMT
Replace static fallback folder which could be invalid in certain contexts with an invalid folder
name which will cause errors when being used. The invalid name will hint the user at the potential
problem.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e7cc4813
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e7cc4813
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e7cc4813

Branch: refs/heads/master
Commit: e7cc481341746143fa6daae23ada846944b41a18
Parents: 6aabbca
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Tue Jun 24 12:17:17 2014 +0300
Committer: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Committed: Wed Jun 25 18:28:57 2014 +0300

----------------------------------------------------------------------
 core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e7cc4813/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java b/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
index b131fb3..90e52ee 100644
--- a/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
+++ b/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
@@ -43,7 +43,7 @@ public class BrooklynConfigKeys {
             "${"
             + "config['"+ONBOX_BASE_DIR.getName()+"']!"
             + "config['"+BROOKLYN_DATA_DIR.getName()+"']!"
-            + "r'"+Os.mergePathsUnix("/tmp", "brooklyn-"+Os.user())+"'"
+            + "'/<ERROR>-ONBOX_BASE_DIR-not-set'"
             + "}"
             + "/"
             + "installs/"
@@ -61,7 +61,7 @@ public class BrooklynConfigKeys {
         "${"
         + "config['"+ONBOX_BASE_DIR.getName()+"']!"
         + "config['"+BROOKLYN_DATA_DIR.getName()+"']!"
-        + "r'"+Os.mergePathsUnix("/tmp","brooklyn-"+Os.user())+"'"
+        + "'/<ERROR>-ONBOX_BASE_DIR-not-set'"
         + "}"
             + "/"
             + "apps/${entity.applicationId}/"


Mime
View raw message