You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2014/09/01 11:48:34 UTC

[01/14] git commit: Improvements to SoftwareProcess lifecycle phases

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 761f471ab -> e0e56f485


Improvements to SoftwareProcess lifecycle phases


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c6d148d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c6d148d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c6d148d3

Branch: refs/heads/master
Commit: c6d148d3b042ed9c486e5f5737284ccc8611a861
Parents: 761f471
Author: Andrew Kennedy <gr...@apache.org>
Authored: Mon Aug 25 18:33:44 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Aug 30 17:21:23 2014 +0100

----------------------------------------------------------------------
 .../entity/basic/BrooklynConfigKeys.java        | 11 ++++-
 .../basic/PortAttributeSensorAndConfigKey.java  |  5 ++-
 .../basic/AbstractSoftwareProcessDriver.java    | 43 ++++++++++++++++----
 .../basic/AbstractSoftwareProcessSshDriver.java | 24 +++++++++++
 .../brooklyn/entity/basic/SoftwareProcess.java  | 39 +++++++++++++++---
 .../basic/VanillaSoftwareProcessSshDriver.java  |  2 -
 .../java/JavaSoftwareProcessSshDriver.java      |  8 ++--
 .../entity/messaging/qpid/QpidBroker.java       | 10 -----
 8 files changed, 109 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6d148d3/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java b/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
index 1972983..d2f690f 100644
--- a/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
+++ b/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
@@ -59,10 +59,15 @@ public class BrooklynConfigKeys {
         + "this should include something readable, and must include a hash of all data which differentiates an installation "
         + "(e.g. version, plugins, etc), but should be the same where install dirs can be shared to allow for re-use");
     
-    public static final ConfigKey<String> PRE_LAUNCH_COMMAND = ConfigKeys.newStringConfigKey("pre.launch.command",
-            "Command to be run prior to the launch method being called on the driver");
+    public static final ConfigKey<Boolean> SKIP_INSTALLATION = newBooleanConfigKey("install.skip", "Skip the driver install commands entirely, for pre-installed software", Boolean.FALSE);
     
     // The implementation in AbstractSoftwareSshDriver runs this command as an SSH command 
+    public static final ConfigKey<String> PRE_INSTALL_COMMAND = ConfigKeys.newStringConfigKey("pre.install.command",
+            "Command to be run prior to the install method being called on the driver");
+    public static final ConfigKey<String> POST_INSTALL_COMMAND = ConfigKeys.newStringConfigKey("post.install.command",
+            "Command to be run after the install method being called on the driver");
+    public static final ConfigKey<String> PRE_LAUNCH_COMMAND = ConfigKeys.newStringConfigKey("pre.launch.command",
+            "Command to be run prior to the launch method being called on the driver");
     public static final ConfigKey<String> POST_LAUNCH_COMMAND = ConfigKeys.newStringConfigKey("post.launch.command",
             "Command to be run after the launch method being called on the driver");
     
@@ -111,8 +116,10 @@ public class BrooklynConfigKeys {
      * component is up, but this entity does not care about the dependent component's actual config values.
      */
     public static final ConfigKey<Boolean> START_LATCH = newBooleanConfigKey("start.latch", "Latch for blocking start until ready");
+    public static final ConfigKey<Boolean> SETUP_LATCH = newBooleanConfigKey("setup.latch", "Latch for blocking setup until ready");
     public static final ConfigKey<Boolean> INSTALL_LATCH = newBooleanConfigKey("install.latch", "Latch for blocking install until ready");
     public static final ConfigKey<Boolean> CUSTOMIZE_LATCH = newBooleanConfigKey("customize.latch", "Latch for blocking customize until ready");
+    public static final ConfigKey<Boolean> RESOURCES_LATCH = newBooleanConfigKey("resources.latch", "Latch for blocking resources until ready");
     public static final ConfigKey<Boolean> LAUNCH_LATCH = newBooleanConfigKey("launch.latch", "Latch for blocking launch until ready");
 
     public static final ConfigKey<Duration> START_TIMEOUT = newConfigKey(

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6d148d3/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java
index c059542..fbee6ba 100644
--- a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java
+++ b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java
@@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
 
 import brooklyn.config.ConfigKey;
 import brooklyn.entity.Entity;
+import brooklyn.entity.basic.BrooklynConfigKeys;
 import brooklyn.event.Sensor;
 import brooklyn.location.Location;
 import brooklyn.location.MachineProvisioningLocation;
@@ -37,6 +38,7 @@ import brooklyn.management.ManagementContext;
 import brooklyn.util.flags.TypeCoercions;
 import brooklyn.util.guava.Maybe;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 
@@ -92,7 +94,8 @@ public class PortAttributeSensorAndConfigKey extends AttributeSensorAndConfigKey
             }
             if (lo.isPresent()) {
                 Location l = lo.get();
-                if (l instanceof PortSupplier) {
+                Boolean skip = Optional.fromNullable(entity.getConfig(BrooklynConfigKeys.SKIP_INSTALLATION)).or(false);
+                if (l instanceof PortSupplier && !skip) {
                     int p = ((PortSupplier)l).obtainPort(value);
                     if (p!=-1) {
                         LOG.debug(""+entity+" choosing port "+p+" for "+getName());

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6d148d3/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 e9ab449..18c5e06 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java
@@ -36,6 +36,7 @@ import brooklyn.util.text.Strings;
 import brooklyn.util.text.TemplateProcessor;
 
 import com.google.common.annotations.Beta;
+import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 
 /**
@@ -78,27 +79,52 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr
      */
     @Override
     public void start() {
-        DynamicTasks.queue("install", new Runnable() { public void run() {
-            waitForConfigKey(BrooklynConfigKeys.INSTALL_LATCH);
-            install();
-        }});
+        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("install", new Runnable() { public void run() {
+                waitForConfigKey(BrooklynConfigKeys.INSTALL_LATCH);
+                install();
+            }});
+        }
+
+        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("customize", new Runnable() { public void run() {
             waitForConfigKey(BrooklynConfigKeys.CUSTOMIZE_LATCH);
             customize();
         }});
 
+        DynamicTasks.queue("resources", new Runnable() { public void run() {
+            waitForConfigKey(BrooklynConfigKeys.RESOURCES_LATCH);
+            resources();
+        }});
+
         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();
         }});
-        
+
         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));
@@ -113,12 +139,15 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr
     @Override
     public abstract void stop();
 
+    public abstract void runPreInstallCommand(String command);
+    public abstract void setup();
     public abstract void install();
+    public abstract void runPostInstallCommand(String command);
     public abstract void customize();
+    public abstract void resources();
     public abstract void runPreLaunchCommand(String command);
     public abstract void launch();
     public abstract void runPostLaunchCommand(String command);
-    
 
     @Override
     public void kill() {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6d148d3/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 da1efe2..eb51e7d 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java
@@ -279,6 +279,25 @@ public abstract class AbstractSoftwareProcessSshDriver extends AbstractSoftwareP
         if (!flags.containsKey("logPrefix")) flags.put("logPrefix", ""+entity.getId()+"@"+getLocation().getDisplayName());
         return getMachine().execScript(flags, summaryForLogging, script, environment);
     }
