rename coreâs o.a.b.entity to o.a.b.core.entity - except for things that truly are entities, such as .group and .stock
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/9945926a Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/9945926a Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/9945926a Branch: refs/heads/0.8.0-incubating Commit: 9945926af0e8ae82c973d439da18740a28c046d6 Parents: 1bfbc5a Author: Aled Sage <[email protected]> Authored: Wed Aug 19 16:13:12 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Wed Aug 19 16:13:12 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/demo/GlobalWebFabricExample.java | 6 +++--- .../apache/brooklyn/demo/KafkaClusterExample.java | 4 ++-- .../brooklyn/demo/StandaloneQpidBrokerExample.java | 6 +++--- .../apache/brooklyn/demo/CumulusRDFApplication.java | 14 +++++++------- .../demo/HighAvailabilityCassandraCluster.java | 6 +++--- .../apache/brooklyn/demo/ResilientMongoDbApp.java | 6 +++--- .../apache/brooklyn/demo/RiakClusterExample.java | 6 +++--- .../brooklyn/demo/SimpleCassandraCluster.java | 6 +++--- .../apache/brooklyn/demo/SimpleCouchDBCluster.java | 2 +- .../brooklyn/demo/SimpleMongoDBReplicaSet.java | 2 +- .../apache/brooklyn/demo/SimpleRedisCluster.java | 2 +- .../org/apache/brooklyn/demo/StormSampleApp.java | 6 +++--- .../brooklyn/demo/WideAreaCassandraCluster.java | 6 +++--- .../apache/brooklyn/demo/NodeJsTodoApplication.java | 8 ++++---- .../brooklyn/demo/SingleWebServerExample.java | 8 ++++---- .../brooklyn/demo/WebClusterDatabaseExample.java | 6 +++--- .../brooklyn/demo/WebClusterDatabaseExampleApp.java | 6 +++--- .../demo/WebClusterDatabaseExampleGroovy.groovy | 4 ++-- .../org/apache/brooklyn/demo/WebClusterExample.java | 4 ++-- ...WebClusterDatabaseExampleAppIntegrationTest.java | 4 ++-- .../brooklyn/entity/database/derby/DerbySchema.java | 2 +- .../database/postgresql/PostgreSqlNodeSaltImpl.java | 2 +- .../apache/brooklyn/entity/salt/SaltConfigs.java | 3 ++- .../entity/salt/SaltLifecycleEffectorTasks.java | 4 ++-- .../brooklyn/entity/salt/SaltStackMaster.java | 3 ++- .../entity/salt/SaltStackMasterSshDriver.java | 2 +- .../org/apache/brooklyn/entity/salt/SaltTasks.java | 2 +- .../database/postgresql/PostgreSqlSaltLiveTest.java | 3 +-- .../brooklyn/entity/salt/SaltConfigsTest.java | 5 ++--- .../entity/monitoring/zabbix/ZabbixFeed.java | 4 ++-- .../entity/monitoring/zabbix/ZabbixServerImpl.java | 4 ++-- .../nosql/hazelcast/HazelcastClusterImpl.java | 6 ++++-- .../entity/nosql/hazelcast/HazelcastNodeImpl.java | 3 +-- .../nosql/hazelcast/HazelcastNodeSshDriver.java | 3 ++- .../hazelcast/HazelcastClusterEc2LiveTest.java | 3 ++- .../HazelcastClusterSoftlayerLiveTest.java | 3 ++- .../brooklyn/entity/database/crate/CrateNode.java | 2 +- .../entity/database/crate/CrateNodeImpl.java | 2 +- .../entity/database/crate/CrateNodeSshDriver.java | 2 +- .../entity/database/mariadb/MariaDbNode.java | 2 +- .../entity/database/mariadb/MariaDbSshDriver.java | 4 ++-- .../entity/database/mysql/MySqlClusterImpl.java | 8 ++++---- .../brooklyn/entity/database/mysql/MySqlNode.java | 6 +++--- .../entity/database/mysql/MySqlSshDriver.java | 4 ++-- .../PostgreSqlNodeChefImplFromScratch.java | 2 +- .../database/postgresql/PostgreSqlSshDriver.java | 2 +- .../entity/database/rubyrep/RubyRepNode.java | 2 +- .../entity/database/rubyrep/RubyRepNodeImpl.java | 2 +- .../entity/database/rubyrep/RubyRepSshDriver.java | 4 ++-- .../database/crate/CrateNodeIntegrationTest.java | 6 +++--- .../database/mariadb/MariaDbIntegrationTest.java | 4 ++-- .../database/postgresql/PostgreSqlChefTest.java | 2 +- .../postgresql/PostgreSqlIntegrationTest.java | 4 ++-- .../database/rubyrep/RubyRepIntegrationTest.java | 4 ++-- .../entity/messaging/activemq/ActiveMQBroker.java | 2 +- .../messaging/activemq/ActiveMQBrokerImpl.java | 2 +- .../messaging/activemq/ActiveMQSshDriver.java | 2 +- .../brooklyn/entity/messaging/amqp/AmqpServer.java | 2 +- .../entity/messaging/jms/JMSBrokerImpl.java | 2 +- .../entity/messaging/jms/JMSDestinationImpl.java | 2 +- .../messaging/kafka/AbstractfKafkaSshDriver.java | 2 +- .../brooklyn/entity/messaging/kafka/Kafka.java | 2 +- .../entity/messaging/kafka/KafkaBrokerImpl.java | 2 +- .../entity/messaging/kafka/KafkaCluster.java | 6 +++--- .../entity/messaging/kafka/KafkaClusterImpl.java | 6 +++--- .../entity/messaging/kafka/KafkaZooKeeper.java | 4 ++-- .../entity/messaging/kafka/KafkaZooKeeperImpl.java | 2 +- .../messaging/kafka/KafkaZooKeeperSshDriver.java | 2 +- .../brooklyn/entity/messaging/qpid/QpidBroker.java | 2 +- .../entity/messaging/qpid/QpidBrokerImpl.java | 2 +- .../entity/messaging/qpid/QpidSshDriver.java | 2 +- .../entity/messaging/rabbit/RabbitBrokerImpl.java | 2 +- .../entity/messaging/rabbit/RabbitDestination.java | 2 +- .../entity/messaging/rabbit/RabbitSshDriver.java | 2 +- .../entity/messaging/storm/StormDeployment.java | 2 +- .../entity/messaging/storm/StormDeploymentImpl.java | 2 +- .../brooklyn/entity/messaging/storm/StormImpl.java | 2 +- .../entity/messaging/storm/StormSshDriver.java | 4 ++-- .../entity/zookeeper/ZooKeeperEnsembleImpl.java | 4 ++-- .../entity/zookeeper/ZooKeeperSshDriver.java | 2 +- .../messaging/activemq/ActiveMQEc2LiveTest.java | 2 +- .../activemq/ActiveMQGoogleComputeLiveTest.java | 2 +- .../messaging/activemq/ActiveMQIntegrationTest.java | 6 +++--- .../messaging/kafka/KafkaIntegrationTest.java | 6 +++--- .../entity/messaging/kafka/KafkaLiveTest.java | 4 ++-- .../entity/messaging/kafka/KafkaSupport.java | 2 +- .../entity/messaging/qpid/QpidIntegrationTest.java | 8 ++++---- .../messaging/rabbit/RabbitIntegrationTest.java | 6 +++--- .../messaging/storm/StormAbstractCloudLiveTest.java | 6 +++--- .../entity/messaging/storm/StormEc2LiveTest.java | 4 ++-- .../messaging/zookeeper/ZooKeeperEc2LiveTest.java | 4 ++-- .../zookeeper/ZooKeeperEnsembleLiveTest.java | 8 ++++---- .../brooklyn/entity/monitoring/monit/MonitNode.java | 2 +- .../entity/monitoring/monit/MonitSshDriver.java | 2 +- .../monitoring/monit/MonitIntegrationTest.java | 2 +- .../brooklyn/entity/network/bind/BindDnsServer.java | 2 +- .../entity/network/bind/BindDnsServerImpl.java | 4 ++-- .../network/bind/BindDnsServerIntegrationTest.java | 8 ++++---- .../entity/network/bind/BindDnsServerLiveTest.java | 4 ++-- .../entity/nosql/cassandra/CassandraDatacenter.java | 2 +- .../nosql/cassandra/CassandraDatacenterImpl.java | 10 +++++----- .../entity/nosql/cassandra/CassandraFabric.java | 2 +- .../entity/nosql/cassandra/CassandraFabricImpl.java | 10 +++++----- .../entity/nosql/cassandra/CassandraNode.java | 2 +- .../entity/nosql/cassandra/CassandraNodeImpl.java | 4 ++-- .../nosql/cassandra/CassandraNodeSshDriver.java | 4 ++-- .../nosql/couchbase/CouchbaseClusterImpl.java | 10 +++++----- .../entity/nosql/couchbase/CouchbaseNode.java | 6 +++--- .../entity/nosql/couchbase/CouchbaseNodeImpl.java | 2 +- .../nosql/couchbase/CouchbaseNodeSshDriver.java | 10 +++++----- .../couchbase/CouchbaseSyncGatewaySshDriver.java | 4 ++-- .../entity/nosql/couchdb/CouchDBNodeSshDriver.java | 2 +- .../elasticsearch/ElasticSearchNodeSshDriver.java | 2 +- .../nosql/mongodb/AbstractMongoDBSshDriver.java | 2 +- .../entity/nosql/mongodb/MongoDBClient.java | 4 ++-- .../entity/nosql/mongodb/MongoDBClientImpl.java | 2 +- .../nosql/mongodb/MongoDBClientSshDriver.java | 2 +- .../entity/nosql/mongodb/MongoDBReplicaSetImpl.java | 6 +++--- .../sharding/CoLocatedMongoDBRouterImpl.java | 4 ++-- .../mongodb/sharding/MongoDBRouterClusterImpl.java | 4 ++-- .../mongodb/sharding/MongoDBShardClusterImpl.java | 2 +- .../mongodb/sharding/MongoDBShardedDeployment.java | 2 +- .../sharding/MongoDBShardedDeploymentImpl.java | 14 +++++++------- .../brooklyn/entity/nosql/redis/RedisCluster.java | 2 +- .../entity/nosql/redis/RedisClusterImpl.java | 10 +++++----- .../brooklyn/entity/nosql/redis/RedisShardImpl.java | 2 +- .../entity/nosql/redis/RedisStoreSshDriver.java | 2 +- .../brooklyn/entity/nosql/riak/RiakCluster.java | 2 +- .../brooklyn/entity/nosql/riak/RiakClusterImpl.java | 16 ++++++++-------- .../apache/brooklyn/entity/nosql/riak/RiakNode.java | 6 +++--- .../brooklyn/entity/nosql/riak/RiakNodeImpl.java | 2 +- .../entity/nosql/riak/RiakNodeSshDriver.java | 4 ++-- .../brooklyn/entity/nosql/solr/SolrServer.java | 2 +- .../brooklyn/entity/nosql/solr/SolrServerImpl.java | 2 +- .../entity/nosql/solr/SolrServerSshDriver.java | 2 +- .../entity/nosql/cassandra/AstyanaxSupport.java | 2 +- .../CassandraDatacenterIntegrationTest.java | 4 ++-- .../cassandra/CassandraDatacenterLiveTest.java | 6 +++--- .../CassandraDatacenterRebindIntegrationTest.java | 2 +- .../nosql/cassandra/CassandraDatacenterTest.java | 4 ++-- .../entity/nosql/cassandra/CassandraFabricTest.java | 12 ++++++------ .../cassandra/CassandraNodeIntegrationTest.java | 4 ++-- .../nosql/couchbase/CouchbaseOfflineTest.java | 2 +- .../couchbase/CouchbaseSyncGatewayEc2LiveTest.java | 2 +- .../nosql/couchdb/AbstractCouchDBNodeTest.java | 4 ++-- .../nosql/couchdb/CouchDBClusterLiveTest.java | 6 +++--- .../nosql/couchdb/CouchDBNodeEc2LiveTest.java | 2 +- .../nosql/couchdb/CouchDBNodeIntegrationTest.java | 2 +- .../entity/nosql/couchdb/CouchDBNodeLiveTest.java | 2 +- .../entity/nosql/couchdb/JcouchdbSupport.java | 2 +- .../ElasticSearchClusterIntegrationTest.java | 4 ++-- .../ElasticSearchNodeIntegrationTest.java | 8 ++++---- .../nosql/mongodb/MongoDBIntegrationTest.java | 6 +++--- .../nosql/mongodb/MongoDBReplicaSetEc2LiveTest.java | 2 +- .../mongodb/MongoDBReplicaSetIntegrationTest.java | 2 +- .../MongoDBConfigServerIntegrationTest.java | 6 +++--- .../MongoDBShardedDeploymentEc2LiveTest.java | 2 +- .../MongoDBShardedDeploymentIntegrationTest.java | 2 +- .../nosql/redis/RedisClusterIntegrationTest.java | 6 +++--- .../entity/nosql/redis/RedisIntegrationTest.java | 4 ++-- .../entity/nosql/riak/RiakClusterEc2LiveTest.java | 2 +- .../entity/nosql/riak/RiakNodeIntegrationTest.java | 4 ++-- .../brooklyn/entity/nosql/solr/SolrJSupport.java | 2 +- .../entity/nosql/solr/SolrServerEc2LiveTest.java | 2 +- .../nosql/solr/SolrServerIntegrationTest.java | 4 ++-- .../entity/nosql/solr/SolrServerLiveTest.java | 2 +- .../brooklyn/entity/osgi/karaf/KarafContainer.java | 4 ++-- .../entity/osgi/karaf/KarafContainerImpl.java | 4 ++-- .../brooklyn/entity/osgi/karaf/KarafSshDriver.java | 2 +- .../entity/osgi/karaf/KarafContainerTest.java | 4 ++-- .../brooklyn/entity/dns/AbstractGeoDnsService.java | 6 +++--- .../entity/dns/AbstractGeoDnsServiceImpl.java | 10 +++++----- .../entity/dns/geoscaling/GeoscalingDnsService.java | 2 +- .../dns/geoscaling/GeoscalingDnsServiceImpl.java | 4 ++-- .../entity/proxy/AbstractControllerImpl.java | 10 +++++----- .../proxy/AbstractNonProvisionedControllerImpl.java | 4 ++-- .../apache/brooklyn/entity/proxy/LoadBalancer.java | 6 +++--- .../entity/proxy/nginx/NginxController.java | 4 ++-- .../entity/proxy/nginx/NginxControllerImpl.java | 8 ++++---- .../brooklyn/entity/proxy/nginx/NginxSshDriver.java | 8 ++++---- .../brooklyn/entity/proxy/nginx/UrlMapping.java | 2 +- .../brooklyn/entity/proxy/nginx/UrlMappingImpl.java | 10 +++++----- .../webapp/ControlledDynamicWebAppCluster.java | 12 ++++++------ .../webapp/ControlledDynamicWebAppClusterImpl.java | 16 ++++++++-------- .../entity/webapp/DynamicWebAppClusterImpl.java | 6 +++--- .../entity/webapp/ElasticJavaWebAppService.java | 8 ++++---- .../brooklyn/entity/webapp/JavaWebAppService.java | 4 ++-- .../webapp/JavaWebAppSoftwareProcessImpl.java | 4 ++-- .../brooklyn/entity/webapp/JavaWebAppSshDriver.java | 2 +- .../entity/webapp/WebAppServiceConstants.java | 2 +- .../entity/webapp/jboss/JBoss6ServerImpl.java | 2 +- .../entity/webapp/jboss/JBoss6SshDriver.java | 4 ++-- .../entity/webapp/jboss/JBoss7ServerImpl.java | 2 +- .../entity/webapp/jboss/JBoss7SshDriver.java | 2 +- .../entity/webapp/jetty/Jetty6ServerImpl.java | 2 +- .../entity/webapp/jetty/Jetty6SshDriver.java | 2 +- .../entity/webapp/nodejs/NodeJsWebAppService.java | 2 +- .../webapp/nodejs/NodeJsWebAppServiceImpl.java | 2 +- .../entity/webapp/nodejs/NodeJsWebAppSshDriver.java | 2 +- .../entity/webapp/tomcat/TomcatSshDriver.java | 2 +- .../entity/dns/AbstractGeoDnsServiceTest.java | 8 ++++---- .../dns/geoscaling/GeoscalingIntegrationTest.java | 4 ++-- .../entity/proxy/AbstractControllerTest.java | 8 ++++---- .../apache/brooklyn/entity/proxy/StubAppServer.java | 6 +++--- .../brooklyn/entity/proxy/UrlMappingTest.java | 12 ++++++------ .../proxy/nginx/NginxClusterIntegrationTest.java | 4 ++-- .../proxy/nginx/NginxHttpsSslIntegrationTest.java | 2 +- .../entity/proxy/nginx/NginxIntegrationTest.java | 2 +- .../proxy/nginx/NginxLightIntegrationTest.java | 6 +++--- .../proxy/nginx/NginxRebindIntegrationTest.java | 4 ++-- .../nginx/NginxRebindWithHaIntegrationTest.java | 8 ++++---- .../proxy/nginx/NginxUrlMappingIntegrationTest.java | 6 +++--- .../proxy/nginx/NginxWebClusterEc2LiveTest.java | 4 ++-- .../AbstractWebAppFixtureIntegrationTest.java | 8 ++++---- ...ntrolledDynamicWebAppClusterIntegrationTest.java | 6 +++--- .../webapp/ControlledDynamicWebAppClusterTest.java | 6 +++--- .../entity/webapp/DynamicWebAppClusterTest.java | 6 +++--- .../entity/webapp/DynamicWebAppFabricTest.java | 6 +++--- .../entity/webapp/ElasticCustomLocationTest.java | 8 ++++---- .../ElasticJavaWebAppServiceIntegrationTest.java | 2 +- .../entity/webapp/TomcatAutoScalerPolicyTest.java | 2 +- .../entity/webapp/WebAppConcurrentDeployTest.java | 4 ++-- .../entity/webapp/WebAppLiveIntegrationTest.groovy | 4 ++-- ...edDynamicWebAppClusterRebindIntegrationTest.java | 4 ++-- .../DynamicWebAppClusterRebindIntegrationTest.java | 4 ++-- .../JBoss7ServerNonInheritingIntegrationTest.java | 2 +- .../nodejs/NodeJsWebAppFixtureIntegrationTest.java | 4 ++-- .../brooklyn/test/entity/TestJavaWebAppEntity.java | 6 +++--- .../brooklyn/EnrichersSlightlySimplerYamlTest.java | 6 +++--- .../camp/brooklyn/JavaWebAppsIntegrationTest.java | 6 +++--- .../camp/brooklyn/JavaWebAppsMatchingTest.java | 2 +- .../brooklyn/qa/load/SimulatedJBoss7ServerImpl.java | 2 +- .../brooklyn/qa/load/SimulatedTheeTierApp.java | 10 +++++----- .../SoftlayerObtainPrivateLiveTest.java | 8 ++++---- .../java/org/apache/brooklyn/qa/load/LoadTest.java | 6 +++--- .../qa/longevity/webcluster/WebClusterApp.java | 6 +++--- 236 files changed, 506 insertions(+), 502 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 5bb8426..2748852 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 @@ -31,9 +31,9 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.config.StringConfigMap; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.entity.core.AbstractApplication; -import org.apache.brooklyn.entity.core.Entities; -import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService; import org.apache.brooklyn.entity.group.DynamicRegionsFabric; import org.apache.brooklyn.entity.proxy.AbstractController; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 071b9ea..5c5afb2 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 @@ -20,10 +20,10 @@ package org.apache.brooklyn.demo; import java.util.List; -import org.apache.brooklyn.entity.core.Entities; -import org.apache.brooklyn.entity.factory.ApplicationBuilder; import org.apache.brooklyn.entity.messaging.kafka.KafkaCluster; import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.util.CommandLineUtil; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 1ecd59f..98f7acb 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 @@ -20,12 +20,12 @@ package org.apache.brooklyn.demo; import java.util.List; -import org.apache.brooklyn.entity.core.AbstractApplication; -import org.apache.brooklyn.entity.core.Entities; -import org.apache.brooklyn.entity.core.StartableApplication; import org.apache.brooklyn.entity.messaging.amqp.AmqpServer; import org.apache.brooklyn.entity.messaging.qpid.QpidBroker; import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.util.CommandLineUtil; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 5f9d297..a484900 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 @@ -36,20 +36,20 @@ import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.EntityInternal; +import org.apache.brooklyn.core.entity.StartableApplication; +import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; +import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; +import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.effector.core.Effectors; -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; import org.apache.brooklyn.entity.nosql.cassandra.CassandraFabric; 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 org.apache.brooklyn.launcher.BrooklynLauncher; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 48dea48..fbcd44d 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 @@ -27,9 +27,9 @@ import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.api.sensor.EnricherSpec; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.entity.core.AbstractApplication; -import org.apache.brooklyn.entity.core.Entities; -import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter; import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode; import org.apache.brooklyn.launcher.BrooklynLauncher; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 fdce4d0..24622c0 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 @@ -27,9 +27,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; -import org.apache.brooklyn.entity.core.AbstractApplication; -import org.apache.brooklyn.entity.core.Entities; -import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 e81c581..646d74e 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 @@ -27,9 +27,9 @@ import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.api.sensor.EnricherSpec; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.entity.core.AbstractApplication; -import org.apache.brooklyn.entity.core.Entities; -import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.entity.nosql.riak.RiakCluster; import org.apache.brooklyn.entity.nosql.riak.RiakNode; import org.apache.brooklyn.launcher.BrooklynLauncher; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 bef60cf..65c189c 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 @@ -21,9 +21,9 @@ package org.apache.brooklyn.demo; import java.util.List; import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.entity.core.AbstractApplication; -import org.apache.brooklyn.entity.core.Entities; -import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.util.CommandLineUtil; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCouchDBCluster.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCouchDBCluster.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCouchDBCluster.java index f1ba829..1454ee6 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCouchDBCluster.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleCouchDBCluster.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.demo; import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.entity.nosql.couchdb.CouchDBCluster; /** CouchDB cluster. */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleMongoDBReplicaSet.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleMongoDBReplicaSet.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleMongoDBReplicaSet.java index 9ea6532..949729a 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleMongoDBReplicaSet.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleMongoDBReplicaSet.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.demo; import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleRedisCluster.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleRedisCluster.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleRedisCluster.java index c5e40ea..c505940 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleRedisCluster.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/SimpleRedisCluster.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.demo; import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.entity.nosql.redis.RedisCluster; /** Redis cluster. */ http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 087eea4..062e044 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 @@ -24,9 +24,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.entity.core.AbstractApplication; -import org.apache.brooklyn.entity.core.Entities; -import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.entity.messaging.storm.StormDeployment; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.util.CommandLineUtil; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 46c8d7c..2f0ce34 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 @@ -28,9 +28,9 @@ import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.api.sensor.EnricherSpec; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.entity.core.AbstractApplication; -import org.apache.brooklyn.entity.core.Entities; -import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter; import org.apache.brooklyn.entity.nosql.cassandra.CassandraFabric; import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 eed6a05..5ce062a 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 @@ -22,12 +22,12 @@ import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWh import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.EntitySpec; -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.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.entity.StartableApplication; +import org.apache.brooklyn.core.entity.trait.Startable; 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; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 77adc18..c37cf8c 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 @@ -23,10 +23,10 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.entity.core.AbstractApplication; -import org.apache.brooklyn.entity.core.Attributes; -import org.apache.brooklyn.entity.core.Entities; -import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 1092262..2299dfa 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 @@ -27,12 +27,12 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.entity.core.AbstractApplication; -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.api.entity.EntitySpec; import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.JavaWebAppService; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 2030200..c87fe61 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 @@ -32,14 +32,14 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; 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.entity.core.AbstractApplication; -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 org.apache.brooklyn.entity.java.JavaEntityMethods; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 9327db4..8ec01e4 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 @@ -23,8 +23,8 @@ import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWh import static org.apache.brooklyn.sensor.core.DependentConfiguration.formatString import org.apache.brooklyn.api.entity.EntitySpec -import org.apache.brooklyn.entity.core.AbstractApplication -import org.apache.brooklyn.entity.core.Entities +import org.apache.brooklyn.core.entity.AbstractApplication +import org.apache.brooklyn.core.entity.Entities import org.apache.brooklyn.entity.database.mysql.MySqlNode import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 6f0784c..bca5b71 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 @@ -23,9 +23,9 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.internal.BrooklynProperties; -import org.apache.brooklyn.entity.core.AbstractApplication; -import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 fabb071..40fd821 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 @@ -22,6 +22,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.sensor.Enricher; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.core.mgmt.rebind.RebindOptions; import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixture; import org.apache.brooklyn.entity.proxy.nginx.NginxController; @@ -52,8 +54,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -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 org.apache.brooklyn.entity.java.JavaEntityMethods; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java ---------------------------------------------------------------------- diff --git a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java index 1a895c6..adc31ab 100644 --- a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java +++ b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java @@ -25,11 +25,11 @@ import java.util.concurrent.TimeUnit; import javax.management.ObjectName; +import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.entity.database.Schema; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.entity.core.AbstractEntity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.api.event.AttributeSensor; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java index 4be9e20..1470c80 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java @@ -33,8 +33,8 @@ import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.entity.stock.EffectorStartableImpl; -import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; import brooklyn.entity.effector.EffectorBody; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java index 94a7205..58ac78e 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java @@ -22,8 +22,9 @@ import java.util.Map; import brooklyn.config.ConfigKey; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.entity.core.EntityInternal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.core.entity.EntityInternal; + import brooklyn.event.basic.MapConfigKey.MapModifications; import brooklyn.event.basic.SetConfigKey.SetModifications; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java index e418689..18fe929 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java @@ -20,14 +20,14 @@ package org.apache.brooklyn.entity.salt; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynServerConfig; -import org.apache.brooklyn.entity.core.Attributes; -import org.apache.brooklyn.entity.lifecycle.Lifecycle; import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java index 872865b..ad166b3 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java @@ -26,8 +26,9 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; -import org.apache.brooklyn.entity.core.BrooklynConfigKeys; + import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.entity.BrooklynConfigKeys; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java index df39083..c0afb08 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java @@ -19,9 +19,9 @@ package org.apache.brooklyn.entity.salt; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.util.task.DynamicTasks; -import org.apache.brooklyn.entity.core.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java index 49871bd..41bf452 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java @@ -28,12 +28,12 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.TaskFactory; +import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.core.util.text.TemplateProcessor; -import org.apache.brooklyn.entity.core.Entities; import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java index 613e002..fee43ae 100644 --- a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java +++ b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java @@ -22,6 +22,7 @@ import java.util.Random; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.PortRange; +import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNodeSaltImpl; import org.apache.brooklyn.entity.salt.SaltConfig; @@ -34,8 +35,6 @@ import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; - -import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.VogellaExampleAccess; 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/9945926a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java index 12758c3..ae07f74 100644 --- a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java +++ b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java @@ -26,9 +26,8 @@ import org.apache.brooklyn.entity.salt.SaltConfigs; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; - -import org.apache.brooklyn.entity.factory.ApplicationBuilder; -import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 906b684..fc65f28 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 @@ -35,8 +35,8 @@ 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.config.ConfigKeys; -import org.apache.brooklyn.entity.core.Attributes; -import org.apache.brooklyn.entity.core.EntityFunctions; +import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.entity.EntityFunctions; import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.core.SupportsPortForwarding; import org.apache.brooklyn.sensor.feed.AbstractFeed; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java index 3596488..b4f0f6d 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java @@ -24,10 +24,10 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.policy.PolicySpec; -import org.apache.brooklyn.entity.core.AbstractEntity; +import org.apache.brooklyn.core.entity.AbstractEntity; +import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy; import org.apache.brooklyn.entity.group.DynamicGroup; -import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.feed.http.HttpFeed; import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java index f7a8e48..d300ceb 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java @@ -27,13 +27,15 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.entity.core.Attributes; -import org.apache.brooklyn.entity.core.EntityInternal; + import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicClusterImpl; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.entity.EntityInternal; + import brooklyn.util.text.Strings; public class HazelcastClusterImpl extends DynamicClusterImpl implements HazelcastCluster { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java index efd575c..811f1b9 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java @@ -23,8 +23,7 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java index aaf281a..d35513b 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java @@ -27,8 +27,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.core.entity.Entities; + import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java index ae9b148..6f944b5 100644 --- a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java +++ b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java @@ -26,9 +26,10 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import org.apache.brooklyn.entity.core.Attributes; + import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.entity.Attributes; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java index ed1c755..1538822 100644 --- a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java +++ b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java @@ -26,9 +26,10 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.AbstractSoftlayerLiveTest; -import org.apache.brooklyn.entity.core.Attributes; + import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.entity.Attributes; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 30f5800..55da7fb 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,7 +22,7 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.java.UsesJava; import org.apache.brooklyn.entity.java.UsesJavaMXBeans; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 7e4f314..8b544c4 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 @@ -19,7 +19,7 @@ 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.core.entity.Attributes; import org.apache.brooklyn.entity.java.JavaAppUtils; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.sensor.enricher.Enrichers; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 072f5b6..f972570 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 @@ -23,7 +23,7 @@ import static java.lang.String.format; import java.util.List; import org.apache.brooklyn.api.entity.EntityLocal; -import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 1755802..563c392 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,7 +25,7 @@ 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 org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.entity.database.DatabaseNode; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.software.base.SoftwareProcess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 0827c96..af1c240 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,11 +33,11 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.entity.core.Attributes; -import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.brooklyn.api.location.OsDetails; +import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 2646924..2d28ac7 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 @@ -32,11 +32,11 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.entity.core.Attributes; -import org.apache.brooklyn.entity.core.EntityInternal; -import org.apache.brooklyn.entity.core.EntityPredicates; +import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.entity.EntityInternal; +import org.apache.brooklyn.core.entity.EntityPredicates; +import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; import org.apache.brooklyn.entity.group.DynamicClusterImpl; -import org.apache.brooklyn.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.enricher.Enrichers; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 038c0f6..728614d 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 @@ -23,12 +23,12 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.objs.HasShortName; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.annotation.Effector; +import org.apache.brooklyn.core.annotation.EffectorParam; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.config.MapConfigKey; +import org.apache.brooklyn.core.entity.Attributes; 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.core.PortRanges; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 978ce83..0de7fe4 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,11 +35,11 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.entity.core.Attributes; -import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.brooklyn.api.location.OsDetails; +import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.location.core.BasicOsDetails.OsVersions; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 c291be6..1c8fd40 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 @@ -21,12 +21,12 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.effector.Effector; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.entity.Entities; 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; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 749031c..3b97011 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 @@ -39,6 +39,7 @@ import java.io.InputStream; import javax.annotation.Nullable; import org.apache.brooklyn.api.location.OsDetails; +import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; @@ -58,7 +59,6 @@ import org.apache.brooklyn.util.text.StringFunctions; import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.brooklyn.entity.software.base.SoftwareProcess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 60f7f32..608b45d 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,7 +23,7 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.entity.database.DatastoreMixins; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.software.base.SoftwareProcess; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 2554d17..8340794 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,7 +20,7 @@ package org.apache.brooklyn.entity.database.rubyrep; import java.net.URI; -import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.sensor.core.DependentConfiguration; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 15fa9da..ef58f13 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 @@ -26,8 +26,8 @@ import java.util.List; import java.util.concurrent.ExecutionException; import org.apache.brooklyn.api.entity.EntityLocal; -import org.apache.brooklyn.entity.core.Attributes; -import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/software/database/src/test/java/org/apache/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java index f4c28d5..10c72c1 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java @@ -21,10 +21,10 @@ package org.apache.brooklyn.entity.database.crate; import static org.testng.Assert.assertFalse; import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.test.entity.TestApplication; -import org.apache.brooklyn.entity.core.Entities; -import org.apache.brooklyn.entity.factory.ApplicationBuilder; -import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 04d6f78..061ec02 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 @@ -23,6 +23,8 @@ import java.net.InetAddress; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.test.entity.TestApplication; @@ -34,10 +36,8 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; -import org.apache.brooklyn.entity.factory.ApplicationBuilder; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/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 cf6d62d..50fb103 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 @@ -26,10 +26,10 @@ import org.testng.Assert; import org.testng.annotations.Test; 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 org.apache.brooklyn.api.location.PortRange; +import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java index 0f2392e..2cfe531 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java @@ -20,6 +20,8 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.test.entity.TestApplication; @@ -28,10 +30,8 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; -import org.apache.brooklyn.entity.factory.ApplicationBuilder; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9945926a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java index 4740772..6cc01d1 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java @@ -26,6 +26,8 @@ import java.util.List; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.test.entity.TestApplication; @@ -34,14 +36,12 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.entity.database.mysql.MySqlIntegrationTest; import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; -import org.apache.brooklyn.entity.factory.ApplicationBuilder; import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation;
