Add application base directory for Node.JS
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/fbe97e5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fbe97e5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fbe97e5e Branch: refs/heads/master Commit: fbe97e5ee7c30a2d703d87b914c16d8ea004d457 Parents: 6bc2410 Author: Andrew Kennedy <[email protected]> Authored: Thu Aug 28 07:43:25 2014 +0100 Committer: Andrew Kennedy <[email protected]> Committed: Sat Aug 30 17:23:48 2014 +0100 ---------------------------------------------------------------------- .../java/brooklyn/entity/webapp/nodejs/NodeJsWebAppDriver.java | 2 ++ .../brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java | 5 +++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fbe97e5e/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppDriver.java b/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppDriver.java index 7638018..8c812a0 100644 --- a/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppDriver.java +++ b/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppDriver.java @@ -24,4 +24,6 @@ public interface NodeJsWebAppDriver extends SoftwareProcessDriver { Integer getHttpPort(); + String getAppDir(); + } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fbe97e5e/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java b/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java index e8f243d..8db6e8a 100644 --- a/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java +++ b/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java @@ -61,6 +61,11 @@ public class NodeJsWebAppSshDriver extends AbstractSoftwareProcessSshDriver impl } @Override + public String getAppDir() { + return Os.mergePaths(getRunDir(), getEntity().getConfig(NodeJsWebAppService.APP_NAME)); + } + + @Override public void postLaunch() { String rootUrl = String.format("http://%s:%d/";, getHostname(), getHttpPort()); entity.setAttribute(WebAppService.ROOT_URL, rootUrl);