+
+    @Override
+    public void resources() {
+        Map runtimeFiles = entity.getConfig(SoftwareProcess.RUNTIME_FILES);
+        copyResources(runtimeFiles);
+
+        Map runtimeTemplates = entity.getConfig(SoftwareProcess.RUNTIME_TEMPLATES);
+        copyTemplates(runtimeTemplates);
+    }
+    
+    @Override
+    public void runPreInstallCommand(String command) {
+        execute(ImmutableList.of(command), "running pre-install commands");
+    }
+    
+    @Override
+    public void runPostInstallCommand(String command) {
+        execute(ImmutableList.of(command), "running post-install commands");
+    }
     
     @Override
     public void runPreLaunchCommand(String command) {
@@ -599,6 +618,8 @@ public abstract class AbstractSoftwareProcessSshDriver extends AbstractSoftwareP
                 if (!groovyTruth(flags.get(INSTALL_INCOMPLETE))) {
                     s.footer.append("date > $INSTALL_DIR/BROOKLYN");
                 }
+                // don't set vars during install phase, prevent dependency resolution
+                s.environmentVariablesReset();
             }
             if (ImmutableSet.of(CUSTOMIZING, LAUNCHING, CHECK_RUNNING, STOPPING, KILLING, RESTARTING).contains(phase)) {
                 s.header.append(
@@ -713,4 +734,7 @@ public abstract class AbstractSoftwareProcessSshDriver extends AbstractSoftwareP
         return result;
     }
 
+    @Override
+    public void setup() { }
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6d148d3/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java
index 0551840..d71375f 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java
@@ -33,6 +33,8 @@ import brooklyn.util.collections.MutableMap;
 import brooklyn.util.flags.SetFromFlag;
 import brooklyn.util.time.Duration;
 
+import com.google.common.reflect.TypeToken;
+
 public interface SoftwareProcess extends Entity, Startable {
 
     public static final AttributeSensor<String> HOSTNAME = Attributes.HOSTNAME;
@@ -46,21 +48,36 @@ public interface SoftwareProcess extends Entity, Startable {
     @SetFromFlag("startLatch")
     public static final ConfigKey<Boolean> START_LATCH = BrooklynConfigKeys.START_LATCH;
 
+    @SetFromFlag("setupLatch")
+    public static final ConfigKey<Boolean> SETUP_LATCH = BrooklynConfigKeys.SETUP_LATCH;
+
     @SetFromFlag("installLatch")
     public static final ConfigKey<Boolean> INSTALL_LATCH = BrooklynConfigKeys.INSTALL_LATCH;
 
     @SetFromFlag("customizeLatch")
     public static final ConfigKey<Boolean> CUSTOMIZE_LATCH = BrooklynConfigKeys.CUSTOMIZE_LATCH;
-    
+
+    @SetFromFlag("resourcesLatch")
+    public static final ConfigKey<Boolean> RESOURCES_LATCH = BrooklynConfigKeys.RESOURCES_LATCH;
+
+    @SetFromFlag("launchLatch")
+    public static final ConfigKey<Boolean> LAUNCH_LATCH = BrooklynConfigKeys.LAUNCH_LATCH;
+
+    @SetFromFlag("skipInstall")
+    public static final ConfigKey<Boolean> SKIP_INSTALLATION = BrooklynConfigKeys.SKIP_INSTALLATION;
+
+    @SetFromFlag("preInstallCommand")
+    public static final ConfigKey<String> PRE_INSTALL_COMMAND = BrooklynConfigKeys.PRE_INSTALL_COMMAND;
+
+    @SetFromFlag("postInstallCommand")
+    public static final ConfigKey<String> POST_INSTALL_COMMAND = BrooklynConfigKeys.POST_INSTALL_COMMAND;
+
     @SetFromFlag("preLaunchCommand")
     public static final ConfigKey<String> PRE_LAUNCH_COMMAND = BrooklynConfigKeys.PRE_LAUNCH_COMMAND;
-    
+
     @SetFromFlag("postLaunchCommand")
     public static final ConfigKey<String> POST_LAUNCH_COMMAND = BrooklynConfigKeys.POST_LAUNCH_COMMAND;
 
-    @SetFromFlag("launchLatch")
-    public static final ConfigKey<Boolean> LAUNCH_LATCH = BrooklynConfigKeys.LAUNCH_LATCH;
-
     @SetFromFlag("version")
     public static final ConfigKey<String> SUGGESTED_VERSION = BrooklynConfigKeys.SUGGESTED_VERSION;
 
@@ -72,7 +89,7 @@ public interface SoftwareProcess extends Entity, Startable {
 
     @SetFromFlag("installLabel")
     public static final ConfigKey<String> INSTALL_UNIQUE_LABEL = BrooklynConfigKeys.INSTALL_UNIQUE_LABEL;
-    
+
     @SetFromFlag("expandedInstallDir")
     BasicAttributeSensorAndConfigKey<String> EXPANDED_INSTALL_DIR = BrooklynConfigKeys.EXPANDED_INSTALL_DIR;
 
@@ -86,6 +103,16 @@ public interface SoftwareProcess extends Entity, Startable {
     @Deprecated
     public static final ConfigKey<String> SUGGESTED_RUN_DIR = BrooklynConfigKeys.SUGGESTED_RUN_DIR;
 
+    /** Files to be copied to the server, map of "subpath/file.name": "classpath://foo/file.txt" (or other url) */
+    @SetFromFlag("runtimeFiles")
+    ConfigKey<Map<String, String>> RUNTIME_FILES = ConfigKeys.newConfigKey(new TypeToken<Map<String, String>>() { },
+            "files.runtime", "Map of files to be copied, keyed by destination name relative to runDir");
+
+    /** Templates to be filled in and then copied to the server. See {@link #RUNTIME_FILES}. */
+    @SetFromFlag("runtimeTemplates")
+    ConfigKey<Map<String, String>> RUNTIME_TEMPLATES = ConfigKeys.newConfigKey(new TypeToken<Map<String, String>>() { },
+            "templates.runtime", "Map of templates to be filled in and copied, keyed by destination name relative to runDir");
+
     @SetFromFlag("env")
     public static final MapConfigKey<Object> SHELL_ENVIRONMENT = new MapConfigKey<Object>(Object.class,
             "shell.env", "Map of environment variables to pass to the runtime shell", MutableMap.<String,Object>of());

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6d148d3/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java b/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java
index 389807a..b3c0d26 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java
@@ -64,8 +64,6 @@ public class VanillaSoftwareProcessSshDriver extends AbstractSoftwareProcessSshD
 
             int result = newScript(INSTALLING)
                     .failOnNonZeroResultCode(false)
-                    // don't set vars yet -- it resolves dependencies (e.g. DB) which we don't want until we start
-                    .environmentVariablesReset()
                     .body.append(commands)
                     .execute();
             

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6d148d3/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
index 95ed43b..d4e5156 100644
--- a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
@@ -438,13 +438,13 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
     }
     
     @Override
-    public void start() {
+    public void setup() {
         DynamicTasks.queue("install java", new Runnable() { public void run() {
             installJava();
         }});
-            
+
         // TODO check java version
-        
+
         if (isJmxEnabled()) {
             DynamicTasks.queue("install jmx", new Runnable() { public void run() {
                 installJmxSupport(); }}); 
@@ -454,8 +454,6 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
             DynamicTasks.queue("check java hostname bug", new Runnable() { public void run() {
                 checkJavaHostnameBug(); }});
         }
-
-        super.start();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6d148d3/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java
index 0ad7c56..6fd2e82 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.java
@@ -68,16 +68,6 @@ public interface QpidBroker extends SoftwareProcess, MessageBroker, UsesJmx, Amq
     @SetFromFlag("httpManagementPort")
     public static final PortAttributeSensorAndConfigKey HTTP_MANAGEMENT_PORT = new PortAttributeSensorAndConfigKey("qpid.http-management.port", "Qpid HTTP management plugin port");
 
-    /** Files to be copied to the server, map of "subpath/file.name": "classpath://foo/file.txt" (or other url) */
-    @SetFromFlag("runtimeFiles")
-    public static final BasicConfigKey<Map<String, String>> RUNTIME_FILES = new BasicConfigKey(
-            Map.class, "qpid.files.runtime", "Map of files to be copied, keyed by destination name relative to runDir");
-
-    /** Templates to be filled in and then copied to the server. See {@link #RUNTIME_FILES}. */
-    @SetFromFlag("runtimeTemplates")
-    public static final BasicConfigKey<Map<String, String>> RUNTIME_TEMPLATES = new BasicConfigKey(
-            Map.class, "qpid.templates.runtime", "Map of templates to be filled in and copied, keyed by destination name relative to runDir");
-
     @SetFromFlag("jmxUser")
     public static final BasicAttributeSensorAndConfigKey<String> JMX_USER = new BasicAttributeSensorAndConfigKey<String>(
             UsesJmx.JMX_USER, "admin");


[14/14] git commit: This closes #133

Posted by sj...@apache.org.
This closes #133


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e0e56f48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e0e56f48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e0e56f48

Branch: refs/heads/master
Commit: e0e56f485ada65fbc9ddef2048a2d57b14ca6cae
Parents: 761f471 948bf24
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Mon Sep 1 10:32:58 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Mon Sep 1 10:32:58 2014 +0100

----------------------------------------------------------------------
 .../entity/basic/BrooklynConfigKeys.java        | 101 ++++-----
 .../brooklyn/entity/group/DynamicCluster.java   |  14 ++
 .../entity/group/DynamicClusterImpl.java        |  25 ++-
 .../basic/PortAttributeSensorAndConfigKey.java  |  59 +++---
 .../java/brooklyn/util/flags/TypeCoercions.java |  10 +
 .../main/java/brooklyn/util/task/BasicTask.java |   3 +-
 .../nosql/infinispan/Infinispan5SshDriver.java  |   5 -
 .../basic/AbstractSoftwareProcessDriver.java    |  50 ++++-
 .../basic/AbstractSoftwareProcessSshDriver.java |  27 +++
 .../entity/basic/EmptySoftwareProcessImpl.java  |  11 +-
 .../brooklyn/entity/basic/SoftwareProcess.java  |  98 +++++----
 .../entity/basic/VanillaSoftwareProcess.java    |  44 ++--
 .../basic/VanillaSoftwareProcessSshDriver.java  |   2 -
 .../brooklynnode/BrooklynNodeSshDriver.java     |  16 +-
 .../java/JavaSoftwareProcessSshDriver.java      |   8 +-
 .../java/brooklyn/entity/java/JmxSupport.java   | 109 +++++-----
 .../main/java/brooklyn/entity/java/UsesJmx.java | 116 +++++------
 .../entity/machine/MachineEntityImpl.java       |   2 -
 .../software/MachineLifecycleEffectorTasks.java | 205 +++++++++++--------
 .../database/mariadb/MariaDbSshDriver.java      |  14 +-
 .../entity/database/mysql/MySqlSshDriver.java   |  11 +-
 .../database/rubyrep/RubyRepSshDriver.java      |  13 +-
 .../messaging/activemq/ActiveMQSshDriver.java   |   9 +-
 .../kafka/AbstractfKafkaSshDriver.java          |  11 +-
 .../entity/messaging/qpid/QpidBroker.java       |  10 -
 .../entity/messaging/qpid/QpidSshDriver.java    |  11 +-
 .../messaging/rabbit/RabbitSshDriver.java       |  10 +-
 .../entity/messaging/storm/StormSshDriver.java  |  10 +-
 .../entity/zookeeper/ZooKeeperSshDriver.java    |   9 +-
 .../entity/monitoring/monit/MonitSshDriver.java |  14 +-
 .../nosql/cassandra/CassandraNodeSshDriver.java |  12 +-
 .../nosql/couchbase/CouchbaseNodeSshDriver.java |  13 +-
 .../ElasticSearchNodeSshDriver.java             |  10 +-
 .../nosql/mongodb/AbstractMongoDBSshDriver.java |  10 +-
 .../entity/nosql/redis/RedisStoreSshDriver.java |  10 +-
 .../entity/nosql/riak/RiakNodeSshDriver.java    |  23 ++-
 .../entity/nosql/solr/SolrServerSshDriver.java  |  13 +-
 .../entity/osgi/karaf/KarafSshDriver.java       |  11 +-
 .../brooklyn/entity/proxy/ProxySslConfig.java   |  20 +-
 .../entity/proxy/nginx/NginxSshDriver.java      |  14 +-
 .../entity/webapp/jboss/JBoss6SshDriver.java    |   9 +-
 .../entity/webapp/jboss/JBoss7SshDriver.java    |   9 +-
 .../entity/webapp/jetty/Jetty6SshDriver.java    |   9 +-
 .../webapp/nodejs/NodeJsWebAppDriver.java       |   2 +
 .../webapp/nodejs/NodeJsWebAppSshDriver.java    |   9 +
 .../entity/webapp/tomcat/Tomcat7SshDriver.java  |   8 +-
 46 files changed, 720 insertions(+), 489 deletions(-)
----------------------------------------------------------------------



[04/14] git commit: Coerce String to Class

Posted by sj...@apache.org.
Coerce String to Class


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5263b543
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5263b543
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5263b543

Branch: refs/heads/master
Commit: 5263b54393ce7978bab447e64e403138ecf5a306
Parents: c6a2212
Author: Andrew Kennedy <gr...@apache.org>
Authored: Thu Aug 28 17:12:05 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Aug 30 17:23:48 2014 +0100

----------------------------------------------------------------------
 core/src/main/java/brooklyn/util/flags/TypeCoercions.java | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5263b543/core/src/main/java/brooklyn/util/flags/TypeCoercions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/util/flags/TypeCoercions.java b/core/src/main/java/brooklyn/util/flags/TypeCoercions.java
index 7e92ed5..5d705e9 100644
--- a/core/src/main/java/brooklyn/util/flags/TypeCoercions.java
+++ b/core/src/main/java/brooklyn/util/flags/TypeCoercions.java
@@ -619,6 +619,16 @@ public class TypeCoercions {
                 return BigInteger.valueOf(input);
             }
         });
+        registerAdapter(String.class, Class.class, new Function<String,Class>() {
+            @Override
+            public Class apply(final String input) {
+                try {
+                    return Class.forName(input);
+                } catch (ClassNotFoundException e) {
+                    throw Exceptions.propagate(e);
+                }
+            }
+        });
         registerAdapter(String.class, AttributeSensor.class, new Function<String,AttributeSensor>() {
             @Override
             public AttributeSensor apply(final String input) {


[08/14] git commit: Fix port config check when skipping install

Posted by sj...@apache.org.
Fix port config check when skipping install


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5c2f36f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5c2f36f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5c2f36f3

Branch: refs/heads/master
Commit: 5c2f36f37f2ce53530d17b8c30fce32f81af4153
Parents: 32e9911
Author: Andrew Kennedy <gr...@apache.org>
Authored: Fri Aug 29 01:32:58 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Aug 30 17:25:36 2014 +0100

----------------------------------------------------------------------
 .../basic/PortAttributeSensorAndConfigKey.java  | 58 ++++++++++----------
 .../basic/AbstractSoftwareProcessDriver.java    |  2 +-
 2 files changed, 31 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c2f36f3/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java
index fbee6ba..0f4e3f4 100644
--- a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java
+++ b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java
@@ -50,13 +50,13 @@ import com.google.common.collect.Iterables;
  * To convert at runtime a single port is chosen, respecting the entity.
  */
 public class PortAttributeSensorAndConfigKey extends AttributeSensorAndConfigKey<PortRange,Integer> {
+
     private static final long serialVersionUID = 4680651022807491321L;
-    
+
     public static final Logger LOG = LoggerFactory.getLogger(PortAttributeSensorAndConfigKey.class);
 
     static {
-        // ensure type coercions are registered
-        PortRanges.init();
+        PortRanges.init(); // Ensure type coercions are registered
     }
 
     public PortAttributeSensorAndConfigKey(String name) {
@@ -89,49 +89,51 @@ public class PortAttributeSensorAndConfigKey extends AttributeSensorAndConfigKey
                 lo = Maybe.of(locations.iterator().next());
             }
             if (LOG.isTraceEnabled()) {
-                LOG.trace("Convert config to sensor for {} found locations: {}. Selected: {}",
-                        new Object[] {entity, locations, lo});
+                LOG.trace("Convert config to sensor for {} found locations: {}. Selected: {}", new Object[] {entity, locations, lo});
             }
             if (lo.isPresent()) {
                 Location l = lo.get();
                 Boolean skip = Optional.fromNullable(entity.getConfig(BrooklynConfigKeys.SKIP_INSTALLATION)).or(false);
-                if (l instanceof PortSupplier && !skip) {
-                    int p = ((PortSupplier)l).obtainPort(value);
-                    if (p!=-1) {
-                        LOG.debug(""+entity+" choosing port "+p+" for "+getName());
+                if (l instanceof PortSupplier) {
+                    int p = ((PortSupplier) l).obtainPort(value);
+                    if (p != -1) {
+                        LOG.debug("{}: choosing port {} for {}", new Object[] { entity, p, getName() });
                         return p;
                     }
-                    int rangeSize = Iterables.size(value);
-                    if (rangeSize==0)
-                        LOG.warn(""+entity+" no port available for "+getName()+" (empty range "+value+")");
-                    else if (rangeSize==1) {
-                        Integer pp = value.iterator().next();
-                        if (pp>1024)
-                            LOG.warn(""+entity+" port "+pp+" not available for "+getName());
-                        else
-                            LOG.warn(""+entity+" port "+pp+" not available for "+getName()+" (root may be required?)");
-                    } else {
-                        LOG.warn(""+entity+" no port available for "+getName()+" (tried range "+value+")");
+                    // If we are not skipping install, fail now
+                    if (!skip) {
+                        int rangeSize = Iterables.size(value);
+                        if (rangeSize == 0) {
+                            LOG.warn("{}: no port available for {} (empty range {})", new Object[] { entity, getName(), value });
+                        } else if (rangeSize == 1) {
+                            Integer pp = value.iterator().next();
+                            if (pp > 1024) {
+                                LOG.warn("{}: port {} not available for {}", new Object[] { entity, pp, getName() });
+                            } else {
+                                LOG.warn("{}: port {} not available for {} (root may be required?)", new Object[] { entity, pp, getName() });
+                            }
+                        } else {
+                            LOG.warn("{}: no port available for {} (tried range {})", new Object[] { entity, getName(), value });
+                        }
+                        return null; // Definitively, no ports available
                     }
-                    // definitively, no ports available
-                    return null;
                 }
-                // ports may be available, we just can't tell from the location
+                // Ports may be available, we just can't tell from the location
                 Integer v = (value.isEmpty() ? null : value.iterator().next());
-                LOG.debug(""+entity+" choosing port "+v+" (unconfirmed) for "+getName());
+                LOG.debug("{}: choosing port {} (unconfirmed) for {}", new Object[] { entity, v, getName() });
                 return v;
             } else {
-                LOG.warn(""+entity+" ports not applicable, or not yet applicable, because has multiple locations "+locations+"; ignoring "+getName());
+                LOG.warn("{}: ports not applicable, or not yet applicable, because has multiple locations {}; ignoring ", new Object[] { entity, locations, getName() });
             }
         } else {
-            LOG.warn(""+entity+" ports not applicable, or not yet applicable, bacause has no locations; ignoring "+getName());
+            LOG.warn("{}: ports not applicable, or not yet applicable, bacause has no locations; ignoring {}", entity, getName());
         }
         return null;
     }
-    
+
     @Override
     protected Integer convertConfigToSensor(PortRange value, ManagementContext managementContext) {
-        LOG.warn("ports not applicable, bacause given managementContext rather than entity; ignoring "+getName());
+        LOG.warn("ports not applicable, bacause given managementContext rather than entity; ignoring {}", getName());
         return null;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c2f36f3/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 609c624..c32e1fc 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java
@@ -79,7 +79,7 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr
      */
     @Override
     public void start() {
-        DynamicTasks.queue("post-launch", new Runnable() { public void run() {
+        DynamicTasks.queue("pre-install", new Runnable() { public void run() {
             preInstall();
         }});
 


[09/14] git commit: Tidy up formatting

Posted by sj...@apache.org.
Tidy up formatting


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a5012ce6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a5012ce6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a5012ce6

Branch: refs/heads/master
Commit: a5012ce60c4ed63280659e920be9ab6dc3ac1b2f
Parents: 5263b54
Author: Andrew Kennedy <gr...@apache.org>
Authored: Thu Aug 28 17:12:28 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Aug 30 17:25:36 2014 +0100

----------------------------------------------------------------------
 .../entity/basic/BrooklynConfigKeys.java        | 92 ++++++++++----------
 .../brooklyn/entity/basic/SoftwareProcess.java  | 68 +++++++--------
 2 files changed, 78 insertions(+), 82 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a5012ce6/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java b/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
index d2f690f..0f99497 100644
--- a/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
+++ b/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
@@ -18,13 +18,10 @@
  */
 package brooklyn.entity.basic;
 
-import static brooklyn.entity.basic.ConfigKeys.newBooleanConfigKey;
-import static brooklyn.entity.basic.ConfigKeys.newConfigKey;
-import static brooklyn.entity.basic.ConfigKeys.newConfigKeyWithPrefix;
-import static brooklyn.entity.basic.ConfigKeys.newStringConfigKey;
+import static brooklyn.entity.basic.ConfigKeys.*;
 import brooklyn.config.BrooklynServerConfig;
 import brooklyn.config.ConfigKey;
-import brooklyn.event.basic.BasicAttributeSensorAndConfigKey;
+import brooklyn.event.basic.AttributeSensorAndConfigKey;
 import brooklyn.event.basic.TemplatedStringAttributeSensorAndConfigKey;
 import brooklyn.util.internal.ssh.ShellTool;
 import brooklyn.util.internal.ssh.SshTool;
@@ -42,25 +39,24 @@ public class BrooklynConfigKeys {
     @Deprecated /** @deprecated since 0.7.0 use BrooklynServerConfig routines */
     public static final ConfigKey<String> BROOKLYN_DATA_DIR = BrooklynServerConfig.BROOKLYN_DATA_DIR;
 
-    public static final ConfigKey<String> ONBOX_BASE_DIR = newStringConfigKey(
-        "onbox.base.dir", "Default base directory on target machines where Brooklyn config data is stored; "
-        + "default depends on the location, either ~/brooklyn-managed-processes or /tmp/brooklyn-${username} on localhost");
+    public static final ConfigKey<String> ONBOX_BASE_DIR = newStringConfigKey("onbox.base.dir",
+            "Default base directory on target machines where Brooklyn config data is stored; " +
+            "default depends on the location, either ~/brooklyn-managed-processes or /tmp/brooklyn-${username} on localhost");
 
-    public static final ConfigKey<Boolean> SKIP_ON_BOX_BASE_DIR_RESOLUTION = ConfigKeys.newBooleanConfigKey(
-            "onbox.base.dir.skipResolution",
+    public static final ConfigKey<Boolean> SKIP_ON_BOX_BASE_DIR_RESOLUTION = ConfigKeys.newBooleanConfigKey("onbox.base.dir.skipResolution",
             "Whether to skip on-box directory resolution (which can require ssh'ing), and just assume the directory exists; can be set on machine or on entity", 
             false);
 
     // TODO Rename to VERSION, instead of SUGGESTED_VERSION? And declare as BasicAttributeSensorAndConfigKey?
     public static final ConfigKey<String> SUGGESTED_VERSION = newStringConfigKey("install.version", "Suggested version");
-    
+
     public static final ConfigKey<String> INSTALL_UNIQUE_LABEL = ConfigKeys.newStringConfigKey("install.unique_label",
-        "Provides a label which uniquely identifies an installation, used in the computation of the install dir; "
-        + "this should include something readable, and must include a hash of all data which differentiates an installation "
-        + "(e.g. version, plugins, etc), but should be the same where install dirs can be shared to allow for re-use");
-    
+            "Provides a label which uniquely identifies an installation, used in the computation of the install dir; " +
+            "this should include something readable, and must include a hash of all data which differentiates an installation " +
+            "(e.g. version, plugins, etc), but should be the same where install dirs can be shared to allow for re-use");
+
     public static final ConfigKey<Boolean> SKIP_INSTALLATION = newBooleanConfigKey("install.skip", "Skip the driver install commands entirely, for pre-installed software", Boolean.FALSE);
-    
+
     // The implementation in AbstractSoftwareSshDriver runs this command as an SSH command 
     public static final ConfigKey<String> PRE_INSTALL_COMMAND = ConfigKeys.newStringConfigKey("pre.install.command",
             "Command to be run prior to the install method being called on the driver");
@@ -70,37 +66,37 @@ public class BrooklynConfigKeys {
             "Command to be run prior to the launch method being called on the driver");
     public static final ConfigKey<String> POST_LAUNCH_COMMAND = ConfigKeys.newStringConfigKey("post.launch.command",
             "Command to be run after the launch method being called on the driver");
-    
-    public static final BasicAttributeSensorAndConfigKey<String> INSTALL_DIR = new TemplatedStringAttributeSensorAndConfigKey("install.dir", "Directory for this software to be installed in",
-            "${"
-            + "config['"+ONBOX_BASE_DIR.getName()+"']!"
-            + "config['"+BROOKLYN_DATA_DIR.getName()+"']!"
-            + "'/<ERROR>-ONBOX_BASE_DIR-not-set'"
-            + "}"
-            + "/"
-            + "installs/"
+
+    public static final AttributeSensorAndConfigKey<String, String> INSTALL_DIR = new TemplatedStringAttributeSensorAndConfigKey("install.dir", "Directory for this software to be installed in",
+            "${" +
+            "config['"+ONBOX_BASE_DIR.getName()+"']!" +
+            "config['"+BROOKLYN_DATA_DIR.getName()+"']!" +
+            "'/<ERROR>-ONBOX_BASE_DIR-not-set'" +
+            "}" +
+            "/" +
+            "installs/" +
             // the  var??  tests if it exists, passing value to ?string(if_present,if_absent)
             // the ! provides a default value afterwards, which is never used, but is required for parsing
             // when the config key is not available;
             // thus the below prefers the install.unique_label, but falls back to simple name
             // plus a version identifier *if* the version is explicitly set
-            + "${(config['install.unique_label']??)?string(config['install.unique_label']!'X',"
-            + "(entity.entityType.simpleName)+"
-            + "((config['install.version']??)?string('_'+(config['install.version']!'X'),''))"
-            + ")}");
-    
-    public static final BasicAttributeSensorAndConfigKey<String> RUN_DIR = new TemplatedStringAttributeSensorAndConfigKey("run.dir", "Directory for this software to be run from",
-        "${"
-        + "config['"+ONBOX_BASE_DIR.getName()+"']!"
-        + "config['"+BROOKLYN_DATA_DIR.getName()+"']!"
-        + "'/<ERROR>-ONBOX_BASE_DIR-not-set'"
-        + "}"
-            + "/"
-            + "apps/${entity.applicationId}/"
-            + "entities/${entity.entityType.simpleName}_"
-            + "${entity.id}");
-
-    public static final BasicAttributeSensorAndConfigKey<String> EXPANDED_INSTALL_DIR = new TemplatedStringAttributeSensorAndConfigKey(
+            "${(config['install.unique_label']??)?string(config['install.unique_label']!'X'," +
+            "(entity.entityType.simpleName)+" +
+            "((config['install.version']??)?string('_'+(config['install.version']!'X'),''))" +
+            ")}");
+
+    public static final AttributeSensorAndConfigKey<String, String> RUN_DIR = new TemplatedStringAttributeSensorAndConfigKey("run.dir", "Directory for this software to be run from",
+            "${" +
+            "config['"+ONBOX_BASE_DIR.getName()+"']!" +
+            "config['"+BROOKLYN_DATA_DIR.getName()+"']!" +
+            "'/<ERROR>-ONBOX_BASE_DIR-not-set'" +
+            "}" +
+            "/" +
+            "apps/${entity.applicationId}/" +
+            "entities/${entity.entityType.simpleName}_" +
+            "${entity.id}");
+
+    public static final AttributeSensorAndConfigKey<String, String> EXPANDED_INSTALL_DIR = new TemplatedStringAttributeSensorAndConfigKey(
             "expandedinstall.dir", 
             "Directory for installed artifacts (e.g. expanded dir after unpacking .tgz)", 
             null);
@@ -124,25 +120,25 @@ public class BrooklynConfigKeys {
 
     public static final ConfigKey<Duration> START_TIMEOUT = newConfigKey(
             "start.timeout", "Time to wait for process and for SERVICE_UP before failing (in seconds, default 2m)", Duration.seconds(120));
-        
+
     /* selected properties from SshTool for external public access (e.g. putting on entities) */
-    
+
     /** Public-facing global config keys for Brooklyn are defined in ConfigKeys, 
      * and have this prefix pre-prended to the config keys in this class. */
     public static final String BROOKLYN_SSH_CONFIG_KEY_PREFIX = "brooklyn.ssh.config.";
-    
+
     // some checks (this line, and a few Preconditions below) that the remote values aren't null, 
     // because they have some funny circular references
     static { assert BROOKLYN_SSH_CONFIG_KEY_PREFIX.equals(SshTool.BROOKLYN_CONFIG_KEY_PREFIX) : "static final initializer classload ordering problem"; }
-    
+
     public static final ConfigKey<String> SSH_TOOL_CLASS = newConfigKeyWithPrefix(BROOKLYN_SSH_CONFIG_KEY_PREFIX, 
             Preconditions.checkNotNull(SshTool.PROP_TOOL_CLASS, "static final initializer classload ordering problem"));
-    
+
     public static final ConfigKey<String> SSH_CONFIG_HOST = newConfigKeyWithPrefix(BROOKLYN_SSH_CONFIG_KEY_PREFIX, SshTool.PROP_HOST);
     public static final ConfigKey<Integer> SSH_CONFIG_PORT = newConfigKeyWithPrefix(BROOKLYN_SSH_CONFIG_KEY_PREFIX, SshTool.PROP_PORT);
     public static final ConfigKey<String> SSH_CONFIG_USER = newConfigKeyWithPrefix(BROOKLYN_SSH_CONFIG_KEY_PREFIX, SshTool.PROP_USER);
     public static final ConfigKey<String> SSH_CONFIG_PASSWORD = newConfigKeyWithPrefix(BROOKLYN_SSH_CONFIG_KEY_PREFIX, SshTool.PROP_PASSWORD);
-    
+
     public static final ConfigKey<String> SSH_CONFIG_SCRIPT_DIR = newConfigKeyWithPrefix(BROOKLYN_SSH_CONFIG_KEY_PREFIX, 
             Preconditions.checkNotNull(ShellTool.PROP_SCRIPT_DIR, "static final initializer classload ordering problem"));
     public static final ConfigKey<String> SSH_CONFIG_SCRIPT_HEADER = newConfigKeyWithPrefix(BROOKLYN_SSH_CONFIG_KEY_PREFIX, ShellTool.PROP_SCRIPT_HEADER);

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a5012ce6/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java
index d71375f..765a819 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java
@@ -24,7 +24,7 @@ import brooklyn.config.ConfigKey;
 import brooklyn.entity.Entity;
 import brooklyn.entity.trait.Startable;
 import brooklyn.event.AttributeSensor;
-import brooklyn.event.basic.BasicAttributeSensor;
+import brooklyn.event.basic.AttributeSensorAndConfigKey;
 import brooklyn.event.basic.BasicAttributeSensorAndConfigKey;
 import brooklyn.event.basic.MapConfigKey;
 import brooklyn.event.basic.Sensors;
@@ -37,71 +37,71 @@ import com.google.common.reflect.TypeToken;
 
 public interface SoftwareProcess extends Entity, Startable {
 
-    public static final AttributeSensor<String> HOSTNAME = Attributes.HOSTNAME;
-    public static final AttributeSensor<String> ADDRESS = Attributes.ADDRESS;
-    public static final AttributeSensor<String> SUBNET_HOSTNAME = Attributes.SUBNET_HOSTNAME;
-    public static final AttributeSensor<String> SUBNET_ADDRESS = Attributes.SUBNET_ADDRESS;
+    AttributeSensor<String> HOSTNAME = Attributes.HOSTNAME;
+    AttributeSensor<String> ADDRESS = Attributes.ADDRESS;
+    AttributeSensor<String> SUBNET_HOSTNAME = Attributes.SUBNET_HOSTNAME;
+    AttributeSensor<String> SUBNET_ADDRESS = Attributes.SUBNET_ADDRESS;
 
     @SetFromFlag("startTimeout")
-    public static final ConfigKey<Duration> START_TIMEOUT = BrooklynConfigKeys.START_TIMEOUT;
+    ConfigKey<Duration> START_TIMEOUT = BrooklynConfigKeys.START_TIMEOUT;
 
     @SetFromFlag("startLatch")
-    public static final ConfigKey<Boolean> START_LATCH = BrooklynConfigKeys.START_LATCH;
+    ConfigKey<Boolean> START_LATCH = BrooklynConfigKeys.START_LATCH;
 
     @SetFromFlag("setupLatch")
-    public static final ConfigKey<Boolean> SETUP_LATCH = BrooklynConfigKeys.SETUP_LATCH;
+    ConfigKey<Boolean> SETUP_LATCH = BrooklynConfigKeys.SETUP_LATCH;
 
     @SetFromFlag("installLatch")
-    public static final ConfigKey<Boolean> INSTALL_LATCH = BrooklynConfigKeys.INSTALL_LATCH;
+    ConfigKey<Boolean> INSTALL_LATCH = BrooklynConfigKeys.INSTALL_LATCH;
 
     @SetFromFlag("customizeLatch")
-    public static final ConfigKey<Boolean> CUSTOMIZE_LATCH = BrooklynConfigKeys.CUSTOMIZE_LATCH;
+    ConfigKey<Boolean> CUSTOMIZE_LATCH = BrooklynConfigKeys.CUSTOMIZE_LATCH;
 
     @SetFromFlag("resourcesLatch")
-    public static final ConfigKey<Boolean> RESOURCES_LATCH = BrooklynConfigKeys.RESOURCES_LATCH;
+    ConfigKey<Boolean> RESOURCES_LATCH = BrooklynConfigKeys.RESOURCES_LATCH;
 
     @SetFromFlag("launchLatch")
-    public static final ConfigKey<Boolean> LAUNCH_LATCH = BrooklynConfigKeys.LAUNCH_LATCH;
+    ConfigKey<Boolean> LAUNCH_LATCH = BrooklynConfigKeys.LAUNCH_LATCH;
 
     @SetFromFlag("skipInstall")
-    public static final ConfigKey<Boolean> SKIP_INSTALLATION = BrooklynConfigKeys.SKIP_INSTALLATION;
+    ConfigKey<Boolean> SKIP_INSTALLATION = BrooklynConfigKeys.SKIP_INSTALLATION;
 
     @SetFromFlag("preInstallCommand")
-    public static final ConfigKey<String> PRE_INSTALL_COMMAND = BrooklynConfigKeys.PRE_INSTALL_COMMAND;
+    ConfigKey<String> PRE_INSTALL_COMMAND = BrooklynConfigKeys.PRE_INSTALL_COMMAND;
 
     @SetFromFlag("postInstallCommand")
-    public static final ConfigKey<String> POST_INSTALL_COMMAND = BrooklynConfigKeys.POST_INSTALL_COMMAND;
+    ConfigKey<String> POST_INSTALL_COMMAND = BrooklynConfigKeys.POST_INSTALL_COMMAND;
 
     @SetFromFlag("preLaunchCommand")
-    public static final ConfigKey<String> PRE_LAUNCH_COMMAND = BrooklynConfigKeys.PRE_LAUNCH_COMMAND;
+    ConfigKey<String> PRE_LAUNCH_COMMAND = BrooklynConfigKeys.PRE_LAUNCH_COMMAND;
 
     @SetFromFlag("postLaunchCommand")
-    public static final ConfigKey<String> POST_LAUNCH_COMMAND = BrooklynConfigKeys.POST_LAUNCH_COMMAND;
+    ConfigKey<String> POST_LAUNCH_COMMAND = BrooklynConfigKeys.POST_LAUNCH_COMMAND;
 
     @SetFromFlag("version")
-    public static final ConfigKey<String> SUGGESTED_VERSION = BrooklynConfigKeys.SUGGESTED_VERSION;
+    ConfigKey<String> SUGGESTED_VERSION = BrooklynConfigKeys.SUGGESTED_VERSION;
 
     @SetFromFlag("downloadUrl")
-    public static final BasicAttributeSensorAndConfigKey<String> DOWNLOAD_URL = Attributes.DOWNLOAD_URL;
+    BasicAttributeSensorAndConfigKey<String> DOWNLOAD_URL = Attributes.DOWNLOAD_URL;
 
     @SetFromFlag("downloadAddonUrls")
     BasicAttributeSensorAndConfigKey<Map<String,String>> DOWNLOAD_ADDON_URLS = Attributes.DOWNLOAD_ADDON_URLS;
 
     @SetFromFlag("installLabel")
-    public static final ConfigKey<String> INSTALL_UNIQUE_LABEL = BrooklynConfigKeys.INSTALL_UNIQUE_LABEL;
+    ConfigKey<String> INSTALL_UNIQUE_LABEL = BrooklynConfigKeys.INSTALL_UNIQUE_LABEL;
 
     @SetFromFlag("expandedInstallDir")
-    BasicAttributeSensorAndConfigKey<String> EXPANDED_INSTALL_DIR = BrooklynConfigKeys.EXPANDED_INSTALL_DIR;
+    AttributeSensorAndConfigKey<String,String> EXPANDED_INSTALL_DIR = BrooklynConfigKeys.EXPANDED_INSTALL_DIR;
 
     @SetFromFlag("installDir")
-    BasicAttributeSensorAndConfigKey<String> INSTALL_DIR = BrooklynConfigKeys.INSTALL_DIR;
+    AttributeSensorAndConfigKey<String,String> INSTALL_DIR = BrooklynConfigKeys.INSTALL_DIR;
     @Deprecated
-    public static final ConfigKey<String> SUGGESTED_INSTALL_DIR = BrooklynConfigKeys.SUGGESTED_INSTALL_DIR;
+    ConfigKey<String> SUGGESTED_INSTALL_DIR = BrooklynConfigKeys.SUGGESTED_INSTALL_DIR;
 
     @SetFromFlag("runDir")
-    BasicAttributeSensorAndConfigKey<String> RUN_DIR = BrooklynConfigKeys.RUN_DIR;
+    AttributeSensorAndConfigKey<String,String> RUN_DIR = BrooklynConfigKeys.RUN_DIR;
     @Deprecated
-    public static final ConfigKey<String> SUGGESTED_RUN_DIR = BrooklynConfigKeys.SUGGESTED_RUN_DIR;
+    ConfigKey<String> SUGGESTED_RUN_DIR = BrooklynConfigKeys.SUGGESTED_RUN_DIR;
 
     /** Files to be copied to the server, map of "subpath/file.name": "classpath://foo/file.txt" (or other url) */
     @SetFromFlag("runtimeFiles")
@@ -114,11 +114,11 @@ public interface SoftwareProcess extends Entity, Startable {
             "templates.runtime", "Map of templates to be filled in and copied, keyed by destination name relative to runDir");
 
     @SetFromFlag("env")
-    public static final MapConfigKey<Object> SHELL_ENVIRONMENT = new MapConfigKey<Object>(Object.class,
+    MapConfigKey<Object> SHELL_ENVIRONMENT = new MapConfigKey<Object>(Object.class,
             "shell.env", "Map of environment variables to pass to the runtime shell", MutableMap.<String,Object>of());
 
     @SetFromFlag("provisioningProperties")
-    public static final MapConfigKey<Object> PROVISIONING_PROPERTIES = new MapConfigKey<Object>(Object.class,
+    MapConfigKey<Object> PROVISIONING_PROPERTIES = new MapConfigKey<Object>(Object.class,
             "provisioning.properties", "Custom properties to be passed in when provisioning a new machine", MutableMap.<String,Object>of());
 
     @SetFromFlag("maxRebindSensorsDelay")
@@ -135,7 +135,7 @@ public interface SoftwareProcess extends Entity, Startable {
      * (NB: restarts are currently not propagated to children in the default {@link SoftwareProcess}
      * due to the various semantics which may be desired; this may change, but if entities have specific requirements for restart,
      * developers should either subclass the {@link SoftwareProcessDriverLifecycleEffectorTasks} and/or lean on sensors from the parent */
-    public enum ChildStartableMode {
+    enum ChildStartableMode {
         /** do nothing with {@link Startable} children */
         NONE(true, false, false),
         /** start (stop) {@link Startable} children concurrent with *driver* start (stop),
@@ -174,17 +174,17 @@ public interface SoftwareProcess extends Entity, Startable {
     }
 
     @SetFromFlag("childStartMode")
-    public static final ConfigKey<ChildStartableMode> CHILDREN_STARTABLE_MODE = ConfigKeys.newConfigKey(ChildStartableMode.class, "children.startable.mode");
+    ConfigKey<ChildStartableMode> CHILDREN_STARTABLE_MODE = ConfigKeys.newConfigKey(ChildStartableMode.class, "children.startable.mode");
 
     @SuppressWarnings("rawtypes")
-    public static final AttributeSensor<MachineProvisioningLocation> PROVISIONING_LOCATION = new BasicAttributeSensor<MachineProvisioningLocation>(
+    AttributeSensor<MachineProvisioningLocation> PROVISIONING_LOCATION = Sensors.newSensor(
             MachineProvisioningLocation.class, "softwareservice.provisioningLocation", "Location used to provision a machine where this is running");
 
-    public static final AttributeSensor<Boolean> SERVICE_PROCESS_IS_RUNNING = Sensors.newBooleanSensor("service.process.isRunning", 
-        "Whether the process for the service is confirmed as running");
+    AttributeSensor<Boolean> SERVICE_PROCESS_IS_RUNNING = Sensors.newBooleanSensor("service.process.isRunning", 
+            "Whether the process for the service is confirmed as running");
     
-    public static final AttributeSensor<Lifecycle> SERVICE_STATE_ACTUAL = Attributes.SERVICE_STATE_ACTUAL;
+    AttributeSensor<Lifecycle> SERVICE_STATE_ACTUAL = Attributes.SERVICE_STATE_ACTUAL;
  
-    public static final AttributeSensor<String> PID_FILE = Sensors.newStringSensor("softwareprocess.pid.file", "PID file");
+    AttributeSensor<String> PID_FILE = Sensors.newStringSensor("softwareprocess.pid.file", "PID file");
 
 }


[03/14] git commit: Add new first cluster member attributes

Posted by sj...@apache.org.
Add new first cluster member attributes


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d2d78e43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d2d78e43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d2d78e43

Branch: refs/heads/master
Commit: d2d78e43262f42a33b77dadee8b54917399d6608
Parents: c6d148d
Author: Andrew Kennedy <gr...@apache.org>
Authored: Mon Aug 25 19:32:02 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Aug 30 17:23:47 2014 +0100

----------------------------------------------------------------------
 .../brooklyn/entity/group/DynamicCluster.java   | 14 +++++++++++
 .../entity/group/DynamicClusterImpl.java        | 25 ++++++++++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d2d78e43/core/src/main/java/brooklyn/entity/group/DynamicCluster.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/group/DynamicCluster.java b/core/src/main/java/brooklyn/entity/group/DynamicCluster.java
index f51a9ef..bf46ebb 100644
--- a/core/src/main/java/brooklyn/entity/group/DynamicCluster.java
+++ b/core/src/main/java/brooklyn/entity/group/DynamicCluster.java
@@ -166,6 +166,18 @@ public interface DynamicCluster extends AbstractGroup, Cluster, MemberReplaceabl
             new TypeToken<Set<Location>>() {},
             "dynamiccluster.failedSubLocations", "Sub locations that seem to have failed");
 
+    AttributeSensor<Boolean> CLUSTER_MEMBER = Sensors.newBooleanSensor(
+            "cluster.member", "Set on an entity if it is a member of a cluster");
+
+    AttributeSensor<Boolean> FIRST_MEMBER = Sensors.newBooleanSensor(
+            "cluster.first", "Set on an entity if it is the first member of a cluster");
+
+    AttributeSensor<Entity> FIRST = Sensors.newSensor(Entity.class,
+            "cluster.first.entity", "The first member of the cluster");
+
+    AttributeSensor<Entity> CLUSTER = Sensors.newSensor(Entity.class,
+            "cluster.entity", "The cluster an entity is a member of");
+
     /**
      * Changes the cluster size by the given number.
      *
@@ -187,4 +199,6 @@ public interface DynamicCluster extends AbstractGroup, Cluster, MemberReplaceabl
     /** @deprecated since 0.7.0; use {@link #setMemberSpec(EntitySpec)} */
     @Deprecated
     void setFactory(EntityFactory<?> factory);
+
+    Entity addNode(Location loc, Map<?,?> extraFlags);
 }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d2d78e43/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java
index 553d453..d0e273f 100644
--- a/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java
+++ b/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java
@@ -34,12 +34,14 @@ import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import brooklyn.config.render.RendererHints;
 import brooklyn.entity.Entity;
 import brooklyn.entity.basic.AbstractGroupImpl;
-import brooklyn.entity.basic.Attributes;
+import brooklyn.entity.basic.DelegateEntity;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.EntityFactory;
 import brooklyn.entity.basic.EntityFactoryForLocation;
+import brooklyn.entity.basic.EntityLocal;
 import brooklyn.entity.basic.Lifecycle;
 import brooklyn.entity.basic.QuorumCheck.QuorumChecks;
 import brooklyn.entity.basic.ServiceStateLogic;
@@ -112,6 +114,12 @@ public class DynamicClusterImpl extends AbstractGroupImpl implements DynamicClus
         });
     }
 
+    static {
+        RendererHints.register(FIRST, new RendererHints.NamedActionWithUrl("Open", DelegateEntity.EntityUrl.entityUrl()));
+        RendererHints.register(CLUSTER, new RendererHints.NamedActionWithUrl("Open", DelegateEntity.EntityUrl.entityUrl()));
+    }
+
+
     private static final Logger LOG = LoggerFactory.getLogger(DynamicClusterImpl.class);
 
     /**
@@ -710,7 +718,8 @@ public class DynamicClusterImpl extends AbstractGroupImpl implements DynamicClus
         return getConfig(CUSTOM_CHILD_FLAGS);
     }
 
-    protected Entity addNode(Location loc, Map<?,?> extraFlags) {
+    @Override
+    public Entity addNode(Location loc, Map<?,?> extraFlags) {
         Map<?,?> createFlags = MutableMap.builder()
                 .putAll(getCustomChildFlags())
                 .putAll(extraFlags)
@@ -720,6 +729,18 @@ public class DynamicClusterImpl extends AbstractGroupImpl implements DynamicClus
         }
 
         Entity entity = createNode(loc, createFlags);
+
+        ((EntityLocal) entity).setAttribute(CLUSTER_MEMBER, true);
+        ((EntityLocal) entity).setAttribute(CLUSTER, this);
+        synchronized (this) {
+            if (getAttribute(FIRST) == null) {
+                setAttribute(FIRST, entity);
+                ((EntityLocal) entity).setAttribute(FIRST_MEMBER, true);
+            } else {
+                ((EntityLocal) entity).setAttribute(FIRST_MEMBER, false);
+            }
+        }
+
         Entities.manage(entity);
         addMember(entity);
         return entity;


[05/14] git commit: Fixing an intermittent concurrent modification exception in task tags

Posted by sj...@apache.org.
Fixing an intermittent concurrent modification exception in task tags


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c6a22124
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c6a22124
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c6a22124

Branch: refs/heads/master
Commit: c6a2212493c98d6884ad8f0c895478988d073a66
Parents: fbe97e5
Author: Andrew Kennedy <gr...@apache.org>
Authored: Thu Aug 28 12:58:28 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Aug 30 17:23:48 2014 +0100

----------------------------------------------------------------------
 core/src/main/java/brooklyn/util/task/BasicTask.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6a22124/core/src/main/java/brooklyn/util/task/BasicTask.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/util/task/BasicTask.java b/core/src/main/java/brooklyn/util/task/BasicTask.java
index e4424b8..44f2535 100644
--- a/core/src/main/java/brooklyn/util/task/BasicTask.java
+++ b/core/src/main/java/brooklyn/util/task/BasicTask.java
@@ -57,6 +57,7 @@ import com.google.common.base.Function;
 import com.google.common.base.Objects;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.ExecutionList;
 import com.google.common.util.concurrent.ListenableFuture;
 
@@ -81,7 +82,7 @@ public class BasicTask<T> implements TaskInternal<T> {
     public final String displayName;
     public final String description;
 
-    protected final Set<Object> tags = new LinkedHashSet<Object>();
+    protected final Set<Object> tags = Sets.newConcurrentHashSet();
     // for debugging, to record where tasks were created
 //    { tags.add(new Throwable("Creation stack trace")); }
 


[07/14] git commit: Move download resolver and expanded install dir setup to preInstall method

Posted by sj...@apache.org.
Move download resolver and expanded install dir setup to preInstall method


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/32e99110
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/32e99110
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/32e99110

Branch: refs/heads/master
Commit: 32e991104c7e4c37060aed05f19fa85a02f3933b
Parents: a5012ce
Author: Andrew Kennedy <gr...@apache.org>
Authored: Thu Aug 28 22:02:36 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Aug 30 17:25:36 2014 +0100

----------------------------------------------------------------------
 .../nosql/infinispan/Infinispan5SshDriver.java  |  5 -----
 .../basic/AbstractSoftwareProcessDriver.java    |  9 ++++++++
 .../basic/AbstractSoftwareProcessSshDriver.java |  3 +++
 .../brooklynnode/BrooklynNodeSshDriver.java     | 16 ++++++++------
 .../database/mariadb/MariaDbSshDriver.java      | 14 +++++++-----
 .../entity/database/mysql/MySqlSshDriver.java   | 11 ++++++----
 .../database/rubyrep/RubyRepSshDriver.java      | 13 ++++++-----
 .../messaging/activemq/ActiveMQSshDriver.java   |  9 +++++---
 .../kafka/AbstractfKafkaSshDriver.java          | 11 ++++++----
 .../entity/messaging/qpid/QpidSshDriver.java    | 11 ++++++----
 .../messaging/rabbit/RabbitSshDriver.java       | 10 ++++++---
 .../entity/messaging/storm/StormSshDriver.java  | 10 +++++----
 .../entity/zookeeper/ZooKeeperSshDriver.java    |  9 +++++---
 .../entity/monitoring/monit/MonitSshDriver.java | 14 ++++++++----
 .../nosql/cassandra/CassandraNodeSshDriver.java | 12 +++++-----
 .../nosql/couchbase/CouchbaseNodeSshDriver.java | 13 ++++++-----
 .../ElasticSearchNodeSshDriver.java             | 10 +++++----
 .../nosql/mongodb/AbstractMongoDBSshDriver.java | 10 ++++++---
 .../entity/nosql/redis/RedisStoreSshDriver.java | 10 ++++++---
 .../entity/nosql/riak/RiakNodeSshDriver.java    | 23 +++++++++++---------
 .../entity/nosql/solr/SolrServerSshDriver.java  | 13 ++++++-----
 .../entity/osgi/karaf/KarafSshDriver.java       | 11 ++++++----
 .../entity/proxy/nginx/NginxSshDriver.java      | 14 ++++++++----
 .../entity/webapp/jboss/JBoss6SshDriver.java    |  9 +++++---
 .../entity/webapp/jboss/JBoss7SshDriver.java    |  9 +++++---
 .../entity/webapp/jetty/Jetty6SshDriver.java    |  9 +++++---
 .../webapp/nodejs/NodeJsWebAppSshDriver.java    |  4 ++++
 .../entity/webapp/tomcat/Tomcat7SshDriver.java  |  8 +++++--
 28 files changed, 193 insertions(+), 107 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5SshDriver.java
----------------------------------------------------------------------
diff --git a/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5SshDriver.java b/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5SshDriver.java
index ba595a9..361a6ab 100644
--- a/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5SshDriver.java
+++ b/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5SshDriver.java
@@ -24,8 +24,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.java.JavaSoftwareProcessSshDriver;
 import brooklyn.location.Location;
 import brooklyn.location.basic.SshMachineLocation;
@@ -59,11 +57,8 @@ public class Infinispan5SshDriver extends JavaSoftwareProcessSshDriver implement
 
     @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        // FIXME will saveAs be "infinispan-${version}-all.zip"?
-        setExpandedInstallDir(getInstallDir()); // unpacks to current directory, rather than sub-directory
 
         List<String> commands = ImmutableList.<String>builder()
                 .addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs))

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/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 18c5e06..609c624 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java
@@ -79,6 +79,10 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr
      */
     @Override
     public void start() {
+        DynamicTasks.queue("post-launch", 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));
@@ -139,6 +143,11 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr
     @Override
     public abstract void stop();
 
+    /**
+     * Implement this method in child classes to add some post-launch behavior
+     */
+    public void preInstall() {}
+
     public abstract void runPreInstallCommand(String command);
     public abstract void setup();
     public abstract void install();

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/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 eb51e7d..213fb32 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
 import brooklyn.config.BrooklynLogging;
 import brooklyn.entity.basic.lifecycle.NaiveScriptRunner;
 import brooklyn.entity.basic.lifecycle.ScriptHelper;
+import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.drivers.downloads.DownloadResolverManager;
 import brooklyn.entity.software.SshEffectorTasks;
 import brooklyn.event.feed.ConfigToAttributes;
@@ -80,6 +81,8 @@ public abstract class AbstractSoftwareProcessSshDriver extends AbstractSoftwareP
     private volatile String installDir;
     private volatile String runDir;
     private volatile String expandedInstallDir;
+
+    protected volatile DownloadResolver resolver;
     
     /** include this flag in newScript creation to prevent entity-level flags from being included;
      * any SSH-specific flags passed to newScript override flags from the entity,

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java
index cfdbc85..14f628c 100644
--- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java
@@ -30,7 +30,6 @@ import java.util.Map;
 
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.brooklynnode.BrooklynNode.ExistingFileBehaviour;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.java.JavaSoftwareProcessSshDriver;
 import brooklyn.entity.software.SshEffectorTasks;
 import brooklyn.location.basic.SshMachineLocation;
@@ -78,7 +77,15 @@ public class BrooklynNodeSshDriver extends JavaSoftwareProcessSshDriver implemen
     protected String getInstallLabelExtraSalt() {
         return Identifiers.makeIdFromHash(Objects.hashCode(entity.getConfig(BrooklynNode.DOWNLOAD_URL), entity.getConfig(BrooklynNode.DISTRO_UPLOAD_URL)));
     }
-    
+
+    @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        String subpath = entity.getConfig(BrooklynNode.SUBPATH_IN_ARCHIVE);
+        if (Strings.isBlank(subpath)) subpath = format("brooklyn-%s", getVersion());
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(subpath)));
+    }
+
     @Override
     public void install() {
         String uploadUrl = entity.getConfig(BrooklynNode.DISTRO_UPLOAD_URL);
@@ -87,14 +94,9 @@ public class BrooklynNodeSshDriver extends JavaSoftwareProcessSshDriver implemen
         // This filename is used to generate the first URL to try: 
         // file://$HOME/.brooklyn/repository/BrooklynNode/0.6.0-SNAPSHOT/brooklyn-0.6.0-SNAPSHOT-dist.tar.gz
         // (DOWNLOAD_URL overrides this and has a default which comes from maven)
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
         
-        String subpath = entity.getConfig(BrooklynNode.SUBPATH_IN_ARCHIVE);
-        if (Strings.isBlank(subpath)) subpath = format("brooklyn-%s", getVersion());
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(subpath));
-        
         newScript("createInstallDir")
                 .body.append("mkdir -p "+getInstallDir())
                 .failOnNonZeroResultCode()

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java
index e25d2f2..ca80a70 100644
--- a/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java
+++ b/software/database/src/main/java/brooklyn/entity/database/mariadb/MariaDbSshDriver.java
@@ -19,9 +19,7 @@
 package brooklyn.entity.database.mariadb;
 
 import static brooklyn.util.JavaGroovyEquivalents.groovyTruth;
-import static brooklyn.util.ssh.BashCommands.commandsToDownloadUrlsAs;
-import static brooklyn.util.ssh.BashCommands.installPackage;
-import static brooklyn.util.ssh.BashCommands.ok;
+import static brooklyn.util.ssh.BashCommands.*;
 import static java.lang.String.format;
 
 import java.io.InputStream;
@@ -38,12 +36,12 @@ import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
 import brooklyn.entity.basic.Attributes;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.database.DatastoreMixins;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.software.SshEffectorTasks;
 import brooklyn.location.OsDetails;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.net.Urls;
+import brooklyn.util.os.Os;
 import brooklyn.util.ssh.BashCommands;
 import brooklyn.util.task.DynamicTasks;
 import brooklyn.util.task.system.ProcessTaskWrapper;
@@ -111,11 +109,15 @@ public class MariaDbSshDriver extends AbstractSoftwareProcessSshDriver implement
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this, ImmutableMap.of("filename", getInstallFilename()));
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("mariadb-%s-%s", getVersion(), getOsTag()))));
+    }
+
+    @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this, ImmutableMap.of("filename", getInstallFilename()));
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir() + "/" + resolver.getUnpackedDirectoryName(format("mariadb-%s-%s", getVersion(), getOsTag())));
 
         List<String> commands = new LinkedList<String>();
         commands.add(BashCommands.INSTALL_TAR);

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java
index 49dc209..da4f3b6 100644
--- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java
+++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java
@@ -21,7 +21,6 @@ package brooklyn.entity.database.mysql;
 import static brooklyn.util.JavaGroovyEquivalents.groovyTruth;
 import static brooklyn.util.ssh.BashCommands.commandsToDownloadUrlsAs;
 import static brooklyn.util.ssh.BashCommands.installPackage;
-import static brooklyn.util.ssh.BashCommands.ok;
 import static java.lang.String.format;
 
 import java.io.InputStream;
@@ -38,13 +37,13 @@ import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
 import brooklyn.entity.basic.Attributes;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.database.DatastoreMixins;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.software.SshEffectorTasks;
 import brooklyn.location.OsDetails;
 import brooklyn.location.basic.BasicOsDetails.OsVersions;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.net.Urls;
+import brooklyn.util.os.Os;
 import brooklyn.util.ssh.BashCommands;
 import brooklyn.util.task.DynamicTasks;
 import brooklyn.util.task.system.ProcessTaskWrapper;
@@ -111,11 +110,15 @@ public class MySqlSshDriver extends AbstractSoftwareProcessSshDriver implements
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this, ImmutableMap.of("filename", getInstallFilename()));
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("mysql-%s-%s", getVersion(), getOsTag()))));
+    }
+
+    @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this, ImmutableMap.of("filename", getInstallFilename()));
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir() + "/" + resolver.getUnpackedDirectoryName(format("mysql-%s-%s", getVersion(), getOsTag())));
 
         List<String> commands = new LinkedList<String>();
         commands.add(BashCommands.INSTALL_TAR);

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java b/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java
index 56bec94..d1c4087 100644
--- a/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java
+++ b/software/database/src/main/java/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java
@@ -32,9 +32,9 @@ import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
 import brooklyn.entity.basic.Attributes;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.EntityLocal;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
+import brooklyn.util.os.Os;
 import brooklyn.util.ssh.BashCommands;
 import brooklyn.util.stream.Streams;
 
@@ -51,12 +51,17 @@ public class RubyRepSshDriver extends AbstractSoftwareProcessSshDriver implement
     }
 
     protected String getLogFileLocation() {
-        return getRunDir() + "/log/rubyrep.log";
+        return Os.mergePaths(getRunDir(), "log", "rubyrep.log");
+    }
+
+    @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("rubyrep-%s", getVersion()))));
     }
 
     @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
 
@@ -70,8 +75,6 @@ public class RubyRepSshDriver extends AbstractSoftwareProcessSshDriver implement
                 .body.append(commands)
                 .failOnNonZeroResultCode()
                 .execute();
-
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(format("rubyrep-%s", getVersion())));
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java
index 51c1418..f8c223d 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java
@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.Map;
 
 import brooklyn.entity.basic.Entities;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.java.JavaSoftwareProcessSshDriver;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
@@ -64,11 +63,15 @@ public class ActiveMQSshDriver extends JavaSoftwareProcessSshDriver implements A
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("apache-activemq-%s", getVersion()))));
+    }
+
+    @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(format("apache-activemq-%s", getVersion())));
 
         List<String> commands = new LinkedList<String>();
         commands.addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs));

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java
index 9b50092..010c6da 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java
@@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory;
 import brooklyn.config.ConfigKey;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.EntityLocal;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.java.JavaSoftwareProcessSshDriver;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
@@ -58,14 +57,18 @@ public abstract class AbstractfKafkaSshDriver extends JavaSoftwareProcessSshDriv
     protected abstract String getProcessIdentifier();
 
     @Override
-    protected String getLogFileLocation() { return Os.mergePathsUnix(getRunDir(), "console.out"); }
+    protected String getLogFileLocation() { return Os.mergePaths(getRunDir(), "console.out"); }
+
+    @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("kafka-%s-src", getVersion()))));
+    }
 
     @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(format("kafka-%s-src", getVersion())));
 
         List<String> commands = new LinkedList<String>();
         commands.addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs));

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidSshDriver.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidSshDriver.java b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidSshDriver.java
index b336feb..2ad68be 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidSshDriver.java
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/qpid/QpidSshDriver.java
@@ -28,7 +28,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import brooklyn.entity.basic.Entities;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.java.JavaSoftwareProcessSshDriver;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
@@ -47,7 +46,7 @@ public class QpidSshDriver extends JavaSoftwareProcessSshDriver implements QpidD
     }
 
     @Override
-    protected String getLogFileLocation() { return Os.mergePathsUnix(getRunDir(), "log/qpid.log"); }
+    protected String getLogFileLocation() { return Os.mergePaths(getRunDir(), "log", "qpid.log"); }
 
     @Override
     public Integer getAmqpPort() { return entity.getAttribute(QpidBroker.AMQP_PORT); }
@@ -58,11 +57,15 @@ public class QpidSshDriver extends JavaSoftwareProcessSshDriver implements QpidD
     public Integer getHttpManagementPort() { return entity.getAttribute(QpidBroker.HTTP_MANAGEMENT_PORT); }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("qpid-broker-%s", getVersion()))));
+    }
+
+    @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(format("qpid-broker-%s", getVersion())));
 
         List<String> commands = new LinkedList<String>();
         commands.addAll( BashCommands.commandsToDownloadUrlsAs(urls, saveAs));

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java b/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
index 07beffc..bb8d4e2 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
@@ -29,11 +29,11 @@ import org.slf4j.LoggerFactory;
 
 import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
 import brooklyn.entity.basic.Entities;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.messaging.amqp.AmqpServer;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.net.Networking;
+import brooklyn.util.os.Os;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -61,13 +61,17 @@ public class RabbitSshDriver extends AbstractSoftwareProcessSshDriver implements
     public RabbitBrokerImpl getEntity() {
         return (RabbitBrokerImpl) super.getEntity();
     }
+
+    @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("rabbitmq_server-%s", getVersion()))));
+    }
     
     @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(format("rabbitmq_server-%s", getVersion())));
 
         List<String> commands = ImmutableList.<String>builder()
                 .add(ifExecutableElse0("zypper", chainGroup(

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormSshDriver.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormSshDriver.java b/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormSshDriver.java
index 0283929..12f73a1 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormSshDriver.java
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/storm/StormSshDriver.java
@@ -31,7 +31,6 @@ import brooklyn.entity.basic.Attributes;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.EntityLocal;
 import brooklyn.entity.basic.SoftwareProcess;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.java.JavaSoftwareProcessSshDriver;
 import brooklyn.entity.zookeeper.ZooKeeperEnsemble;
 import brooklyn.event.basic.DependentConfiguration;
@@ -120,12 +119,15 @@ public class StormSshDriver extends JavaSoftwareProcessSshDriver implements Stor
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("storm-%s", getVersion()))));
+    }
+
+    @Override
     public void install() {
-        log.debug("Installing {}", entity);
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir() + "/" + resolver.getUnpackedDirectoryName(format("storm-%s", getVersion())));
         
         ImmutableList.Builder<String> commands= ImmutableList.<String> builder();
         if (!getLocation().getOsDetails().isMac()) {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java
index 7ee67e9..5fa0275 100644
--- a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java
+++ b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java
@@ -26,7 +26,6 @@ import java.util.concurrent.ExecutionException;
 
 import brooklyn.entity.Entity;
 import brooklyn.entity.basic.Entities;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.java.JavaSoftwareProcessSshDriver;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
@@ -93,11 +92,15 @@ public class ZooKeeperSshDriver extends JavaSoftwareProcessSshDriver implements
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("zookeeper-%s", getVersion()))));
+    }
+
+    @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(format("zookeeper-%s", getVersion())));
 
         List<String> commands = ImmutableList.<String> builder()
                 .addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs))

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/monitoring/src/main/java/brooklyn/entity/monitoring/monit/MonitSshDriver.java
----------------------------------------------------------------------
diff --git a/software/monitoring/src/main/java/brooklyn/entity/monitoring/monit/MonitSshDriver.java b/software/monitoring/src/main/java/brooklyn/entity/monitoring/monit/MonitSshDriver.java
index fbb57c3..5fd5749 100644
--- a/software/monitoring/src/main/java/brooklyn/entity/monitoring/monit/MonitSshDriver.java
+++ b/software/monitoring/src/main/java/brooklyn/entity/monitoring/monit/MonitSshDriver.java
@@ -24,12 +24,12 @@ import java.util.List;
 import java.util.Map;
 
 import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
-import brooklyn.entity.basic.EntityInternal;
+import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.lifecycle.ScriptHelper;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.location.OsDetails;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
+import brooklyn.util.os.Os;
 import brooklyn.util.ssh.BashCommands;
 
 import com.google.common.collect.ImmutableList;
@@ -43,12 +43,18 @@ public class MonitSshDriver extends AbstractSoftwareProcessSshDriver implements
     public MonitSshDriver(MonitNodeImpl entity, SshMachineLocation machine) {
         super(entity, machine);
     }
+
+    @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("monit-%s", getVersion()))));
+    }
+
     @Override
     public void install() {
-        DownloadResolver resolver = ((EntityInternal)entity).getManagementContext().getEntityDownloadsManager().newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        expandedInstallDir = getInstallDir() + "/" + resolver.getUnpackedDirectoryName(format("monit-%s", getVersion()));
+
         List<String> commands = ImmutableList.<String>builder()
             .add(BashCommands.INSTALL_TAR)
             .add(BashCommands.INSTALL_CURL)

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java
index fc97186..65ed4a6 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java
@@ -35,7 +35,6 @@ import brooklyn.entity.basic.Attributes;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.EntityLocal;
 import brooklyn.entity.database.DatastoreMixins;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.java.JavaSoftwareProcessSshDriver;
 import brooklyn.entity.java.UsesJmx;
 import brooklyn.entity.software.SshEffectorTasks;
@@ -127,14 +126,17 @@ public class CassandraNodeSshDriver extends JavaSoftwareProcessSshDriver impleme
             return super.installJava();
         }
     }
-    
+
+    @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(getDefaultUnpackedDirectoryName())));
+    }
+
     @Override
     public void install() {
-        log.debug("Installing {}", entity);
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(getDefaultUnpackedDirectoryName()));
 
         List<String> commands = ImmutableList.<String>builder()
                 .addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs))

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java
index d55f7df..ff56859 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java
@@ -18,17 +18,13 @@
  */
 package brooklyn.entity.nosql.couchbase;
 
-import static brooklyn.util.ssh.BashCommands.INSTALL_CURL;
-import static brooklyn.util.ssh.BashCommands.alternatives;
-import static brooklyn.util.ssh.BashCommands.chainGroup;
-import static brooklyn.util.ssh.BashCommands.sudo;
+import static brooklyn.util.ssh.BashCommands.*;
 import static java.lang.String.format;
 
 import java.util.List;
 
 import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
 import brooklyn.entity.basic.Entities;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.location.OsDetails;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.ssh.BashCommands;
@@ -49,11 +45,16 @@ public class CouchbaseNodeSshDriver extends AbstractSoftwareProcessSshDriver imp
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(getInstallDir());
+    }
+
+    @Override
     public void install() {
         //for reference https://github.com/urbandecoder/couchbase/blob/master/recipes/server.rb
         //installation instructions (http://docs.couchbase.com/couchbase-manual-2.5/cb-install/#preparing-to-install)
 
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java
index d8cbb03..c2a31de 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java
@@ -28,7 +28,6 @@ import brooklyn.config.ConfigKey;
 import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.EntityLocal;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.net.Urls;
@@ -44,8 +43,13 @@ public class ElasticSearchNodeSshDriver extends AbstractSoftwareProcessSshDriver
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("elasticsearch-%s", getVersion()))));
+    }
+
+    @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
         
@@ -56,8 +60,6 @@ public class ElasticSearchNodeSshDriver extends AbstractSoftwareProcessSshDriver
             .build();
         
         newScript(INSTALLING).body.append(commands).execute();
-        
-        setExpandedInstallDir(getInstallDir() + "/" + resolver.getUnpackedDirectoryName(format("elasticsearch-%s", getVersion())));
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java
index b872fde..7544f86 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java
@@ -29,11 +29,11 @@ import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.EntityLocal;
 import brooklyn.entity.basic.lifecycle.ScriptHelper;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.location.OsDetails;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.exceptions.Exceptions;
 import brooklyn.util.net.Networking;
+import brooklyn.util.os.Os;
 import brooklyn.util.ssh.BashCommands;
 
 import com.google.common.base.Joiner;
@@ -50,11 +50,15 @@ public abstract class AbstractMongoDBSshDriver extends AbstractSoftwareProcessSs
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(getBaseName())));
+    }
+
+    @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(getBaseName()));
     
         List<String> commands = new LinkedList<String>();
         commands.addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs));

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
index d3ea238..0d20290 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
@@ -27,10 +27,10 @@ import org.slf4j.LoggerFactory;
 
 import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
 import brooklyn.entity.basic.Entities;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.location.Location;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
+import brooklyn.util.os.Os;
 import brooklyn.util.ssh.BashCommands;
 
 import com.google.common.collect.ImmutableList;
@@ -47,11 +47,15 @@ public class RedisStoreSshDriver extends AbstractSoftwareProcessSshDriver implem
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("redis-%s", getVersion()))));
+    }
+
+    @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(format("redis-%s", getVersion())));
 
         MutableMap<String, String> installGccPackageFlags = MutableMap.of(
                 "onlyifmissing", "gcc",

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
index 8b7ab1a..372b0bd 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
@@ -27,23 +27,23 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-
 import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
 import brooklyn.entity.basic.Attributes;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.lifecycle.ScriptHelper;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.software.SshEffectorTasks;
 import brooklyn.location.OsDetails;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.net.Urls;
+import brooklyn.util.os.Os;
 import brooklyn.util.task.DynamicTasks;
 
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+
 // TODO: Alter -env ERL_CRASH_DUMP path in vm.args
 public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implements RiakNodeDriver {
 
@@ -71,16 +71,19 @@ public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implemen
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("riak-%s", getVersion()))));
+    }
+
+    @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         String saveAs = resolver.getFilename();
-        String expandedInstallDir = getInstallDir() + "/" + resolver.getUnpackedDirectoryName(format("riak-%s", getVersion()));
-        setExpandedInstallDir(expandedInstallDir);
 
         OsDetails osDetails = getMachine().getMachineDetails().getOsDetails();
         List<String> commands = Lists.newLinkedList();
         if (osDetails.isLinux()) {
-            commands.addAll(installLinux(expandedInstallDir));
+            commands.addAll(installLinux(getExpandedInstallDir()));
         } else if (osDetails.isMac()) {
             commands.addAll(installMac(saveAs));
         } else if (osDetails.isWindows()) {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/nosql/src/main/java/brooklyn/entity/nosql/solr/SolrServerSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/solr/SolrServerSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/solr/SolrServerSshDriver.java
index 4a2c62e..164cc07 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/solr/SolrServerSshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/solr/SolrServerSshDriver.java
@@ -29,13 +29,13 @@ import org.slf4j.LoggerFactory;
 
 import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
 import brooklyn.entity.basic.Entities;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.location.Location;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.file.ArchiveUtils;
 import brooklyn.util.net.Networking;
 import brooklyn.util.net.Urls;
+import brooklyn.util.os.Os;
 import brooklyn.util.ssh.BashCommands;
 import brooklyn.util.stream.Streams;
 
@@ -62,15 +62,18 @@ public class SolrServerSshDriver extends AbstractSoftwareProcessSshDriver implem
 
     public String getMirrorUrl() { return entity.getConfig(SolrServer.MIRROR_URL); }
 
-    public String getPidFile() { return String.format("%s/solr.pid", getRunDir()); }
+    public String getPidFile() { return Os.mergePaths(getRunDir(), "solr.pid"); }
+
+    @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("solr-%s", getVersion()))));
+    }
 
     @Override
     public void install() {
-        log.debug("Installing {}", entity);
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(format("solr-%s", getVersion())));
 
         List<String> commands = ImmutableList.<String>builder()
                 .addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs))

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/osgi/src/main/java/brooklyn/entity/osgi/karaf/KarafSshDriver.java
----------------------------------------------------------------------
diff --git a/software/osgi/src/main/java/brooklyn/entity/osgi/karaf/KarafSshDriver.java b/software/osgi/src/main/java/brooklyn/entity/osgi/karaf/KarafSshDriver.java
index 59f09d8..0e529d9 100644
--- a/software/osgi/src/main/java/brooklyn/entity/osgi/karaf/KarafSshDriver.java
+++ b/software/osgi/src/main/java/brooklyn/entity/osgi/karaf/KarafSshDriver.java
@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.Map;
 
 import brooklyn.entity.basic.Entities;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.java.JavaSoftwareProcessSshDriver;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableList;
