You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/10/06 21:11:48 UTC
[08/10] git commit: Use LocationSpec when starting local BrooklynNode
Use LocationSpec when starting local BrooklynNode
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5374ed71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5374ed71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5374ed71
Branch: refs/heads/master
Commit: 5374ed716265cb721ffa14252ffc65fa5c509749
Parents: 6ce1b6f
Author: Andrew Kennedy <gr...@apache.org>
Authored: Tue Sep 30 15:28:26 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Mon Oct 6 15:57:22 2014 +0100
----------------------------------------------------------------------
.../basic/AbstractSoftwareProcessDriver.java | 102 +++++++++----------
.../brooklyn/launcher/BrooklynLauncher.java | 5 +-
2 files changed, 55 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5374ed71/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java
index 4cc89ef..e4a26da 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java
@@ -80,68 +80,68 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr
@Override
public void start() {
Boolean started = Optional.fromNullable(entity.getConfig(BrooklynConfigKeys.ENTITY_STARTED)).or(false);
- if (started) return;
-
- DynamicTasks.queue("pre-install", new Runnable() { public void run() {
- preInstall();
- }});
-
- if (Strings.isNonBlank(entity.getConfig(BrooklynConfigKeys.PRE_INSTALL_COMMAND))) {
- DynamicTasks.queue("pre-install-command", new Runnable() { public void run() {
- runPreInstallCommand(entity.getConfig(BrooklynConfigKeys.PRE_INSTALL_COMMAND));
+ if (!started) {
+ DynamicTasks.queue("pre-install", new Runnable() { public void run() {
+ preInstall();
}});
- };
- Boolean skip = Optional.fromNullable(entity.getConfig(BrooklynConfigKeys.SKIP_INSTALLATION)).or(false);
- if (!skip) {
- DynamicTasks.queue("setup", new Runnable() { public void run() {
- waitForConfigKey(BrooklynConfigKeys.SETUP_LATCH);
- setup();
- }});
+ if (Strings.isNonBlank(entity.getConfig(BrooklynConfigKeys.PRE_INSTALL_COMMAND))) {
+ DynamicTasks.queue("pre-install-command", new Runnable() { public void run() {
+ runPreInstallCommand(entity.getConfig(BrooklynConfigKeys.PRE_INSTALL_COMMAND));
+ }});
+ };
+
+ Boolean skip = Optional.fromNullable(entity.getConfig(BrooklynConfigKeys.SKIP_INSTALLATION)).or(false);
+ if (!skip) {
+ DynamicTasks.queue("setup", new Runnable() { public void run() {
+ waitForConfigKey(BrooklynConfigKeys.SETUP_LATCH);
+ setup();
+ }});
+
+ DynamicTasks.queue("copy-install-resources", new Runnable() { public void run() {
+ waitForConfigKey(BrooklynConfigKeys.INSTALL_RESOURCES_LATCH);
+ copyInstallResources();
+ }});
+
+ DynamicTasks.queue("install", new Runnable() { public void run() {
+ waitForConfigKey(BrooklynConfigKeys.INSTALL_LATCH);
+ install();
+ }});
+ }
- DynamicTasks.queue("copy-install-resources", new Runnable() { public void run() {
- waitForConfigKey(BrooklynConfigKeys.INSTALL_RESOURCES_LATCH);
- copyInstallResources();
- }});
+ if (Strings.isNonBlank(entity.getConfig(BrooklynConfigKeys.POST_INSTALL_COMMAND))) {
+ DynamicTasks.queue("post-install-command", new Runnable() { public void run() {
+ runPostInstallCommand(entity.getConfig(BrooklynConfigKeys.POST_INSTALL_COMMAND));
+ }});
+ };
- DynamicTasks.queue("install", new Runnable() { public void run() {
- waitForConfigKey(BrooklynConfigKeys.INSTALL_LATCH);
- install();
+ DynamicTasks.queue("customize", new Runnable() { public void run() {
+ waitForConfigKey(BrooklynConfigKeys.CUSTOMIZE_LATCH);
+ customize();
}});
- }
- if (Strings.isNonBlank(entity.getConfig(BrooklynConfigKeys.POST_INSTALL_COMMAND))) {
- DynamicTasks.queue("post-install-command", new Runnable() { public void run() {
- runPostInstallCommand(entity.getConfig(BrooklynConfigKeys.POST_INSTALL_COMMAND));
+ DynamicTasks.queue("copy-runtime-resources", new Runnable() { public void run() {
+ waitForConfigKey(BrooklynConfigKeys.RUNTIME_RESOURCES_LATCH);
+ copyRuntimeResources();
}});
- };
-
- DynamicTasks.queue("customize", new Runnable() { public void run() {
- waitForConfigKey(BrooklynConfigKeys.CUSTOMIZE_LATCH);
- customize();
- }});
- DynamicTasks.queue("copy-runtime-resources", new Runnable() { public void run() {
- waitForConfigKey(BrooklynConfigKeys.RUNTIME_RESOURCES_LATCH);
- copyRuntimeResources();
- }});
+ if (Strings.isNonBlank(entity.getConfig(BrooklynConfigKeys.PRE_LAUNCH_COMMAND))) {
+ DynamicTasks.queue("pre-launch-command", new Runnable() { public void run() {
+ runPreLaunchCommand(entity.getConfig(BrooklynConfigKeys.PRE_LAUNCH_COMMAND));
+ }});
+ };
- if (Strings.isNonBlank(entity.getConfig(BrooklynConfigKeys.PRE_LAUNCH_COMMAND))) {
- DynamicTasks.queue("pre-launch-command", new Runnable() { public void run() {
- runPreLaunchCommand(entity.getConfig(BrooklynConfigKeys.PRE_LAUNCH_COMMAND));
+ DynamicTasks.queue("launch", new Runnable() { public void run() {
+ waitForConfigKey(BrooklynConfigKeys.LAUNCH_LATCH);
+ launch();
}});
- };
- DynamicTasks.queue("launch", new Runnable() { public void run() {
- waitForConfigKey(BrooklynConfigKeys.LAUNCH_LATCH);
- launch();
- }});
-
- if (Strings.isNonBlank(entity.getConfig(BrooklynConfigKeys.POST_LAUNCH_COMMAND))) {
- DynamicTasks.queue("post-launch-command", new Runnable() { public void run() {
- runPostLaunchCommand(entity.getConfig(BrooklynConfigKeys.POST_LAUNCH_COMMAND));
- }});
- };
+ if (Strings.isNonBlank(entity.getConfig(BrooklynConfigKeys.POST_LAUNCH_COMMAND))) {
+ DynamicTasks.queue("post-launch-command", new Runnable() { public void run() {
+ runPostLaunchCommand(entity.getConfig(BrooklynConfigKeys.POST_LAUNCH_COMMAND));
+ }});
+ };
+ }
DynamicTasks.queue("post-launch", new Runnable() { public void run() {
postLaunch();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5374ed71/usage/launcher/src/main/java/brooklyn/launcher/BrooklynLauncher.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/main/java/brooklyn/launcher/BrooklynLauncher.java b/usage/launcher/src/main/java/brooklyn/launcher/BrooklynLauncher.java
index 8e08bb4..12df384 100644
--- a/usage/launcher/src/main/java/brooklyn/launcher/BrooklynLauncher.java
+++ b/usage/launcher/src/main/java/brooklyn/launcher/BrooklynLauncher.java
@@ -68,6 +68,7 @@ import brooklyn.entity.trait.Startable;
import brooklyn.internal.BrooklynFeatureEnablement;
import brooklyn.launcher.config.StopWhichAppsOnShutdown;
import brooklyn.location.Location;
+import brooklyn.location.LocationSpec;
import brooklyn.location.PortRange;
import brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine;
import brooklyn.location.basic.PortRanges;
@@ -850,9 +851,11 @@ public class BrooklynLauncher {
.displayName("Brooklyn Console"));
}
};
+ LocationSpec<?> spec = LocationSpec.create(LocalhostMachine.class).displayName("Local Brooklyn");
+ Location localhost = managementContext.getLocationManager().createLocation(spec);
brooklyn.appDisplayName("Brooklyn")
.manage(managementContext)
- .start(ImmutableList.of(new LocalhostMachine()));
+ .start(ImmutableList.of(localhost));
}
protected Application getAppFromYaml(String input) {