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 184D818377 for ; Tue, 19 Jan 2016 14:39:04 +0000 (UTC) Received: (qmail 50932 invoked by uid 500); 19 Jan 2016 14:39:02 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 50893 invoked by uid 500); 19 Jan 2016 14:39:02 -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 50830 invoked by uid 99); 19 Jan 2016 14:39:02 -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; Tue, 19 Jan 2016 14:39:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3E88DE00C5; Tue, 19 Jan 2016 14:39:02 +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: Tue, 19 Jan 2016 14:39:02 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/4] incubator-brooklyn git commit: In skipInstall include also : copy-pre-install-resources, pre-install, pre-install-command Repository: incubator-brooklyn Updated Branches: refs/heads/master 1c7ab436b -> 717c79b8e In skipInstall include also : copy-pre-install-resources, pre-install, pre-install-command Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8d1ff758 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8d1ff758 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8d1ff758 Branch: refs/heads/master Commit: 8d1ff758dd9f2f02c30c40849a433e56a03a21b9 Parents: dff3014 Author: Valentin Aitken Authored: Thu Jan 7 18:00:53 2016 +0200 Committer: Valentin Aitken Committed: Thu Jan 7 18:00:53 2016 +0200 ---------------------------------------------------------------------- .../base/AbstractSoftwareProcessDriver.java | 25 ++++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8d1ff758/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java b/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java index 59dac4f..d243833 100644 --- a/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java +++ b/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java @@ -107,23 +107,22 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr skipStart = entityStarted.or(false); } if (!skipStart) { - DynamicTasks.queue("copy-pre-install-resources", new Runnable() { public void run() { - waitForConfigKey(BrooklynConfigKeys.PRE_INSTALL_RESOURCES_LATCH); - copyPreInstallResources(); - }}); - - DynamicTasks.queue("pre-install", new Runnable() { public void run() { - preInstall(); - }}); - - DynamicTasks.queue("pre-install-command", new Runnable() { public void run() { - runPreInstallCommand(); - }}); - Optional locationInstalled = Optional.fromNullable(getLocation().getConfig(BrooklynConfigKeys.SKIP_ENTITY_INSTALLATION)); Optional entityInstalled = Optional.fromNullable(entity.getConfig(BrooklynConfigKeys.SKIP_ENTITY_INSTALLATION)); boolean skipInstall = locationInstalled.or(entityInstalled).or(false); if (!skipInstall) { + DynamicTasks.queue("copy-pre-install-resources", new Runnable() { public void run() { + waitForConfigKey(BrooklynConfigKeys.PRE_INSTALL_RESOURCES_LATCH); + copyPreInstallResources(); + }}); + + DynamicTasks.queue("pre-install", new Runnable() { public void run() { + preInstall(); + }}); + + DynamicTasks.queue("pre-install-command", new Runnable() { public void run() { + runPreInstallCommand(); + }}); DynamicTasks.queue("setup", new Runnable() { public void run() { waitForConfigKey(BrooklynConfigKeys.SETUP_LATCH); setup();