This closes #935
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/44755eb1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/44755eb1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/44755eb1 Branch: refs/heads/master Commit: 44755eb1222ce799d348421c5a984acd0a083662 Parents: bdcc5ce 4d08310 Author: Aled Sage <[email protected]> Authored: Wed Oct 7 10:30:53 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Wed Oct 7 10:30:53 2015 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/api/policy/Policy.java | 2 +- .../core/enricher/AbstractEnricher.java | 4 +- .../core/entity/AbstractApplication.java | 2 +- .../brooklyn/core/entity/AbstractEntity.java | 20 +-- .../apache/brooklyn/core/entity/Entities.java | 4 +- .../brooklyn/core/entity/EntityAdjuncts.java | 2 +- .../core/entity/EntityAndAttribute.java | 2 +- .../brooklyn/core/entity/EntityDynamicType.java | 12 +- .../brooklyn/core/entity/EntityFunctions.java | 2 +- .../entity/lifecycle/ServiceStateLogic.java | 14 +- .../core/feed/AttributePollHandler.java | 2 +- .../brooklyn/core/feed/ConfigToAttributes.java | 2 +- .../access/PortForwardManagerClient.java | 2 +- .../core/mgmt/internal/LocalEntityManager.java | 3 +- .../mgmt/persist/BrooklynPersistenceUtils.java | 4 +- .../mgmt/rebind/BasicEntityRebindSupport.java | 7 +- .../rebind/PeriodicDeltaChangeListener.java | 4 +- .../mgmt/rebind/dto/MementosGenerators.java | 4 +- .../core/objs/AbstractEntityAdjunct.java | 4 +- .../core/objs/proxy/InternalEntityFactory.java | 10 +- .../objs/proxy/InternalLocationFactory.java | 2 +- .../apache/brooklyn/core/policy/Policies.java | 4 +- .../brooklyn/core/sensor/StaticSensor.java | 2 +- .../core/server/entity/BrooklynMetricsImpl.java | 14 +- .../stock/AbstractAggregatingEnricher.java | 8 +- .../enricher/stock/AbstractAggregator.java | 10 +- .../stock/AbstractMultipleSensorAggregator.java | 4 +- .../enricher/stock/AbstractTransformer.java | 2 +- .../stock/AbstractTypeTransformingEnricher.java | 2 +- .../brooklyn/enricher/stock/AddingEnricher.java | 6 +- .../brooklyn/enricher/stock/Aggregator.java | 6 +- .../brooklyn/enricher/stock/Combiner.java | 2 +- .../stock/CustomAggregatingEnricher.java | 2 +- .../apache/brooklyn/enricher/stock/Joiner.java | 2 +- .../brooklyn/enricher/stock/Propagator.java | 6 +- .../stock/SensorPropagatingEnricher.java | 10 +- .../stock/SensorTransformingEnricher.java | 4 +- .../entity/group/AbstractGroupImpl.java | 28 ++-- .../group/AbstractMembershipTrackingPolicy.java | 8 +- .../entity/group/DynamicClusterImpl.java | 22 +-- .../entity/group/DynamicFabricImpl.java | 8 +- .../brooklyn/entity/group/DynamicGroupImpl.java | 6 +- .../entity/group/DynamicMultiGroupImpl.java | 4 +- .../entity/stock/BasicStartableImpl.java | 4 +- .../brooklyn/entity/stock/DataEntityImpl.java | 4 +- .../entity/stock/DelegateEntityImpl.java | 6 +- .../windows/WindowsPerformanceCounterFeed.java | 6 +- .../winrm/AdvertiseWinrmLoginPolicy.java | 4 +- .../brooklyn/util/core/flags/FlagUtils.java | 2 +- .../config/MapConfigKeyAndFriendsMoreTest.java | 100 ++++++------ ...apListAndOtherStructuredConfigKeyTest.groovy | 112 +++++++------- .../core/enricher/BasicEnricherTest.java | 12 +- .../core/enricher/EnricherConfigTest.java | 18 +-- .../brooklyn/core/entity/AttributeMapTest.java | 2 +- .../brooklyn/core/entity/AttributeTest.java | 4 +- .../entity/ConfigEntityInheritanceTest.java | 6 +- .../core/entity/DependentConfigurationTest.java | 44 +++--- .../brooklyn/core/entity/EntitiesTest.java | 6 +- .../core/entity/EntityFunctionsTest.java | 4 +- .../core/entity/EntityLocationsTest.java | 8 +- .../core/entity/EntityPreManagementTest.java | 14 +- .../core/entity/EntityPredicatesTest.java | 4 +- .../core/entity/EntityRegistrationTest.java | 4 +- .../brooklyn/core/entity/EntitySpecTest.java | 12 +- .../core/entity/EntitySubscriptionTest.java | 44 +++--- .../brooklyn/core/entity/EntityTypeTest.java | 4 +- .../core/entity/PolicyRegistrationTest.java | 48 +++--- .../downloads/BasicDownloadsRegistryTest.java | 26 ++-- .../DownloadProducerFromLocalRepoTest.java | 6 +- .../DownloadProducerFromPropertiesTest.java | 6 +- .../downloads/DownloadSubstitutersTest.java | 8 +- .../core/entity/hello/HelloEntityImpl.java | 4 +- .../core/entity/hello/LocalEntitiesTest.java | 16 +- .../entity/internal/ConfigMapGroovyTest.groovy | 2 +- .../core/entity/internal/ConfigMapTest.java | 14 +- .../EntityConfigMapUsageLegacyTest.java | 32 ++-- .../internal/EntityConfigMapUsageTest.java | 20 +-- .../entity/lifecycle/ServiceStateLogicTest.java | 8 +- .../core/location/LocationPredicatesTest.java | 2 +- .../access/BrooklynAccessUtilsTest.java | 2 +- .../access/PortForwardManagerRebindTest.java | 4 +- .../ha/HighAvailabilityManagerInMemoryTest.java | 2 +- .../HighAvailabilityManagerSplitBrainTest.java | 2 +- .../brooklyn/core/mgmt/ha/HotStandbyTest.java | 16 +- .../internal/EntityExecutionManagerTest.java | 4 +- .../internal/LocalSubscriptionManagerTest.java | 16 +- .../mgmt/osgi/OsgiVersionMoreEntityTest.java | 6 +- ...ntoPersisterInMemorySizeIntegrationTest.java | 4 +- .../BrooklynMementoPersisterTestFixture.java | 4 +- .../core/mgmt/rebind/CheckpointEntityTest.java | 4 +- .../mgmt/rebind/RebindCatalogEntityTest.java | 2 +- .../core/mgmt/rebind/RebindEnricherTest.java | 48 +++--- .../rebind/RebindEntityDynamicTypeInfoTest.java | 6 +- .../core/mgmt/rebind/RebindEntityTest.java | 36 ++--- .../core/mgmt/rebind/RebindFailuresTest.java | 8 +- .../core/mgmt/rebind/RebindFeedTest.java | 8 +- .../core/mgmt/rebind/RebindFeedWithHaTest.java | 4 +- .../core/mgmt/rebind/RebindManagerTest.java | 2 +- .../core/mgmt/rebind/RebindPolicyTest.java | 50 +++--- .../transformer/CompoundTransformerTest.java | 4 +- .../core/policy/basic/BasicPolicyTest.java | 6 +- .../core/policy/basic/PolicyConfigTest.java | 22 +-- .../policy/basic/PolicySubscriptionTest.java | 30 ++-- .../core/sensor/http/HttpRequestSensorTest.java | 2 +- .../ssh/SshCommandSensorIntegrationTest.java | 2 +- .../core/server/entity/BrooklynMetricsTest.java | 4 +- .../core/test/entity/TestClusterImpl.java | 2 +- .../core/test/entity/TestEntityImpl.java | 6 +- .../EntityCleanupLongevityTestFixture.java | 6 +- .../qa/performance/EntityPerformanceTest.java | 6 +- .../EntityPersistencePerformanceTest.java | 8 +- ...stomAggregatingEnricherDeprecatedTest.groovy | 46 +++--- .../stock/CustomAggregatingEnricherTest.java | 120 +++++++-------- .../brooklyn/enricher/stock/EnrichersTest.java | 151 +++++++++---------- ...SensorPropagatingEnricherDeprecatedTest.java | 26 ++-- .../stock/SensorPropagatingEnricherTest.java | 58 +++---- .../TransformingEnricherDeprecatedTest.groovy | 4 +- .../stock/TransformingEnricherTest.java | 4 +- .../YamlRollingTimeWindowMeanEnricherTest.java | 4 +- .../YamlTimeWeightedDeltaEnricherTest.java | 4 +- .../entity/group/DynamicClusterTest.java | 2 +- ...DynamicClusterWithAvailabilityZonesTest.java | 14 +- .../brooklyn/entity/group/DynamicGroupTest.java | 49 +++--- .../entity/group/DynamicMultiGroupTest.java | 26 ++-- .../entity/group/GroupPickUpEntitiesTest.java | 16 +- .../apache/brooklyn/entity/group/GroupTest.java | 10 +- .../group/MembershipTrackingPolicyTest.java | 44 +++--- .../feed/function/FunctionFeedTest.java | 4 +- .../apache/brooklyn/feed/http/HttpFeedTest.java | 4 +- .../feed/ssh/SshFeedIntegrationTest.java | 2 +- .../WindowsPerformanceCounterFeedLiveTest.java | 2 +- ...stMachineProvisioningLocationRebindTest.java | 2 +- .../brooklyn/util/core/task/TasksTest.java | 12 +- .../util/core/task/ssh/SshTasksTest.java | 4 +- .../util/core/text/TemplateProcessorTest.java | 2 +- .../brooklyn/demo/CumulusRDFApplication.java | 2 +- .../brooklyn/demo/ResilientMongoDbApp.java | 10 +- .../demo/WebClusterDatabaseExample.java | 8 +- .../demo/WebClusterDatabaseExampleApp.java | 8 +- .../demo/WebClusterDatabaseExampleGroovy.groovy | 2 +- .../apache/brooklyn/demo/WebClusterExample.java | 2 +- ...lusterDatabaseExampleAppIntegrationTest.java | 6 +- .../policy/jclouds/os/CreateUserPolicy.java | 4 +- .../location/jclouds/LiveTestEntity.java | 8 +- .../jclouds/RebindJcloudsLocationLiveTest.java | 2 +- .../policy/autoscaling/AutoScalerPolicy.java | 10 +- .../brooklyn/policy/enricher/DeltaEnricher.java | 2 +- .../policy/enricher/HttpLatencyDetector.java | 6 +- .../policy/enricher/RollingMeanEnricher.java | 2 +- .../enricher/RollingTimeWindowMeanEnricher.java | 2 +- .../enricher/TimeFractionDeltaEnricher.java | 2 +- .../enricher/TimeWeightedDeltaEnricher.java | 4 +- .../policy/followthesun/FollowTheSunPolicy.java | 16 +- .../followthesun/FollowTheSunPoolImpl.java | 28 ++-- .../policy/ha/AbstractFailureDetector.java | 4 +- .../policy/ha/ConditionalSuspendPolicy.java | 6 +- .../policy/ha/ServiceFailureDetector.java | 4 +- .../brooklyn/policy/ha/ServiceReplacer.java | 4 +- .../brooklyn/policy/ha/ServiceRestarter.java | 4 +- .../BalanceableWorkerPoolImpl.java | 26 ++-- .../ItemsInContainersGroupImpl.java | 6 +- .../loadbalancing/LoadBalancingPolicy.java | 18 +-- .../autoscaling/AutoScalerPolicyMetricTest.java | 60 ++++---- .../autoscaling/AutoScalerPolicyRebindTest.java | 10 +- .../AutoScalerPolicyReconfigurationTest.java | 32 ++-- .../autoscaling/AutoScalerPolicyTest.java | 132 ++++++++-------- .../autoscaling/LocallyResizableEntity.java | 2 +- .../policy/enricher/DeltaEnrichersTests.groovy | 8 +- .../enricher/HttpLatencyDetectorTest.java | 18 +-- .../policy/enricher/RebindEnricherTest.java | 32 ++-- .../enricher/RollingMeanEnricherTest.groovy | 6 +- .../RollingTimeWindowMeanEnricherTest.groovy | 4 +- .../enricher/TimeFractionDeltaEnricherTest.java | 6 +- .../AbstractFollowTheSunPolicyTest.java | 6 +- .../FollowTheSunPolicySoakTest.java | 2 +- .../followthesun/FollowTheSunPolicyTest.java | 35 +++-- .../ha/ConnectionFailureDetectorTest.java | 20 +-- .../brooklyn/policy/ha/HaPolicyRebindTest.java | 14 +- ...ServiceFailureDetectorStabilizationTest.java | 44 +++--- .../policy/ha/ServiceFailureDetectorTest.java | 78 +++++----- .../brooklyn/policy/ha/ServiceReplacerTest.java | 28 ++-- .../policy/ha/ServiceRestarterTest.java | 28 ++-- .../AbstractLoadBalancingPolicyTest.java | 7 +- .../LoadBalancingPolicyConcurrencyTest.java | 2 +- .../LoadBalancingPolicySoakTest.java | 2 +- .../loadbalancing/LoadBalancingPolicyTest.java | 8 +- .../loadbalancing/MockContainerEntityImpl.java | 15 +- .../loadbalancing/MockItemEntityImpl.java | 4 +- .../postgresql/PostgreSqlNodeSaltImpl.java | 2 +- .../brooklyn/entity/salt/SaltConfigs.java | 8 +- .../entity/salt/SaltLifecycleEffectorTasks.java | 4 +- .../entity/monitoring/zabbix/ZabbixFeed.java | 2 +- .../monitoring/zabbix/ZabbixServerImpl.java | 4 +- .../nosql/hazelcast/HazelcastClusterImpl.java | 8 +- .../nosql/hazelcast/HazelcastNodeImpl.java | 2 +- .../nosql/hazelcast/HazelcastNodeSshDriver.java | 2 +- .../Infinispan5ServerIntegrationTest.groovy | 2 +- .../brooklynnode/BrooklynClusterImpl.java | 2 +- .../brooklynnode/BrooklynEntityMirrorImpl.java | 8 +- .../entity/brooklynnode/BrooklynNodeImpl.java | 4 +- .../brooklynnode/LocalBrooklynNodeImpl.java | 4 +- .../BrooklynClusterUpgradeEffectorBody.java | 4 +- .../BrooklynNodeUpgradeEffectorBody.java | 8 +- .../brooklyn/entity/chef/ChefAttributeFeed.java | 8 +- .../brooklyn/entity/chef/ChefConfigs.java | 8 +- .../entity/chef/ChefLifecycleEffectorTasks.java | 6 +- .../brooklyn/entity/java/JavaAppUtils.java | 4 +- .../java/JavaSoftwareProcessSshDriver.java | 2 +- .../apache/brooklyn/entity/java/JmxSupport.java | 12 +- .../entity/java/VanillaJavaAppImpl.java | 4 +- .../entity/java/VanillaJavaAppSshDriver.java | 4 +- .../entity/machine/pool/ServerPoolImpl.java | 40 ++--- .../base/AbstractSoftwareProcessSshDriver.java | 12 +- .../AbstractSoftwareProcessWinRmDriver.java | 4 +- .../software/base/SameServerEntityImpl.java | 2 +- .../software/base/SoftwareProcessImpl.java | 20 +-- .../base/VanillaWindowsProcessImpl.java | 4 +- .../base/VanillaWindowsProcessWinRmDriver.java | 2 +- .../MachineLifecycleEffectorTasks.java | 28 ++-- .../system_service/SystemServiceEnricher.java | 2 +- .../org/apache/brooklyn/feed/jmx/JmxHelper.java | 2 +- .../BrooklynNodeIntegrationTest.java | 2 +- .../entity/brooklynnode/BrooklynNodeTest.java | 2 +- .../entity/brooklynnode/MockBrooklynNode.java | 2 +- .../brooklynnode/SameBrooklynNodeImpl.java | 4 +- .../brooklynnode/SelectMasterEffectorTest.java | 4 +- .../entity/chef/ChefLiveTestSupport.java | 2 +- .../chef/mysql/TypedToyMySqlEntityChef.java | 12 +- .../brooklyn/entity/java/JavaOptsTest.java | 2 +- .../brooklyn/entity/java/JmxSupportTest.java | 8 +- .../entity/java/VanillaJavaAppRebindTest.java | 4 +- .../entity/java/VanillaJavaAppTest.java | 8 +- .../base/DoNothingSoftwareProcessImpl.java | 2 +- .../base/SoftwareProcessEntityLatchTest.java | 2 +- .../base/SoftwareProcessEntityRebindTest.java | 4 +- .../base/SoftwareProcessEntityTest.java | 14 +- ...SoftwareProcessSshDriverIntegrationTest.java | 18 +-- .../MachineLifecycleEffectorTasksTest.java | 4 +- .../base/lifecycle/StartStopSshDriverTest.java | 4 +- .../mysql/DynamicToyMySqlEntityBuilder.java | 6 +- .../apache/brooklyn/feed/jmx/JmxFeedTest.java | 12 +- .../brooklyn/feed/jmx/RebindJmxFeedTest.java | 10 +- .../entity/database/crate/CrateNodeImpl.java | 6 +- .../database/mariadb/MariaDbNodeImpl.java | 8 +- .../database/mariadb/MariaDbSshDriver.java | 2 +- .../entity/database/mysql/MySqlClusterImpl.java | 29 ++-- .../entity/database/mysql/MySqlNodeImpl.java | 8 +- .../entity/database/mysql/MySqlSshDriver.java | 4 +- .../PostgreSqlNodeChefImplFromScratch.java | 2 +- .../database/postgresql/PostgreSqlNodeImpl.java | 2 +- .../postgresql/PostgreSqlSshDriver.java | 4 +- .../database/rubyrep/RubyRepNodeImpl.java | 4 +- .../database/rubyrep/RubyRepSshDriver.java | 2 +- .../messaging/activemq/ActiveMQBrokerImpl.java | 4 +- .../messaging/activemq/ActiveMQQueueImpl.java | 2 +- .../messaging/activemq/ActiveMQTopicImpl.java | 2 +- .../entity/messaging/kafka/KafkaBrokerImpl.java | 13 +- .../messaging/kafka/KafkaClusterImpl.java | 16 +- .../entity/messaging/qpid/QpidBrokerImpl.java | 2 +- .../messaging/qpid/QpidDestinationImpl.java | 2 +- .../entity/messaging/qpid/QpidQueueImpl.java | 2 +- .../entity/messaging/qpid/QpidTopicImpl.java | 2 +- .../messaging/rabbit/RabbitBrokerImpl.java | 4 +- .../messaging/rabbit/RabbitDestination.java | 2 +- .../entity/messaging/rabbit/RabbitQueue.java | 2 +- .../messaging/storm/StormDeploymentImpl.java | 10 +- .../entity/messaging/storm/StormImpl.java | 2 +- .../entity/zookeeper/ZooKeeperEnsembleImpl.java | 6 +- .../entity/monitoring/monit/MonitNodeImpl.java | 2 +- .../entity/network/bind/BindDnsServerImpl.java | 28 ++-- .../bind/BindDnsServerIntegrationTest.java | 4 +- .../network/bind/PrefixAndIdEnricher.java | 4 +- .../cassandra/CassandraDatacenterImpl.java | 18 +-- .../nosql/cassandra/CassandraFabricImpl.java | 10 +- .../nosql/cassandra/CassandraNodeImpl.java | 14 +- .../nosql/couchbase/CouchbaseClusterImpl.java | 36 ++--- .../nosql/couchbase/CouchbaseNodeImpl.java | 4 +- .../nosql/couchbase/CouchbaseNodeSshDriver.java | 12 +- .../couchbase/CouchbaseSyncGatewayImpl.java | 2 +- .../entity/nosql/couchdb/CouchDBNodeImpl.java | 4 +- .../nosql/couchdb/CouchDBNodeSshDriver.java | 2 +- .../ElasticSearchNodeSshDriver.java | 2 +- .../entity/nosql/mongodb/MongoDBClientImpl.java | 2 +- .../nosql/mongodb/MongoDBReplicaSetImpl.java | 14 +- .../entity/nosql/mongodb/MongoDBServerImpl.java | 2 +- .../sharding/CoLocatedMongoDBRouterImpl.java | 2 +- .../sharding/MongoDBRouterClusterImpl.java | 8 +- .../sharding/MongoDBShardClusterImpl.java | 4 +- .../sharding/MongoDBShardedDeploymentImpl.java | 4 +- .../entity/nosql/redis/RedisClusterImpl.java | 2 +- .../entity/nosql/riak/RiakClusterImpl.java | 26 ++-- .../entity/nosql/riak/RiakNodeImpl.java | 4 +- .../entity/nosql/riak/RiakNodeSshDriver.java | 14 +- .../entity/nosql/solr/SolrServerImpl.java | 2 +- .../entity/osgi/karaf/KarafContainerImpl.java | 28 ++-- .../entity/dns/AbstractGeoDnsServiceImpl.java | 8 +- .../geoscaling/GeoscalingDnsServiceImpl.java | 16 +- .../entity/proxy/AbstractControllerImpl.java | 20 +-- .../AbstractNonProvisionedControllerImpl.java | 8 +- .../entity/proxy/nginx/NginxControllerImpl.java | 12 +- .../entity/proxy/nginx/NginxSshDriver.java | 12 +- .../entity/proxy/nginx/UrlMappingImpl.java | 10 +- .../ControlledDynamicWebAppClusterImpl.java | 20 +-- .../entity/webapp/DynamicWebAppClusterImpl.java | 12 +- .../entity/webapp/DynamicWebAppFabricImpl.java | 4 +- .../webapp/JavaWebAppSoftwareProcessImpl.java | 10 +- .../entity/webapp/JavaWebAppSshDriver.java | 4 +- .../entity/webapp/WebAppServiceMethods.java | 8 +- .../entity/webapp/jboss/JBoss6SshDriver.java | 2 +- .../entity/webapp/jboss/JBoss7ServerImpl.java | 4 +- .../entity/webapp/jboss/JBoss7SshDriver.java | 4 +- .../entity/webapp/jetty/Jetty6ServerImpl.java | 2 +- .../webapp/nodejs/NodeJsWebAppServiceImpl.java | 4 +- .../webapp/nodejs/NodeJsWebAppSshDriver.java | 4 +- .../entity/dns/AbstractGeoDnsServiceTest.java | 10 +- .../geoscaling/GeoscalingIntegrationTest.java | 12 +- .../entity/proxy/AbstractControllerTest.java | 50 +++--- .../brooklyn/entity/proxy/StubAppServer.java | 8 +- .../proxy/TrackingAbstractControllerImpl.java | 2 +- .../brooklyn/entity/proxy/UrlMappingTest.java | 4 +- .../nginx/NginxHttpsSslIntegrationTest.java | 4 +- .../AbstractWebAppFixtureIntegrationTest.java | 4 +- ...lledDynamicWebAppClusterIntegrationTest.java | 2 +- .../ControlledDynamicWebAppClusterTest.java | 4 +- .../entity/webapp/DynamicWebAppClusterTest.java | 4 +- .../entity/webapp/DynamicWebAppFabricTest.java | 4 +- .../webapp/ElasticCustomLocationTest.java | 4 +- .../webapp/TomcatAutoScalerPolicyTest.java | 2 +- .../test/entity/TestJavaWebAppEntity.java | 8 +- .../test/entity/TestJavaWebAppEntityImpl.java | 2 +- .../camp/brooklyn/DslAndRebindYamlTest.java | 4 +- .../EnrichersSlightlySimplerYamlTest.java | 14 +- .../camp/brooklyn/EnrichersYamlTest.java | 4 +- .../brooklyn/JavaWebAppsIntegrationTest.java | 2 +- .../camp/brooklyn/PoliciesYamlTest.java | 8 +- .../TestSensorAndEffectorInitializer.java | 4 +- .../CatalogOsgiVersionMoreEntityTest.java | 6 +- .../brooklyn/catalog/CatalogYamlPolicyTest.java | 6 +- .../brooklyn/catalog/CatalogYamlRebindTest.java | 8 +- .../BrooklynEntityMirrorIntegrationTest.java | 8 +- .../brooklynnode/BrooklynNodeRestTest.java | 2 +- .../qa/load/SimulatedJBoss7ServerImpl.java | 18 +-- .../qa/load/SimulatedMySqlNodeImpl.java | 6 +- .../qa/load/SimulatedNginxControllerImpl.java | 8 +- .../brooklyn/qa/load/SimulatedTheeTierApp.java | 6 +- .../webcluster/SinusoidalLoadGenerator.java | 2 +- .../qa/longevity/webcluster/WebClusterApp.java | 4 +- .../brooklyn/rest/resources/PolicyResource.java | 19 ++- .../brooklyn/rest/resources/SensorResource.java | 4 +- .../rest/util/BrooklynRestResourceUtils.java | 6 +- .../brooklyn/rest/domain/SensorSummaryTest.java | 2 +- .../rest/resources/ApplicationResourceTest.java | 4 +- .../rest/resources/DescendantsTest.java | 4 +- .../rest/resources/SensorResourceTest.java | 2 +- .../brooklynnode/DeployBlueprintTest.java | 2 +- .../testing/mocks/RestMockSimpleEntity.java | 2 +- .../util/BrooklynRestResourceUtilsTest.java | 2 +- .../apache/brooklyn/test/EntityTestUtils.java | 4 +- 358 files changed, 1910 insertions(+), 1908 deletions(-) ----------------------------------------------------------------------