@@ -53,15 +52,19 @@ public class KarafSshDriver extends JavaSoftwareProcessSshDriver implements Kara
 
     @Override
     protected String getLogFileLocation() {
-        return Os.mergePathsUnix(getRunDir(), "data/karaf.out");
+        return Os.mergePaths(getRunDir(), "data", "karaf.out");
+    }
+
+    @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("apache-karaf-%s", getVersion()))));
     }
 
     @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(format("apache-karaf-%s", getVersion())));
 
         List<String> commands = ImmutableList.<String>builder()
                 .addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs))

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java
index 8a3f2c6..dabdae2 100644
--- a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java
+++ b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxSshDriver.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
 
 import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
 import brooklyn.entity.basic.Attributes;
+import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.EntityInternal;
 import brooklyn.entity.basic.Lifecycle;
 import brooklyn.entity.basic.lifecycle.ScriptHelper;
@@ -38,6 +39,7 @@ import brooklyn.management.ManagementContext;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.exceptions.Exceptions;
 import brooklyn.util.net.Networking;
+import brooklyn.util.os.Os;
 import brooklyn.util.ssh.BashCommands;
 import brooklyn.util.stream.Streams;
 import brooklyn.util.task.DynamicTasks;
@@ -114,14 +116,18 @@ public class NginxSshDriver extends AbstractSoftwareProcessSshDriver implements
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("nginx-%s", getVersion()))));
+    }
+
+    @Override
     public void install() {
         // inessential here, installation will fail later if it needs to sudo (eg if using port 80)
         DynamicTasks.queueIfPossible(SshTasks.dontRequireTtyForSudo(getMachine(), OnFailingTask.WARN_OR_IF_DYNAMIC_FAIL_MARKING_INESSENTIAL)).orSubmitAndBlock();
 
-        DownloadResolver nginxResolver = mgmt().getEntityDownloadsManager().newDownloader(this);
-        List<String> nginxUrls = nginxResolver.getTargets();
-        String nginxSaveAs = nginxResolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/" + nginxResolver.getUnpackedDirectoryName(format("nginx-%s", getVersion())));
+        List<String> nginxUrls = resolver.getTargets();
+        String nginxSaveAs = resolver.getFilename();
 
         boolean sticky = ((NginxController) entity).isSticky();
         boolean isMac = getMachine().getOsDetails().isMac();

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java b/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
index 5104a52..63e646d 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
@@ -29,7 +29,6 @@ import java.util.Map;
 
 import brooklyn.entity.basic.Attributes;
 import brooklyn.entity.basic.Entities;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.java.UsesJmx;
 import brooklyn.entity.java.UsesJmx.JmxAgentModes;
 import brooklyn.entity.webapp.JavaWebAppSshDriver;
@@ -90,11 +89,15 @@ public class JBoss6SshDriver extends JavaWebAppSshDriver implements JBoss6Driver
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("jboss-%s", getVersion()))));
+    }
+
+    @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/" + resolver.getUnpackedDirectoryName("jboss-"+getVersion()));
 
         // Note the -o option to unzip, to overwrite existing files without warning.
         // The JBoss zip file contains lgpl.txt (at least) twice and the prompt to

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java b/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java
index 9bac1a7..5b8a036 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java
@@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory;
 
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.SoftwareProcess;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.webapp.JavaWebAppSshDriver;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableList;
@@ -106,11 +105,15 @@ public class JBoss7SshDriver extends JavaWebAppSshDriver implements JBoss7Driver
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("jboss-as-%s", getVersion()))));
+    }
+
+    @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName(format("jboss-as-%s", getVersion())));
 
         List<String> commands = new LinkedList<String>();
         commands.addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs));

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/software/webapp/src/main/java/brooklyn/entity/webapp/jetty/Jetty6SshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/jetty/Jetty6SshDriver.java b/software/webapp/src/main/java/brooklyn/entity/webapp/jetty/Jetty6SshDriver.java
index 0e2d69d..33ff65d 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/jetty/Jetty6SshDriver.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/jetty/Jetty6SshDriver.java
@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.Map;
 
 import brooklyn.entity.basic.Entities;
