Merge branch 'master' into couchbase
Conflicts:
core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java -
imports
software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java
- install commands
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d23d5c09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d23d5c09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d23d5c09
Branch: refs/heads/master
Commit: d23d5c09d2133e406d27d445979cc73e991fe185
Parents: 1064cd5 68592b4
Author: Alex Heneveld <[email protected]>
Authored: Mon Sep 1 17:10:32 2014 +0100
Committer: Alex Heneveld <[email protected]>
Committed: Mon Sep 1 17:10:32 2014 +0100
----------------------------------------------------------------------
.../entity/basic/BrooklynConfigKeys.java | 101 ++++-----
.../brooklyn/entity/group/DynamicCluster.java | 14 ++
.../entity/group/DynamicClusterImpl.java | 26 ++-
.../basic/PortAttributeSensorAndConfigKey.java | 59 +++---
.../java/brooklyn/util/flags/TypeCoercions.java | 10 +
.../main/java/brooklyn/util/task/BasicTask.java | 3 +-
pom.xml | 2 +-
.../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 | 3 +-
.../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 | 8 +-
.../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 +-
.../java/brooklyn/rest/client/BrooklynApi.java | 51 +++--
48 files changed, 761 insertions(+), 498 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d23d5c09/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java
----------------------------------------------------------------------
diff --cc core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java
index 647ddaa,d0e273f..be7724d
--- a/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java
+++ b/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java
@@@ -39,10 -41,10 +41,11 @@@ import brooklyn.entity.basic.DelegateEn
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.ServiceProblemsLogic;
import brooklyn.entity.basic.ServiceStateLogic;
++import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic;
import brooklyn.entity.effector.Effectors;
import brooklyn.entity.proxying.EntitySpec;
import brooklyn.entity.trait.Startable;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d23d5c09/core/src/main/java/brooklyn/util/flags/TypeCoercions.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d23d5c09/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java
----------------------------------------------------------------------
diff --cc
software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java
index 6dc3cfb,ff56859..3269aad
---
a/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java
+++
b/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java
@@@ -37,15 -25,8 +37,14 @@@ import org.apache.http.auth.UsernamePas
import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
import brooklyn.entity.basic.Entities;
- import brooklyn.entity.drivers.downloads.DownloadResolver;
+import brooklyn.event.feed.http.HttpValueFunctions;
+import brooklyn.event.feed.http.JsonFunctions;
import brooklyn.location.OsDetails;
import brooklyn.location.basic.SshMachineLocation;
+import brooklyn.util.guava.Functionals;
+import brooklyn.util.http.HttpTool;
+import brooklyn.util.http.HttpToolResponse;
+import brooklyn.util.repeat.Repeater;
import brooklyn.util.ssh.BashCommands;
import brooklyn.util.task.Tasks;
import brooklyn.util.time.Duration;
