This closes #14
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/7911d295 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/7911d295 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/7911d295 Branch: refs/heads/master Commit: 7911d295bbfe7903deec0ea775cd3b8974798e72 Parents: a0e352d 3352bfa Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Thu Mar 10 12:34:13 2016 +0000 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Thu Mar 10 12:34:13 2016 +0000 ---------------------------------------------------------------------- .../entity/database/crate/CrateNode.java | 3 + .../database/crate/CrateNodeSshDriver.java | 16 +-- .../database/mariadb/MariaDbSshDriver.java | 2 +- .../entity/database/mysql/MySqlSshDriver.java | 11 +- .../entity/database/rubyrep/RubyRepNode.java | 3 + .../database/rubyrep/RubyRepSshDriver.java | 16 +-- .../messaging/activemq/ActiveMQBroker.java | 3 + .../messaging/activemq/ActiveMQSshDriver.java | 11 +- .../kafka/AbstractfKafkaSshDriver.java | 12 +-- .../brooklyn/entity/messaging/kafka/Kafka.java | 3 + .../entity/messaging/qpid/QpidBroker.java | 43 ++++---- .../entity/messaging/qpid/QpidSshDriver.java | 12 +-- .../entity/messaging/rabbit/RabbitBroker.java | 35 +++---- .../messaging/rabbit/RabbitSshDriver.java | 6 -- .../brooklyn/entity/messaging/storm/Storm.java | 21 ++-- .../entity/messaging/storm/StormSshDriver.java | 6 -- .../entity/zookeeper/ZooKeeperNode.java | 33 +++--- .../entity/zookeeper/ZooKeeperSshDriver.java | 8 +- .../entity/monitoring/monit/MonitNode.java | 26 ++--- .../entity/monitoring/monit/MonitSshDriver.java | 14 +-- .../entity/nosql/cassandra/CassandraNode.java | 43 ++++---- .../nosql/cassandra/CassandraNodeSshDriver.java | 10 -- .../nosql/couchbase/CouchbaseNodeSshDriver.java | 37 ++++--- .../nosql/elasticsearch/ElasticSearchNode.java | 14 ++- .../ElasticSearchNodeSshDriver.java | 13 +-- .../nosql/hazelcast/HazelcastNodeSshDriver.java | 5 - .../nosql/mongodb/AbstractMongoDBSshDriver.java | 25 ++--- .../brooklyn/entity/nosql/redis/RedisStore.java | 11 +- .../entity/nosql/redis/RedisStoreSshDriver.java | 6 -- .../brooklyn/entity/nosql/riak/RiakNode.java | 3 + .../entity/nosql/riak/RiakNodeSshDriver.java | 5 +- .../brooklyn/entity/nosql/solr/SolrServer.java | 17 ++-- .../entity/nosql/solr/SolrServerSshDriver.java | 6 -- .../entity/osgi/karaf/KarafContainer.java | 100 +++++++++---------- .../entity/osgi/karaf/KarafSshDriver.java | 6 -- .../entity/proxy/nginx/NginxController.java | 36 ++++--- .../entity/proxy/nginx/NginxSshDriver.java | 6 -- .../entity/webapp/jboss/JBoss6Server.java | 22 ++-- .../entity/webapp/jboss/JBoss6SshDriver.java | 7 -- .../entity/webapp/jboss/JBoss7Server.java | 33 +++--- .../entity/webapp/jboss/JBoss7SshDriver.java | 2 +- .../entity/webapp/jetty/Jetty6Server.java | 9 +- .../entity/webapp/jetty/Jetty6SshDriver.java | 7 -- .../webapp/nodejs/NodeJsWebAppService.java | 10 +- .../webapp/nodejs/NodeJsWebAppSshDriver.java | 22 ++-- .../entity/webapp/tomcat/Tomcat8Server.java | 9 +- .../entity/webapp/tomcat/TomcatServer.java | 13 ++- .../entity/webapp/tomcat/TomcatSshDriver.java | 11 +- 48 files changed, 337 insertions(+), 435 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/7911d295/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/7911d295/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/7911d295/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java ---------------------------------------------------------------------- diff --cc software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java index 884f082,e703b56..bcf8162 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java @@@ -18,18 -18,18 +18,21 @@@ */ package org.apache.brooklyn.entity.nosql.solr; +import java.net.URI; import java.util.Map; + import com.google.common.collect.Maps; + import com.google.common.reflect.TypeToken; + import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.BrooklynConfigKeys; import org.apache.brooklyn.core.location.PortRanges; - import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; + import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey; import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.entity.java.UsesJava; import org.apache.brooklyn.entity.java.UsesJavaMXBeans;