-import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.webapp.JavaWebAppSshDriver;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableList;
@@ -53,11 +52,15 @@ public class Jetty6SshDriver extends JavaWebAppSshDriver implements Jetty6Driver
     }
 
     @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("jetty-%s", getVersion()))));
+    }
+
+    @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName("jetty-"+getVersion()));
 
         List<String> commands = new LinkedList<String>();
         commands.addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs));

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/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 8db6e8a..3e582fb 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
@@ -18,6 +18,8 @@
  */
 package brooklyn.entity.webapp.nodejs;
 
+import static java.lang.String.format;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -27,7 +29,9 @@ import org.slf4j.LoggerFactory;
 
 import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
 import brooklyn.entity.basic.Attributes;
+import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.SoftwareProcess;
+import brooklyn.entity.drivers.downloads.DownloadResolver;
 import brooklyn.entity.webapp.WebAppService;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.util.collections.MutableList;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/32e99110/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 82068e0..8d1b9d3 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
@@ -52,13 +52,17 @@ public class Tomcat7SshDriver extends JavaWebAppSshDriver implements Tomcat7Driv
     protected Integer getShutdownPort() {
         return entity.getAttribute(TomcatServerImpl.SHUTDOWN_PORT);
     }
+    
+    @Override
+    public void preInstall() {
+        resolver = Entities.newDownloader(this);
+        setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName("apache-tomcat-"+getVersion())));
+    }
 
     @Override
     public void install() {
-        DownloadResolver resolver = Entities.newDownloader(this);
         List<String> urls = resolver.getTargets();
         String saveAs = resolver.getFilename();
-        setExpandedInstallDir(getInstallDir()+"/"+resolver.getUnpackedDirectoryName("apache-tomcat-"+getVersion()));
 
         List<String> commands = new LinkedList<String>();
         commands.addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs));


