BROOKLYN-162 - apply org.apache package prefix to software-base, tidying package names, and moving a few sensory things to core
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/c37090c0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/c37090c0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/c37090c0 Branch: refs/heads/0.8.0-incubating Commit: c37090c074b396f6c58cabbf7a4ac3dcc8ed039f Parents: 16519be Author: Alex Heneveld <[email protected]> Authored: Tue Aug 18 22:12:56 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Wed Aug 19 00:52:54 2015 +0100 ---------------------------------------------------------------------- .../apache/brooklyn/demo/CumulusRDFApplication.java | 8 +++----- .../org/apache/brooklyn/demo/ResilientMongoDbApp.java | 4 +--- .../apache/brooklyn/demo/NodeJsTodoApplication.java | 3 +-- .../brooklyn/demo/WebClusterDatabaseExample.java | 2 +- .../brooklyn/demo/WebClusterDatabaseExampleApp.java | 4 +--- ...ndWebClusterDatabaseExampleAppIntegrationTest.java | 4 +--- .../brooklyn/entity/database/crate/CrateNode.java | 12 ++++-------- .../entity/database/crate/CrateNodeDriver.java | 2 +- .../brooklyn/entity/database/crate/CrateNodeImpl.java | 7 +++---- .../entity/database/crate/CrateNodeSshDriver.java | 3 +-- .../entity/database/mariadb/MariaDbDriver.java | 3 +-- .../brooklyn/entity/database/mariadb/MariaDbNode.java | 4 +--- .../entity/database/mariadb/MariaDbNodeImpl.java | 4 +--- .../entity/database/mariadb/MariaDbSshDriver.java | 8 ++------ .../brooklyn/entity/database/mysql/MySqlDriver.java | 3 +-- .../brooklyn/entity/database/mysql/MySqlNode.java | 4 +--- .../brooklyn/entity/database/mysql/MySqlNodeImpl.java | 4 +--- .../entity/database/mysql/MySqlSshDriver.java | 8 ++------ .../entity/database/postgresql/PostgreSqlDriver.java | 5 ++--- .../entity/database/postgresql/PostgreSqlNode.java | 4 +--- .../postgresql/PostgreSqlNodeChefImplFromScratch.java | 10 ++++------ .../database/postgresql/PostgreSqlNodeImpl.java | 3 +-- .../entity/database/postgresql/PostgreSqlSpecs.java | 5 ++--- .../database/postgresql/PostgreSqlSshDriver.java | 9 +++------ .../entity/database/rubyrep/RubyRepDriver.java | 2 +- .../brooklyn/entity/database/rubyrep/RubyRepNode.java | 4 +--- .../entity/database/rubyrep/RubyRepNodeImpl.java | 3 +-- .../entity/database/rubyrep/RubyRepSshDriver.java | 4 +--- .../apache/brooklyn/entity/database/mssql/mssql.yaml | 2 +- .../entity/database/mariadb/MariaDbLiveEc2Test.java | 4 +--- .../database/mysql/MySqlClusterLiveEc2Test.java | 4 +--- .../database/mysql/MySqlClusterLiveSoftlayerTest.java | 4 +--- .../entity/database/mysql/MySqlLiveEc2Test.java | 4 +--- .../entity/database/mysql/MySqlLiveGceTest.java | 4 +--- .../database/mysql/MySqlRestartIntegrationTest.java | 5 ++--- .../entity/database/mysql/MysqlDockerLiveTest.java | 3 +-- .../database/postgresql/PostgreSqDockerLiveTest.java | 3 +-- .../database/postgresql/PostgreSqlChefTest.java | 8 ++------ .../database/postgresql/PostgreSqlEc2LiveTest.java | 4 +--- .../database/postgresql/PostgreSqlGceLiveTest.java | 4 +--- .../postgresql/PostgreSqlRestartIntegrationTest.java | 5 ++--- .../entity/database/rubyrep/RubyRepEc2LiveTest.java | 4 +--- .../entity/messaging/activemq/ActiveMQBroker.java | 6 ++---- .../entity/messaging/activemq/ActiveMQBrokerImpl.java | 9 +++------ .../messaging/activemq/ActiveMQDestinationImpl.java | 5 ++--- .../entity/messaging/activemq/ActiveMQDriver.java | 2 +- .../entity/messaging/activemq/ActiveMQQueueImpl.java | 5 ++--- .../entity/messaging/activemq/ActiveMQSshDriver.java | 3 +-- .../brooklyn/entity/messaging/jms/JMSBroker.java | 2 +- .../brooklyn/entity/messaging/jms/JMSBrokerImpl.java | 4 +--- .../messaging/kafka/AbstractfKafkaSshDriver.java | 4 +--- .../apache/brooklyn/entity/messaging/kafka/Kafka.java | 3 +-- .../brooklyn/entity/messaging/kafka/KafkaBroker.java | 6 ++---- .../entity/messaging/kafka/KafkaBrokerDriver.java | 2 +- .../entity/messaging/kafka/KafkaBrokerImpl.java | 11 ++++------- .../entity/messaging/kafka/KafkaBrokerSshDriver.java | 6 ++---- .../entity/messaging/kafka/KafkaZooKeeper.java | 4 +--- .../entity/messaging/kafka/KafkaZooKeeperDriver.java | 2 +- .../brooklyn/entity/messaging/qpid/QpidBroker.java | 6 ++---- .../entity/messaging/qpid/QpidBrokerImpl.java | 11 ++++------- .../entity/messaging/qpid/QpidDestinationImpl.java | 9 +++------ .../brooklyn/entity/messaging/qpid/QpidDriver.java | 2 +- .../brooklyn/entity/messaging/qpid/QpidQueueImpl.java | 5 ++--- .../brooklyn/entity/messaging/qpid/QpidSshDriver.java | 4 +--- .../entity/messaging/rabbit/RabbitBroker.java | 4 +--- .../entity/messaging/rabbit/RabbitBrokerImpl.java | 3 +-- .../entity/messaging/rabbit/RabbitDriver.java | 2 +- .../entity/messaging/rabbit/RabbitSshDriver.java | 5 ++--- .../apache/brooklyn/entity/messaging/storm/Storm.java | 6 ++---- .../brooklyn/entity/messaging/storm/StormDriver.java | 2 +- .../brooklyn/entity/messaging/storm/StormImpl.java | 11 +++++------ .../entity/messaging/storm/StormSshDriver.java | 6 ++---- .../entity/zookeeper/AbstractZooKeeperImpl.java | 11 +++++------ .../brooklyn/entity/zookeeper/ZooKeeperDriver.java | 2 +- .../brooklyn/entity/zookeeper/ZooKeeperNode.java | 3 +-- .../brooklyn/entity/zookeeper/ZooKeeperSshDriver.java | 4 +--- .../messaging/activemq/ActiveMQEc2LiveTest.java | 3 +-- .../activemq/ActiveMQGoogleComputeLiveTest.java | 3 +-- .../messaging/activemq/ActiveMQIntegrationTest.java | 5 ++--- .../entity/messaging/kafka/KafkaLiveTest.java | 3 +-- .../entity/messaging/qpid/QpidEc2LiveTest.java | 3 +-- .../entity/messaging/qpid/QpidIntegrationTest.java | 3 +-- .../entity/messaging/rabbit/RabbitEc2LiveTest.java | 4 +--- .../entity/messaging/storm/StormEc2LiveTest.java | 4 +--- .../messaging/zookeeper/ZooKeeperEc2LiveTest.java | 4 +--- .../brooklyn/entity/monitoring/monit/MonitDriver.java | 2 +- .../brooklyn/entity/monitoring/monit/MonitNode.java | 3 +-- .../entity/monitoring/monit/MonitNodeImpl.java | 3 +-- .../entity/monitoring/monit/MonitSshDriver.java | 5 ++--- .../entity/monitoring/monit/MonitIntegrationTest.java | 5 ++--- .../brooklyn/entity/network/bind/BindDnsServer.java | 4 +--- .../entity/network/bind/BindDnsServerDriver.java | 4 ++-- .../entity/network/bind/BindDnsServerImpl.java | 3 +-- .../entity/network/bind/BindDnsServerSshDriver.java | 3 +-- .../entity/network/bind/BindDnsServerEc2LiveTest.java | 4 +--- .../network/bind/BindDnsServerIntegrationTest.java | 3 +-- .../entity/network/bind/BindDnsServerLiveTest.java | 5 ++--- .../network/bind/BindDnsServerSoftlayerLiveTest.java | 4 +--- .../network/bind/DoNothingSoftwareProcessDriver.java | 6 ++---- .../entity/nosql/cassandra/CassandraNode.java | 10 +++------- .../entity/nosql/cassandra/CassandraNodeDriver.java | 3 +-- .../entity/nosql/cassandra/CassandraNodeImpl.java | 14 ++++++-------- .../nosql/cassandra/CassandraNodeSshDriver.java | 8 +++----- .../entity/nosql/couchbase/CouchbaseClusterImpl.java | 4 +--- .../entity/nosql/couchbase/CouchbaseNode.java | 3 +-- .../entity/nosql/couchbase/CouchbaseNodeDriver.java | 3 +-- .../entity/nosql/couchbase/CouchbaseNodeImpl.java | 4 +--- .../nosql/couchbase/CouchbaseNodeSshDriver.java | 6 ++---- .../entity/nosql/couchbase/CouchbaseSyncGateway.java | 3 +-- .../nosql/couchbase/CouchbaseSyncGatewayDriver.java | 2 +- .../nosql/couchbase/CouchbaseSyncGatewayImpl.java | 3 +-- .../couchbase/CouchbaseSyncGatewaySshDriver.java | 4 +--- .../brooklyn/entity/nosql/couchdb/CouchDBNode.java | 3 +-- .../entity/nosql/couchdb/CouchDBNodeDriver.java | 2 +- .../entity/nosql/couchdb/CouchDBNodeImpl.java | 3 +-- .../entity/nosql/couchdb/CouchDBNodeSshDriver.java | 4 +--- .../entity/nosql/elasticsearch/ElasticSearchNode.java | 4 +--- .../nosql/elasticsearch/ElasticSearchNodeDriver.java | 2 +- .../nosql/elasticsearch/ElasticSearchNodeImpl.java | 4 +--- .../elasticsearch/ElasticSearchNodeSshDriver.java | 4 +--- .../entity/nosql/mongodb/AbstractMongoDBServer.java | 3 +-- .../nosql/mongodb/AbstractMongoDBSshDriver.java | 6 ++---- .../entity/nosql/mongodb/MongoDBClientDriver.java | 2 +- .../entity/nosql/mongodb/MongoDBClientImpl.java | 3 +-- .../brooklyn/entity/nosql/mongodb/MongoDBDriver.java | 2 +- .../entity/nosql/mongodb/MongoDBServerImpl.java | 4 +--- .../mongodb/sharding/CoLocatedMongoDBRouter.java | 3 +-- .../mongodb/sharding/CoLocatedMongoDBRouterImpl.java | 3 +-- .../mongodb/sharding/MongoDBConfigServerDriver.java | 2 +- .../mongodb/sharding/MongoDBConfigServerImpl.java | 2 +- .../nosql/mongodb/sharding/MongoDBRouterDriver.java | 2 +- .../nosql/mongodb/sharding/MongoDBRouterImpl.java | 3 +-- .../brooklyn/entity/nosql/redis/RedisStore.java | 3 +-- .../brooklyn/entity/nosql/redis/RedisStoreDriver.java | 2 +- .../brooklyn/entity/nosql/redis/RedisStoreImpl.java | 4 +--- .../entity/nosql/redis/RedisStoreSshDriver.java | 4 +--- .../apache/brooklyn/entity/nosql/riak/RiakNode.java | 5 ++--- .../brooklyn/entity/nosql/riak/RiakNodeDriver.java | 4 ++-- .../brooklyn/entity/nosql/riak/RiakNodeImpl.java | 4 +--- .../brooklyn/entity/nosql/riak/RiakNodeSshDriver.java | 9 +++------ .../apache/brooklyn/entity/nosql/solr/SolrServer.java | 10 ++++------ .../brooklyn/entity/nosql/solr/SolrServerDriver.java | 4 ++-- .../brooklyn/entity/nosql/solr/SolrServerImpl.java | 3 +-- .../entity/nosql/solr/SolrServerSshDriver.java | 5 ++--- .../nosql/cassandra/CassandraDatacenterTest.java | 6 ++---- .../entity/nosql/cassandra/CassandraFabricTest.java | 4 +--- .../nosql/cassandra/CassandraNodeEc2LiveTest.java | 3 +-- .../couchbase/CouchbaseSyncGatewayEc2LiveTest.java | 3 +-- .../entity/nosql/couchdb/CouchDBNodeEc2LiveTest.java | 3 +-- .../entity/nosql/mongodb/MongoDBEc2LiveTest.java | 3 +-- .../nosql/mongodb/MongoDBReplicaSetEc2LiveTest.java | 3 +-- .../nosql/mongodb/MongoDBRestartIntegrationTest.java | 5 ++--- .../nosql/mongodb/MongoDBSoftLayerLiveTest.java | 3 +-- .../sharding/MongoDBShardedDeploymentEc2LiveTest.java | 3 +-- .../brooklyn/entity/nosql/redis/RedisEc2LiveTest.java | 3 +-- .../entity/nosql/riak/RiakClusterEc2LiveTest.java | 3 +-- .../entity/nosql/riak/RiakNodeEc2LiveTest.java | 3 +-- .../nosql/riak/RiakNodeGoogleComputeLiveTest.java | 3 +-- .../entity/nosql/riak/RiakNodeSoftlayerLiveTest.java | 3 +-- .../entity/nosql/solr/SolrServerEc2LiveTest.java | 3 +-- .../brooklyn/entity/osgi/karaf/KarafContainer.java | 7 +++---- .../entity/osgi/karaf/KarafContainerImpl.java | 13 ++++++------- .../brooklyn/entity/osgi/karaf/KarafDriver.java | 2 +- .../brooklyn/entity/osgi/karaf/KarafSshDriver.java | 3 +-- .../entity/osgi/karaf/KarafContainerEc2LiveTest.java | 3 +-- .../entity/osgi/karaf/KarafContainerTest.java | 4 +--- .../brooklyn/entity/proxy/AbstractController.java | 3 +-- .../brooklyn/entity/proxy/AbstractControllerImpl.java | 4 +--- .../brooklyn/entity/proxy/nginx/NginxController.java | 3 +-- .../brooklyn/entity/proxy/nginx/NginxDriver.java | 2 +- .../brooklyn/entity/proxy/nginx/NginxSshDriver.java | 6 ++---- .../brooklyn/entity/webapp/JavaWebAppDriver.java | 2 +- .../brooklyn/entity/webapp/JavaWebAppService.java | 3 +-- .../entity/webapp/JavaWebAppSoftwareProcess.java | 2 +- .../entity/webapp/JavaWebAppSoftwareProcessImpl.java | 5 ++--- .../brooklyn/entity/webapp/JavaWebAppSshDriver.java | 3 +-- .../brooklyn/entity/webapp/jboss/JBoss6Server.java | 5 ++--- .../entity/webapp/jboss/JBoss6ServerImpl.java | 5 ++--- .../brooklyn/entity/webapp/jboss/JBoss6SshDriver.java | 6 ++---- .../brooklyn/entity/webapp/jboss/JBoss7Server.java | 3 +-- .../brooklyn/entity/webapp/jboss/JBoss7SshDriver.java | 4 +--- .../brooklyn/entity/webapp/jetty/Jetty6Server.java | 5 ++--- .../entity/webapp/jetty/Jetty6ServerImpl.java | 9 ++++----- .../entity/webapp/nodejs/NodeJsWebAppDriver.java | 2 +- .../entity/webapp/nodejs/NodeJsWebAppService.java | 4 +--- .../entity/webapp/nodejs/NodeJsWebAppServiceImpl.java | 4 +--- .../entity/webapp/nodejs/NodeJsWebAppSshDriver.java | 6 ++---- .../brooklyn/entity/webapp/tomcat/Tomcat8Server.java | 3 +-- .../brooklyn/entity/webapp/tomcat/TomcatServer.java | 6 ++---- .../entity/webapp/tomcat/TomcatServerImpl.java | 7 +++---- .../entity/proxy/TrackingAbstractControllerImpl.java | 3 +-- .../brooklyn/entity/proxy/nginx/NginxEc2LiveTest.java | 5 ++--- .../proxy/nginx/NginxHttpsSslIntegrationTest.java | 4 +--- .../entity/proxy/nginx/NginxIntegrationTest.java | 3 +-- .../proxy/nginx/NginxRebindIntegrationTest.java | 4 +--- .../webapp/AbstractWebAppFixtureIntegrationTest.java | 7 ++----- .../webapp/ControlledDynamicWebAppClusterTest.java | 4 +--- ...lledDynamicWebAppClusterRebindIntegrationTest.java | 4 +--- .../webapp/jboss/JBoss6ServerAwsEc2LiveTest.java | 3 +-- .../JBoss6ServerNonInheritingIntegrationTest.java | 4 +--- .../webapp/jboss/JBoss7ServerAwsEc2LiveTest.java | 3 +-- .../webapp/jboss/JBoss7ServerDockerLiveTest.java | 3 +-- .../jboss/JBoss7ServerRebindingIntegrationTest.java | 4 +--- ...rversMultiVersionWebAppFixtureIntegrationTest.java | 4 +--- .../jboss/Jboss7ServerGoogleComputeLiveTest.java | 3 +-- .../jetty/JettyWebAppFixtureIntegrationTest.java | 4 +--- .../entity/webapp/nodejs/NodeJsWebAppEc2LiveTest.java | 3 +-- .../nodejs/NodeJsWebAppFixtureIntegrationTest.java | 3 +-- .../webapp/nodejs/NodeJsWebAppSoftlayerLiveTest.java | 3 +-- .../webapp/tomcat/Tomcat8ServerEc2LiveTest.java | 4 +--- .../tomcat/Tomcat8ServerRestartIntegrationTest.java | 5 ++--- .../webapp/tomcat/Tomcat8ServerSoftlayerLiveTest.java | 4 +--- .../Tomcat8ServerWebAppFixtureIntegrationTest.java | 4 +--- ...verDisableRetrieveUsageMetricsIntegrationTest.java | 4 +--- .../entity/webapp/tomcat/TomcatServerEc2LiveTest.java | 3 +-- .../tomcat/TomcatServerRestartIntegrationTest.java | 5 ++--- .../webapp/tomcat/TomcatServerSoftlayerLiveTest.java | 3 +-- .../TomcatServerWebAppFixtureIntegrationTest.java | 4 +--- .../brooklyn/test/entity/TestJavaWebAppEntity.java | 7 +++---- .../test/entity/TestJavaWebAppEntityImpl.java | 3 +-- .../brooklyn/qa/load/SimulatedMySqlNodeImpl.java | 5 ++--- .../apache/brooklyn/qa/load/SimulatedTheeTierApp.java | 3 +-- .../brooklynnode/SoftlayerObtainPrivateLiveTest.java | 7 +++---- 223 files changed, 327 insertions(+), 628 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 bcdd143..26891d5 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 @@ -42,6 +42,8 @@ import org.apache.brooklyn.entity.core.AbstractApplication; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.EntityInternal; import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.entity.java.UsesJava; +import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.lifecycle.Lifecycle; import org.apache.brooklyn.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter; @@ -50,17 +52,13 @@ import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode; import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; - -import brooklyn.entity.java.UsesJava; -import brooklyn.entity.java.UsesJmx; -import brooklyn.entity.software.SshEffectorTasks; - 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 org.apache.brooklyn.sensor.core.DependentConfiguration; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.CommandLineUtil; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 ab70e77..fdce4d0 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 @@ -33,9 +33,7 @@ import org.apache.brooklyn.entity.core.StartableApplication; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer; - -import brooklyn.entity.basic.SoftwareProcess; - +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.policy.ha.ServiceFailureDetector; import org.apache.brooklyn.policy.ha.ServiceReplacer; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/NodeJsTodoApplication.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/NodeJsTodoApplication.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/NodeJsTodoApplication.java index fd3a22c..eed6a05 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/NodeJsTodoApplication.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/NodeJsTodoApplication.java @@ -26,12 +26,11 @@ import org.apache.brooklyn.entity.core.AbstractApplication; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.StartableApplication; import org.apache.brooklyn.entity.nosql.redis.RedisStore; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppService; import org.apache.brooklyn.sensor.core.DependentConfiguration; -import brooklyn.entity.basic.SoftwareProcess; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 a22a8a6..8682335 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 @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.demo; -import static brooklyn.entity.java.JavaEntityMethods.javaSysProp; +import static org.apache.brooklyn.entity.java.JavaEntityMethods.javaSysProp; import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady; import static org.apache.brooklyn.sensor.core.DependentConfiguration.formatString; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 a988440..e13a632 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 @@ -42,9 +42,7 @@ import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.StartableApplication; import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.group.DynamicCluster; - -import brooklyn.entity.java.JavaEntityMethods; - +import org.apache.brooklyn.entity.java.JavaEntityMethods; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 c302141..fabb071 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 @@ -56,9 +56,7 @@ import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.StartableApplication; import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.group.DynamicCluster; - -import brooklyn.entity.java.JavaEntityMethods; - +import org.apache.brooklyn.entity.java.JavaEntityMethods; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import org.apache.brooklyn.policy.enricher.HttpLatencyDetector; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 9762d5c..94b03bf 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 @@ -22,16 +22,12 @@ 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 brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; - -import brooklyn.entity.java.UsesJava; -import brooklyn.entity.java.UsesJavaMXBeans; -import brooklyn.entity.java.UsesJmx; - +import org.apache.brooklyn.entity.java.UsesJava; +import org.apache.brooklyn.entity.java.UsesJavaMXBeans; +import org.apache.brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeDriver.java index 708e0e8..de01b6b 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.database.crate; -import brooklyn.entity.java.JavaSoftwareProcessDriver; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessDriver; public interface CrateNodeDriver extends JavaSoftwareProcessDriver { } http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 5cf4065..7e4f314 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 @@ -20,16 +20,15 @@ package org.apache.brooklyn.entity.database.crate; import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.java.JavaAppUtils; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.sensor.feed.http.HttpFeed; import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; import org.apache.brooklyn.sensor.feed.http.HttpValueFunctions; +import org.apache.brooklyn.sensor.feed.jmx.JmxFeed; import org.apache.brooklyn.util.guava.Functionals; -import brooklyn.entity.basic.SoftwareProcessImpl; -import brooklyn.entity.java.JavaAppUtils; -import brooklyn.event.feed.jmx.JmxFeed; - public class CrateNodeImpl extends SoftwareProcessImpl implements CrateNode{ private JmxFeed jmxFeed; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 f72c071..fbfe9dd 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 @@ -24,11 +24,10 @@ import java.util.List; import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; import com.google.common.collect.ImmutableList; -import brooklyn.entity.java.JavaSoftwareProcessSshDriver; - import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbDriver.java index 066a73b..05c097a 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbDriver.java @@ -18,10 +18,9 @@ */ package org.apache.brooklyn.entity.database.mariadb; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; -import brooklyn.entity.basic.SoftwareProcessDriver; - /** * The {@link SoftwareProcessDriver} for MariaDB. */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 5612b5b..a5a91f6 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 @@ -25,12 +25,10 @@ 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.config.MapConfigKey; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.database.DatabaseNode; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 632e3f2..0b5becf 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 @@ -20,10 +20,8 @@ package org.apache.brooklyn.entity.database.mariadb; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.effector.core.EffectorBody; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.sensor.feed.ssh.SshFeed; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 054e5fa..300cc35 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 @@ -33,17 +33,13 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; - import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins; - -import brooklyn.entity.software.SshEffectorTasks; - +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.task.DynamicTasks; import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java index b11d22b..461369b 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java @@ -18,10 +18,9 @@ */ package org.apache.brooklyn.entity.database.mysql; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; -import brooklyn.entity.basic.SoftwareProcessDriver; - /** * The {@link SoftwareProcessDriver} for MySQL. */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 b9e9f2c..be837c4 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 @@ -25,14 +25,12 @@ 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.config.MapConfigKey; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.effector.core.MethodEffector; import org.apache.brooklyn.entity.annotation.Effector; import org.apache.brooklyn.entity.annotation.EffectorParam; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 5d1462f..4f0ae7d 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 @@ -22,11 +22,9 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.effector.core.EffectorBody; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.sensor.feed.ssh.SshFeed; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 6e68d6a..b73b6c1 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 @@ -35,18 +35,14 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; - import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins; - -import brooklyn.entity.software.SshEffectorTasks; - +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.location.basic.BasicOsDetails.OsVersions; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.task.DynamicTasks; import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java index f8b6bad..dc267b4 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java @@ -18,12 +18,11 @@ */ package org.apache.brooklyn.entity.database.postgresql; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; -import brooklyn.entity.basic.SoftwareProcessDriver; - /** - * The {@link brooklyn.entity.basic.SoftwareProcessDriver} for PostgreSQL. + * The {@link org.apache.brooklyn.entity.software.base.SoftwareProcessDriver} for PostgreSQL. */ public interface PostgreSqlDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 3e3835e..168179c 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 @@ -24,13 +24,11 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.objs.HasShortName; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.effector.core.Effectors; import org.apache.brooklyn.entity.database.DatabaseNode; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 69a5363..f839a91 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 @@ -23,20 +23,18 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.effector.core.Effectors; +import org.apache.brooklyn.entity.chef.ChefConfig; +import org.apache.brooklyn.entity.chef.ChefLifecycleEffectorTasks; +import org.apache.brooklyn.entity.chef.ChefServerTasks; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.stock.EffectorStartableImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.chef.ChefConfig; -import brooklyn.entity.chef.ChefLifecycleEffectorTasks; -import brooklyn.entity.chef.ChefServerTasks; -import brooklyn.entity.software.SshEffectorTasks; - import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.sensor.feed.ssh.SshFeed; import org.apache.brooklyn.sensor.feed.ssh.SshPollConfig; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.collections.Jsonya; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.core.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java index 13537a1..15d280e 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java @@ -19,12 +19,11 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.effector.core.EffectorBody; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.util.core.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.SoftwareProcessImpl; - public class PostgreSqlNodeImpl extends SoftwareProcessImpl implements PostgreSqlNode { private static final Logger LOG = LoggerFactory.getLogger(PostgreSqlNodeImpl.class); http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java index f560add..b46374d 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSpecs.java @@ -19,9 +19,8 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.entity.EntitySpec; - -import brooklyn.entity.chef.ChefConfig; -import brooklyn.entity.chef.ChefConfig.ChefModes; +import org.apache.brooklyn.entity.chef.ChefConfig; +import org.apache.brooklyn.entity.chef.ChefConfig.ChefModes; /** * Utiltiy for creating specs for {@link PostgreSqlNode} instances. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 5ec85de..ec70005 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 @@ -41,6 +41,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.task.DynamicTasks; @@ -57,14 +58,10 @@ 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.SoftwareProcess; - import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.database.DatastoreMixins; - -import brooklyn.entity.software.SshEffectorTasks; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import com.google.common.base.Charsets; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepDriver.java index 056dd3d..ab4eec0 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.database.rubyrep; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; /** * The driver interface for {@link RubyRepNode}. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 8d7ddfb..60f7f32 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 @@ -23,12 +23,10 @@ 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 brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 86aeafe..2554d17 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 @@ -20,10 +20,9 @@ package org.apache.brooklyn.entity.database.rubyrep; import java.net.URI; -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 c915556..4a11b63 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 @@ -28,11 +28,9 @@ import java.util.concurrent.ExecutionException; import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; - import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql/mssql.yaml ---------------------------------------------------------------------- diff --git a/software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql/mssql.yaml b/software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql/mssql.yaml index 413ec3d..c3d3c99 100644 --- a/software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql/mssql.yaml +++ b/software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql/mssql.yaml @@ -12,7 +12,7 @@ location: mapNewVolumeToDeviceName: ["/dev/sda1", 100, true] services: -- type: brooklyn.entity.basic.VanillaWindowsProcess +- type: org.apache.brooklyn.entity.software.base.VanillaWindowsProcess brooklyn.config: templates.install: classpath://org/apache/brooklyn/entity/database/mssql/ConfigurationFile.ini: "C:\\ConfigurationFile.ini" http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java index 80961dd..222998a 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java @@ -21,9 +21,7 @@ package org.apache.brooklyn.entity.database.mariadb; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; - -import brooklyn.entity.AbstractEc2LiveTest; - +import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.location.jclouds.JcloudsLocation; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterLiveEc2Test.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterLiveEc2Test.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterLiveEc2Test.java index 1849ab0..93fe0c9 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterLiveEc2Test.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterLiveEc2Test.java @@ -19,10 +19,8 @@ package org.apache.brooklyn.entity.database.mysql; import org.testng.annotations.Test; - -import brooklyn.entity.AbstractEc2LiveTest; - import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractEc2LiveTest; @Test(groups = { "Live" }) public class MySqlClusterLiveEc2Test extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterLiveSoftlayerTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterLiveSoftlayerTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterLiveSoftlayerTest.java index a911200..c711265 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterLiveSoftlayerTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterLiveSoftlayerTest.java @@ -19,10 +19,8 @@ package org.apache.brooklyn.entity.database.mysql; import org.testng.annotations.Test; - -import brooklyn.entity.AbstractSoftlayerLiveTest; - import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.entity.AbstractSoftlayerLiveTest; @Test(groups = { "Live" }) public class MySqlClusterLiveSoftlayerTest extends AbstractSoftlayerLiveTest { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java index 1d32bbe..6b04c49 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java @@ -21,9 +21,7 @@ package org.apache.brooklyn.entity.database.mysql; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; - -import brooklyn.entity.AbstractEc2LiveTest; - +import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveGceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveGceTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveGceTest.java index dbc87e1..45202a0 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveGceTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveGceTest.java @@ -21,9 +21,7 @@ package org.apache.brooklyn.entity.database.mysql; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; - -import brooklyn.entity.AbstractGoogleComputeLiveTest; - +import org.apache.brooklyn.entity.AbstractGoogleComputeLiveTest; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java index cf7f749..f7913f0 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java @@ -19,13 +19,12 @@ package org.apache.brooklyn.entity.database.mysql; import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessRestartIntegrationTest; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.basic.AbstractSoftwareProcessRestartIntegrationTest; -import brooklyn.entity.basic.SoftwareProcess; - /** * Tests restart of the software *process* (as opposed to the VM). */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java index f22cf7b..f8a285c 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java @@ -20,8 +20,7 @@ package org.apache.brooklyn.entity.database.mysql; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; - -import brooklyn.entity.software.AbstractDockerLiveTest; +import org.apache.brooklyn.entity.software.base.AbstractDockerLiveTest; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java index 1f7b94a..7ba4ec8 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqDockerLiveTest.java @@ -20,8 +20,7 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; - -import brooklyn.entity.software.AbstractDockerLiveTest; +import org.apache.brooklyn.entity.software.base.AbstractDockerLiveTest; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/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 51c49a7..7ae04f7 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 @@ -24,19 +24,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; - -import brooklyn.entity.chef.ChefLiveTestSupport; - import org.apache.brooklyn.effector.core.EffectorTasks; +import org.apache.brooklyn.entity.chef.ChefLiveTestSupport; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; - -import brooklyn.entity.software.SshEffectorTasks; - import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; import org.apache.brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java index eb432c8..f878778 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlEc2LiveTest.java @@ -21,9 +21,7 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; - -import brooklyn.entity.AbstractEc2LiveTest; - +import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java index 0428f5d..d6dbb45 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlGceLiveTest.java @@ -21,9 +21,7 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; - -import brooklyn.entity.AbstractGoogleComputeLiveTest; - +import org.apache.brooklyn.entity.AbstractGoogleComputeLiveTest; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java index 970d3ff..185fec3 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java @@ -19,13 +19,12 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessRestartIntegrationTest; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.entity.basic.AbstractSoftwareProcessRestartIntegrationTest; -import brooklyn.entity.basic.SoftwareProcess; - /** * Tests restart of the software *process* (as opposed to the VM). */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java index 52b919f..db7dcbd 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepEc2LiveTest.java @@ -21,9 +21,7 @@ package org.apache.brooklyn.entity.database.rubyrep; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.testng.annotations.Test; - -import brooklyn.entity.AbstractEc2LiveTest; - +import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java index f154f81..cf37106 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBroker.java @@ -23,13 +23,11 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; - -import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.java.UsesJmx; - import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.messaging.jms.JMSBroker; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java index 7dcf3be..4427b52 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java @@ -24,14 +24,11 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.java.UsesJmx; - import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.messaging.jms.JMSBrokerImpl; - -import brooklyn.event.feed.jmx.JmxAttributePollConfig; -import brooklyn.event.feed.jmx.JmxFeed; +import org.apache.brooklyn.sensor.feed.jmx.JmxAttributePollConfig; +import org.apache.brooklyn.sensor.feed.jmx.JmxFeed; import com.google.common.base.Functions; import com.google.common.base.Objects.ToStringHelper; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java index ae11770..337d68b 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java @@ -27,11 +27,10 @@ import org.apache.brooklyn.api.internal.EntityLocal; import com.google.common.base.Preconditions; import org.apache.brooklyn.entity.messaging.jms.JMSDestinationImpl; +import org.apache.brooklyn.sensor.feed.jmx.JmxFeed; +import org.apache.brooklyn.sensor.feed.jmx.JmxHelper; import org.apache.brooklyn.util.exceptions.Exceptions; -import brooklyn.event.feed.jmx.JmxFeed; -import brooklyn.event.feed.jmx.JmxHelper; - public abstract class ActiveMQDestinationImpl extends JMSDestinationImpl implements ActiveMQDestination { protected ObjectName brokerMBeanName; protected transient JmxHelper jmxHelper; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDriver.java index 99a7b86..768efa6 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.activemq; -import brooklyn.entity.java.JavaSoftwareProcessDriver; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessDriver; public interface ActiveMQDriver extends JavaSoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java index 63d5c1c..dddb6c9 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java @@ -18,12 +18,11 @@ */ package org.apache.brooklyn.entity.messaging.activemq; +import org.apache.brooklyn.sensor.feed.jmx.JmxAttributePollConfig; +import org.apache.brooklyn.sensor.feed.jmx.JmxFeed; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.event.feed.jmx.JmxAttributePollConfig; -import brooklyn.event.feed.jmx.JmxFeed; - public class ActiveMQQueueImpl extends ActiveMQDestinationImpl implements ActiveMQQueue { public static final Logger log = LoggerFactory.getLogger(ActiveMQQueue.class); http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java index c7cf623..56cbbd5 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQSshDriver.java @@ -24,9 +24,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import brooklyn.entity.java.JavaSoftwareProcessSshDriver; - import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBroker.java index a83d259..34d03f7 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBroker.java @@ -21,10 +21,10 @@ package org.apache.brooklyn.entity.messaging.jms; import java.util.Collection; import java.util.Map; -import brooklyn.entity.basic.SoftwareProcess; import org.apache.brooklyn.entity.messaging.MessageBroker; import org.apache.brooklyn.entity.messaging.Queue; import org.apache.brooklyn.entity.messaging.Topic; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java index 73b05a7..2fdfa7f 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSBrokerImpl.java @@ -25,12 +25,10 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.entity.lifecycle.Lifecycle; import org.apache.brooklyn.entity.messaging.Queue; import org.apache.brooklyn.entity.messaging.Topic; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.time.Duration; import org.apache.brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java index b6176a7..efcb5a8 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java @@ -27,11 +27,9 @@ import java.util.Map; import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.java.JavaSoftwareProcessSshDriver; - import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java index fc31708..57d2db9 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java @@ -21,11 +21,10 @@ package org.apache.brooklyn.entity.messaging.kafka; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; -import brooklyn.entity.basic.SoftwareProcess; - /** * Shared Kafka broker and zookeeper properties. */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java index 52130cf..65576f3 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java @@ -23,11 +23,9 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; - -import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.java.UsesJmx; - +import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.messaging.MessageBroker; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerDriver.java index 357dae8..fe2a396 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.kafka; -import brooklyn.entity.java.JavaSoftwareProcessDriver; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessDriver; public interface KafkaBrokerDriver extends JavaSoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java index 5da2114..0d17099 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java @@ -26,16 +26,13 @@ import javax.management.ObjectName; import org.apache.brooklyn.api.entity.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.messaging.MessageBroker; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; - -import brooklyn.event.feed.jmx.JmxAttributePollConfig; -import brooklyn.event.feed.jmx.JmxFeed; -import brooklyn.event.feed.jmx.JmxHelper; +import org.apache.brooklyn.sensor.feed.jmx.JmxAttributePollConfig; +import org.apache.brooklyn.sensor.feed.jmx.JmxFeed; +import org.apache.brooklyn.sensor.feed.jmx.JmxHelper; import com.google.common.base.Functions; import com.google.common.base.Objects.ToStringHelper; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerSshDriver.java index d50b1bb..b1eeb43 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerSshDriver.java @@ -22,11 +22,9 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.java.UsesJmx; -import brooklyn.entity.java.UsesJmx.JmxAgentModes; - import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.entity.java.UsesJmx; +import org.apache.brooklyn.entity.java.UsesJmx.JmxAgentModes; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java index 0cc8b22..97f1216 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java @@ -21,11 +21,9 @@ package org.apache.brooklyn.entity.messaging.kafka; import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.entity.annotation.Effector; import org.apache.brooklyn.entity.annotation.EffectorParam; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.util.core.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c37090c0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperDriver.java index f08736d..c1b7ad7 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeperDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.kafka; -import brooklyn.entity.java.JavaSoftwareProcessDriver; +import org.apache.brooklyn.entity.java.JavaSoftwareProcessDriver; public interface KafkaZooKeeperDriver extends JavaSoftwareProcessDriver {
