BROOKLYN-162 - apply org.apache package prefix to utils-common
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/37fc5ed1 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/37fc5ed1 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/37fc5ed1 Branch: refs/heads/0.8.0-incubating Commit: 37fc5ed15bcbe4bbb197da160cc67d77773d1288 Parents: e4a4e0d Author: Alex Heneveld <[email protected]> Authored: Tue Aug 18 13:14:41 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Aug 18 14:51:55 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/demo/GlobalWebFabricExample.java | 7 ++- .../brooklyn/demo/KafkaClusterExample.java | 5 +-- .../demo/StandaloneQpidBrokerExample.java | 5 +-- .../brooklyn/demo/CumulusRDFApplication.java | 15 +++---- .../demo/HighAvailabilityCassandraCluster.java | 5 +-- .../brooklyn/demo/ResilientMongoDbApp.java | 3 +- .../brooklyn/demo/RiakClusterExample.java | 5 +-- .../brooklyn/demo/SimpleCassandraCluster.java | 3 +- .../apache/brooklyn/demo/StormSampleApp.java | 5 +-- .../brooklyn/demo/WideAreaCassandraCluster.java | 5 +-- .../brooklyn/demo/SingleWebServerExample.java | 3 +- .../demo/WebClusterDatabaseExample.java | 5 ++- .../demo/WebClusterDatabaseExampleApp.java | 8 ++-- .../demo/WebClusterDatabaseExampleGroovy.groovy | 4 +- .../apache/brooklyn/demo/WebClusterExample.java | 3 +- ...lusterDatabaseExampleAppIntegrationTest.java | 9 ++-- .../entity/monitoring/zabbix/ZabbixFeed.java | 4 +- .../monitoring/zabbix/ZabbixMonitored.java | 2 +- .../monitoring/zabbix/ZabbixPollConfig.java | 2 +- .../entity/monitoring/zabbix/ZabbixServer.java | 2 +- .../entity/database/DatastoreMixins.java | 6 +-- .../entity/database/crate/CrateNode.java | 4 +- .../entity/database/crate/CrateNodeImpl.java | 3 +- .../database/crate/CrateNodeSshDriver.java | 9 ++-- .../entity/database/mariadb/MariaDbNode.java | 4 +- .../database/mariadb/MariaDbNodeImpl.java | 9 ++-- .../database/mariadb/MariaDbSshDriver.java | 27 ++++++------ .../entity/database/mysql/MySqlCluster.java | 4 +- .../entity/database/mysql/MySqlClusterImpl.java | 14 +++--- .../entity/database/mysql/MySqlNode.java | 4 +- .../entity/database/mysql/MySqlNodeImpl.java | 11 +++-- .../entity/database/mysql/MySqlRowParser.java | 4 +- .../entity/database/mysql/MySqlSshDriver.java | 33 +++++++------- .../database/postgresql/PostgreSqlNode.java | 5 ++- .../PostgreSqlNodeChefImplFromScratch.java | 9 ++-- .../postgresql/PostgreSqlSshDriver.java | 46 ++++++++++---------- .../entity/database/rubyrep/RubyRepNode.java | 4 +- .../database/rubyrep/RubyRepNodeImpl.java | 4 +- .../database/rubyrep/RubyRepSshDriver.java | 9 ++-- .../mariadb/MariaDbIntegrationTest.java | 5 ++- .../mariadb/MariaDbLiveRackspaceTest.java | 9 ++-- .../mysql/MySqlClusterIntegrationTest.java | 2 +- .../database/mysql/MySqlClusterTestHelper.java | 6 +-- .../database/mysql/MySqlIntegrationTest.java | 7 +-- .../database/mysql/MySqlLiveRackspaceTest.java | 9 ++-- .../database/postgresql/PostgreSqlChefTest.java | 5 ++- .../postgresql/PostgreSqlRackspaceLiveTest.java | 9 ++-- .../rubyrep/RubyRepRackspaceLiveTest.java | 11 ++--- .../messaging/activemq/ActiveMQBroker.java | 6 ++- .../activemq/ActiveMQDestinationImpl.java | 3 +- .../messaging/activemq/ActiveMQSshDriver.java | 9 ++-- .../entity/messaging/jms/JMSBrokerImpl.java | 9 ++-- .../kafka/AbstractfKafkaSshDriver.java | 11 ++--- .../brooklyn/entity/messaging/kafka/Kafka.java | 3 +- .../entity/messaging/kafka/KafkaBroker.java | 7 +-- .../messaging/kafka/KafkaBrokerSshDriver.java | 5 ++- .../entity/messaging/kafka/KafkaCluster.java | 6 ++- .../messaging/kafka/KafkaClusterImpl.java | 6 ++- .../entity/messaging/kafka/KafkaZooKeeper.java | 6 ++- .../kafka/KafkaZooKeeperSshDriver.java | 7 +-- .../entity/messaging/qpid/QpidBroker.java | 4 +- .../entity/messaging/qpid/QpidBrokerImpl.java | 4 +- .../messaging/qpid/QpidDestinationImpl.java | 4 +- .../entity/messaging/qpid/QpidQueueImpl.java | 3 +- .../entity/messaging/qpid/QpidSshDriver.java | 9 ++-- .../entity/messaging/qpid/QpidTopicImpl.java | 2 +- .../entity/messaging/rabbit/RabbitBroker.java | 4 +- .../messaging/rabbit/RabbitSshDriver.java | 9 ++-- .../brooklyn/entity/messaging/storm/Storm.java | 4 +- .../entity/messaging/storm/StormDeployment.java | 2 +- .../entity/messaging/storm/StormImpl.java | 4 +- .../entity/messaging/storm/StormSshDriver.java | 15 ++++--- .../entity/zookeeper/ZooKeeperEnsemble.java | 2 +- .../entity/zookeeper/ZooKeeperNode.java | 2 +- .../entity/zookeeper/ZooKeeperSshDriver.java | 9 ++-- .../messaging/kafka/KafkaIntegrationTest.java | 9 ++-- .../entity/messaging/kafka/KafkaLiveTest.java | 4 +- .../messaging/qpid/QpidIntegrationTest.java | 6 +-- .../storm/StormAbstractCloudLiveTest.java | 12 +++-- .../messaging/storm/StormGceLiveTest.java | 3 +- .../entity/network/bind/BindDnsServer.java | 5 +-- .../entity/network/bind/BindDnsServerImpl.java | 9 ++-- .../network/bind/BindDnsServerSshDriver.java | 19 ++++---- .../network/bind/BindDnsServerByonLiveTest.java | 3 +- .../network/bind/BindDnsServerLiveTest.java | 4 +- .../network/bind/PrefixAndIdEnricher.java | 2 +- .../nosql/cassandra/CassandraDatacenter.java | 6 ++- .../cassandra/CassandraDatacenterImpl.java | 11 +++-- .../entity/nosql/cassandra/CassandraFabric.java | 2 +- .../nosql/cassandra/CassandraFabricImpl.java | 8 ++-- .../entity/nosql/cassandra/CassandraNode.java | 7 +-- .../nosql/cassandra/CassandraNodeImpl.java | 11 +++-- .../nosql/cassandra/CassandraNodeSshDriver.java | 27 ++++++------ .../entity/nosql/cassandra/TokenGenerators.java | 2 +- .../nosql/couchbase/CouchbaseCluster.java | 4 +- .../nosql/couchbase/CouchbaseClusterImpl.java | 27 ++++++------ .../entity/nosql/couchbase/CouchbaseNode.java | 4 +- .../nosql/couchbase/CouchbaseNodeImpl.java | 19 ++++---- .../nosql/couchbase/CouchbaseNodeSshDriver.java | 17 ++++---- .../nosql/couchbase/CouchbaseSyncGateway.java | 2 +- .../CouchbaseSyncGatewaySshDriver.java | 17 ++++---- .../entity/nosql/couchdb/CouchDBNode.java | 2 +- .../entity/nosql/couchdb/CouchDBNodeImpl.java | 2 +- .../nosql/couchdb/CouchDBNodeSshDriver.java | 9 ++-- .../nosql/elasticsearch/ElasticSearchNode.java | 4 +- .../elasticsearch/ElasticSearchNodeImpl.java | 9 ++-- .../ElasticSearchNodeSshDriver.java | 11 ++--- .../nosql/mongodb/AbstractMongoDBServer.java | 2 +- .../nosql/mongodb/AbstractMongoDBSshDriver.java | 9 ++-- .../entity/nosql/mongodb/MongoDBClient.java | 2 +- .../nosql/mongodb/MongoDBClientSshDriver.java | 5 ++- .../entity/nosql/mongodb/MongoDBReplicaSet.java | 2 +- .../nosql/mongodb/MongoDBReplicaSetImpl.java | 6 +-- .../entity/nosql/mongodb/MongoDBServer.java | 2 +- .../sharding/CoLocatedMongoDBRouter.java | 2 +- .../nosql/mongodb/sharding/MongoDBRouter.java | 4 +- .../sharding/MongoDBShardClusterImpl.java | 6 +-- .../sharding/MongoDBShardedDeployment.java | 4 +- .../sharding/MongoDBShardedDeploymentImpl.java | 2 +- .../entity/nosql/redis/RedisClusterImpl.java | 6 +-- .../brooklyn/entity/nosql/redis/RedisSlave.java | 2 +- .../brooklyn/entity/nosql/redis/RedisStore.java | 2 +- .../entity/nosql/redis/RedisStoreSshDriver.java | 7 ++- .../brooklyn/entity/nosql/riak/RiakCluster.java | 4 +- .../entity/nosql/riak/RiakClusterImpl.java | 6 +-- .../brooklyn/entity/nosql/riak/RiakNode.java | 2 +- .../entity/nosql/riak/RiakNodeImpl.java | 7 ++- .../entity/nosql/riak/RiakNodeSshDriver.java | 33 +++++++------- .../brooklyn/entity/nosql/solr/SolrServer.java | 5 +-- .../entity/nosql/solr/SolrServerSshDriver.java | 13 +++--- .../entity/nosql/cassandra/AstyanaxSupport.java | 8 ++-- .../CassandraDatacenterIntegrationTest.java | 4 +- .../cassandra/CassandraDatacenterLiveTest.java | 10 ++--- .../cassandra/CassandraDatacenterTest.java | 5 +-- .../nosql/cassandra/CassandraFabricTest.java | 3 +- .../cassandra/CassandraNodeIntegrationTest.java | 4 +- .../nosql/cassandra/CassandraNodeLiveTest.java | 5 +-- .../nosql/couchdb/CouchDBNodeLiveTest.java | 4 +- .../ElasticSearchClusterIntegrationTest.java | 2 +- .../mongodb/MongoDBReplicaSetEc2LiveTest.java | 2 +- .../MongoDBReplicaSetIntegrationTest.java | 5 ++- .../MongoDBConfigServerIntegrationTest.java | 3 +- .../MongoDBShardedDeploymentEc2LiveTest.java | 2 +- .../redis/RedisClusterIntegrationTest.java | 3 +- .../nosql/redis/RedisIntegrationTest.java | 3 +- .../nosql/solr/SolrServerEc2LiveTest.java | 2 +- .../nosql/solr/SolrServerIntegrationTest.java | 2 +- .../entity/nosql/solr/SolrServerLiveTest.java | 4 +- .../entity/osgi/karaf/KarafContainer.java | 2 +- .../entity/osgi/karaf/KarafContainerImpl.java | 8 ++-- .../entity/osgi/karaf/KarafSshDriver.java | 11 ++--- .../osgi/karaf/KarafContainerEc2LiveTest.java | 2 +- .../entity/osgi/karaf/KarafContainerTest.java | 7 ++- .../entity/dns/AbstractGeoDnsService.java | 3 +- .../entity/dns/AbstractGeoDnsServiceImpl.java | 11 +++-- .../dns/geoscaling/GeoscalingDnsService.java | 2 +- .../geoscaling/GeoscalingDnsServiceImpl.java | 7 ++- .../geoscaling/GeoscalingScriptGenerator.java | 7 ++- .../dns/geoscaling/GeoscalingWebClient.java | 3 +- .../entity/proxy/AbstractController.java | 2 +- .../entity/proxy/AbstractControllerImpl.java | 11 +++-- .../AbstractNonProvisionedControllerImpl.java | 6 +-- .../brooklyn/entity/proxy/LoadBalancer.java | 2 +- .../entity/proxy/nginx/NginxController.java | 2 +- .../entity/proxy/nginx/NginxControllerImpl.java | 6 +-- .../nginx/NginxDefaultConfigGenerator.java | 3 +- .../entity/proxy/nginx/NginxSshDriver.java | 15 +++---- .../nginx/NginxTemplateConfigGenerator.java | 6 +-- .../brooklyn/entity/proxy/nginx/UrlMapping.java | 2 +- .../entity/proxy/nginx/UrlMappingImpl.java | 2 +- .../webapp/ControlledDynamicWebAppCluster.java | 2 +- .../ControlledDynamicWebAppClusterImpl.java | 8 ++-- .../entity/webapp/DynamicWebAppCluster.java | 2 +- .../entity/webapp/DynamicWebAppClusterImpl.java | 10 ++--- .../brooklyn/entity/webapp/HttpsSslConfig.java | 2 +- .../entity/webapp/JavaWebAppService.java | 2 +- .../entity/webapp/JavaWebAppSshDriver.java | 3 +- .../entity/webapp/WebAppServiceMethods.java | 3 +- .../entity/webapp/WebAppServiceMetrics.java | 10 ++--- .../entity/webapp/jboss/JBoss6Server.java | 2 +- .../entity/webapp/jboss/JBoss6SshDriver.java | 13 +++--- .../entity/webapp/jboss/JBoss7Server.java | 4 +- .../entity/webapp/jboss/JBoss7ServerImpl.java | 3 +- .../entity/webapp/jboss/JBoss7SshDriver.java | 13 +++--- .../entity/webapp/jetty/Jetty6Server.java | 4 +- .../entity/webapp/jetty/Jetty6SshDriver.java | 13 +++--- .../webapp/nodejs/NodeJsWebAppService.java | 2 +- .../webapp/nodejs/NodeJsWebAppSshDriver.java | 13 +++--- .../entity/webapp/tomcat/Tomcat8Server.java | 4 +- .../entity/webapp/tomcat/TomcatServer.java | 7 ++- .../entity/webapp/tomcat/TomcatSshDriver.java | 13 +++--- .../entity/dns/AbstractGeoDnsServiceTest.java | 7 ++- .../geoscaling/GeoscalingIntegrationTest.java | 11 +++-- .../dns/geoscaling/GeoscalingWebClientTest.java | 3 +- .../entity/proxy/AbstractControllerTest.java | 9 ++-- .../entity/proxy/ProxySslConfigTest.java | 3 +- .../brooklyn/entity/proxy/StubAppServer.java | 2 +- .../brooklyn/entity/proxy/UrlMappingTest.java | 7 ++- .../nginx/NginxClusterIntegrationTest.java | 5 +-- .../nginx/NginxHttpsSslIntegrationTest.java | 5 +-- .../proxy/nginx/NginxIntegrationTest.java | 6 +-- .../proxy/nginx/NginxLightIntegrationTest.java | 3 +- .../proxy/nginx/NginxRebindIntegrationTest.java | 3 +- .../nginx/NginxRebindWithHaIntegrationTest.java | 7 ++- .../nginx/NginxUrlMappingIntegrationTest.java | 3 +- .../proxy/nginx/NginxWebClusterEc2LiveTest.java | 3 +- .../AbstractWebAppFixtureIntegrationTest.java | 13 +++--- ...lledDynamicWebAppClusterIntegrationTest.java | 7 +-- .../ControlledDynamicWebAppClusterTest.java | 3 +- .../entity/webapp/DynamicWebAppClusterTest.java | 3 +- .../entity/webapp/DynamicWebAppFabricTest.java | 3 +- .../webapp/ElasticCustomLocationTest.java | 3 +- ...ElasticJavaWebAppServiceIntegrationTest.java | 3 +- .../entity/webapp/HttpsSslConfigTest.java | 3 +- .../webapp/TomcatAutoScalerPolicyTest.java | 5 +-- .../webapp/WebAppConcurrentDeployTest.java | 9 ++-- .../jboss/JBoss6ServerAwsEc2LiveTest.java | 2 +- ...Boss6ServerNonInheritingIntegrationTest.java | 3 +- .../jboss/JBoss7ServerAwsEc2LiveTest.java | 2 +- .../jboss/JBoss7ServerDockerLiveTest.java | 2 +- ...Boss7ServerNonInheritingIntegrationTest.java | 4 +- .../Jboss7ServerGoogleComputeLiveTest.java | 2 +- .../NodeJsWebAppFixtureIntegrationTest.java | 9 ++-- .../NodeJsWebAppSimpleIntegrationTest.java | 3 +- .../webapp/tomcat/Tomcat8ServerEc2LiveTest.java | 2 +- .../tomcat/Tomcat8ServerSoftlayerLiveTest.java | 2 +- ...mcat8ServerWebAppFixtureIntegrationTest.java | 7 ++- ...ableRetrieveUsageMetricsIntegrationTest.java | 3 +- .../webapp/tomcat/TomcatServerEc2LiveTest.java | 2 +- .../tomcat/TomcatServerSoftlayerLiveTest.java | 2 +- ...omcatServerWebAppFixtureIntegrationTest.java | 5 ++- .../test/entity/TestJavaWebAppEntity.java | 2 +- .../EnrichersSlightlySimplerYamlTest.java | 8 ++-- .../brooklyn/JavaWebAppsIntegrationTest.java | 13 +++--- .../camp/brooklyn/JavaWebAppsMatchingTest.java | 4 +- 235 files changed, 743 insertions(+), 724 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java ---------------------------------------------------------------------- diff --git a/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java b/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java index 6fd3462..ab0e613 100644 --- a/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java +++ b/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java @@ -28,6 +28,8 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.catalog.CatalogConfig; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.StringConfigMap; import org.apache.brooklyn.core.util.BrooklynMavenArtifacts; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService; @@ -35,8 +37,6 @@ import org.apache.brooklyn.entity.proxy.AbstractController; import org.apache.brooklyn.entity.webapp.ElasticJavaWebAppService; import org.apache.brooklyn.entity.webapp.JavaWebAppService; -import brooklyn.config.ConfigKey; -import brooklyn.config.StringConfigMap; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; @@ -46,8 +46,7 @@ import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.location.basic.PortRanges; - -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-messaging-pubsub/src/main/java/org/apache/brooklyn/demo/KafkaClusterExample.java ---------------------------------------------------------------------- diff --git a/examples/simple-messaging-pubsub/src/main/java/org/apache/brooklyn/demo/KafkaClusterExample.java b/examples/simple-messaging-pubsub/src/main/java/org/apache/brooklyn/demo/KafkaClusterExample.java index 63bc3fd..0c8cebc 100644 --- a/examples/simple-messaging-pubsub/src/main/java/org/apache/brooklyn/demo/KafkaClusterExample.java +++ b/examples/simple-messaging-pubsub/src/main/java/org/apache/brooklyn/demo/KafkaClusterExample.java @@ -22,12 +22,11 @@ import java.util.List; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import org.apache.brooklyn.entity.messaging.kafka.KafkaCluster; +import org.apache.brooklyn.entity.messaging.kafka.KafkaCluster; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.launcher.BrooklynLauncher; - -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-messaging-pubsub/src/main/java/org/apache/brooklyn/demo/StandaloneQpidBrokerExample.java ---------------------------------------------------------------------- diff --git a/examples/simple-messaging-pubsub/src/main/java/org/apache/brooklyn/demo/StandaloneQpidBrokerExample.java b/examples/simple-messaging-pubsub/src/main/java/org/apache/brooklyn/demo/StandaloneQpidBrokerExample.java index c3969a5..8975606 100644 --- a/examples/simple-messaging-pubsub/src/main/java/org/apache/brooklyn/demo/StandaloneQpidBrokerExample.java +++ b/examples/simple-messaging-pubsub/src/main/java/org/apache/brooklyn/demo/StandaloneQpidBrokerExample.java @@ -23,13 +23,12 @@ import java.util.List; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; + import org.apache.brooklyn.entity.messaging.amqp.AmqpServer; import org.apache.brooklyn.entity.messaging.qpid.QpidBroker; - import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.launcher.BrooklynLauncher; - -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java index d79228d..e5c8e6e 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java @@ -34,6 +34,7 @@ import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.task.DynamicTasks; @@ -44,7 +45,6 @@ import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; @@ -62,16 +62,15 @@ import brooklyn.event.basic.DependentConfiguration; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.location.basic.PortRanges; - import org.apache.brooklyn.policy.ha.ServiceFailureDetector; import org.apache.brooklyn.policy.ha.ServiceReplacer; import org.apache.brooklyn.policy.ha.ServiceRestarter; -import brooklyn.util.CommandLineUtil; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.StringEscapes.JavaStringEscapes; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.StringEscapes.JavaStringEscapes; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java index 0361ef4..533b1ca 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java @@ -25,21 +25,20 @@ import org.apache.brooklyn.api.catalog.CatalogConfig; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter; import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import org.apache.brooklyn.launcher.BrooklynLauncher; - import org.apache.brooklyn.policy.ha.ServiceFailureDetector; import org.apache.brooklyn.policy.ha.ServiceReplacer; import org.apache.brooklyn.policy.ha.ServiceRestarter; -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/ResilientMongoDbApp.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/ResilientMongoDbApp.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/ResilientMongoDbApp.java index 1f2f4d3..6e2c065 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/ResilientMongoDbApp.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/ResilientMongoDbApp.java @@ -38,11 +38,10 @@ import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.launcher.BrooklynLauncher; - import org.apache.brooklyn.policy.ha.ServiceFailureDetector; import org.apache.brooklyn.policy.ha.ServiceReplacer; import org.apache.brooklyn.policy.ha.ServiceRestarter; -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java index 3d434b7..e3c7512 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java @@ -25,20 +25,19 @@ import org.apache.brooklyn.api.catalog.CatalogConfig; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.entity.nosql.riak.RiakCluster; import org.apache.brooklyn.entity.nosql.riak.RiakNode; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import org.apache.brooklyn.launcher.BrooklynLauncher; - import org.apache.brooklyn.policy.ha.ServiceFailureDetector; import org.apache.brooklyn.policy.ha.ServiceRestarter; -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java index 0e9a110..4070807 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCassandraCluster.java @@ -28,8 +28,7 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import org.apache.brooklyn.launcher.BrooklynLauncher; - -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/StormSampleApp.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/StormSampleApp.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/StormSampleApp.java index 26f4e37..bf1bef7 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/StormSampleApp.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/StormSampleApp.java @@ -28,11 +28,10 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import org.apache.brooklyn.entity.messaging.storm.StormDeployment; +import org.apache.brooklyn.entity.messaging.storm.StormDeployment; import org.apache.brooklyn.launcher.BrooklynLauncher; - -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java index 16ad833..905547b 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java @@ -26,22 +26,21 @@ import org.apache.brooklyn.api.catalog.CatalogConfig; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter; import org.apache.brooklyn.entity.nosql.cassandra.CassandraFabric; import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import org.apache.brooklyn.launcher.BrooklynLauncher; - import org.apache.brooklyn.policy.ha.ServiceFailureDetector; import org.apache.brooklyn.policy.ha.ServiceReplacer; import org.apache.brooklyn.policy.ha.ServiceRestarter; -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java index 5523286..6dcba0a 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java @@ -32,9 +32,8 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; - import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java index 4303378..e85624f 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java @@ -33,7 +33,9 @@ import brooklyn.enricher.HttpLatencyDetector; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; + import org.apache.brooklyn.entity.database.mysql.MySqlNode; + import brooklyn.event.basic.Sensors; import org.apache.brooklyn.api.entity.proxying.EntitySpec; @@ -44,10 +46,9 @@ import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; import org.apache.brooklyn.launcher.BrooklynLauncher; - import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java index 044fda1..a07bba8 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java @@ -30,6 +30,7 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.catalog.CatalogConfig; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.BrooklynMavenArtifacts; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; @@ -38,24 +39,23 @@ import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; -import brooklyn.config.ConfigKey; import brooklyn.enricher.Enrichers; import brooklyn.enricher.HttpLatencyDetector; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; + import org.apache.brooklyn.entity.database.mysql.MySqlNode; + import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.java.JavaEntityMethods; import brooklyn.event.basic.Sensors; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.location.basic.PortRanges; - import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; - -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy index 8bade65..ffb90eb 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory import brooklyn.entity.basic.AbstractApplication import brooklyn.entity.basic.Entities -import brooklyn.entity.database.mysql.MySqlNode +import org.apache.brooklyn.entity.database.mysql.MySqlNode import org.apache.brooklyn.api.entity.proxying.EntitySpec import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster @@ -36,7 +36,7 @@ import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy -import brooklyn.util.CommandLineUtil +import org.apache.brooklyn.util.CommandLineUtil import com.google.common.collect.Lists http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java index 95197ed..59b62f3 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java @@ -33,9 +33,8 @@ import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; - import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; -import brooklyn.util.CommandLineUtil; +import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java b/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java index 9ed646a..925bb17 100644 --- a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java +++ b/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java @@ -26,9 +26,12 @@ import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.WebAppMonitor; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; import static com.google.common.base.Preconditions.checkNotNull; import static org.testng.Assert.assertEquals; @@ -51,15 +54,15 @@ import brooklyn.enricher.HttpLatencyDetector; import brooklyn.enricher.basic.Propagator; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; + import org.apache.brooklyn.entity.database.mysql.MySqlNode; + import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.java.JavaEntityMethods; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestFixture; + import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java index f1e5ae1..747a9c9 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java @@ -33,10 +33,12 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.http.HttpTool; import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.basic.SupportsPortForwarding; +import org.apache.brooklyn.util.net.Cidr; import org.apache.http.client.HttpClient; import org.apache.http.impl.NoConnectionReuseStrategy; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; @@ -59,7 +61,6 @@ import com.google.common.net.HostAndPort; import com.google.common.reflect.TypeToken; import com.google.gson.JsonObject; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityFunctions; @@ -68,7 +69,6 @@ import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.PollHandler; import brooklyn.event.feed.Poller; import brooklyn.event.feed.http.HttpValueFunctions; -import brooklyn.util.net.Cidr; public class ZabbixFeed extends AbstractFeed { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java index 3104ca3..746247d 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java @@ -19,9 +19,9 @@ package org.apache.brooklyn.entity.monitoring.zabbix; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java index 7b2a911..1b1d11b 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java @@ -22,6 +22,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.core.util.http.HttpToolResponse; +import org.apache.brooklyn.util.collections.MutableList; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -30,7 +31,6 @@ import com.google.gson.JsonElement; import brooklyn.event.feed.PollConfig; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.http.JsonFunctions; -import brooklyn.util.collections.MutableList; public class ZabbixPollConfig<T> extends PollConfig<HttpToolResponse, T, ZabbixPollConfig<T>> { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java index ad4f415..f80a7ed 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java @@ -21,12 +21,12 @@ package org.apache.brooklyn.entity.monitoring.zabbix; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java index fee8f02..89034c2 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java @@ -25,15 +25,15 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.stream.KnownSizeInputStream; +import org.apache.brooklyn.util.text.Strings; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.effector.Effectors; import brooklyn.event.basic.Sensors; -import brooklyn.util.stream.KnownSizeInputStream; -import brooklyn.util.text.Strings; public class DatastoreMixins { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java index 264611e..8a358bc 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java @@ -20,13 +20,15 @@ package org.apache.brooklyn.entity.database.crate; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; + import brooklyn.entity.java.UsesJava; import brooklyn.entity.java.UsesJavaMXBeans; import brooklyn.entity.java.UsesJmx; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java index df65398..0edb37d 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java @@ -18,6 +18,8 @@ */ package org.apache.brooklyn.entity.database.crate; +import org.apache.brooklyn.util.guava.Functionals; + import brooklyn.config.render.RendererHints; import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.Attributes; @@ -27,7 +29,6 @@ import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.jmx.JmxFeed; -import brooklyn.util.guava.Functionals; public class CrateNodeImpl extends SoftwareProcessImpl implements CrateNode{ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeSshDriver.java index 2eafc81..4fc91ee 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeSshDriver.java @@ -28,11 +28,12 @@ import com.google.common.collect.ImmutableList; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; + import org.apache.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 org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; public class CrateNodeSshDriver extends JavaSoftwareProcessSshDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java index 34b068e..bd4b0a8 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java @@ -22,14 +22,16 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.entity.trait.HasShortName; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; + import org.apache.brooklyn.entity.database.DatabaseNode; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; + import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.MapConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java index 238ce49..a965e01 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNodeImpl.java @@ -30,11 +30,10 @@ import brooklyn.event.feed.ssh.SshPollValue; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.guava.Maybe; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbSshDriver.java index 4f3a59b..05a43ef 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbSshDriver.java @@ -18,11 +18,11 @@ */ package org.apache.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 java.lang.String.format; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth; +import static org.apache.brooklyn.util.ssh.BashCommands.commandsToDownloadUrlsAs; +import static org.apache.brooklyn.util.ssh.BashCommands.installPackage; +import static org.apache.brooklyn.util.ssh.BashCommands.ok; import java.io.InputStream; import java.io.Reader; @@ -37,22 +37,23 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.entity.database.DatastoreMixins; + import brooklyn.entity.software.SshEffectorTasks; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.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.text.Identifiers; -import brooklyn.util.text.Strings; -import brooklyn.util.time.CountdownTimer; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java index 3dc26cc..0a2b829 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java @@ -23,12 +23,14 @@ import java.util.Collection; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import com.google.common.reflect.TypeToken; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; + import org.apache.brooklyn.entity.database.DatastoreMixins.HasDatastoreUrl; + import brooklyn.entity.group.DynamicCluster; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java index 5bf6e88..f80d09a 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java @@ -31,8 +31,15 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.TaskBuilder; +import org.apache.brooklyn.util.collections.CollectionFunctionals; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.guava.IfFunctions; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.StringPredicates; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Function; import com.google.common.base.Functions; @@ -44,7 +51,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.reflect.TypeToken; -import brooklyn.config.ConfigKey; import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.EntityInternal; @@ -55,12 +61,6 @@ import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; -import brooklyn.util.collections.CollectionFunctionals; -import brooklyn.util.guava.Functionals; -import brooklyn.util.guava.IfFunctions; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.StringPredicates; -import brooklyn.util.time.Duration; // https://dev.mysql.com/doc/refman/5.7/en/replication-howto.html http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java index 226d8fb..6d521ab 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java @@ -22,16 +22,18 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.entity.trait.HasShortName; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.basic.SoftwareProcess; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; + import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.MapConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java index 075db69..73204a8 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java @@ -33,12 +33,11 @@ import brooklyn.event.feed.ssh.SshPollValue; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.guava.Maybe; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlRowParser.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlRowParser.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlRowParser.java index 2ae12b5..f7f98b9 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlRowParser.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlRowParser.java @@ -20,8 +20,8 @@ package org.apache.brooklyn.entity.database.mysql; import java.util.Map; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.Strings; public class MySqlRowParser { public static Map<String, String> parseSingle(String row) { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java index eef77cd..af93827 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java @@ -18,10 +18,10 @@ */ package org.apache.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 java.lang.String.format; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth; +import static org.apache.brooklyn.util.ssh.BashCommands.commandsToDownloadUrlsAs; +import static org.apache.brooklyn.util.ssh.BashCommands.installPackage; import java.io.BufferedWriter; import java.io.File; @@ -39,7 +39,9 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.entity.database.DatastoreMixins; + import brooklyn.entity.software.SshEffectorTasks; import org.apache.brooklyn.api.location.OsDetails; @@ -47,19 +49,18 @@ import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.location.basic.BasicOsDetails.OsVersions; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.io.FileUtil; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.ComparableVersion; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; -import brooklyn.util.time.CountdownTimer; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.io.FileUtil; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.ComparableVersion; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java index 70ac0c7..8f00fcf 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java @@ -22,17 +22,20 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.entity.trait.HasShortName; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; + import org.apache.brooklyn.entity.database.DatabaseNode; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; + import brooklyn.entity.effector.Effectors; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; + import org.apache.brooklyn.location.basic.PortRanges; /** http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java index e99714a..d8aad4b 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java @@ -19,13 +19,13 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EffectorStartableImpl; import brooklyn.entity.basic.Entities; @@ -40,10 +40,9 @@ import brooklyn.event.feed.ssh.SshPollConfig; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.Jsonya; -import brooklyn.util.guava.Maybe; -import brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.collections.Jsonya; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.ssh.BashCommands; public class PostgreSqlNodeChefImplFromScratch extends EffectorStartableImpl implements PostgreSqlNode { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java index ed5359f..3d911c9 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java @@ -18,19 +18,19 @@ */ package org.apache.brooklyn.entity.database.postgresql; -import static brooklyn.util.ssh.BashCommands.INSTALL_WGET; -import static brooklyn.util.ssh.BashCommands.alternativesGroup; -import static brooklyn.util.ssh.BashCommands.chainGroup; -import static brooklyn.util.ssh.BashCommands.dontRequireTtyForSudo; -import static brooklyn.util.ssh.BashCommands.executeCommandThenAsUserTeeOutputToFile; -import static brooklyn.util.ssh.BashCommands.fail; -import static brooklyn.util.ssh.BashCommands.ifExecutableElse0; -import static brooklyn.util.ssh.BashCommands.ifExecutableElse1; -import static brooklyn.util.ssh.BashCommands.installPackage; -import static brooklyn.util.ssh.BashCommands.sudo; -import static brooklyn.util.ssh.BashCommands.sudoAsUser; -import static brooklyn.util.ssh.BashCommands.warn; import static java.lang.String.format; +import static org.apache.brooklyn.util.ssh.BashCommands.INSTALL_WGET; +import static org.apache.brooklyn.util.ssh.BashCommands.alternativesGroup; +import static org.apache.brooklyn.util.ssh.BashCommands.chainGroup; +import static org.apache.brooklyn.util.ssh.BashCommands.dontRequireTtyForSudo; +import static org.apache.brooklyn.util.ssh.BashCommands.executeCommandThenAsUserTeeOutputToFile; +import static org.apache.brooklyn.util.ssh.BashCommands.fail; +import static org.apache.brooklyn.util.ssh.BashCommands.ifExecutableElse0; +import static org.apache.brooklyn.util.ssh.BashCommands.ifExecutableElse1; +import static org.apache.brooklyn.util.ssh.BashCommands.installPackage; +import static org.apache.brooklyn.util.ssh.BashCommands.sudo; +import static org.apache.brooklyn.util.ssh.BashCommands.sudoAsUser; +import static org.apache.brooklyn.util.ssh.BashCommands.warn; import java.io.File; import java.io.IOException; @@ -44,25 +44,27 @@ import org.apache.brooklyn.core.util.task.ssh.SshTasks; import org.apache.brooklyn.core.util.task.ssh.SshTasks.OnFailingTask; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.StringEscapes; +import org.apache.brooklyn.util.text.StringFunctions; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.SoftwareProcess; + import org.apache.brooklyn.entity.database.DatastoreMixins; + import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.StringEscapes; -import brooklyn.util.text.StringFunctions; -import brooklyn.util.text.Strings; import com.google.common.base.Charsets; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java index 207d233..5c386b8 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNode.java @@ -21,14 +21,16 @@ package org.apache.brooklyn.entity.database.rubyrep; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; + import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; + import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java index 282608f..0843f3b 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepNodeImpl.java @@ -22,9 +22,11 @@ import java.net.URI; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.SoftwareProcessImpl; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; +import org.apache.brooklyn.util.time.Duration; + import brooklyn.event.basic.DependentConfiguration; -import brooklyn.util.time.Duration; public class RubyRepNodeImpl extends SoftwareProcessImpl implements RubyRepNode { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java index ad8bfde..1009a7d 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java @@ -32,11 +32,12 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.stream.Streams; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java index 8e846e1..b6eb469 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java @@ -25,6 +25,8 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -35,11 +37,10 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.Strings; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java index d5fcb25..6d4d4ef 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java @@ -22,15 +22,14 @@ import java.util.Arrays; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; - import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocation; -import brooklyn.util.net.Protocol; -import brooklyn.util.ssh.IptablesCommands; -import brooklyn.util.ssh.IptablesCommands.Chain; -import brooklyn.util.ssh.IptablesCommands.Policy; +import org.apache.brooklyn.util.net.Protocol; +import org.apache.brooklyn.util.ssh.IptablesCommands; +import org.apache.brooklyn.util.ssh.IptablesCommands.Chain; +import org.apache.brooklyn.util.ssh.IptablesCommands.Policy; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java index 86764cf..e9d9c2d 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterIntegrationTest.java @@ -19,12 +19,12 @@ package org.apache.brooklyn.entity.database.mysql; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.util.os.Os; import org.testng.annotations.Test; import com.google.common.collect.Iterables; import brooklyn.entity.BrooklynAppLiveTestSupport; -import brooklyn.util.os.Os; public class MySqlClusterIntegrationTest extends BrooklynAppLiveTestSupport { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java index 4080173..43d1dee 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java @@ -24,7 +24,10 @@ import java.util.List; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,9 +37,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import org.apache.brooklyn.entity.database.VogellaExampleAccess; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; /** * Runs a slightly modified version of the popular Vogella MySQL tutorial, http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java index d22a979..f435525 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java @@ -27,11 +27,12 @@ import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; + import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java index 26f9fb9..158dcc3 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java @@ -24,14 +24,15 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocation; -import brooklyn.util.net.Protocol; -import brooklyn.util.ssh.IptablesCommands; -import brooklyn.util.ssh.IptablesCommands.Chain; -import brooklyn.util.ssh.IptablesCommands.Policy; +import org.apache.brooklyn.util.net.Protocol; +import org.apache.brooklyn.util.ssh.IptablesCommands; +import org.apache.brooklyn.util.ssh.IptablesCommands.Chain; +import org.apache.brooklyn.util.ssh.IptablesCommands.Policy; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/37fc5ed1/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java index 1a75d88..d1a3589 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java @@ -27,8 +27,10 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.chef.ChefLiveTestSupport; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; + import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.software.SshEffectorTasks; @@ -36,8 +38,7 @@ import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList;
