This closes #790
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ef3af121 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ef3af121 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ef3af121 Branch: refs/heads/master Commit: ef3af12139a3ed3361fb9fb29a5cb8c4472e40d8 Parents: 0dc3911 64a1983 Author: Aled Sage <[email protected]> Authored: Tue Aug 11 21:42:32 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Tue Aug 11 21:42:32 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/entity/basic/AbstractEntity.java | 24 +- .../java/brooklyn/entity/basic/Attributes.java | 10 + .../entity/basic/ServiceStateLogic.java | 1 + .../event/feed/AttributePollHandler.java | 12 +- .../java/brooklyn/event/feed/FeedConfig.java | 27 ++- .../event/feed/function/FunctionFeed.java | 1 + .../java/brooklyn/event/feed/http/HttpFeed.java | 1 + .../event/feed/http/HttpValueFunctions.java | 55 ++++- .../brooklyn/event/feed/shell/ShellFeed.java | 1 + .../windows/WindowsPerformanceCounterFeed.java | 1 + .../java/brooklyn/location/basic/Machines.java | 4 +- .../internal/AbstractManagementContext.java | 6 - .../internal/CollectionChangeListener.java | 1 + .../internal/EntityManagementUtils.java | 2 +- .../java/brooklyn/util/flags/TypeCoercions.java | 69 ++++-- .../brooklyn/util/http/HttpToolResponse.java | 2 +- .../brooklyn/entity/basic/EntitySpecTest.java | 33 ++- .../brooklyn/entity/basic/EntityTypeTest.java | 5 +- .../java/brooklyn/entity/group/GroupTest.java | 58 +++-- .../event/feed/http/HttpValueFunctionsTest.java | 94 ++++++++ .../util/internal/TypeCoercionsTest.java | 5 + .../basic/RecordingSensorEventListener.java | 2 +- .../demo/WebClusterDatabaseExampleGroovy.groovy | 2 +- .../location/jclouds/JcloudsLocation.java | 63 +++++ .../jclouds/JcloudsSshMachineLocation.java | 10 +- .../jclouds/JcloudsAddressesLiveTest.java | 228 +++++++++++++++++++ .../postgresql/PostgreSqlNodeSaltImpl.java | 6 +- .../entity/monitoring/zabbix/ZabbixFeed.java | 1 + .../hazelcast/HazelcastClusterEc2LiveTest.java | 2 +- .../HazelcastClusterSoftlayerLiveTest.java | 2 +- .../Infinispan5ServerIntegrationTest.groovy | 2 +- .../entity/basic/SameServerEntityImpl.java | 8 +- .../brooklyn/entity/basic/SoftwareProcess.java | 12 + .../entity/basic/SoftwareProcessImpl.java | 65 ++++++ .../entity/brooklynnode/BrooklynNodeImpl.java | 4 +- .../brooklyn/entity/chef/ChefAttributeFeed.java | 1 + .../brooklyn/entity/chef/ChefEntityImpl.java | 8 +- .../java/brooklyn/event/feed/jmx/JmxFeed.java | 3 + .../entity/brooklynnode/MockBrooklynNode.java | 4 + .../brooklynnode/SameBrooklynNodeImpl.java | 4 + .../entity/database/mysql/MySqlNodeImpl.java | 8 +- .../PostgreSqlNodeChefImplFromScratch.java | 4 + .../messaging/activemq/ActiveMQBrokerImpl.java | 3 +- .../entity/messaging/kafka/KafkaBrokerImpl.java | 27 ++- .../entity/messaging/qpid/QpidBrokerImpl.java | 3 +- .../nosql/cassandra/CassandraNodeImpl.java | 39 ++-- .../entity/nosql/couchdb/CouchDBNodeImpl.java | 23 +- .../entity/nosql/mongodb/MongoDBServerImpl.java | 3 +- .../entity/nosql/redis/RedisStoreImpl.java | 24 +- .../dns/geoscaling/GeoscalingDnsService.java | 6 + .../geoscaling/GeoscalingDnsServiceImpl.java | 10 +- .../dns/geoscaling/GeoscalingWebClient.java | 4 +- .../entity/proxy/nginx/NginxControllerImpl.java | 26 ++- .../webapp/ControlledDynamicWebAppCluster.java | 5 + .../ControlledDynamicWebAppClusterImpl.java | 18 +- .../entity/webapp/jboss/JBoss6ServerImpl.java | 26 ++- .../entity/webapp/jboss/JBoss7ServerImpl.java | 28 ++- .../entity/webapp/tomcat/TomcatServerImpl.java | 30 ++- .../ControlledDynamicWebAppClusterTest.java | 24 ++ ...ableRetrieveUsageMetricsIntegrationTest.java | 65 ++++++ .../test/entity/TestJavaWebAppEntity.java | 3 +- .../camp/brooklyn/ApplicationsYamlTest.java | 116 ++++++++++ .../brooklyn/catalog/CatalogYamlAppTest.java | 73 ++++++ .../camp/brooklyn/EntitiesYamlTest.java | 38 ---- 64 files changed, 1240 insertions(+), 205 deletions(-) ----------------------------------------------------------------------
