You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:47:37 UTC
[17/51] [abbrv] brooklyn-library git commit: BROOKLYN-162 -
refactoring core, applying org.apache package prefix and grouping more
sensibly; also restructuring api package similarly
BROOKLYN-162 - refactoring core, applying org.apache package prefix and grouping more sensibly; also restructuring api package similarly
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/951bad84
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/951bad84
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/951bad84
Branch: refs/heads/0.8.0-incubating
Commit: 951bad845bc0e2bd8f0be517d900a7d28a88b368
Parents: d0564c9
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Aug 18 20:20:05 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Aug 18 21:32:40 2015 +0100
----------------------------------------------------------------------
.../brooklyn/demo/GlobalWebFabricExample.java | 20 +++++-----
.../brooklyn/demo/KafkaClusterExample.java | 7 ++--
.../demo/StandaloneQpidBrokerExample.java | 9 ++---
.../brooklyn/demo/CumulusRDFApplication.java | 40 +++++++++----------
.../demo/HighAvailabilityCassandraCluster.java | 14 +++----
.../brooklyn/demo/ResilientMongoDbApp.java | 16 ++++----
.../brooklyn/demo/RiakClusterExample.java | 14 +++----
.../brooklyn/demo/SimpleCassandraCluster.java | 10 ++---
.../brooklyn/demo/SimpleCouchDBCluster.java | 5 +--
.../brooklyn/demo/SimpleMongoDBReplicaSet.java | 5 +--
.../brooklyn/demo/SimpleRedisCluster.java | 5 +--
.../apache/brooklyn/demo/StormSampleApp.java | 10 ++---
.../brooklyn/demo/WideAreaCassandraCluster.java | 14 +++----
.../brooklyn/demo/NodeJsTodoApplication.java | 14 +++----
.../brooklyn/demo/SingleWebServerExample.java | 12 +++---
.../demo/WebClusterDatabaseExample.java | 20 +++++-----
.../demo/WebClusterDatabaseExampleApp.java | 26 ++++++------
.../demo/WebClusterDatabaseExampleGroovy.groovy | 20 ++++------
.../apache/brooklyn/demo/WebClusterExample.java | 10 ++---
...lusterDatabaseExampleAppIntegrationTest.java | 16 ++++----
.../entity/monitoring/zabbix/ZabbixFeed.java | 23 +++++------
.../monitoring/zabbix/ZabbixMonitored.java | 11 +++--
.../monitoring/zabbix/ZabbixPollConfig.java | 11 +++--
.../entity/monitoring/zabbix/ZabbixServer.java | 11 +++--
.../monitoring/zabbix/ZabbixServerImpl.java | 17 ++++----
.../brooklyn/entity/database/DatabaseNode.java | 2 +-
.../entity/database/DatastoreMixins.java | 15 ++++---
.../entity/database/crate/CrateNode.java | 18 ++++-----
.../entity/database/crate/CrateNodeImpl.java | 10 ++---
.../database/crate/CrateNodeSshDriver.java | 4 +-
.../entity/database/mariadb/MariaDbDriver.java | 4 +-
.../entity/database/mariadb/MariaDbNode.java | 24 +++++------
.../database/mariadb/MariaDbNodeImpl.java | 10 ++---
.../database/mariadb/MariaDbSshDriver.java | 8 ++--
.../entity/database/mysql/MySqlCluster.java | 14 +++----
.../entity/database/mysql/MySqlClusterImpl.java | 35 ++++++++--------
.../entity/database/mysql/MySqlDriver.java | 4 +-
.../entity/database/mysql/MySqlNode.java | 30 +++++++-------
.../entity/database/mysql/MySqlNodeImpl.java | 10 ++---
.../entity/database/mysql/MySqlSshDriver.java | 8 ++--
.../database/postgresql/PostgreSqlDriver.java | 4 +-
.../database/postgresql/PostgreSqlNode.java | 18 ++++-----
.../PostgreSqlNodeChefImplFromScratch.java | 22 +++++-----
.../database/postgresql/PostgreSqlNodeImpl.java | 4 +-
.../database/postgresql/PostgreSqlSpecs.java | 2 +-
.../postgresql/PostgreSqlSshDriver.java | 12 +++---
.../entity/database/rubyrep/RubyRepNode.java | 17 ++++----
.../database/rubyrep/RubyRepNodeImpl.java | 5 +--
.../database/rubyrep/RubyRepSshDriver.java | 6 +--
.../crate/CrateNodeIntegrationTest.java | 10 ++---
.../mariadb/MariaDbIntegrationTest.java | 16 ++++----
.../database/mariadb/MariaDbLiveEc2Test.java | 4 +-
.../mariadb/MariaDbLiveRackspaceTest.java | 2 +-
.../mysql/MySqlClusterIntegrationTest.java | 3 +-
.../database/mysql/MySqlClusterTestHelper.java | 4 +-
.../database/mysql/MySqlIntegrationTest.java | 6 +--
.../entity/database/mysql/MySqlLiveEc2Test.java | 3 +-
.../entity/database/mysql/MySqlLiveGceTest.java | 3 +-
.../database/mysql/MySqlLiveRackspaceTest.java | 4 +-
.../mysql/MySqlRestartIntegrationTest.java | 2 +-
.../database/mysql/MysqlDockerLiveTest.java | 3 +-
.../postgresql/PostgreSqDockerLiveTest.java | 3 +-
.../database/postgresql/PostgreSqlChefTest.java | 6 +--
.../postgresql/PostgreSqlEc2LiveTest.java | 3 +-
.../postgresql/PostgreSqlGceLiveTest.java | 3 +-
.../postgresql/PostgreSqlIntegrationTest.java | 16 ++++----
.../postgresql/PostgreSqlRackspaceLiveTest.java | 2 +-
.../PostgreSqlRebindIntegrationTest.java | 5 +--
.../PostgreSqlRestartIntegrationTest.java | 2 +-
.../database/rubyrep/RubyRepEc2LiveTest.java | 4 +-
.../rubyrep/RubyRepIntegrationTest.java | 16 ++++----
.../rubyrep/RubyRepRackspaceLiveTest.java | 2 +-
.../entity/messaging/MessageBroker.java | 5 +--
.../apache/brooklyn/entity/messaging/Queue.java | 7 ++--
.../apache/brooklyn/entity/messaging/Topic.java | 2 +-
.../messaging/activemq/ActiveMQBroker.java | 19 +++++----
.../messaging/activemq/ActiveMQBrokerImpl.java | 6 ++-
.../activemq/ActiveMQDestinationImpl.java | 2 +-
.../messaging/activemq/ActiveMQQueue.java | 3 +-
.../messaging/activemq/ActiveMQSpecs.java | 2 +-
.../messaging/activemq/ActiveMQSshDriver.java | 2 +-
.../messaging/activemq/ActiveMQTopic.java | 3 +-
.../entity/messaging/amqp/AmqpExchange.java | 7 ++--
.../entity/messaging/amqp/AmqpServer.java | 7 ++--
.../entity/messaging/jms/JMSBrokerImpl.java | 2 +-
.../messaging/jms/JMSDestinationImpl.java | 2 +-
.../kafka/AbstractfKafkaSshDriver.java | 4 +-
.../brooklyn/entity/messaging/kafka/Kafka.java | 9 ++---
.../entity/messaging/kafka/KafkaBroker.java | 16 ++++----
.../entity/messaging/kafka/KafkaBrokerImpl.java | 6 ++-
.../entity/messaging/kafka/KafkaCluster.java | 29 ++++++--------
.../messaging/kafka/KafkaClusterImpl.java | 17 ++++----
.../entity/messaging/kafka/KafkaZooKeeper.java | 13 +++---
.../messaging/kafka/KafkaZooKeeperImpl.java | 3 +-
.../kafka/KafkaZooKeeperSshDriver.java | 3 +-
.../entity/messaging/qpid/QpidBroker.java | 15 ++++---
.../entity/messaging/qpid/QpidBrokerImpl.java | 4 +-
.../messaging/qpid/QpidDestinationImpl.java | 4 +-
.../entity/messaging/qpid/QpidQueue.java | 3 +-
.../entity/messaging/qpid/QpidSshDriver.java | 2 +-
.../entity/messaging/qpid/QpidTopic.java | 3 +-
.../entity/messaging/rabbit/RabbitBroker.java | 17 ++++----
.../messaging/rabbit/RabbitBrokerImpl.java | 4 +-
.../messaging/rabbit/RabbitDestination.java | 3 +-
.../entity/messaging/rabbit/RabbitQueue.java | 6 +--
.../messaging/rabbit/RabbitSshDriver.java | 2 +-
.../brooklyn/entity/messaging/storm/Storm.java | 15 ++++---
.../entity/messaging/storm/StormDeployment.java | 9 ++---
.../messaging/storm/StormDeploymentImpl.java | 13 +++---
.../entity/messaging/storm/StormImpl.java | 2 +-
.../entity/messaging/storm/StormSshDriver.java | 10 ++---
.../entity/zookeeper/ZooKeeperEnsemble.java | 15 ++++---
.../entity/zookeeper/ZooKeeperEnsembleImpl.java | 11 +++--
.../entity/zookeeper/ZooKeeperNode.java | 14 +++----
.../entity/zookeeper/ZooKeeperSshDriver.java | 2 +-
.../messaging/activemq/ActiveMQEc2LiveTest.java | 4 +-
.../activemq/ActiveMQGoogleComputeLiveTest.java | 4 +-
.../activemq/ActiveMQIntegrationTest.java | 10 ++---
.../messaging/kafka/KafkaIntegrationTest.java | 14 +++----
.../entity/messaging/kafka/KafkaLiveTest.java | 6 +--
.../entity/messaging/kafka/KafkaSupport.java | 2 +-
.../entity/messaging/qpid/QpidEc2LiveTest.java | 2 +-
.../messaging/qpid/QpidIntegrationTest.java | 12 +++---
.../messaging/rabbit/RabbitEc2LiveTest.java | 3 +-
.../messaging/rabbit/RabbitIntegrationTest.java | 12 +++---
.../storm/StormAbstractCloudLiveTest.java | 21 +++++-----
.../messaging/storm/StormEc2LiveTest.java | 7 ++--
.../zookeeper/ZooKeeperEc2LiveTest.java | 7 ++--
.../zookeeper/ZooKeeperEnsembleLiveTest.java | 12 +++---
.../entity/monitoring/monit/MonitNode.java | 18 ++++-----
.../entity/monitoring/monit/MonitNodeImpl.java | 6 +--
.../entity/monitoring/monit/MonitSshDriver.java | 2 +-
.../monitoring/monit/MonitIntegrationTest.java | 8 ++--
.../entity/network/bind/BindDnsServer.java | 16 ++++----
.../entity/network/bind/BindDnsServerImpl.java | 12 +++---
.../network/bind/BindDnsServerByonLiveTest.java | 4 +-
.../bind/BindDnsServerIntegrationTest.java | 24 +++++------
.../network/bind/BindDnsServerLiveTest.java | 12 +++---
.../bind/DoNothingSoftwareProcessDriver.java | 3 +-
.../network/bind/PrefixAndIdEnricher.java | 15 ++++---
.../network/bind/TestBindDnsServerImpl.java | 3 +-
.../nosql/cassandra/CassandraCluster.java | 2 +-
.../nosql/cassandra/CassandraDatacenter.java | 25 +++++-------
.../cassandra/CassandraDatacenterImpl.java | 34 ++++++++--------
.../entity/nosql/cassandra/CassandraFabric.java | 13 +++---
.../nosql/cassandra/CassandraFabricImpl.java | 23 +++++------
.../entity/nosql/cassandra/CassandraNode.java | 20 +++++-----
.../nosql/cassandra/CassandraNodeDriver.java | 2 +-
.../nosql/cassandra/CassandraNodeImpl.java | 20 +++++-----
.../nosql/cassandra/CassandraNodeSshDriver.java | 19 +++++----
.../nosql/couchbase/CouchbaseCluster.java | 13 +++---
.../nosql/couchbase/CouchbaseClusterImpl.java | 42 ++++++++++----------
.../entity/nosql/couchbase/CouchbaseNode.java | 26 ++++++------
.../nosql/couchbase/CouchbaseNodeImpl.java | 26 ++++++------
.../nosql/couchbase/CouchbaseNodeSshDriver.java | 28 ++++++-------
.../nosql/couchbase/CouchbaseSyncGateway.java | 14 +++----
.../couchbase/CouchbaseSyncGatewayImpl.java | 6 +--
.../CouchbaseSyncGatewaySshDriver.java | 8 ++--
.../entity/nosql/couchdb/CouchDBCluster.java | 13 +++---
.../nosql/couchdb/CouchDBClusterImpl.java | 5 +--
.../entity/nosql/couchdb/CouchDBNode.java | 8 ++--
.../entity/nosql/couchdb/CouchDBNodeImpl.java | 8 ++--
.../nosql/couchdb/CouchDBNodeSshDriver.java | 2 +-
.../elasticsearch/ElasticSearchCluster.java | 9 ++---
.../elasticsearch/ElasticSearchClusterImpl.java | 5 +--
.../nosql/elasticsearch/ElasticSearchNode.java | 18 ++++-----
.../elasticsearch/ElasticSearchNodeImpl.java | 12 +++---
.../ElasticSearchNodeSshDriver.java | 4 +-
.../nosql/mongodb/AbstractMongoDBServer.java | 10 ++---
.../nosql/mongodb/AbstractMongoDBSshDriver.java | 4 +-
.../entity/nosql/mongodb/MongoDBClient.java | 13 +++---
.../entity/nosql/mongodb/MongoDBClientImpl.java | 3 +-
.../nosql/mongodb/MongoDBClientSshDriver.java | 8 ++--
.../entity/nosql/mongodb/MongoDBReplicaSet.java | 15 ++++---
.../nosql/mongodb/MongoDBReplicaSetImpl.java | 21 +++++-----
.../entity/nosql/mongodb/MongoDBServer.java | 17 ++++----
.../entity/nosql/mongodb/MongoDBServerImpl.java | 8 ++--
.../sharding/CoLocatedMongoDBRouter.java | 12 +++---
.../sharding/CoLocatedMongoDBRouterImpl.java | 10 ++---
.../mongodb/sharding/MongoDBConfigServer.java | 2 +-
.../sharding/MongoDBConfigServerCluster.java | 9 ++---
.../MongoDBConfigServerClusterImpl.java | 5 +--
.../nosql/mongodb/sharding/MongoDBRouter.java | 9 ++---
.../mongodb/sharding/MongoDBRouterCluster.java | 9 ++---
.../sharding/MongoDBRouterClusterImpl.java | 15 ++++---
.../mongodb/sharding/MongoDBRouterImpl.java | 4 +-
.../mongodb/sharding/MongoDBShardCluster.java | 5 +--
.../sharding/MongoDBShardClusterImpl.java | 11 +++--
.../sharding/MongoDBShardedDeployment.java | 15 ++++---
.../sharding/MongoDBShardedDeploymentImpl.java | 25 ++++++------
.../entity/nosql/redis/RedisCluster.java | 7 ++--
.../entity/nosql/redis/RedisClusterImpl.java | 21 +++++-----
.../brooklyn/entity/nosql/redis/RedisShard.java | 2 +-
.../entity/nosql/redis/RedisShardImpl.java | 2 +-
.../brooklyn/entity/nosql/redis/RedisSlave.java | 7 ++--
.../brooklyn/entity/nosql/redis/RedisStore.java | 14 +++----
.../entity/nosql/redis/RedisStoreImpl.java | 8 ++--
.../entity/nosql/redis/RedisStoreSshDriver.java | 2 +-
.../brooklyn/entity/nosql/riak/RiakCluster.java | 15 ++++---
.../entity/nosql/riak/RiakClusterImpl.java | 33 ++++++++-------
.../brooklyn/entity/nosql/riak/RiakNode.java | 22 +++++-----
.../entity/nosql/riak/RiakNodeImpl.java | 16 ++++----
.../entity/nosql/riak/RiakNodeSshDriver.java | 8 ++--
.../brooklyn/entity/nosql/solr/SolrServer.java | 12 +++---
.../entity/nosql/solr/SolrServerImpl.java | 10 +++--
.../entity/nosql/solr/SolrServerSshDriver.java | 6 +--
.../cassandra/AbstractCassandraNodeTest.java | 4 +-
.../entity/nosql/cassandra/AstyanaxSupport.java | 3 +-
.../CassandraDatacenterIntegrationTest.java | 9 ++---
.../cassandra/CassandraDatacenterLiveTest.java | 11 +++--
...assandraDatacenterRebindIntegrationTest.java | 9 ++---
.../cassandra/CassandraDatacenterTest.java | 12 +++---
.../nosql/cassandra/CassandraFabricTest.java | 20 +++++-----
.../cassandra/CassandraNodeEc2LiveTest.java | 2 +-
.../cassandra/CassandraNodeIntegrationTest.java | 9 ++---
.../nosql/cassandra/CassandraNodeLiveTest.java | 2 +-
.../nosql/couchbase/CouchbaseOfflineTest.java | 8 ++--
.../CouchbaseSyncGatewayEc2LiveTest.java | 6 +--
.../nosql/couchdb/AbstractCouchDBNodeTest.java | 8 ++--
.../nosql/couchdb/CouchDBClusterLiveTest.java | 11 +++--
.../nosql/couchdb/CouchDBNodeEc2LiveTest.java | 4 +-
.../couchdb/CouchDBNodeIntegrationTest.java | 5 +--
.../nosql/couchdb/CouchDBNodeLiveTest.java | 5 +--
.../entity/nosql/couchdb/JcouchdbSupport.java | 3 +-
.../ElasticSearchClusterIntegrationTest.java | 17 ++++----
.../ElasticSearchNodeIntegrationTest.java | 20 +++++-----
.../nosql/mongodb/MongoDBEc2LiveTest.java | 2 +-
.../nosql/mongodb/MongoDBIntegrationTest.java | 11 +++--
.../mongodb/MongoDBRebindIntegrationTest.java | 5 +--
.../mongodb/MongoDBReplicaSetEc2LiveTest.java | 6 +--
.../MongoDBReplicaSetIntegrationTest.java | 10 ++---
.../mongodb/MongoDBRestartIntegrationTest.java | 2 +-
.../nosql/mongodb/MongoDBSoftLayerLiveTest.java | 2 +-
.../MongoDBConfigServerIntegrationTest.java | 12 +++---
.../MongoDBShardedDeploymentEc2LiveTest.java | 4 +-
...MongoDBShardedDeploymentIntegrationTest.java | 7 ++--
.../redis/RedisClusterIntegrationTest.java | 14 +++----
.../entity/nosql/redis/RedisEc2LiveTest.java | 2 +-
.../nosql/redis/RedisIntegrationTest.java | 10 ++---
.../nosql/riak/RiakClusterEc2LiveTest.java | 4 +-
.../entity/nosql/riak/RiakNodeEc2LiveTest.java | 2 +-
.../riak/RiakNodeGoogleComputeLiveTest.java | 2 +-
.../nosql/riak/RiakNodeIntegrationTest.java | 8 ++--
.../nosql/riak/RiakNodeSoftlayerLiveTest.java | 2 +-
.../nosql/solr/AbstractSolrServerTest.java | 4 +-
.../entity/nosql/solr/SolrJSupport.java | 3 +-
.../nosql/solr/SolrServerEc2LiveTest.java | 4 +-
.../nosql/solr/SolrServerIntegrationTest.java | 7 ++--
.../entity/nosql/solr/SolrServerLiveTest.java | 5 +--
.../entity/osgi/karaf/KarafContainer.java | 20 +++++-----
.../entity/osgi/karaf/KarafContainerImpl.java | 10 ++---
.../entity/osgi/karaf/KarafSshDriver.java | 2 +-
.../osgi/karaf/KarafContainerEc2LiveTest.java | 2 +-
.../entity/osgi/karaf/KarafContainerTest.java | 8 ++--
.../entity/dns/AbstractGeoDnsService.java | 14 +++----
.../entity/dns/AbstractGeoDnsServiceImpl.java | 18 ++++-----
.../dns/geoscaling/GeoscalingDnsService.java | 15 ++++---
.../geoscaling/GeoscalingDnsServiceImpl.java | 8 ++--
.../geoscaling/GeoscalingScriptGenerator.java | 2 +-
.../dns/geoscaling/GeoscalingWebClient.java | 2 +-
.../entity/proxy/AbstractController.java | 12 +++---
.../entity/proxy/AbstractControllerImpl.java | 22 +++++-----
.../proxy/AbstractNonProvisionedController.java | 2 +-
.../AbstractNonProvisionedControllerImpl.java | 13 +++---
.../brooklyn/entity/proxy/LoadBalancer.java | 21 +++++-----
.../entity/proxy/LoadBalancerCluster.java | 5 +--
.../entity/proxy/LoadBalancerClusterImpl.java | 3 +-
.../brooklyn/entity/proxy/ProxySslConfig.java | 4 +-
.../entity/proxy/nginx/NginxController.java | 20 +++++-----
.../entity/proxy/nginx/NginxControllerImpl.java | 35 ++++++++--------
.../entity/proxy/nginx/NginxSshDriver.java | 18 ++++-----
.../nginx/NginxTemplateConfigGenerator.java | 7 ++--
.../brooklyn/entity/proxy/nginx/UrlMapping.java | 17 ++++----
.../entity/proxy/nginx/UrlMappingImpl.java | 19 +++++----
.../webapp/ControlledDynamicWebAppCluster.java | 37 +++++++++--------
.../ControlledDynamicWebAppClusterImpl.java | 31 +++++++--------
.../entity/webapp/DynamicWebAppCluster.java | 9 ++---
.../entity/webapp/DynamicWebAppClusterImpl.java | 29 +++++++-------
.../entity/webapp/DynamicWebAppFabric.java | 9 ++---
.../entity/webapp/DynamicWebAppFabricImpl.java | 7 ++--
.../entity/webapp/ElasticJavaWebAppService.java | 11 +++--
.../entity/webapp/JavaWebAppService.java | 14 +++----
.../webapp/JavaWebAppSoftwareProcessImpl.java | 4 +-
.../entity/webapp/JavaWebAppSshDriver.java | 8 ++--
.../entity/webapp/WebAppServiceConstants.java | 13 +++---
.../entity/webapp/WebAppServiceMethods.java | 2 +-
.../entity/webapp/WebAppServiceMetrics.java | 11 +++--
.../entity/webapp/jboss/JBoss6Server.java | 8 ++--
.../entity/webapp/jboss/JBoss6ServerImpl.java | 4 +-
.../entity/webapp/jboss/JBoss6SshDriver.java | 4 +-
.../entity/webapp/jboss/JBoss7Server.java | 18 ++++-----
.../entity/webapp/jboss/JBoss7ServerImpl.java | 12 +++---
.../entity/webapp/jboss/JBoss7SshDriver.java | 2 +-
.../entity/webapp/jetty/Jetty6Server.java | 14 +++----
.../entity/webapp/jetty/Jetty6ServerImpl.java | 4 +-
.../entity/webapp/jetty/Jetty6SshDriver.java | 4 +-
.../webapp/nodejs/NodeJsWebAppService.java | 8 ++--
.../webapp/nodejs/NodeJsWebAppServiceImpl.java | 11 ++---
.../webapp/nodejs/NodeJsWebAppSshDriver.java | 4 +-
.../entity/webapp/tomcat/Tomcat8Server.java | 8 ++--
.../entity/webapp/tomcat/TomcatServer.java | 16 ++++----
.../entity/webapp/tomcat/TomcatSshDriver.java | 4 +-
.../entity/dns/AbstractGeoDnsServiceTest.java | 30 +++++++-------
.../geoscaling/GeoscalingIntegrationTest.java | 18 ++++-----
.../GeoscalingScriptGeneratorTest.java | 2 +-
.../dns/geoscaling/GeoscalingWebClientTest.java | 2 +-
.../entity/proxy/AbstractControllerTest.java | 28 ++++++-------
.../entity/proxy/ProxySslConfigTest.java | 2 +-
.../brooklyn/entity/proxy/StubAppServer.java | 11 +++--
.../proxy/TrackingAbstractController.java | 2 +-
.../brooklyn/entity/proxy/UrlMappingTest.java | 24 +++++------
.../nginx/NginxClusterIntegrationTest.java | 16 ++++----
.../entity/proxy/nginx/NginxEc2LiveTest.java | 2 +-
.../nginx/NginxHttpsSslIntegrationTest.java | 10 ++---
.../proxy/nginx/NginxIntegrationTest.java | 8 ++--
.../proxy/nginx/NginxLightIntegrationTest.java | 14 +++----
.../proxy/nginx/NginxRebindIntegrationTest.java | 16 ++++----
.../nginx/NginxRebindWithHaIntegrationTest.java | 32 +++++++--------
.../nginx/NginxUrlMappingIntegrationTest.java | 18 ++++-----
.../proxy/nginx/NginxWebClusterEc2LiveTest.java | 14 +++----
.../AbstractWebAppFixtureIntegrationTest.java | 30 +++++++-------
...lledDynamicWebAppClusterIntegrationTest.java | 12 +++---
.../ControlledDynamicWebAppClusterTest.java | 12 +++---
.../entity/webapp/DynamicWebAppClusterTest.java | 14 +++----
.../entity/webapp/DynamicWebAppFabricTest.java | 16 ++++----
.../webapp/ElasticCustomLocationTest.java | 14 +++----
...ElasticJavaWebAppServiceIntegrationTest.java | 6 +--
.../entity/webapp/HttpsSslConfigTest.java | 2 +-
.../webapp/TomcatAutoScalerPolicyTest.java | 10 ++---
.../webapp/WebAppConcurrentDeployTest.java | 16 ++++----
.../webapp/WebAppLiveIntegrationTest.groovy | 28 ++++++-------
...namicWebAppClusterRebindIntegrationTest.java | 12 +++---
...namicWebAppClusterRebindIntegrationTest.java | 14 +++----
.../jboss/JBoss6ServerAwsEc2LiveTest.java | 2 +-
...Boss6ServerNonInheritingIntegrationTest.java | 4 +-
.../jboss/JBoss7ServerAwsEc2LiveTest.java | 2 +-
.../jboss/JBoss7ServerDockerLiveTest.java | 2 +-
...Boss7ServerNonInheritingIntegrationTest.java | 8 ++--
.../JBoss7ServerRebindingIntegrationTest.java | 9 +++--
...ultiVersionWebAppFixtureIntegrationTest.java | 5 ++-
.../Jboss7ServerGoogleComputeLiveTest.java | 2 +-
.../JettyWebAppFixtureIntegrationTest.java | 5 ++-
.../webapp/nodejs/NodeJsWebAppEc2LiveTest.java | 2 +-
.../NodeJsWebAppFixtureIntegrationTest.java | 10 ++---
.../NodeJsWebAppSimpleIntegrationTest.java | 6 +--
.../nodejs/NodeJsWebAppSoftlayerLiveTest.java | 2 +-
.../webapp/tomcat/Tomcat8ServerEc2LiveTest.java | 2 +-
.../Tomcat8ServerRestartIntegrationTest.java | 2 +-
.../tomcat/Tomcat8ServerSoftlayerLiveTest.java | 2 +-
...mcat8ServerWebAppFixtureIntegrationTest.java | 4 +-
...ableRetrieveUsageMetricsIntegrationTest.java | 4 +-
.../webapp/tomcat/TomcatServerEc2LiveTest.java | 2 +-
.../TomcatServerRestartIntegrationTest.java | 2 +-
.../tomcat/TomcatServerSoftlayerLiveTest.java | 2 +-
...omcatServerWebAppFixtureIntegrationTest.java | 4 +-
.../test/entity/TestJavaWebAppEntity.java | 14 +++----
.../test/entity/TestJavaWebAppEntityImpl.java | 2 +-
.../EnrichersSlightlySimplerYamlTest.java | 11 +++--
.../brooklyn/EntitiesYamlIntegrationTest.java | 5 +--
.../brooklyn/JavaWebAppsIntegrationTest.java | 16 ++++----
.../camp/brooklyn/JavaWebAppsMatchingTest.java | 11 +++--
...est-app-with-enrichers-slightly-simpler.yaml | 20 +++++-----
.../test-webapp-with-averaging-enricher.yaml | 4 +-
.../qa/load/SimulatedJBoss7ServerImpl.java | 15 ++++---
.../qa/load/SimulatedMySqlNodeImpl.java | 8 ++--
.../qa/load/SimulatedNginxControllerImpl.java | 15 ++++---
.../brooklyn/qa/load/SimulatedTheeTierApp.java | 22 +++++-----
.../brooklyn/qa/longevity/MonitorUtils.java | 4 +-
.../SoftlayerObtainPrivateLiveTest.java | 20 +++++-----
.../org/apache/brooklyn/qa/load/LoadTest.java | 17 ++++----
.../webcluster/SinusoidalLoadGenerator.java | 9 ++---
.../qa/longevity/webcluster/WebClusterApp.java | 19 +++++----
372 files changed, 1774 insertions(+), 2007 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 ab0e613..ff2627d 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
@@ -27,26 +27,24 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.brooklyn.api.catalog.Catalog;
import org.apache.brooklyn.api.catalog.CatalogConfig;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.config.StringConfigMap;
-import org.apache.brooklyn.core.util.BrooklynMavenArtifacts;
-import org.apache.brooklyn.core.util.ResourceUtils;
+import org.apache.brooklyn.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.entity.dns.geoscaling.GeoscalingDnsService;
+import org.apache.brooklyn.entity.group.DynamicRegionsFabric;
import org.apache.brooklyn.entity.proxy.AbstractController;
import org.apache.brooklyn.entity.webapp.ElasticJavaWebAppService;
import org.apache.brooklyn.entity.webapp.JavaWebAppService;
-
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.StartableApplication;
-import brooklyn.entity.group.DynamicRegionsFabric;
-import brooklyn.event.basic.PortAttributeSensorAndConfigKey;
-
import org.apache.brooklyn.launcher.BrooklynLauncher;
import org.apache.brooklyn.location.basic.PortRanges;
+import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey;
import org.apache.brooklyn.util.CommandLineUtil;
+import org.apache.brooklyn.util.core.BrooklynMavenArtifacts;
+import org.apache.brooklyn.util.core.ResourceUtils;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 0c8cebc..071b9ea 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,11 +20,10 @@ package org.apache.brooklyn.demo;
import java.util.List;
-import brooklyn.entity.basic.ApplicationBuilder;
-import brooklyn.entity.basic.Entities;
-
+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.proxying.EntitySpec;
+import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.launcher.BrooklynLauncher;
import org.apache.brooklyn.util.CommandLineUtil;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 8975606..1ecd59f 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,13 +20,12 @@ package org.apache.brooklyn.demo;
import java.util.List;
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.StartableApplication;
-
+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.proxying.EntitySpec;
+import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.launcher.BrooklynLauncher;
import org.apache.brooklyn.util.CommandLineUtil;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 e5c8e6e..bcdd143 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
@@ -26,48 +26,48 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.brooklyn.api.catalog.Catalog;
import org.apache.brooklyn.api.catalog.CatalogConfig;
-import org.apache.brooklyn.api.entity.Effector;
+import org.apache.brooklyn.api.effector.Effector;
import org.apache.brooklyn.api.entity.Entity;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
-import org.apache.brooklyn.api.event.SensorEvent;
-import org.apache.brooklyn.api.event.SensorEventListener;
+import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.location.Location;
-import org.apache.brooklyn.api.policy.EnricherSpec;
import org.apache.brooklyn.api.policy.PolicySpec;
+import org.apache.brooklyn.api.sensor.EnricherSpec;
+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.util.ResourceUtils;
-import org.apache.brooklyn.core.util.config.ConfigBag;
-import org.apache.brooklyn.core.util.task.DynamicTasks;
-import org.apache.brooklyn.core.util.text.TemplateProcessor;
+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.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.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 brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.EntityInternal;
-import brooklyn.entity.basic.Lifecycle;
-import brooklyn.entity.basic.ServiceStateLogic;
-import brooklyn.entity.basic.StartableApplication;
-import brooklyn.entity.effector.EffectorBody;
-import brooklyn.entity.effector.Effectors;
import brooklyn.entity.java.UsesJava;
import brooklyn.entity.java.UsesJmx;
import brooklyn.entity.software.SshEffectorTasks;
-import brooklyn.entity.trait.Startable;
-import brooklyn.event.basic.DependentConfiguration;
import org.apache.brooklyn.launcher.BrooklynLauncher;
import org.apache.brooklyn.location.basic.PortRanges;
import org.apache.brooklyn.policy.ha.ServiceFailureDetector;
import org.apache.brooklyn.policy.ha.ServiceReplacer;
import org.apache.brooklyn.policy.ha.ServiceRestarter;
+import org.apache.brooklyn.sensor.core.DependentConfiguration;
import org.apache.brooklyn.util.CommandLineUtil;
import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.collections.MutableMap;
+import org.apache.brooklyn.util.core.ResourceUtils;
+import org.apache.brooklyn.util.core.config.ConfigBag;
+import org.apache.brooklyn.util.core.task.DynamicTasks;
+import org.apache.brooklyn.util.core.text.TemplateProcessor;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.text.Strings;
import org.apache.brooklyn.util.text.StringEscapes.JavaStringEscapes;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 533b1ca..48dea48 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
@@ -22,18 +22,16 @@ import java.util.List;
import org.apache.brooklyn.api.catalog.Catalog;
import org.apache.brooklyn.api.catalog.CatalogConfig;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
-import org.apache.brooklyn.api.policy.EnricherSpec;
+import org.apache.brooklyn.api.entity.EntitySpec;
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.entity.nosql.cassandra.CassandraDatacenter;
import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode;
-
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.StartableApplication;
-
import org.apache.brooklyn.launcher.BrooklynLauncher;
import org.apache.brooklyn.policy.ha.ServiceFailureDetector;
import org.apache.brooklyn.policy.ha.ServiceReplacer;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 6e2c065..ab70e77 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
@@ -24,23 +24,23 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.brooklyn.api.catalog.Catalog;
import org.apache.brooklyn.api.entity.Entity;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
-import org.apache.brooklyn.api.event.SensorEvent;
-import org.apache.brooklyn.api.event.SensorEventListener;
+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.entity.group.DynamicCluster;
import org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet;
import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer;
-import brooklyn.enricher.Enrichers;
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.Entities;
import brooklyn.entity.basic.SoftwareProcess;
-import brooklyn.entity.basic.StartableApplication;
-import brooklyn.entity.group.DynamicCluster;
import org.apache.brooklyn.launcher.BrooklynLauncher;
import org.apache.brooklyn.policy.ha.ServiceFailureDetector;
import org.apache.brooklyn.policy.ha.ServiceReplacer;
import org.apache.brooklyn.policy.ha.ServiceRestarter;
+import org.apache.brooklyn.sensor.enricher.Enrichers;
import org.apache.brooklyn.util.CommandLineUtil;
import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 e3c7512..e81c581 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
@@ -22,18 +22,16 @@ import java.util.List;
import org.apache.brooklyn.api.catalog.Catalog;
import org.apache.brooklyn.api.catalog.CatalogConfig;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
-import org.apache.brooklyn.api.policy.EnricherSpec;
+import org.apache.brooklyn.api.entity.EntitySpec;
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.entity.nosql.riak.RiakCluster;
import org.apache.brooklyn.entity.nosql.riak.RiakNode;
-
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.StartableApplication;
-
import org.apache.brooklyn.launcher.BrooklynLauncher;
import org.apache.brooklyn.policy.ha.ServiceFailureDetector;
import org.apache.brooklyn.policy.ha.ServiceRestarter;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 4070807..bef60cf 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
@@ -20,13 +20,11 @@ package org.apache.brooklyn.demo;
import java.util.List;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+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.entity.nosql.cassandra.CassandraDatacenter;
-
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.StartableApplication;
-
import org.apache.brooklyn.launcher.BrooklynLauncher;
import org.apache.brooklyn.util.CommandLineUtil;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 2611043..f1ba829 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
@@ -18,11 +18,10 @@
*/
package org.apache.brooklyn.demo;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+import org.apache.brooklyn.api.entity.EntitySpec;
+import org.apache.brooklyn.entity.factory.ApplicationBuilder;
import org.apache.brooklyn.entity.nosql.couchdb.CouchDBCluster;
-import brooklyn.entity.basic.ApplicationBuilder;
-
/** CouchDB cluster. */
public class SimpleCouchDBCluster extends ApplicationBuilder {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 c3916e4..9ea6532 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
@@ -18,12 +18,11 @@
*/
package org.apache.brooklyn.demo;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+import org.apache.brooklyn.api.entity.EntitySpec;
+import org.apache.brooklyn.entity.factory.ApplicationBuilder;
import org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet;
import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer;
-import brooklyn.entity.basic.ApplicationBuilder;
-
public class SimpleMongoDBReplicaSet extends ApplicationBuilder {
protected void doBuild() {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 2f37dc1..c5e40ea 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
@@ -18,11 +18,10 @@
*/
package org.apache.brooklyn.demo;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+import org.apache.brooklyn.api.entity.EntitySpec;
+import org.apache.brooklyn.entity.factory.ApplicationBuilder;
import org.apache.brooklyn.entity.nosql.redis.RedisCluster;
-import brooklyn.entity.basic.ApplicationBuilder;
-
/** Redis cluster. */
public class SimpleRedisCluster extends ApplicationBuilder {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 bf1bef7..087eea4 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
@@ -23,12 +23,10 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.brooklyn.api.catalog.Catalog;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
-
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.StartableApplication;
-
+import org.apache.brooklyn.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.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/951bad84/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 905547b..46c8d7c 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
@@ -23,19 +23,17 @@ import java.util.List;
import org.apache.brooklyn.api.catalog.Catalog;
import org.apache.brooklyn.api.catalog.CatalogConfig;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
-import org.apache.brooklyn.api.policy.EnricherSpec;
+import org.apache.brooklyn.api.entity.EntitySpec;
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.entity.nosql.cassandra.CassandraDatacenter;
import org.apache.brooklyn.entity.nosql.cassandra.CassandraFabric;
import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode;
-
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.StartableApplication;
-
import org.apache.brooklyn.launcher.BrooklynLauncher;
import org.apache.brooklyn.policy.ha.ServiceFailureDetector;
import org.apache.brooklyn.policy.ha.ServiceReplacer;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 bbca3a3..fd3a22c 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
@@ -18,19 +18,19 @@
*/
package org.apache.brooklyn.demo;
-import static brooklyn.event.basic.DependentConfiguration.attributeWhenReady;
+import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady;
import org.apache.brooklyn.api.catalog.Catalog;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+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.entity.nosql.redis.RedisStore;
+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.AbstractApplication;
-import brooklyn.entity.basic.Attributes;
import brooklyn.entity.basic.SoftwareProcess;
-import brooklyn.entity.basic.StartableApplication;
-import brooklyn.entity.trait.Startable;
-import brooklyn.event.basic.DependentConfiguration;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 6dcba0a..46be8bb 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
@@ -22,13 +22,11 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.Attributes;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.StartableApplication;
-
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+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.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/951bad84/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 e85624f..3906a75 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
@@ -19,8 +19,8 @@
package org.apache.brooklyn.demo;
import static brooklyn.entity.java.JavaEntityMethods.javaSysProp;
-import static brooklyn.event.basic.DependentConfiguration.attributeWhenReady;
-import static brooklyn.event.basic.DependentConfiguration.formatString;
+import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady;
+import static org.apache.brooklyn.sensor.core.DependentConfiguration.formatString;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -28,18 +28,14 @@ import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import brooklyn.enricher.Enrichers;
import brooklyn.enricher.HttpLatencyDetector;
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.StartableApplication;
+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 brooklyn.event.basic.Sensors;
-
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
-import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.entity.EntitySpec;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster;
import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster;
import org.apache.brooklyn.entity.webapp.JavaWebAppService;
@@ -48,6 +44,8 @@ import org.apache.brooklyn.entity.webapp.WebAppServiceConstants;
import org.apache.brooklyn.launcher.BrooklynLauncher;
import org.apache.brooklyn.location.basic.PortRanges;
import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy;
+import org.apache.brooklyn.sensor.core.Sensors;
+import org.apache.brooklyn.sensor.enricher.Enrichers;
import org.apache.brooklyn.util.CommandLineUtil;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 a07bba8..aafe287 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
@@ -18,8 +18,8 @@
*/
package org.apache.brooklyn.demo;
-import static brooklyn.event.basic.DependentConfiguration.attributeWhenReady;
-import static brooklyn.event.basic.DependentConfiguration.formatString;
+import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady;
+import static org.apache.brooklyn.sensor.core.DependentConfiguration.formatString;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -28,34 +28,34 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.brooklyn.api.catalog.Catalog;
import org.apache.brooklyn.api.catalog.CatalogConfig;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
-import org.apache.brooklyn.api.event.AttributeSensor;
+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.util.BrooklynMavenArtifacts;
-import org.apache.brooklyn.core.util.ResourceUtils;
+import org.apache.brooklyn.core.config.ConfigKeys;
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 brooklyn.enricher.Enrichers;
import brooklyn.enricher.HttpLatencyDetector;
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.StartableApplication;
+import org.apache.brooklyn.entity.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 brooklyn.entity.group.DynamicCluster;
import brooklyn.entity.java.JavaEntityMethods;
-import brooklyn.event.basic.Sensors;
import org.apache.brooklyn.launcher.BrooklynLauncher;
import org.apache.brooklyn.location.basic.PortRanges;
import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy;
+import org.apache.brooklyn.sensor.core.Sensors;
+import org.apache.brooklyn.sensor.enricher.Enrichers;
import org.apache.brooklyn.util.CommandLineUtil;
+import org.apache.brooklyn.util.core.BrooklynMavenArtifacts;
+import org.apache.brooklyn.util.core.ResourceUtils;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 ffb90eb..dfd677d 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
@@ -19,24 +19,20 @@
package org.apache.brooklyn.demo;
import static brooklyn.entity.java.JavaEntityMethods.javaSysProp
-import static brooklyn.event.basic.DependentConfiguration.attributeWhenReady
-import static brooklyn.event.basic.DependentConfiguration.formatString
+import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady
+import static org.apache.brooklyn.sensor.core.DependentConfiguration.formatString
-import org.apache.brooklyn.launcher.BrooklynLauncher
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-import brooklyn.entity.basic.AbstractApplication
-import brooklyn.entity.basic.Entities
+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.database.mysql.MySqlNode
-
-import org.apache.brooklyn.api.entity.proxying.EntitySpec
import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster
-
+import org.apache.brooklyn.launcher.BrooklynLauncher
import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
-
import org.apache.brooklyn.util.CommandLineUtil
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
import com.google.common.collect.Lists
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 8cefe1a..6f0784c 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
@@ -22,12 +22,10 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.Entities;
-
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
-import org.apache.brooklyn.core.config.BrooklynProperties;
+import org.apache.brooklyn.api.entity.EntitySpec;
+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/951bad84/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 925bb17..88d4265 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
@@ -19,13 +19,16 @@
package org.apache.brooklyn.demo;
import org.apache.brooklyn.api.entity.Entity;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.location.Location;
-import org.apache.brooklyn.api.policy.Enricher;
+import org.apache.brooklyn.api.sensor.Enricher;
+import org.apache.brooklyn.core.mgmt.rebind.RebindOptions;
+import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixture;
import org.apache.brooklyn.entity.proxy.nginx.NginxController;
import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster;
import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster;
import org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server;
+import org.apache.brooklyn.sensor.enricher.Propagator;
import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.test.EntityTestUtils;
import org.apache.brooklyn.test.HttpTestUtils;
@@ -51,16 +54,13 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import brooklyn.enricher.HttpLatencyDetector;
-import brooklyn.enricher.basic.Propagator;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.StartableApplication;
+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.group.DynamicCluster;
import brooklyn.entity.java.JavaEntityMethods;
-import brooklyn.entity.rebind.RebindOptions;
-import brooklyn.entity.rebind.RebindTestFixture;
import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 747a9c9..ce527eb 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
@@ -30,14 +30,22 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.brooklyn.api.entity.Entity;
-import org.apache.brooklyn.api.entity.basic.EntityLocal;
+import org.apache.brooklyn.api.internal.EntityLocal;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.location.MachineLocation;
import org.apache.brooklyn.config.ConfigKey;
-import org.apache.brooklyn.core.util.http.HttpTool;
-import org.apache.brooklyn.core.util.http.HttpToolResponse;
+import org.apache.brooklyn.core.config.ConfigKeys;
+import org.apache.brooklyn.entity.core.Attributes;
+import org.apache.brooklyn.entity.core.EntityFunctions;
import org.apache.brooklyn.location.access.BrooklynAccessUtils;
import org.apache.brooklyn.location.basic.SupportsPortForwarding;
+import org.apache.brooklyn.sensor.feed.AbstractFeed;
+import org.apache.brooklyn.sensor.feed.AttributePollHandler;
+import org.apache.brooklyn.sensor.feed.PollHandler;
+import org.apache.brooklyn.sensor.feed.Poller;
+import org.apache.brooklyn.sensor.feed.http.HttpValueFunctions;
+import org.apache.brooklyn.util.core.http.HttpTool;
+import org.apache.brooklyn.util.core.http.HttpToolResponse;
import org.apache.brooklyn.util.net.Cidr;
import org.apache.http.client.HttpClient;
import org.apache.http.impl.NoConnectionReuseStrategy;
@@ -61,15 +69,6 @@ import com.google.common.net.HostAndPort;
import com.google.common.reflect.TypeToken;
import com.google.gson.JsonObject;
-import brooklyn.entity.basic.Attributes;
-import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.entity.basic.EntityFunctions;
-import brooklyn.event.feed.AbstractFeed;
-import brooklyn.event.feed.AttributePollHandler;
-import brooklyn.event.feed.PollHandler;
-import brooklyn.event.feed.Poller;
-import brooklyn.event.feed.http.HttpValueFunctions;
-
public class ZabbixFeed extends AbstractFeed {
public static final Logger log = LoggerFactory.getLogger(ZabbixFeed.class);
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java
index 746247d..12d7bac 100644
--- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java
+++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java
@@ -18,13 +18,12 @@
*/
package org.apache.brooklyn.entity.monitoring.zabbix;
-import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.config.ConfigKey;
-import org.apache.brooklyn.core.util.flags.SetFromFlag;
-
-import brooklyn.event.basic.BasicAttributeSensor;
-import brooklyn.event.basic.BasicConfigKey;
-import brooklyn.event.basic.PortAttributeSensorAndConfigKey;
+import org.apache.brooklyn.core.config.BasicConfigKey;
+import org.apache.brooklyn.sensor.core.BasicAttributeSensor;
+import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey;
+import org.apache.brooklyn.util.core.flags.SetFromFlag;
public interface ZabbixMonitored {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java
index 1b1d11b..978261c 100644
--- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java
+++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java
@@ -20,18 +20,17 @@ package org.apache.brooklyn.entity.monitoring.zabbix;
import javax.annotation.Nullable;
-import org.apache.brooklyn.api.event.AttributeSensor;
-import org.apache.brooklyn.core.util.http.HttpToolResponse;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
+import org.apache.brooklyn.sensor.feed.PollConfig;
+import org.apache.brooklyn.sensor.feed.http.HttpValueFunctions;
+import org.apache.brooklyn.sensor.feed.http.JsonFunctions;
import org.apache.brooklyn.util.collections.MutableList;
+import org.apache.brooklyn.util.core.http.HttpToolResponse;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import com.google.gson.JsonElement;
-import brooklyn.event.feed.PollConfig;
-import brooklyn.event.feed.http.HttpValueFunctions;
-import brooklyn.event.feed.http.JsonFunctions;
-
public class ZabbixPollConfig<T> extends PollConfig<HttpToolResponse, T, ZabbixPollConfig<T>> {
private String itemKey;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java
index f80a7ed..861d103 100644
--- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java
+++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java
@@ -19,17 +19,16 @@
package org.apache.brooklyn.entity.monitoring.zabbix;
import org.apache.brooklyn.api.entity.Entity;
-import org.apache.brooklyn.api.entity.proxying.ImplementedBy;
-import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.entity.ImplementedBy;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.config.ConfigKey;
-import org.apache.brooklyn.core.util.flags.SetFromFlag;
+import org.apache.brooklyn.core.config.BasicConfigKey;
+import org.apache.brooklyn.sensor.core.BasicAttributeSensor;
+import org.apache.brooklyn.util.core.flags.SetFromFlag;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
-import brooklyn.event.basic.BasicAttributeSensor;
-import brooklyn.event.basic.BasicConfigKey;
-
@ImplementedBy(ZabbixServerImpl.class)
public interface ZabbixServer extends Entity {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 ce003cd..1adfc4c 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
@@ -21,10 +21,17 @@ package org.apache.brooklyn.entity.monitoring.zabbix;
import java.util.List;
import org.apache.brooklyn.api.entity.Entity;
-import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+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.entity.group.AbstractMembershipTrackingPolicy;
+import org.apache.brooklyn.entity.group.DynamicGroup;
+import org.apache.brooklyn.entity.trait.Startable;
import org.apache.brooklyn.location.basic.SshMachineLocation;
+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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,14 +45,6 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Multimap;
-import brooklyn.entity.basic.AbstractEntity;
-import brooklyn.entity.basic.DynamicGroup;
-import brooklyn.entity.group.AbstractMembershipTrackingPolicy;
-import brooklyn.entity.trait.Startable;
-import brooklyn.event.feed.http.HttpFeed;
-import brooklyn.event.feed.http.HttpPollConfig;
-import brooklyn.event.feed.http.HttpValueFunctions;
-
public class ZabbixServerImpl extends AbstractEntity implements ZabbixServer {
private static final Logger log = LoggerFactory.getLogger(ZabbixServerImpl.class);
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/DatabaseNode.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/DatabaseNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/DatabaseNode.java
index 56eb9b7..d034d7d 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/DatabaseNode.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/DatabaseNode.java
@@ -18,7 +18,7 @@
*/
package org.apache.brooklyn.entity.database;
-import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
/** @deprecated since 0.7.0 use DatastoreMixins.DatastoreCommon */ @Deprecated
public interface DatabaseNode extends DatastoreMixins.DatastoreCommon {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java
index 89034c2..5536366 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java
@@ -22,19 +22,18 @@ import java.io.InputStream;
import javax.annotation.Nullable;
-import org.apache.brooklyn.api.entity.Effector;
+import org.apache.brooklyn.api.effector.Effector;
import org.apache.brooklyn.api.entity.Entity;
-import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.config.ConfigKey;
-import org.apache.brooklyn.core.util.ResourceUtils;
-import org.apache.brooklyn.core.util.flags.SetFromFlag;
+import org.apache.brooklyn.core.config.ConfigKeys;
+import org.apache.brooklyn.effector.core.Effectors;
+import org.apache.brooklyn.sensor.core.Sensors;
+import org.apache.brooklyn.util.core.ResourceUtils;
+import org.apache.brooklyn.util.core.flags.SetFromFlag;
import org.apache.brooklyn.util.stream.KnownSizeInputStream;
import org.apache.brooklyn.util.text.Strings;
-import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.entity.effector.Effectors;
-import brooklyn.event.basic.Sensors;
-
public class DatastoreMixins {
private DatastoreMixins() {}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 8a358bc..9762d5c 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
@@ -18,26 +18,26 @@
*/
package org.apache.brooklyn.entity.database.crate;
-import org.apache.brooklyn.api.entity.proxying.ImplementedBy;
-import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.entity.ImplementedBy;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.config.ConfigKey;
-import org.apache.brooklyn.core.util.flags.SetFromFlag;
+import org.apache.brooklyn.core.config.ConfigKeys;
-import brooklyn.entity.basic.Attributes;
-import brooklyn.entity.basic.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 brooklyn.event.basic.AttributeSensorAndConfigKey;
-import brooklyn.event.basic.BasicAttributeSensorAndConfigKey;
-import brooklyn.event.basic.PortAttributeSensorAndConfigKey;
-import brooklyn.event.basic.Sensors;
import org.apache.brooklyn.location.basic.PortRanges;
+import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey;
+import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey;
+import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey;
+import org.apache.brooklyn.sensor.core.Sensors;
+import org.apache.brooklyn.util.core.flags.SetFromFlag;
@ImplementedBy(CrateNodeImpl.class)
public interface CrateNode extends SoftwareProcess, UsesJava,UsesJmx, UsesJavaMXBeans, DatastoreCommon {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 5871fc6..5cf4065 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,15 +19,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.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.util.guava.Functionals;
-import brooklyn.enricher.Enrichers;
-import brooklyn.entity.basic.Attributes;
import brooklyn.entity.basic.SoftwareProcessImpl;
import brooklyn.entity.java.JavaAppUtils;
-import brooklyn.event.feed.http.HttpFeed;
-import brooklyn.event.feed.http.HttpPollConfig;
-import brooklyn.event.feed.http.HttpValueFunctions;
import brooklyn.event.feed.jmx.JmxFeed;
public class CrateNodeImpl extends SoftwareProcessImpl implements CrateNode{
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 4fc91ee..f72c071 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
@@ -22,11 +22,11 @@ import static java.lang.String.format;
import java.util.List;
-import org.apache.brooklyn.api.entity.basic.EntityLocal;
+import org.apache.brooklyn.api.internal.EntityLocal;
+import org.apache.brooklyn.entity.core.Entities;
import com.google.common.collect.ImmutableList;
-import brooklyn.entity.basic.Entities;
import brooklyn.entity.java.JavaSoftwareProcessSshDriver;
import org.apache.brooklyn.location.basic.SshMachineLocation;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 8ff7905..066a73b 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,9 +18,7 @@
*/
package org.apache.brooklyn.entity.database.mariadb;
-import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper;
-
-import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper;
+import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper;
import brooklyn.entity.basic.SoftwareProcessDriver;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 bd4b0a8..5612b5b 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
@@ -19,26 +19,24 @@
package org.apache.brooklyn.entity.database.mariadb;
import org.apache.brooklyn.api.catalog.Catalog;
-import org.apache.brooklyn.api.entity.proxying.ImplementedBy;
-import org.apache.brooklyn.api.entity.trait.HasShortName;
-import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.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.util.flags.SetFromFlag;
+import org.apache.brooklyn.core.config.ConfigKeys;
+import org.apache.brooklyn.core.config.MapConfigKey;
-import brooklyn.entity.basic.Attributes;
-import brooklyn.entity.basic.ConfigKeys;
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 brooklyn.event.basic.BasicAttributeSensorAndConfigKey;
-import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey;
-import brooklyn.event.basic.MapConfigKey;
-import brooklyn.event.basic.PortAttributeSensorAndConfigKey;
-import brooklyn.event.basic.Sensors;
-
import org.apache.brooklyn.location.basic.PortRanges;
+import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey;
+import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey;
+import org.apache.brooklyn.sensor.core.Sensors;
+import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey;
+import org.apache.brooklyn.util.core.flags.SetFromFlag;
@Catalog(name="MariaDB Node", description="MariaDB is an open source relational database management system (RDBMS)", iconUrl="classpath:///mariadb-logo-180x119.png")
@ImplementedBy(MariaDbNodeImpl.class)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 a965e01..632e3f2 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
@@ -22,14 +22,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.entity.basic.SoftwareProcessImpl;
-import brooklyn.entity.effector.EffectorBody;
-import brooklyn.event.feed.ssh.SshFeed;
-import brooklyn.event.feed.ssh.SshPollConfig;
-import brooklyn.event.feed.ssh.SshPollValue;
-import org.apache.brooklyn.core.util.config.ConfigBag;
+import org.apache.brooklyn.effector.core.EffectorBody;
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.feed.ssh.SshPollValue;
+import org.apache.brooklyn.util.core.config.ConfigBag;
import org.apache.brooklyn.util.guava.Maybe;
import org.apache.brooklyn.util.text.Identifiers;
import org.apache.brooklyn.util.text.Strings;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/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 05a43ef..054e5fa 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
@@ -35,18 +35,18 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
-import brooklyn.entity.basic.Attributes;
-import brooklyn.entity.basic.Entities;
+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.api.location.OsDetails;
-import org.apache.brooklyn.core.util.task.DynamicTasks;
-import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper;
import org.apache.brooklyn.location.basic.SshMachineLocation;
import org.apache.brooklyn.util.collections.MutableMap;
+import org.apache.brooklyn.util.core.task.DynamicTasks;
+import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper;
import org.apache.brooklyn.util.net.Urls;
import org.apache.brooklyn.util.os.Os;
import org.apache.brooklyn.util.ssh.BashCommands;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/951bad84/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java
index 0a2b829..955bde6 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java
@@ -21,19 +21,17 @@ package org.apache.brooklyn.entity.database.mysql;
import java.util.Collection;
import org.apache.brooklyn.api.catalog.Catalog;
-import org.apache.brooklyn.api.entity.proxying.ImplementedBy;
-import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.entity.ImplementedBy;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.config.ConfigKey;
+import org.apache.brooklyn.core.config.ConfigKeys;
import com.google.common.reflect.TypeToken;
-import brooklyn.entity.basic.ConfigKeys;
-
import org.apache.brooklyn.entity.database.DatastoreMixins.HasDatastoreUrl;
-
-import brooklyn.entity.group.DynamicCluster;
-import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey;
-import brooklyn.event.basic.Sensors;
+import org.apache.brooklyn.entity.group.DynamicCluster;
+import org.apache.brooklyn.sensor.core.Sensors;
+import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey;
@ImplementedBy(MySqlClusterImpl.class)
@Catalog(name="MySql Master-Slave cluster", description="Sets up a cluster of MySQL nodes using master-slave relation and binary logging", iconUrl="classpath:///mysql-logo-110x57.png")