You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/11/05 15:34:53 UTC
[2/4] git commit: Tomcat install: don’t resolve config (via env variables)
Tomcat install: don’t resolve config (via env variables)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/66cbad2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/66cbad2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/66cbad2b
Branch: refs/heads/master
Commit: 66cbad2b18f793edf19c34afa41d2028d86785ca
Parents: b8ec67f
Author: Aled Sage <al...@gmail.com>
Authored: Wed Nov 5 13:20:21 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Nov 5 13:20:21 2014 +0000
----------------------------------------------------------------------
.../main/java/brooklyn/entity/webapp/tomcat/Tomcat7SshDriver.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/66cbad2b/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/Tomcat7SshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/Tomcat7SshDriver.java b/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/Tomcat7SshDriver.java
index 787ef6e..05d8fc2 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/Tomcat7SshDriver.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/Tomcat7SshDriver.java
@@ -70,6 +70,7 @@ public class Tomcat7SshDriver extends JavaWebAppSshDriver implements Tomcat7Driv
commands.add(format("tar xvzf %s", saveAs));
newScript(INSTALLING)
+ .environmentVariablesReset()
.body.append(commands)
.execute();
}
@@ -91,7 +92,7 @@ public class Tomcat7SshDriver extends JavaWebAppSshDriver implements Tomcat7Driv
@Override
public void launch() {
- Map ports = MutableMap.of("httpPort", getHttpPort(), "shutdownPort", getShutdownPort());
+ Map<String, Integer> ports = MutableMap.of("httpPort", getHttpPort(), "shutdownPort", getShutdownPort());
Networking.checkPortsValid(ports);
// We wait for evidence of tomcat running because, using