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 2015/11/23 19:29:34 UTC

[05/20] incubator-brooklyn git commit: Use /tmp rather than Os.tmp()

Use /tmp rather than Os.tmp()

https://github.com/apache/incubator-brooklyn/pull/1030#discussion_r44859808


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

Branch: refs/heads/master
Commit: 93039184a736a9fc698758d014e545a010438e42
Parents: b30489e
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Tue Nov 17 11:41:00 2015 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Tue Nov 17 11:41:06 2015 +0000

----------------------------------------------------------------------
 .../java/org/apache/brooklyn/test/framework/SimpleCommand.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/93039184/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleCommand.java
----------------------------------------------------------------------
diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleCommand.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleCommand.java
index 40e26a9..c5ff777 100644
--- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleCommand.java
+++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleCommand.java
@@ -26,7 +26,6 @@ import org.apache.brooklyn.core.entity.trait.Startable;
 import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey;
 import org.apache.brooklyn.entity.software.base.SoftwareProcess;
 import org.apache.brooklyn.util.core.flags.SetFromFlag;
-import org.apache.brooklyn.util.os.Os;
 
 import static org.apache.brooklyn.core.config.ConfigKeys.newConfigKey;
 
@@ -38,6 +37,8 @@ import static org.apache.brooklyn.core.config.ConfigKeys.newConfigKey;
 @ImplementedBy(SimpleCommandImpl.class)
 public interface SimpleCommand extends Entity, Startable {
 
+    String TMP_DEFAULT = "/tmp";
+
     /**
      * Result of a command invocation.
      */
@@ -45,6 +46,7 @@ public interface SimpleCommand extends Entity, Startable {
         int getExitCode();
         String getStdout();
         String getStderr();
+
     }
 
     @SetFromFlag(nullable = false)
@@ -55,5 +57,5 @@ public interface SimpleCommand extends Entity, Startable {
     AttributeSensorAndConfigKey<String, String> DOWNLOAD_URL = SoftwareProcess.DOWNLOAD_URL;
 
     @SetFromFlag("scriptDir")
-    ConfigKey<String> SCRIPT_DIR = newConfigKey("scriptDir", "directory where downloaded scripts should be put", Os.tmp());
+    ConfigKey<String> SCRIPT_DIR = newConfigKey("scriptDir", "directory where downloaded scripts should be put", TMP_DEFAULT);
 }