[02/14] git commit: JMX fixes for agentless configration

Posted by sj...@apache.org.
JMX fixes for agentless configration


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6bc2410f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6bc2410f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6bc2410f

Branch: refs/heads/master
Commit: 6bc2410f592df048085ecbd28ee9920665e0d056
Parents: d2d78e4
Author: Andrew Kennedy <gr...@apache.org>
Authored: Thu Aug 28 07:42:55 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Aug 30 17:23:47 2014 +0100

----------------------------------------------------------------------
 .../java/brooklyn/entity/java/JmxSupport.java   |  50 +++-----
 .../main/java/brooklyn/entity/java/UsesJmx.java | 116 +++++++++----------
 2 files changed, 74 insertions(+), 92 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6bc2410f/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
index 19ee628..4ce9456 100644
--- a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
+++ b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
@@ -18,8 +18,6 @@
  */
 package brooklyn.entity.java;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.EnumSet;
 import java.util.List;
 
@@ -32,10 +30,8 @@ import org.slf4j.LoggerFactory;
 import brooklyn.config.ConfigKey;
 import brooklyn.config.ConfigKey.HasConfigKey;
 import brooklyn.entity.Entity;
-import brooklyn.entity.basic.Attributes;
 import brooklyn.entity.basic.EntityInternal;
 import brooklyn.entity.basic.EntityLocal;
-import brooklyn.entity.effector.EffectorTasks;
 import brooklyn.event.feed.jmx.JmxHelper;
 import brooklyn.location.access.BrooklynAccessUtils;
 import brooklyn.location.basic.Locations;
@@ -160,24 +156,18 @@ public class JmxSupport implements UsesJmx {
 
     public String getJmxUrl() {
         init();
-        
-        String host = entity.getAttribute(Attributes.HOSTNAME);
-        if (host==null) {
-            SshMachineLocation machine = EffectorTasks.getSshMachine(entity);
-            host = machine.getAddress().getHostName();
-        }
-        
+
+        HostAndPort jmx = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(JMX_PORT));
+        HostAndPort rmi = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(RMI_REGISTRY_PORT));
+
         if (EnumSet.of(JmxAgentModes.JMXMP, JmxAgentModes.JMXMP_AND_RMI).contains(getJmxAgentMode())) {
-            HostAndPort jmxmp = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(JMX_PORT));
-            return JmxHelper.toJmxmpUrl(jmxmp.getHostText(), jmxmp.getPort());
+            return JmxHelper.toJmxmpUrl(jmx.getHostText(), jmx.getPort());
         } else {
             if (getJmxAgentMode() == JmxAgentModes.NONE) {
                 fixPortsForModeNone();
             }
             // this will work for agent or agentless
-            return JmxHelper.toRmiJmxUrl(host,
-                    entity.getAttribute(JMX_PORT),
-                    entity.getAttribute(RMI_REGISTRY_PORT),
+            return JmxHelper.toRmiJmxUrl(jmx.getHostText(), jmx.getPort(), rmi.getPort(),
                     entity.getAttribute(JMX_CONTEXT));
         }
     }
