You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/05/23 16:51:55 UTC
[24/50] [abbrv] git commit: Hardcode "/tmp" in BCKeys.INSTALL_DIR
Hardcode "/tmp" in BCKeys.INSTALL_DIR
Intended to fix issue #1402
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b23340ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b23340ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b23340ba
Branch: refs/pull/1410/head
Commit: b23340ba2fecc7b7276c3fbf570ba23f91a9a387
Parents: 2f407ca
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu May 22 16:43:30 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu May 22 16:43:30 2014 +0100
----------------------------------------------------------------------
.../java/brooklyn/entity/basic/BrooklynConfigKeys.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b23340ba/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 0ed5f05..0c2701f 100644
--- a/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
+++ b/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
@@ -40,11 +40,11 @@ public class BrooklynConfigKeys {
+ "(e.g. version, plugins, etc), but should be the same where install dirs can be shared to allow for re-use");
public static final BasicAttributeSensorAndConfigKey<String> INSTALL_DIR = new TemplatedStringAttributeSensorAndConfigKey("install.dir", "Directory for this software to be installed in",
- "${"
- + "config['"+ONBOX_BASE_DIR.getName()+"']!"
- + "config['"+BROOKLYN_DATA_DIR.getName()+"']!"
- + "'"+Os.mergePathsUnix(Os.tmp(),"brooklyn-"+Os.user())+"'"
- + "}"
+ "${"
+ + "config['"+ONBOX_BASE_DIR.getName()+"']!"
+ + "config['"+BROOKLYN_DATA_DIR.getName()+"']!"
+ + "'"+Os.mergePathsUnix("/tmp", "brooklyn-"+Os.user())+"'"
+ + "}"
+ "/"
+ "installs/"
// the var?? tests if it exists, passing value to ?string(if_present,if_absent)