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/03/18 23:12:48 UTC
[3/7] incubator-brooklyn git commit: better name for install java ssh
command, and other commands also get abbreviated for display
better name for install java ssh command, and other commands also get abbreviated for display
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e7f64fb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e7f64fb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e7f64fb2
Branch: refs/heads/master
Commit: e7f64fb23aaa1f9e1b14007e7af1d6efd8f7b127
Parents: f68bf83
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Mar 17 12:09:04 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Mar 18 22:08:20 2015 +0000
----------------------------------------------------------------------
core/src/main/java/brooklyn/util/task/system/ProcessTaskStub.java | 2 +-
.../java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e7f64fb2/core/src/main/java/brooklyn/util/task/system/ProcessTaskStub.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/util/task/system/ProcessTaskStub.java b/core/src/main/java/brooklyn/util/task/system/ProcessTaskStub.java
index 03d3f22..9fd19e7 100644
--- a/core/src/main/java/brooklyn/util/task/system/ProcessTaskStub.java
+++ b/core/src/main/java/brooklyn/util/task/system/ProcessTaskStub.java
@@ -71,7 +71,7 @@ public class ProcessTaskStub {
public String getSummary() {
if (summary!=null) return summary;
- return Strings.join(commands, " ; ");
+ return Strings.maxlen(Strings.join(commands, " ; "), 160);
}
/** null for localhost */
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e7f64fb2/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
index 420d3e7..d2a11c9 100644
--- a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
@@ -342,6 +342,7 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
try {
log.debug("Installing Java {} at {}@{}", new Object[]{version, getEntity(), getLocation()});
ProcessTaskFactory<Integer> taskFactory = SshTasks.newSshExecTaskFactory(getLocation(), command)
+ .summary("install java ("+version+")")
.configure(ShellTool.PROP_EXEC_ASYNC, true);
ProcessTaskWrapper<Integer> installCommand = Entities.submit(getEntity(), taskFactory);
int result = installCommand.get();