@@ -269,18 +259,18 @@ public class JmxSupport implements UsesJmx {
     /** applies _some_ of the common settings needed to connect via JMX */
     public void applyJmxJavaSystemProperties(MutableMap.Builder<String,Object> result) {
         if (!isJmx()) return ;
-        
-        Integer jmxRemotePort;
-        String hostName = getEntity().getAttribute(Attributes.HOSTNAME);
-        if (hostName==null) hostName = checkNotNull(getMachine().get().getAddress().getHostName(), "hostname for entity " + entity);
-        
+
+        HostAndPort jmx = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(JMX_PORT));
+        Integer jmxRemotePort = getEntity().getAttribute(JMX_PORT);
+        String hostName = jmx.getHostText();
+
         result.put("com.sun.management.jmxremote", null);
+        result.put("java.rmi.server.hostname", hostName);
 
         switch (getJmxAgentMode()) {
         case JMXMP_AND_RMI:
             result.put(JmxmpAgent.RMI_REGISTRY_PORT_PROPERTY, Preconditions.checkNotNull(entity.getAttribute(UsesJmx.RMI_REGISTRY_PORT), "registry port"));
         case JMXMP:
-            jmxRemotePort = getEntity().getAttribute(JMX_PORT);
             if (jmxRemotePort==null || jmxRemotePort<=0)
                 throw new IllegalStateException("Unsupported JMX port "+jmxRemotePort+" - when applying system properties ("+getJmxAgentMode()+" / "+getEntity()+")");
             result.put(JmxmpAgent.JMXMP_PORT_PROPERTY, jmxRemotePort);
@@ -289,25 +279,21 @@ public class JmxSupport implements UsesJmx {
             // (should not be present, but remove just to be sure)
             result.remove("java.rmi.server.hostname");
             break;
-        case JMX_RMI_CUSTOM_AGENT:    
-            jmxRemotePort = getEntity().getAttribute(JMX_PORT);
+        case JMX_RMI_CUSTOM_AGENT:
             if (jmxRemotePort==null || jmxRemotePort<=0)
                 throw new IllegalStateException("Unsupported JMX port "+jmxRemotePort+" - when applying system properties ("+getJmxAgentMode()+" / "+getEntity()+")");
-            result.put(JmxRmiAgent.RMI_REGISTRY_PORT_PROPERTY, 
-                    Preconditions.checkNotNull(entity.getAttribute(UsesJmx.RMI_REGISTRY_PORT), "registry port"));
+            result.put(JmxRmiAgent.RMI_REGISTRY_PORT_PROPERTY, Preconditions.checkNotNull(entity.getAttribute(UsesJmx.RMI_REGISTRY_PORT), "registry port"));
             result.put(JmxRmiAgent.JMX_SERVER_PORT_PROPERTY, jmxRemotePort);
-            result.put("java.rmi.server.hostname", hostName);
             break;
         case NONE:
-            // only for mode 'NONE' - other modes use different fields
             jmxRemotePort = fixPortsForModeNone();
+        case JMX_RMI:
             result.put("com.sun.management.jmxremote.port", jmxRemotePort);
-            result.put("java.rmi.server.hostname", hostName);
             break;
-        default:    
+        default:
             throw new IllegalStateException("Unsupported JMX mode - when applying system properties ("+getJmxAgentMode()+" / "+getEntity()+")");
         }
-        
+
         if (isSecure()) {
             // set values true, and apply keys pointing to keystore / truststore
             getJmxSslSupport().applyAgentJmxJavaSystemProperties(result);
@@ -320,7 +306,7 @@ public class JmxSupport implements UsesJmx {
 
     /** installs files needed for JMX, to the runDir given in constructor, assuming the runDir has been created */ 
     public void install() {
-        if (getJmxAgentMode()!=JmxAgentModes.NONE) {
+        if (EnumSet.of(JmxAgentModes.JMXMP_AND_RMI, JmxAgentModes.JMXMP, JmxAgentModes.JMX_RMI_CUSTOM_AGENT).contains(getJmxAgentMode())) {
             getMachine().get().copyTo(ResourceUtils.create(this).getResourceFromUrl(
                 getJmxAgentJarUrl()), getJmxAgentJarDestinationFilePath());
         }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6bc2410f/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java b/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java
index 8166d0c..ff8164a 100644
--- a/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java
+++ b/software/base/src/main/java/brooklyn/entity/java/UsesJmx.java
@@ -25,6 +25,7 @@ import brooklyn.config.ConfigKey;
 import brooklyn.entity.Entity;
 import brooklyn.entity.basic.ConfigKeys;
 import brooklyn.event.AttributeSensor;
+import brooklyn.event.basic.AttributeSensorAndConfigKey;
 import brooklyn.event.basic.BasicAttributeSensorAndConfigKey;
 import brooklyn.event.basic.BasicConfigKey;
 import brooklyn.event.basic.PortAttributeSensorAndConfigKey;
@@ -34,14 +35,14 @@ import brooklyn.util.flags.SetFromFlag;
 
 public interface UsesJmx extends UsesJava {
 
-    public static final int DEFAULT_JMX_PORT = 1099;   // RMI port?
+    public static final int DEFAULT_JMX_PORT = 1099; // RMI port?
 
     @SetFromFlag("useJmx")
-    public static final ConfigKey<Boolean> USE_JMX = ConfigKeys.newConfigKey("jmx.enabled", "JMX enabled", Boolean.TRUE);
+    ConfigKey<Boolean> USE_JMX = ConfigKeys.newConfigKey("jmx.enabled", "JMX enabled", Boolean.TRUE);
 
-    /** chosen by java itself by default; setting this will only have any effect if using an agent */ 
+    /** Chosen by Java itself by default, setting this will only have any effect if using an agent. */
     @SetFromFlag("jmxPort")
-    public static final PortAttributeSensorAndConfigKey JMX_PORT = new PortAttributeSensorAndConfigKey(
+    PortAttributeSensorAndConfigKey JMX_PORT = new PortAttributeSensorAndConfigKey(
             "jmx.direct.port", "JMX direct/private port (e.g. JMX RMI server port, or JMXMP port, but not RMI registry port)", PortRanges.fromString("31001+")) {
         @Override protected Integer convertConfigToSensor(PortRange value, Entity entity) {
             // TODO when using JmxAgentModes.NONE we should *not* convert, but leave it null
@@ -52,64 +53,59 @@ public interface UsesJmx extends UsesJava {
             return super.convertConfigToSensor(value, entity);
         }
     };
-    
-    /** well-known port used by Java itself to start the RMI registry where JMX private port can be discovered;
-     * ignored if using JMXMP agent
-     */ 
+
+    /** Well-known port used by Java itself to start the RMI registry where JMX private port can be discovered, ignored if using JMXMP agent. */
     @SetFromFlag("rmiRegistryPort")
-    public static final PortAttributeSensorAndConfigKey RMI_REGISTRY_PORT = new PortAttributeSensorAndConfigKey(
-            "rmi.registry.port", "RMI registry port, used for discovering JMX (private) port", PortRanges.fromString("1099, 19099+"));
+    PortAttributeSensorAndConfigKey RMI_REGISTRY_PORT = ConfigKeys.newPortSensorAndConfigKey(
+            "rmi.registry.port", "RMI registry port, used for discovering JMX (private) port", PortRanges.fromString("1099,19099+"));
 
     @SetFromFlag("jmxContext")
-    public static final BasicAttributeSensorAndConfigKey<String> JMX_CONTEXT = new BasicAttributeSensorAndConfigKey<String>(
-            String.class, "jmx.context", "JMX context path", "jmxrmi");
+    AttributeSensorAndConfigKey<String, String> JMX_CONTEXT = ConfigKeys.newStringSensorAndConfigKey("jmx.context", "JMX context path", "jmxrmi");
 
-    public static final AttributeSensor<String> JMX_URL = new BasicAttributeSensorAndConfigKey<String>(
+    AttributeSensor<String> JMX_URL = new BasicAttributeSensorAndConfigKey<String>(
             String.class, "jmx.service.url", "The URL for connecting to the MBean Server");
 
-    /** forces JMX to be secured, using JMXMP so it gets through firewalls _and_ SSL/TLS
-     * (NB: there is not currently any corresponding JMXMP without SSL/TLS) */
+    /** Forces JMX to be secured, using JMXMP so it gets through firewalls <em>and</em> SSL/TLS. */
     @SetFromFlag("jmxSecure")
-    public static final ConfigKey<Boolean> JMX_SSL_ENABLED = ConfigKeys.newBooleanConfigKey("jmx.ssl.enabled", "JMX over JMXMP enabled with SSL/TLS", Boolean.FALSE);
+    ConfigKey<Boolean> JMX_SSL_ENABLED = ConfigKeys.newBooleanConfigKey("jmx.ssl.enabled", "JMX over JMXMP enabled with SSL/TLS", Boolean.FALSE);
 
-    public enum JmxAgentModes {
-        /** auto-detect the agent to use based on location, preferring JMXMP except at localhost where JMX_RMI_CUSTOM_AGENT is preferred */
+    enum JmxAgentModes {
+        /** Auto-detect the agent to use based on location. Prefer {@link #JMXMP} except at localhost which uses {@link #JMX_RMI_CUSTOM_AGENT}. */
         AUTODETECT,
-        /** JMXMP which permits firewall access through a single port {@link UsesJmx#JMX_PORT} */
+
+        /** JMXMP which permits firewall access through a single port {@link UsesJmx#JMX_PORT}. */
         JMXMP,
-        /** Start {@link #JMXMP} along with an RMI Registry on {@link UsesJmx#RMI_REGISTRY_PORT}
-         * (redirecting to an anonymous high-numbered port as the RMI server) */
+
+        /** Start {@link #JMXMP} along with an RMI Registry on {@link UsesJmx#RMI_REGISTRY_PORT}, redirecting to an anonymous high-numbered port as the RMI server. */
         JMXMP_AND_RMI,
-        /** JMX over RMI custom agent which permits access through a known RMI registry port, redirected to a known JMX-RMI port;
-         * two ports must be opened on the firewall, and the same hostname resolvable on the target machine and by the client */
+
+        /** JMX over RMI custom agent which permits access through a known {@link UsesJmx#RMI_REGISTRY_PORT}, redirected to a known {@link UsesJmx#JMX_PORT}.
+         * Both ports must be opened on the firewall, and the same hostname resolvable on the target machine and by the client */
         JMX_RMI_CUSTOM_AGENT,
-        /** do not install a JMX agent; use the default RMI which opens a registry at a known port, redirected to an _unknown_ port for jmx 
-         * (experimental) */
+
+        /** As with {@link UsesJmx#JMX_RMI_CUSTOM_AGENT} but no custom agent requred, entity must handle pots correctly.  */
+        JMX_RMI,
+
+        /** Do not install a JMX agent. Use the default {@link UsesJmx#RMI_REGISTRY_PORT}, redirected to an unknown port for JMX. */
         NONE
     }
-    
+
     @SetFromFlag("jmxAgentMode")
-    public static final ConfigKey<JmxAgentModes> JMX_AGENT_MODE = ConfigKeys.newConfigKey(JmxAgentModes.class,
-            "jmx.agent.mode", "What type of JMX agent to use; defaults to null (autodetect) which means " +
-    		"JMXMP_AND_RMI allowing firewall access through a single port as well as local access supporting jconsole " +
-    		"(unless JMX_SSL_ENABLED is set, in which case it is JMXMP only)", 
-    		JmxAgentModes.AUTODETECT);
+    ConfigKey<JmxAgentModes> JMX_AGENT_MODE = ConfigKeys.newConfigKey("jmx.agent.mode",
+            "What type of JMX agent to use; defaults to null (autodetect) which means " +
+            "JMXMP_AND_RMI allowing firewall access through a single port as well as local access supporting jconsole " +
+            "(unless JMX_SSL_ENABLED is set, in which case it is JMXMP only)",
+            JmxAgentModes.AUTODETECT);
+
+    /* Currently these are only used to connect, so only applies where systems set this up themselves. */
+    AttributeSensorAndConfigKey<String, String> JMX_USER = ConfigKeys.newStringSensorAndConfigKey("jmx.user", "JMX username");
+    AttributeSensorAndConfigKey<String, String> JMX_PASSWORD = ConfigKeys.newStringSensorAndConfigKey("jmx.password", "JMX password");
 
-    /** Currently only used to connect; not used to set up JMX (so only applies where systems set this up themselves)
-     */
-    public static final BasicAttributeSensorAndConfigKey<String> JMX_USER = new BasicAttributeSensorAndConfigKey<String>(
-            String.class, "jmx.user", "JMX username");
-    
-    /** Currently only used to connect; not used to set up JMX (so only applies where systems set this up themselves)
-     */
-    public static final BasicAttributeSensorAndConfigKey<String> JMX_PASSWORD = new BasicAttributeSensorAndConfigKey<String>(
-            String.class, "jmx.password", "JMX password");
-    
     /*
      * Synopsis of how the keys work for JMX_SSL:
-     * 
+     *
      * BROOKLYN
-     *  * brooklyn ROOT key + cert -> 
+     *  * brooklyn ROOT key + cert ->
      *      used to identify things brooklyn has signed, ie to confirm their identity
      *      signs all certs created by brooklyn
      *      (created per entity if not specified as input)
@@ -120,7 +116,7 @@ public interface UsesJmx extends UsesJava {
      *      global would probably be fine but more work;
      *      however it is important that this _not_ sign agents keys,
      *      to prevent agents from accessing other agents)
-     * 
+     *
      * AGENT (e.g. JMX server in each managed java process)
      *  * gets AGENT key + cert ->
      *      signed by brooklyn ROOT, used to authenticate itself to brooklyn
@@ -129,57 +125,57 @@ public interface UsesJmx extends UsesJava {
      */
 
     /* TODO brooklyn ROOT key
-     *  
+     *
     public static final ConfigKey<String> BROOKLYN_SSL_ROOT_KEYSTORE_URL = new BasicConfigKey<String>(
             String.class, "brooklyn.ssl.root.keyStoreUrl", "URL to keystore Brooklyn should use as root private key and certificate-signing authority", null);
-    
+
     public static final ConfigKey<String> BROOKLYN_SSL_ROOT_KEY_DATA = new BasicConfigKey<String>(
             String.class, "brooklyn.ssl.root.key", "root private key (RSA string format), used to sign managed servers", null);
     public static final ConfigKey<String> BROOKLYN_SSL_ROOT_CERT_DATA = new BasicConfigKey<String>(
             String.class, "brooklyn.ssl.root.cert", "certificate for root private key (RSA string format)", null);
-    
+
      * brooklyn.ssl.root.keyStorePassword
      * brooklyn.ssl.root.keyAlias (if null, looks for one called 'brooklyn', otherwise takes the first key)
      * brooklyn.ssl.root.keyPassword
-     */ 
-    
+     */
+
     public static final ConfigKey<PrivateKey> JMX_SSL_ACCESS_KEY = new BasicConfigKey<PrivateKey>(
             PrivateKey.class, "jmx.ssl.access.key", "key used to access a JMX agent (typically per entity, embedded in the managed JVM)", null);
     public static final ConfigKey<Certificate> JMX_SSL_ACCESS_CERT = new BasicConfigKey<Certificate>(
             Certificate.class, "jmx.ssl.access.cert", "certificate of key used to access a JMX agent", null);
-    
+
     /* TODO specify a keystore from which to get the access key
      * (above keys are set programmatically, typically _not_ by the user ... keystore would be the way to do that)
-     * 
+     *
      * jmx.ssl.access.keyStoreUrl (optional)
      * jmx.ssl.access.keyStorePassword (optional)
      * jmx.ssl.access.keyAlias (optional)
      */
-    
+
     /* could allow user to specify additional certs for JMX agents which should be trusted
-     *    
+     *
      * jmx.ssl.access.trustStoreUrl
      */
-    
-    /* optionally: could allow JMX agent to trust additional accessers, 
+
+    /* optionally: could allow JMX agent to trust additional accessers,
      * and/or use known keys in the case that other accessers might want to authenticate the JMX server
-     *   
-     * NB currently agent keys are not stored in brooklyn... no reason to as 
+     *
+     * NB currently agent keys are not stored in brooklyn... no reason to as
      * (a) currently we trust jmx agents; and (b) for agent-auth we should simply sign keys;
      * either way, seems fine for brooklyn to throw them away once they are installed on the remote machine)
-     * 
+     *
      * jmx.ssl.agent.keyStoreUrl
      * jmx.ssl.agent.keyStorePassword
      * jmx.ssl.agent.keyAlias
      * jmx.ssl.agent.keyPassword
-     * 
+     *
      * jmx.ssl.agent.trustStoreUrl
      */
 
     /* optionally: this could be set to disallow attaching to JMX through the attach mechanism
      * (but this option is generally not considered needed, as JVM attachment is
      * already restricted to localhost and to the the user running the process)
-     * 
+     *
      * -XX:+DisableAttachMechanism
      */
 }
\ No newline at end of file


[11/14] git commit: Use interface for AttributeSensorAndConfigKey

Posted by sj...@apache.org.
Use interface for AttributeSensorAndConfigKey


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/11332d34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/11332d34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/11332d34

Branch: refs/heads/master
Commit: 11332d34f3c23321c1cf38c62d4a593e35ae2b91
Parents: 7b288f2
Author: Andrew Kennedy <gr...@apache.org>
Authored: Fri Aug 29 17:40:22 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Aug 30 17:27:08 2014 +0100

----------------------------------------------------------------------
 .../brooklyn/entity/basic/SoftwareProcess.java  |  5 +--
 .../entity/basic/VanillaSoftwareProcess.java    | 44 ++++++++++++--------
 2 files changed, 28 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/11332d34/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java
index 765a819..2d7347b 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcess.java
@@ -25,7 +25,6 @@ import brooklyn.entity.Entity;
 import brooklyn.entity.trait.Startable;
 import brooklyn.event.AttributeSensor;
 import brooklyn.event.basic.AttributeSensorAndConfigKey;
-import brooklyn.event.basic.BasicAttributeSensorAndConfigKey;
 import brooklyn.event.basic.MapConfigKey;
 import brooklyn.event.basic.Sensors;
 import brooklyn.location.MachineProvisioningLocation;
@@ -82,10 +81,10 @@ public interface SoftwareProcess extends Entity, Startable {
     ConfigKey<String> SUGGESTED_VERSION = BrooklynConfigKeys.SUGGESTED_VERSION;
 
     @SetFromFlag("downloadUrl")
-    BasicAttributeSensorAndConfigKey<String> DOWNLOAD_URL = Attributes.DOWNLOAD_URL;
+    AttributeSensorAndConfigKey<String,String> DOWNLOAD_URL = Attributes.DOWNLOAD_URL;
 
     @SetFromFlag("downloadAddonUrls")
-    BasicAttributeSensorAndConfigKey<Map<String,String>> DOWNLOAD_ADDON_URLS = Attributes.DOWNLOAD_ADDON_URLS;
+    AttributeSensorAndConfigKey<Map<String,String>,Map<String,String>> DOWNLOAD_ADDON_URLS = Attributes.DOWNLOAD_ADDON_URLS;
 
     @SetFromFlag("installLabel")
     ConfigKey<String> INSTALL_UNIQUE_LABEL = BrooklynConfigKeys.INSTALL_UNIQUE_LABEL;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/11332d34/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcess.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcess.java b/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcess.java
index c722f90..9e9e171 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcess.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcess.java
@@ -20,38 +20,46 @@ package brooklyn.entity.basic;
 
 import brooklyn.config.ConfigKey;
 import brooklyn.entity.proxying.ImplementedBy;
-import brooklyn.event.basic.BasicAttributeSensorAndConfigKey;
+import brooklyn.event.basic.AttributeSensorAndConfigKey;
 
 /** 
- * downloads and unpacks the archive indicated (optionally), 
- * then runs the management commands (scripts) indicated
- * (relative to the root of the archive if supplied, otherwise in a tmp working dir) to manage
+ * A {@link SoftwareProcess} entity that runs commands from an archive.
  * <p>
- * uses config keys to identify the files / commands to use
+ * Downloads and unpacks the archive indicated (optionally) then runs the management commands (scripts) indicated
+ * (relative to the root of the archive if supplied, otherwise in a tmp working dir) to manage. Uses config keys
+ * to identify the files or commands to use.
  * <p>
- * in simplest mode, simply provide either:
+ * In the simplest mode, simply provide either:
+ * <ul>
  * <li> an archive in {@link #DOWNLOAD_URL} containing a <code>./start.sh</code>
  * <li> a start command to invoke in {@link #LAUNCH_COMMAND}
+ * </ul>
+ * The only constraint is that the start command must write the PID into the file pointed to by the injected environment
+ * variable {@code PID_FILE} unless one of the options below is supported.
  * <p>
- * the only constraint is that the start command must write the PID into the file pointed to by the injected environment variable PID_FILE,
- * unless one of the options below is supported.
+ * The start command can be a complex bash command, downloading and unpacking files, and handling the {@code PID_FILE} requirement.
+ * For example {@code export MY_PID_FILE=$PID_FILE ; ./my_start.sh} or {@code nohup ./start.sh & ; echo $! > $PID_FILE ; sleep 5}.
+ * </pre>
+ * You can supply both {@link #DOWNLOAD_URL} and {@link #LAUNCH_COMMAND} configuration as well..
  * <p>
- * the start command can be a complex bash command, downloading and unpacking files, and/or handling the PID_FILE requirement 
- * (e.g. <code>export MY_PID_FILE=$PID_FILE ; ./my_start.sh</code> or <code>nohup ./start.sh & ; echo $! > $PID_FILE ; sleep 5</code>),
- * and of course you can supply both {@link #DOWNLOAD_URL} and {@link #LAUNCH_COMMAND}.
- * <p>
- * by default the PID is used to stop the process (kill followed by kill -9 if needed) and restart (process stop followed by process start),
- * but it is possible to override this behavior through config keys:
- * <li> a custom {@link #CHECK_RUNNING_COMMAND}
- * <li> a custom {@link #STOP_COMMAND}
- * <li> specify which {@link SoftwareProcess#PID_FILE} to use
+ * By default the PID is used to stop the process using {@code kill} followed by {@code kill -9} if needed and restart
+ * is implemented by stopping the process and then running {@link VanillaSoftwareProcessSshDriver#launch()}, but it is
+ * possible to override this behavior through config keys:
+ * <ul>
+ * <li> A custom {@link #CHECK_RUNNING_COMMAND}
+ * <li> A custom {@link #STOP_COMMAND}
+ * <li> A different {@link SoftwareProcess#PID_FILE} to use
+ * <li>
  */
 @ImplementedBy(VanillaSoftwareProcessImpl.class)
 public interface VanillaSoftwareProcess extends SoftwareProcess {
-    BasicAttributeSensorAndConfigKey<String> DOWNLOAD_URL = SoftwareProcess.DOWNLOAD_URL;
+
+    AttributeSensorAndConfigKey<String, String> DOWNLOAD_URL = SoftwareProcess.DOWNLOAD_URL;
+
     ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "0.0.0");
 
     ConfigKey<String> LAUNCH_COMMAND = ConfigKeys.newStringConfigKey("launch.command", "command to run to launch the process", "./start.sh");
     ConfigKey<String> CHECK_RUNNING_COMMAND = ConfigKeys.newStringConfigKey("checkRunning.command", "command to determine whether the process is running");
     ConfigKey<String> STOP_COMMAND = ConfigKeys.newStringConfigKey("stop.command", "command to run to stop the process");
+
 }


[13/14] git commit: More formnatting tidyup

Posted by sj...@apache.org.
More formnatting tidyup


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f61c13cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f61c13cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f61c13cb

Branch: refs/heads/master
Commit: f61c13cb4a10e214158135ad286695ec0dbf5c6a
Parents: 5c2f36f
Author: Andrew Kennedy <gr...@apache.org>
Authored: Fri Aug 29 02:32:37 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Aug 30 17:27:08 2014 +0100

----------------------------------------------------------------------
 .../entity/basic/EmptySoftwareProcessImpl.java  |  11 +-
 .../java/brooklyn/entity/java/JmxSupport.java   |  59 +++---
 .../entity/machine/MachineEntityImpl.java       |   2 -
 .../software/MachineLifecycleEffectorTasks.java | 205 +++++++++++--------
 4 files changed, 154 insertions(+), 123 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f61c13cb/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcessImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcessImpl.java b/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcessImpl.java
index c6e256e..ba86768 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcessImpl.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/EmptySoftwareProcessImpl.java
@@ -24,21 +24,16 @@ public class EmptySoftwareProcessImpl extends SoftwareProcessImpl implements Emp
     public Class<?> getDriverInterface() {
         return EmptySoftwareProcessDriver.class;
     }
-    
-    @Override
-    public SoftwareProcessDriver getDriver() {
-        return super.getDriver();
-    }
 
     @Override
     protected void connectSensors() {
         super.connectSensors();
-        super.connectServiceUpIsRunning();
+        connectServiceUpIsRunning();
     }
-    
+
     @Override
     protected void disconnectSensors() {
-        super.disconnectServiceUpIsRunning();
+        disconnectServiceUpIsRunning();
         super.disconnectSensors();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f61c13cb/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
index 4ce9456..7aa8bb0 100644
--- a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
+++ b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
@@ -53,43 +53,43 @@ import com.google.common.net.HostAndPort;
 public class JmxSupport implements UsesJmx {
 
     private static final Logger log = LoggerFactory.getLogger(JmxSupport.class);
-    
+
     private final Entity entity;
     private final String runDir;
-    
+
     private Boolean isJmx;
     private Boolean isSecure;
     private JmxAgentModes jmxAgentMode;
 
     private static boolean warnedAboutNotOnClasspath = false;
-    
+
     /** run dir may be null if it is not accessed */
     public JmxSupport(Entity entity, @Nullable String runDir) {
         this.entity = Preconditions.checkNotNull(entity, "entity must be supplied");
         this.runDir = runDir;
     }
-    
+
     @Nonnull
     public String getRunDir() {
         return Preconditions.checkNotNull(runDir, "runDir must have been supplied to perform this operation");
     }
-    
+
     public Entity getEntity() {
         return entity;
     }
-    
+
     <T> T getConfig(ConfigKey<T> key) {
         return getEntity().getConfig(key);
     }
-    
+
     <T> T getConfig(HasConfigKey<T> key) {
         return getEntity().getConfig(key);
     }
-    
+
     <T> void setConfig(ConfigKey<T> key, T value) {
         ((EntityLocal)getEntity()).setConfig(key, value);
     }
-    
+
     public Maybe<SshMachineLocation> getMachine() {
         return Locations.findUniqueSshMachineLocation(entity.getLocations());
     }
@@ -104,17 +104,17 @@ public class JmxSupport implements UsesJmx {
         if (jmxAgentMode==null) return JmxAgentModes.NONE;
         return jmxAgentMode;
     }
-    
+
     public boolean isSecure() {
         init();
         if (isSecure==null) return false;
         return isSecure;
     }
-    
+
     protected synchronized void init() {
         if (isJmx!=null)
             return;
-        
+
         if (Boolean.FALSE.equals(entity.getConfig(USE_JMX))) {
             isJmx = false;
             return;
@@ -122,10 +122,10 @@ public class JmxSupport implements UsesJmx {
         isJmx = true;
         jmxAgentMode = entity.getConfig(JMX_AGENT_MODE);
         if (jmxAgentMode==null) jmxAgentMode = JmxAgentModes.AUTODETECT;
-        
+
         isSecure = entity.getConfig(JMX_SSL_ENABLED);
         if (isSecure==null) isSecure = false;
-        
+
         if (jmxAgentMode==JmxAgentModes.AUTODETECT) {
             if (isSecure()) {
                 jmxAgentMode = JmxAgentModes.JMXMP;
@@ -135,14 +135,14 @@ public class JmxSupport implements UsesJmx {
                     // can happen e.g. if eclipse build
                     log.warn("JMX agent JAR not found ("+getJmxAgentJarUrl()+") when auto-detecting JMX settings for "+entity+"; " +
                             "likely cause is an incomplete build (e.g. from Eclipse; run a maven build then retry in the IDE); "+
-                    		"reverting to NONE (use built-in Java JMX support, which will not go through firewalls)");
+                            "reverting to NONE (use built-in Java JMX support, which will not go through firewalls)");
                     jmxAgentMode = JmxAgentModes.NONE;
                 }
             }
-            
+
             ((EntityLocal)entity).setConfig(JMX_AGENT_MODE, jmxAgentMode);
         }
-        
+
         if (isSecure && jmxAgentMode!=JmxAgentModes.JMXMP) {
             String msg = "JMX SSL is specified, but it requires JMXMP which is disabled, when configuring "+entity;
             log.warn(msg);
@@ -211,18 +211,18 @@ public class JmxSupport implements UsesJmx {
 
     @Nullable public MavenArtifact getJmxAgentJarMavenArtifact() {
         switch (getJmxAgentMode()) {
-        case JMXMP: 
-        case JMXMP_AND_RMI: 
+        case JMXMP:
+        case JMXMP_AND_RMI:
             MavenArtifact result = BrooklynMavenArtifacts.artifact(null, "brooklyn-jmxmp-agent", "jar", "with-dependencies");
             // the "with-dependencies" variant is needed; however the filename then has the classifier segment _replaced_ by "shaded" when this filename is created
             result.setCustomFileNameAfterArtifactMarker("shaded");
             result.setClassifierFileNameMarker("");
             return result;
-        case JMX_RMI_CUSTOM_AGENT: 
+        case JMX_RMI_CUSTOM_AGENT:
             return BrooklynMavenArtifacts.jar("brooklyn-jmxrmi-agent");
         default:
             return null;
-        }        
+        }
     }
 
     /** @deprecated since 0.6.0; use {@link #getJmxAgentJarMavenArtifact()} */
@@ -235,8 +235,8 @@ public class JmxSupport implements UsesJmx {
     }
 
     /** returns URL for accessing the java agent, throwing if not applicable;
-     * prefers on classpath where it should be, but will fall back to taking from maven hosted 
-     * (known problem in Eclipse where JARs are not always copied) 
+     * prefers on classpath where it should be, but will fall back to taking from maven hosted
+     * (known problem in Eclipse where JARs are not always copied)
      */
     public String getJmxAgentJarUrl() {
         MavenArtifact artifact = getJmxAgentJarMavenArtifact();
@@ -245,7 +245,7 @@ public class JmxSupport implements UsesJmx {
         String jar = "classpath://" + artifact.getFilename();
         if (ResourceUtils.create(this).doesUrlExist(jar))
             return jar;
-        
+
         String result = MavenRetriever.localUrl(artifact);
         if (warnedAboutNotOnClasspath) {
             log.debug("JMX JAR for "+artifact+" is not on the classpath; taking from "+result);
@@ -255,7 +255,7 @@ public class JmxSupport implements UsesJmx {
         }
         return result;
     }
-    
+
     /** applies _some_ of the common settings needed to connect via JMX */
     public void applyJmxJavaSystemProperties(MutableMap.Builder<String,Object> result) {
         if (!isJmx()) return ;
@@ -274,7 +274,7 @@ public class JmxSupport implements UsesJmx {
             if (jmxRemotePort==null || jmxRemotePort<=0)
                 throw new IllegalStateException("Unsupported JMX port "+jmxRemotePort+" - when applying system properties ("+getJmxAgentMode()+" / "+getEntity()+")");
             result.put(JmxmpAgent.JMXMP_PORT_PROPERTY, jmxRemotePort);
-            // with JMXMP don't try to tell it the hostname -- it isn't needed for JMXMP, and if specified 
+            // with JMXMP don't try to tell it the hostname -- it isn't needed for JMXMP, and if specified
             // it will break if the hostname we see is not known at the server, e.g. a forwarding public IP
             // (should not be present, but remove just to be sure)
             result.remove("java.rmi.server.hostname");
@@ -289,6 +289,7 @@ public class JmxSupport implements UsesJmx {
             jmxRemotePort = fixPortsForModeNone();
         case JMX_RMI:
             result.put("com.sun.management.jmxremote.port", jmxRemotePort);
+            result.put("java.rmi.server.useLocalHostname", "true");
             break;
         default:
             throw new IllegalStateException("Unsupported JMX mode - when applying system properties ("+getJmxAgentMode()+" / "+getEntity()+")");
@@ -304,7 +305,7 @@ public class JmxSupport implements UsesJmx {
         }
     }
 
-    /** installs files needed for JMX, to the runDir given in constructor, assuming the runDir has been created */ 
+    /** installs files needed for JMX, to the runDir given in constructor, assuming the runDir has been created */
     public void install() {
         if (EnumSet.of(JmxAgentModes.JMXMP_AND_RMI, JmxAgentModes.JMXMP, JmxAgentModes.JMX_RMI_CUSTOM_AGENT).contains(getJmxAgentMode())) {
             getMachine().get().copyTo(ResourceUtils.create(this).getResourceFromUrl(
@@ -322,7 +323,7 @@ public class JmxSupport implements UsesJmx {
     /** sets JMR_RMI_CUSTOM_AGENT as the connection mode for the indicated apps.
      * <p>
      * TODO callers of this method have RMI dependencies in the actual app;
-     * we should look at removing them, so that those pieces of software can run behind 
+     * we should look at removing them, so that those pieces of software can run behind
      * forwarding public IP's and over SSL (both reasons JMXMP is preferred by us!)
      */
     public void recommendJmxRmiCustomAgent() {
@@ -334,5 +335,5 @@ public class JmxSupport implements UsesJmx {
             log.warn("Entity "+entity+" may not function unless running JMX_RMI_CUSTOM_AGENT mode (asked to use "+jmx.get()+")");
         }
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f61c13cb/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java b/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java
index 4bb64a4..d3c4bd0 100644
--- a/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java
+++ b/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java
@@ -60,7 +60,6 @@ public class MachineEntityImpl extends EmptySoftwareProcessImpl implements Machi
     @Override
     protected void connectSensors() {
         super.connectSensors();
-        connectServiceUpIsRunning();
 
         // Sensors linux-specific
         if (!getMachine().getMachineDetails().getOsDetails().isLinux()) return;
@@ -127,7 +126,6 @@ public class MachineEntityImpl extends EmptySoftwareProcessImpl implements Machi
 
     @Override
     public void disconnectSensors() {
-        disconnectServiceUpIsRunning();
         if (sensorFeed != null) sensorFeed.stop();
         super.disconnectSensors();
     }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f61c13cb/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java
index 746a2be..96e3626 100644
--- a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java
+++ b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java
@@ -77,10 +77,12 @@ import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 
-/** 
+/**
  * Default skeleton for start/stop/restart tasks on machines.
+ * <p>
  * Knows how to provision machines, making use of {@link ProvidesProvisioningFlags#obtainProvisioningFlags(MachineProvisioningLocation)},
  * and provides hooks for injecting behaviour at common places.
+ * <p>
  * Methods are designed for overriding, with the convention that *Async methods should queue (and not block).
  * The following methods are commonly overridden (and you can safely queue tasks, block, or return immediately in them):
  * <ul>
@@ -90,50 +92,54 @@ import com.google.common.collect.Iterables;
  *  <li> {@link #postStartCustom()}
  *  <li> {@link #preStopCustom()}
  * </ul>
- * Note methods at this level typically look after the {@link Attributes#SERVICE_STATE_EXPECTED} sensor.
- *  
+ * Note methods at this level typically look after the {@link Attributes#SERVICE_STATE} sensor.
+ *
  * @since 0.6.0
- **/
+ */
 @Beta
 public abstract class MachineLifecycleEffectorTasks {
 
     private static final Logger log = LoggerFactory.getLogger(MachineLifecycleEffectorTasks.class);
-    
+
     public static final ConfigKey<Boolean> ON_BOX_BASE_DIR_RESOLVED = ConfigKeys.newBooleanConfigKey("onbox.base.dir.resolved",
         "Whether the on-box base directory has been resolved (for internal use)");
-    
+
     public static final ConfigKey<Collection<? extends Location>> LOCATIONS = StartParameters.LOCATIONS;
-    public static final ConfigKey<Duration> STOP_PROCESS_TIMEOUT = 
-        ConfigKeys.newConfigKey(Duration.class, "process.stop.timeout", "How long to wait for the processes to be stopped; "
-            + "use null to mean forever", Duration.TWO_MINUTES);
+    public static final ConfigKey<Duration> STOP_PROCESS_TIMEOUT = ConfigKeys.newConfigKey(Duration.class,
+            "process.stop.timeout", "How long to wait for the processes to be stopped; use null to mean forever", Duration.TWO_MINUTES);
 
-    /** attaches lifecycle effectors (start, restart, stop) to the given entity (post-creation) */ 
+    /** Attaches lifecycle effectors (start, restart, stop) to the given entity post-creation. */
     public void attachLifecycleEffectors(Entity entity) {
-        ((EntityInternal)entity).getMutableEntityType().addEffector(newStartEffector());
-        ((EntityInternal)entity).getMutableEntityType().addEffector(newRestartEffector());
-        ((EntityInternal)entity).getMutableEntityType().addEffector(newStopEffector());
+        ((EntityInternal) entity).getMutableEntityType().addEffector(newStartEffector());
+        ((EntityInternal) entity).getMutableEntityType().addEffector(newRestartEffector());
+        ((EntityInternal) entity).getMutableEntityType().addEffector(newStopEffector());
     }
-    
+
     /**
-     * @return an effector suitable for setting in a public static final or attaching dynamically;
-     * the effector overrides the corresponding effector from {@link Startable} with 
-     * the behaviour in this lifecycle class instance */
+     * Return an effector suitable for setting in a {@code public static final} or attaching dynamically.
+     * <p>
+     * The effector overrides the corresponding effector from {@link Startable} with
+     * the behaviour in this lifecycle class instance.
+     */
     public Effector<Void> newStartEffector() {
         return Effectors.effector(Startable.START).impl(newStartEffectorTask()).build();
     }
 
-    /** as {@link #newStartEffector()} */
+    /** @see {@link #newStartEffector()} */
     public Effector<Void> newRestartEffector() {
         return Effectors.effector(Startable.RESTART).impl(newRestartEffectorTask()).build();
     }
-    
-    /** as {@link #newStartEffector()} */
+
+    /** @see {@link #newStartEffector()} */
     public Effector<Void> newStopEffector() {
         return Effectors.effector(Startable.STOP).impl(newStopEffectorTask()).build();
     }
-    
-    /** returns the TaskFactory which supplies the implementation for this effector,
-     * calling the relevant method in this class ({@link #start(Collection)}) */
+
+    /**
+     * Returns the {@link TaskFactory} which supplies the implementation for the start effector.
+     * <p>
+     * Calls {@link #start(Collection)} in this class.
+     */
     public EffectorBody<Void> newStartEffectorTask() {
         return new EffectorBody<Void>() {
             @Override
@@ -146,7 +152,11 @@ public abstract class MachineLifecycleEffectorTasks {
         };
     }
 
-    /** as {@link #newStartEffectorTask()}, calling {@link #restart()} */
+    /**
+     * Calls {@link #restart()}.
+     *
+     * @see {@link #newStartEffectorTask()}
+     */
     public EffectorBody<Void> newRestartEffectorTask() {
         return new EffectorBody<Void>() {
             @Override
@@ -157,7 +167,11 @@ public abstract class MachineLifecycleEffectorTasks {
         };
     }
 
-    /** as {@link #newStartEffectorTask()}, calling {@link #stop()} */
+    /**
+     * Calls {@link #stop()}.
+     *
+     * @see {@link #newStartEffectorTask()}
+     */
     public EffectorBody<Void> newStopEffectorTask() {
         return new EffectorBody<Void>() {
             @Override
@@ -167,7 +181,7 @@ public abstract class MachineLifecycleEffectorTasks {
             }
         };
     }
-        
+
     protected EntityInternal entity() {
         return (EntityInternal) BrooklynTaskTags.getTargetOrContextEntity(Tasks.current());
     }
@@ -182,7 +196,7 @@ public abstract class MachineLifecycleEffectorTasks {
 
         Maybe<MachineLocation> ml = Locations.findUniqueMachineLocation(locations);
         if (ml.isPresent()) return ml.get();
-    
+
         if (locations.isEmpty())
             throw new IllegalArgumentException("No locations specified when starting "+entity());
         if (locations.size() != 1 || Iterables.getOnlyElement(locations)==null)
@@ -190,8 +204,6 @@ public abstract class MachineLifecycleEffectorTasks {
         return Iterables.getOnlyElement(locations);
     }
     
-    // ---------------------
-    
     /** runs the tasks needed to start, wrapped by setting {@link Attributes#SERVICE_STATE_EXPECTED} appropriately */ 
     public void start(Collection<? extends Location> locations) {
         ServiceStateLogic.setExpectedState(entity(), Lifecycle.STARTING);
@@ -205,12 +217,12 @@ public abstract class MachineLifecycleEffectorTasks {
         }
     }
 
-    /** asserts there is a single location and calls {@link #startInLocation(Location)} with that location */
+    /** Asserts there is a single location and calls {@link #startInLocation(Location)} with that location. */
     protected void startInLocations(Collection<? extends Location> locations) {
-        startInLocation( getLocation(locations) );
+        startInLocation(getLocation(locations));
     }
 
-    /** dispatches to the appropriate method(s) to start in the given location */
+    /** Dispatches to the appropriate method(s) to start in the given location. */
     protected void startInLocation(final Location location) {
         Supplier<MachineLocation> locationS = null;
         if (location instanceof MachineProvisioningLocation) {
@@ -230,8 +242,10 @@ public abstract class MachineLifecycleEffectorTasks {
         return;
     }
 
-    /** returns a queued _task_ which provisions a machine in the given location 
-     * and returns that machine, so the task can be used as a supplier to subsequent methods */
+    /**
+     * Returns a queued {@link Task} which provisions a machine in the given location
+     * and returns that machine. The task can be used as a supplier to subsequent methods.
+     */
     protected Task<MachineLocation> provisionAsync(final MachineProvisioningLocation<?> location) {
         return DynamicTasks.queue(Tasks.<MachineLocation>builder().name("provisioning ("+location.getDisplayName()+")").body(
                 new Callable<MachineLocation>() {
@@ -250,18 +264,18 @@ public abstract class MachineLifecycleEffectorTasks {
                         } catch (Exception e) {
                             throw Exceptions.propagate(e);
                         }
-                        
+
                         if (log.isDebugEnabled())
-                            log.debug("While starting {}, obtained new location instance {}", entity(), 
-                                    (machine instanceof SshMachineLocation ? 
-                                            machine+", details "+((SshMachineLocation)machine).getUser()+":"+Entities.sanitize(((SshMachineLocation)machine).getLocalConfigBag()) 
+                            log.debug("While starting {}, obtained new location instance {}", entity(),
+                                    (machine instanceof SshMachineLocation ?
+                                            machine+", details "+((SshMachineLocation)machine).getUser()+":"+Entities.sanitize(((SshMachineLocation)machine).getLocalConfigBag())
                                             : machine));
                         return machine;
                     }
                 }).build());
     }
 
-    /** wraps a call to {@link #preStartCustom(MachineLocation)}, after setting the hostname and address */
+    /** Wraps a call to {@link #preStartCustom(MachineLocation)}, after setting the hostname and address. */
     protected void preStartAtMachineAsync(final Supplier<MachineLocation> machineS) {
         DynamicTasks.queue("pre-start", new Runnable() { public void run() {
             MachineLocation machine = machineS.get();
@@ -276,9 +290,9 @@ public abstract class MachineLifecycleEffectorTasks {
                         // machines are deemed compatible if hostname and address are the same, or they are localhost
                         // this allows a machine create by jclouds to then be defined with an ip-based spec
                         if (machine.getConfig(AbstractLocation.ORIGINAL_SPEC)!="localhost") {
-                            checkLocationParametersCompatible(machine, oldLoc, "hostname", 
+                            checkLocationParametersCompatible(machine, oldLoc, "hostname",
                                 oldLoc.getAddress().getHostName(), machine.getAddress().getHostName());
-                            checkLocationParametersCompatible(machine, oldLoc, "address", 
+                            checkLocationParametersCompatible(machine, oldLoc, "address",
                                 oldLoc.getAddress().getHostAddress(), machine.getAddress().getHostAddress());
                         }
                     }
@@ -303,27 +317,31 @@ public abstract class MachineLifecycleEffectorTasks {
                 UserAndHostAndPort sshAddress = UserAndHostAndPort.fromParts(sshMachine.getUser(), sshMachine.getAddress().getHostName(), sshMachine.getPort());
                 entity().setAttribute(Attributes.SSH_ADDRESS, sshAddress);
             }
-            
-            resolveOnBoxDir(entity(), machine);            
+
+            resolveOnBoxDir(entity(), machine);
             preStartCustom(machine);
         }});
     }
 
-    /** resolves the on-box dir; logs a warning if not */
-    // initialize and pre-create the right onbox working dir, if an ssh machine location
+    /**
+     * Resolves the on-box dir.
+     * <p>
+     * Initialize and pre-create the right onbox working dir, if an ssh machine location.
+     * Logs a warning if not.
+     */
     @SuppressWarnings("deprecation")
     public static String resolveOnBoxDir(EntityInternal entity, MachineLocation machine) {
-        String base = entity.getConfig(BrooklynConfigKeys.ONBOX_BASE_DIR); 
+        String base = entity.getConfig(BrooklynConfigKeys.ONBOX_BASE_DIR);
         if (base==null) base = machine.getConfig(BrooklynConfigKeys.ONBOX_BASE_DIR);
         if (base!=null && Boolean.TRUE.equals(entity.getConfig(ON_BOX_BASE_DIR_RESOLVED))) return base;
         if (base==null) base = entity.getManagementContext().getConfig().getConfig(BrooklynConfigKeys.ONBOX_BASE_DIR);
-        if (base==null) base = entity.getConfig(BrooklynConfigKeys.BROOKLYN_DATA_DIR); 
+        if (base==null) base = entity.getConfig(BrooklynConfigKeys.BROOKLYN_DATA_DIR);
         if (base==null) base = machine.getConfig(BrooklynConfigKeys.BROOKLYN_DATA_DIR);
         if (base==null) base = entity.getManagementContext().getConfig().getConfig(BrooklynConfigKeys.BROOKLYN_DATA_DIR);
         if (base==null) base = "~/brooklyn-managed-processes";
         if (base=="~") base=".";
         if (base.startsWith("~/")) base = "."+base.substring(1);
-        
+
         String resolvedBase = null;
         if (entity.getConfig(BrooklynConfigKeys.SKIP_ON_BOX_BASE_DIR_RESOLUTION) || machine.getConfig(BrooklynConfigKeys.SKIP_ON_BOX_BASE_DIR_RESOLUTION)) {
             if (log.isDebugEnabled()) log.debug("Skipping on-box base dir resolution for "+entity+" at "+machine);
@@ -354,16 +372,19 @@ public abstract class MachineLifecycleEffectorTasks {
         entity.setConfig(ON_BOX_BASE_DIR_RESOLVED, true);
         return resolvedBase;
     }
-    
+
     protected void checkLocationParametersCompatible(MachineLocation oldLoc, MachineLocation newLoc, String paramSummary,
-        Object oldParam, Object newParam) {
+            Object oldParam, Object newParam) {
         if (oldParam==null || newParam==null || !oldParam.equals(newParam))
-            throw new IllegalStateException("Cannot start "+entity()+" in "+newLoc+" as it has already been started with incompatible location "+oldLoc+" "
-                + "("+paramSummary+" not compatible: "+oldParam+" / "+newParam+"); "
-                + newLoc+" may require manual removal.");
+            throw new IllegalStateException("Cannot start "+entity()+" in "+newLoc+" as it has already been started with incompatible location "+oldLoc+" " +
+                    "("+paramSummary+" not compatible: "+oldParam+" / "+newParam+"); "+newLoc+" may require manual removal.");
     }
 
-    /** default pre-start hooks, can be extended by subclasses if needed*/
+    /**
+     * Default pre-start hooks.
+     * <p>
+     * Can be extended by subclasses if needed.
+     */
     protected void preStartCustom(MachineLocation machine) {
         ConfigToAttributes.apply(entity());
 
@@ -380,22 +401,28 @@ public abstract class MachineLifecycleEffectorTasks {
     }
 
     protected abstract String startProcessesAtMachine(final Supplier<MachineLocation> machineS);
-    
+
     protected void postStartAtMachineAsync() {
         DynamicTasks.queue("post-start", new Runnable() { public void run() {
             postStartCustom();
         }});
     }
 
-    /** default post-start hooks, can be extended by subclasses, and typically will wait for confirmation of start 
-     * (the service not set to running until after this); also invoked following a restart */
+    /**
+     * Default post-start hooks.
+     * <p>
+     * Can be extended by subclasses, and typically will wait for confirmation of start.
+     * The service not set to running until after this. Also invoked following a restart.
+     */
     protected void postStartCustom() {
         // nothing by default
     }
 
-    // ---------------------
-    
-    /** default restart impl, stops processes if possible, then starts the entity again */
+    /**
+     * Default restart implementation for an entity.
+     * <p>
+     * Stops processes if possible, then starts the entity again.
+     */
     public void restart() {
         ServiceStateLogic.setExpectedState(entity(), Lifecycle.STOPPING);
         DynamicTasks.queue("stopping (process)", new Callable<String>() { public String call() {
@@ -404,7 +431,7 @@ public abstract class MachineLifecycleEffectorTasks {
             DynamicTasks.waitForLast();
             return "Stop of process completed with no errors.";
         }});
-        
+
         DynamicTasks.queue("starting", new Runnable() { public void run() {
             // startInLocations will look up the location, and provision a machine if necessary
             // (if it remembered the provisioning location)
@@ -415,14 +442,16 @@ public abstract class MachineLifecycleEffectorTasks {
         }});
     }
 
-    // ---------------------
-
-    /** default stop impl, aborts if already stopped, otherwise sets state STOPPING then
+    /**
+     * Default stop implementation for an entity.
+     * <p>
+     * Aborts if already stopped, otherwise sets state {@link Lifecycle#STOPPING} then
      * invokes {@link #preStopCustom()}, {@link #stopProcessesAtMachine()}, then finally
-     * {@link #stopAnyProvisionedMachines()} and sets state STOPPED */
+     * {@link #stopAnyProvisionedMachines()} and sets state {@link Lifecycle#STOPPED}
+     */
     public void stop() {
         log.info("Stopping {} in {}", entity(), entity().getLocations());
-        
+
         DynamicTasks.queue("pre-stop", new Callable<String>() { public String call() {
             if (entity().getAttribute(SoftwareProcess.SERVICE_STATE_ACTUAL)==Lifecycle.STOPPED) {
                 log.debug("Skipping stop of entity "+entity()+" when already stopped");
@@ -437,7 +466,7 @@ public abstract class MachineLifecycleEffectorTasks {
         if (entity().getAttribute(SoftwareProcess.SERVICE_STATE_ACTUAL)==Lifecycle.STOPPED) {
             return;
         }
-               
+
         Maybe<SshMachineLocation> sshMachine = Machines.findUniqueSshMachineLocation(entity().getLocations());
         Task<String> stoppingProcess = DynamicTasks.queue("stopping (process)", new Callable<String>() { public String call() {
             DynamicTasks.markInessential();
@@ -445,7 +474,7 @@ public abstract class MachineLifecycleEffectorTasks {
             DynamicTasks.waitForLast();
             return "Stop at machine completed with no errors.";
         }});
-        
+
         // Release this machine (even if error trying to stop process - we rethrow that after)
         Task<StopMachineDetails<Integer>> stoppingMachine = DynamicTasks.queue("stopping (machine)", new Callable<StopMachineDetails<Integer>>() { public StopMachineDetails<Integer> call() {
             if (entity().getAttribute(SoftwareProcess.SERVICE_STATE_ACTUAL)==Lifecycle.STOPPED) {
@@ -456,41 +485,42 @@ public abstract class MachineLifecycleEffectorTasks {
         }});
 
         DynamicTasks.drain(entity().getConfig(STOP_PROCESS_TIMEOUT), false);
-        
+
         // shutdown the machine if stopping process fails or takes too long
         synchronized (stoppingMachine) {
             // task also used as mutex by DST when it submits it; ensure it only submits once!
             if (!stoppingMachine.isSubmitted()) {
                 // force the stoppingMachine task to run by submitting it here
                 log.warn("Submitting machine stop early in background for "+entity()+" because process stop has "+
-                    (stoppingProcess.isDone() ? "finished abnormally" : "not finished"));
+                        (stoppingProcess.isDone() ? "finished abnormally" : "not finished"));
                 Entities.submit(entity(), stoppingMachine);
             }
         }
-        
+
         try {
-            if (stoppingMachine.get().value==0) {
+            if (stoppingMachine.get().value == 0) {
                 // TODO we should test for destruction above, not merely successful "stop", as things like localhost and ssh won't be destroyed
                 DynamicTasks.waitForLast();
-                if (sshMachine.isPresent())
+                if (sshMachine.isPresent()) {
                     // throw early errors *only if* there is a machine and we have not destroyed it
                     stoppingProcess.get();
+                }
             }
-            
+
             entity().setAttribute(SoftwareProcess.SERVICE_UP, false);
             ServiceStateLogic.setExpectedState(entity(), Lifecycle.STOPPED);
         } catch (Throwable e) {
             ServiceStateLogic.setExpectedState(entity(), Lifecycle.ON_FIRE);
             Exceptions.propagate(e);
         }
-        
+
         if (log.isDebugEnabled()) log.debug("Stopped software process entity "+entity());
     }
-    
+
     protected void preStopCustom() {
         // nothing needed here
     }
-    
+
     public static class StopMachineDetails<T> implements Serializable {
         private static final long serialVersionUID = 3256747214315895431L;
         final String message;
@@ -504,20 +534,24 @@ public abstract class MachineLifecycleEffectorTasks {
             return message;
         }
     }
-    
-    /** can run synchronously (or not) -- caller will submit/queue as needed, and will block on any submitted tasks. */
+
+    /**
+     * Stop the {@link MachineLocation} the entity is provisioned at.
+     * <p>
+     * Can run synchronously or not, caller will submit/queue as needed, and will block on any submitted tasks.
+     */
     protected StopMachineDetails<Integer> stopAnyProvisionedMachines() {
         @SuppressWarnings("unchecked")
         MachineProvisioningLocation<MachineLocation> provisioner = entity().getAttribute(SoftwareProcess.PROVISIONING_LOCATION);
 
         // NB: previously has logic about "removeFirstMachine" but elsewhere had assumptions that there was only one,
         // so i think that was an aborted bit of work (which has been removed here). Alex, Aug 2013
-        
+
         if (Iterables.isEmpty(entity().getLocations())) {
             log.debug("No machine decommissioning necessary for "+entity()+" - no locations");
             return new StopMachineDetails<Integer>("No machine decommissioning necessary - no locations", 0);
         }
-        
+
         // Only release this machine if we ourselves provisioned it (e.g. it might be running other services)
         if (provisioner==null) {
             log.debug("No machine decommissioning necessary for "+entity()+" - did not provision");
@@ -529,7 +563,7 @@ public abstract class MachineLifecycleEffectorTasks {
             log.debug("No decommissioning necessary for "+entity()+" - not a machine location ("+machine+")");
             return new StopMachineDetails<Integer>("No machine decommissioning necessary - not a machine ("+machine+")", 0);
         }
-        
+
         try {
             entity().removeLocations(ImmutableList.of(machine));
             entity().setAttribute(Attributes.HOSTNAME, null);
@@ -543,8 +577,11 @@ public abstract class MachineLifecycleEffectorTasks {
         return new StopMachineDetails<Integer>("Decommissioned "+machine, 1);
     }
 
-    /** can run synchronously (or not) -- caller will submit/queue as needed, and will block on any submitted tasks. 
-     * @return string message of result */
+    /**
+     * Return string message of result.
+     * <p>
+     * Can run synchronously or not, caller will submit/queue as needed, and will block on any submitted tasks.
+     */
     protected abstract String stopProcessesAtMachine();
 
 }


[06/14] git commit: Add application base directory for Node.JS

Posted by sj...@apache.org.
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 <gr...@apache.org>
Authored: Thu Aug 28 07:43:25 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
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);


[12/14] git commit: Use builder for ProxySslConfig

Posted by sj...@apache.org.
Use builder for ProxySslConfig


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7b288f23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7b288f23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7b288f23

Branch: refs/heads/master
Commit: 7b288f23aa427409faa047691abb26bd91bdfa45
Parents: f61c13c
Author: Andrew Kennedy <gr...@apache.org>
Authored: Fri Aug 29 16:29:13 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Aug 30 17:27:08 2014 +0100

----------------------------------------------------------------------
 .../brooklyn/entity/proxy/ProxySslConfig.java   | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7b288f23/software/webapp/src/main/java/brooklyn/entity/proxy/ProxySslConfig.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/ProxySslConfig.java b/software/webapp/src/main/java/brooklyn/entity/proxy/ProxySslConfig.java
index 0d1be84..a61d401 100644
--- a/software/webapp/src/main/java/brooklyn/entity/proxy/ProxySslConfig.java
+++ b/software/webapp/src/main/java/brooklyn/entity/proxy/ProxySslConfig.java
@@ -35,9 +35,7 @@ import com.google.common.base.Objects;
 public class ProxySslConfig implements Serializable {
 
     private static final long serialVersionUID = -2692754611458939617L;
-    
     private static final Logger LOG = LoggerFactory.getLogger(ProxySslConfig.class);
-    
     private static final AtomicBoolean initialized = new AtomicBoolean(false);
 
     /** Setup type coercion. */
@@ -49,24 +47,24 @@ public class ProxySslConfig implements Serializable {
             @Override
             public ProxySslConfig apply(final Map input) {
                 Map map = MutableMap.copyOf(input);
-                ProxySslConfig sslConfig = new ProxySslConfig();
-                sslConfig.certificateSourceUrl = (String) map.remove("certificateSourceUrl");
-                sslConfig.keySourceUrl = (String) map.remove("keySourceUrl");
-                sslConfig.certificateDestination = (String) map.remove("certificateDestination");
-                sslConfig.keyDestination = (String) map.remove("keyDestination");
+                ProxySslConfig.Builder sslConfig = ProxySslConfig.builder()
+                        .certificateSourceUrl((String) map.remove("certificateSourceUrl"))
+                        .keySourceUrl((String) map.remove("keySourceUrl"))
+                        .certificateDestination((String) map.remove("certificateDestination"))
+                        .keyDestination((String) map.remove("keyDestination"));
                 Object targetIsSsl = map.remove("targetIsSsl");
                 if (targetIsSsl != null) {
-                    sslConfig.targetIsSsl = TypeCoercions.coerce(targetIsSsl, Boolean.TYPE);
+                    sslConfig.targetIsSsl(TypeCoercions.coerce(targetIsSsl, Boolean.TYPE));
                 }
                 Object reuseSessions = map.remove("reuseSessions");
                 if (reuseSessions != null) {
-                    sslConfig.reuseSessions = TypeCoercions.coerce(reuseSessions, Boolean.TYPE);
+                    sslConfig.reuseSessions(TypeCoercions.coerce(reuseSessions, Boolean.TYPE));
                 }
                 if (!map.isEmpty()) {
                     LOG.info("Extra unused keys found in ProxySslConfig config: [{}]",
                             Joiner.on(",").withKeyValueSeparator("=").join(map));
                 }
-                return sslConfig;
+                return sslConfig.build();
             }
         });
     }
@@ -247,7 +245,7 @@ public class ProxySslConfig implements Serializable {
     public void setReuseSessions(boolean reuseSessions) {
         this.reuseSessions = reuseSessions;
     }
-    
+
     // autogenerated hash code and equals; nothing special required
 
     @Override


[10/14] git commit: Fix error in JmxFeedTest

Posted by sj...@apache.org.
Fix error in JmxFeedTest


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/948bf24e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/948bf24e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/948bf24e

Branch: refs/heads/master
Commit: 948bf24ee5b4b5d52650e4aeb9da2a32a7b76568
Parents: 11332d3
Author: Andrew Kennedy <gr...@apache.org>
Authored: Fri Aug 29 19:22:52 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Aug 30 17:27:08 2014 +0100

----------------------------------------------------------------------
 software/base/src/main/java/brooklyn/entity/java/JmxSupport.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/948bf24e/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
index 7aa8bb0..88f76ea 100644
--- a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
+++ b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
@@ -158,7 +158,6 @@ public class JmxSupport implements UsesJmx {
         init();
 
         HostAndPort jmx = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(JMX_PORT));
-        HostAndPort rmi = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(RMI_REGISTRY_PORT));
 
         if (EnumSet.of(JmxAgentModes.JMXMP, JmxAgentModes.JMXMP_AND_RMI).contains(getJmxAgentMode())) {
             return JmxHelper.toJmxmpUrl(jmx.getHostText(), jmx.getPort());
@@ -167,6 +166,7 @@ public class JmxSupport implements UsesJmx {
                 fixPortsForModeNone();
             }
             // this will work for agent or agentless
+            HostAndPort rmi = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(RMI_REGISTRY_PORT));
             return JmxHelper.toRmiJmxUrl(jmx.getHostText(), jmx.getPort(), rmi.getPort(),
                     entity.getAttribute(JMX_CONTEXT));
         }