This is an automated email from the ASF dual-hosted git repository.
iuliana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 9f90561 Found more ssh/scp mentions and removed them. Removed them
from tests too.
new 03e42cc Merge pull request #1239 from iuliana/fix/rm-scp-mentions-2
9f90561 is described below
commit 9f905619a8f43f71121fbec72c42b3768e48262f
Author: iuliana <[email protected]>
AuthorDate: Mon Aug 30 12:58:58 2021 +0100
Found more ssh/scp mentions and removed them. Removed them from tests too.
---
.../task/system/internal/AbstractProcessTaskFactory.java | 4 ++--
.../entity/software/base/lifecycle/ScriptHelper.java | 2 +-
.../base/VanillaSoftwareProcessStreamsIntegrationTest.java | 12 ++++++------
.../software/base/VanillaSoftwareProcessStreamsTest.java | 6 +++---
.../org/apache/brooklyn/location/winrm/WinRmPutTaskStub.java | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java
b/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java
index 7324531..d463779 100644
---
a/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java
+++
b/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java
@@ -170,13 +170,13 @@ public abstract class AbstractProcessTaskFactory<T
extends AbstractProcessTaskFa
/** creates the TaskBuilder which can be further customized; typically
invoked by the initial {@link #newTask()} */
public TaskBuilder<Object> constructCustomizedTaskBuilder() {
- String displayName = config.containsKey("displayName") ?
String.valueOf(config.getStringKey("displayName")) : "ssh: "+ getSummary();
+ String displayName = config.containsKey("displayName") ?
String.valueOf(config.getStringKey("displayName")) : getSummary();
TaskBuilder<Object> tb =
TaskBuilder.builder().dynamic(false).displayName(displayName);
tb.tag(BrooklynTaskTags.tagForStream(BrooklynTaskTags.STREAM_STDIN,
Streams.byteArrayOfString(Strings.join(commands, "\n"))));
tb.tag(BrooklynTaskTags.tagForEnvStream(BrooklynTaskTags.STREAM_ENV,
shellEnvironment));
-
+
return tb;
}
diff --git
a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
index 82d9985..9898d48 100644
---
a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
+++
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
@@ -288,7 +288,7 @@ public class ScriptHelper {
/** creates a task which will execute this script; note this can only be
run once per instance of this class */
public synchronized Task<Integer> newTask() {
if (task!=null) throw new IllegalStateException("task can only be
generated once");
- TaskBuilder<Integer> tb = Tasks.<Integer>builder().displayName("ssh:
"+summary).body(
+ TaskBuilder<Integer> tb =
Tasks.<Integer>builder().displayName(summary).body(
new Callable<Integer>() {
@Override
public Integer call() throws Exception {
diff --git
a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessStreamsIntegrationTest.java
b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessStreamsIntegrationTest.java
index e89f2e2..d2e40a9 100644
---
a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessStreamsIntegrationTest.java
+++
b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessStreamsIntegrationTest.java
@@ -50,11 +50,11 @@ public class VanillaSoftwareProcessStreamsIntegrationTest
extends AbstractSoftwa
VanillaSoftwareProcess entity =
app.createAndManageChild(EntitySpec.create(VanillaSoftwareProcess.class)
.configure(VanillaSoftwareProcess.INSTALL_UNIQUE_LABEL,
Identifiers.makeRandomId(8))
.configure(VanillaSoftwareProcess.PRE_INSTALL_COMMAND, "echo "
+ cmds.get("pre-install-command"))
- .configure(VanillaSoftwareProcess.INSTALL_COMMAND, "echo " +
cmds.get("ssh: installing.*"))
+ .configure(VanillaSoftwareProcess.INSTALL_COMMAND, "echo " +
cmds.get("installing.*"))
.configure(VanillaSoftwareProcess.POST_INSTALL_COMMAND, "echo
" + cmds.get("post-install-command"))
- .configure(VanillaSoftwareProcess.CUSTOMIZE_COMMAND, "echo " +
cmds.get("ssh: customizing.*"))
+ .configure(VanillaSoftwareProcess.CUSTOMIZE_COMMAND, "echo " +
cmds.get("customizing.*"))
.configure(VanillaSoftwareProcess.PRE_LAUNCH_COMMAND, "echo "
+ cmds.get("pre-launch-command"))
- .configure(VanillaSoftwareProcess.LAUNCH_COMMAND, "echo " +
cmds.get("ssh: launching.*"))
+ .configure(VanillaSoftwareProcess.LAUNCH_COMMAND, "echo " +
cmds.get("launching.*"))
.configure(VanillaSoftwareProcess.POST_LAUNCH_COMMAND, "echo "
+ cmds.get("post-launch-command"))
.configure(VanillaSoftwareProcess.CHECK_RUNNING_COMMAND,
"true"));
app.start(ImmutableList.of(localhost));
@@ -66,11 +66,11 @@ public class VanillaSoftwareProcessStreamsIntegrationTest
extends AbstractSoftwa
protected Map<String, String> getCommands() {
return ImmutableMap.<String, String>builder()
.put("pre-install-command", "myPreInstall")
- .put("ssh: installing.*", "myInstall")
+ .put("installing.*", "myInstall")
.put("post-install-command", "myPostInstall")
- .put("ssh: customizing.*", "myCustomizing")
+ .put("customizing.*", "myCustomizing")
.put("pre-launch-command", "myPreLaunch")
- .put("ssh: launching.*", "myLaunch")
+ .put("launching.*", "myLaunch")
.put("post-launch-command", "myPostLaunch")
.build();
}
diff --git
a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessStreamsTest.java
b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessStreamsTest.java
index 5c56ae2..ff375e6 100644
---
a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessStreamsTest.java
+++
b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessStreamsTest.java
@@ -131,11 +131,11 @@ public class VanillaSoftwareProcessStreamsTest extends
AbstractSoftwareProcessSt
protected Map<String, String> getCommands() {
return ImmutableMap.<String, String>builder()
.put("pre-install-command", "myPreInstall")
- .put("ssh: installing.*", "myInstall")
+ .put("installing.*", "myInstall")
.put("post-install-command", "myPostInstall")
- .put("ssh: customizing.*", "myCustomizing")
+ .put("customizing.*", "myCustomizing")
.put("pre-launch-command", "myPreLaunch")
- .put("ssh: launching.*", "myLaunch")
+ .put("launching.*", "myLaunch")
.put("post-launch-command", "myPostLaunch")
.build();
}
diff --git
a/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmPutTaskStub.java
b/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmPutTaskStub.java
index 36bb696..cf4b1c6 100644
---
a/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmPutTaskStub.java
+++
b/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmPutTaskStub.java
@@ -55,7 +55,7 @@ public class WinRmPutTaskStub {
public String getSummary() {
if (summary!=null) return summary;
- return "WinRM put: "+remoteFile;
+ return "WinRm put: "+remoteFile;
}
public WinRmMachineLocation getMachine() {
