Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 374E61835F for ; Mon, 1 Feb 2016 17:49:06 +0000 (UTC) Received: (qmail 56582 invoked by uid 500); 1 Feb 2016 17:48:32 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 56520 invoked by uid 500); 1 Feb 2016 17:48:32 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 55564 invoked by uid 99); 1 Feb 2016 17:48:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2016 17:48:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D49DAE0994; Mon, 1 Feb 2016 17:48:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Mon, 01 Feb 2016 17:49:05 -0000 Message-Id: <0f2cf521277b4d04b754ae9886e112c7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [35/50] brooklyn-server git commit: Reads default install/run dir from brooklyn config Reads default install/run dir from brooklyn config - Rather than hard-coding in /tmp, allows default dirs to be set via brooklyn config (i.e. by system properties, etc) Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/532ade84 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/532ade84 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/532ade84 Branch: refs/heads/0.4.0 Commit: 532ade84d2f92ff13d6a67809b940157b205d331 Parents: de3cb11 Author: Aled Sage Authored: Mon Oct 15 13:32:46 2012 +0100 Committer: Aled Sage Committed: Tue Oct 16 22:20:59 2012 +0100 ---------------------------------------------------------------------- .../basic/AbstractSoftwareProcessSshDriver.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/532ade84/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java index aff0db9..7e01478 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java @@ -32,7 +32,8 @@ public abstract class AbstractSoftwareProcessSshDriver extends AbstractSoftwareP public static final Logger logSsh = LoggerFactory.getLogger(BrooklynLogging.SSH_IO); public static final String BROOKLYN_HOME_DIR = "/tmp/brooklyn-"+System.getProperty("user.name"); - public static final String DEFAULT_INSTALL_BASEDIR = BROOKLYN_HOME_DIR+"/"+"installs"; + public static final String DEFAULT_INSTALL_BASEDIR = BROOKLYN_HOME_DIR+File.separator+"installs"; + public static final String DEFAULT_RUN_BASEDIR = BROOKLYN_HOME_DIR+File.separator+"apps"; public static final String NO_VERSION_INFO = "no-version-info"; public AbstractSoftwareProcessSshDriver(EntityLocal entity, SshMachineLocation machine) { @@ -58,17 +59,28 @@ public abstract class AbstractSoftwareProcessSshDriver extends AbstractSoftwareP protected String getEntityVersionLabel() { return getEntityVersionLabel("_"); } + protected String getEntityVersionLabel(String separator) { return elvis(entity.getClass().getSimpleName(), entity.getClass().getName())+(!NO_VERSION_INFO.equals(getVersion()) ? separator+getVersion() : ""); } + public String getInstallDir() { + String installBasedir = entity.getManagementContext().getConfig().getFirst("brooklyn.dirs.install"); + if (installBasedir == null) installBasedir = DEFAULT_INSTALL_BASEDIR; + if (installBasedir.endsWith(File.separator)) installBasedir.substring(0, installBasedir.length()-1); + return elvis(entity.getConfig(SoftwareProcessEntity.SUGGESTED_INSTALL_DIR), - DEFAULT_INSTALL_BASEDIR+"/"+getEntityVersionLabel("/")); + installBasedir+"/"+getEntityVersionLabel("/")); } + public String getRunDir() { + String runBasedir = entity.getManagementContext().getConfig().getFirst("brooklyn.dirs.run"); + if (runBasedir == null) runBasedir = DEFAULT_RUN_BASEDIR; + if (runBasedir.endsWith(File.separator)) runBasedir.substring(0, runBasedir.length()-1); + return elvis(entity.getConfig(SoftwareProcessEntity.SUGGESTED_RUN_DIR), - BROOKLYN_HOME_DIR+"/"+"apps"+"/"+entity.getApplication().getId()+"/"+"entities"+"/"+ + runBasedir+"/"+entity.getApplication().getId()+"/"+"entities"+"/"+ getEntityVersionLabel()+"_"+entity.getId()); }