This closes #963
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f1d90c63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f1d90c63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f1d90c63 Branch: refs/heads/master Commit: f1d90c6385437508255ca37311aa419be4c23960 Parents: ddc3dd9 f1d8cba Author: Hadrian Zbarcea <[email protected]> Authored: Sat Oct 17 12:05:24 2015 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Sat Oct 17 12:05:24 2015 -0400 ---------------------------------------------------------------------- .../brooklyn/core/entity/AbstractEntity.java | 7 +- .../apache/brooklyn/core/entity/Entities.java | 41 ++- .../core/entity/factory/ApplicationBuilder.java | 6 +- .../core/mgmt/EntityManagementUtils.java | 2 - .../core/mgmt/internal/LocalEntityManager.java | 6 +- .../brooklyn/enricher/stock/Enrichers.java | 13 +- .../entity/group/AbstractGroupImpl.java | 1 - .../entity/group/DynamicClusterImpl.java | 5 +- .../entity/group/DynamicFabricImpl.java | 4 + .../entity/group/DynamicMultiGroupImpl.java | 1 - .../entity/AbstractApplicationLegacyTest.java | 16 +- .../brooklyn/core/entity/AttributeMapTest.java | 14 +- .../core/entity/EntityAutomanagedTest.java | 329 +++++++++++++++++++ .../core/entity/EntityPreManagementTest.java | 146 -------- .../core/entity/hello/LocalEntitiesTest.java | 15 +- .../internal/EntityConfigMapUsageTest.java | 6 +- .../ApplicationBuilderOverridingTest.java | 15 +- .../core/feed/ConfigToAttributesTest.java | 1 - .../brooklyn/core/mgmt/ha/HotStandbyTest.java | 4 - .../internal/LocalSubscriptionManagerTest.java | 6 - .../mgmt/rebind/ActivePartialRebindTest.java | 3 - .../core/mgmt/rebind/CheckpointEntityTest.java | 1 - .../mgmt/rebind/RebindDynamicGroupTest.java | 1 - .../core/test/entity/TestApplicationImpl.java | 5 +- .../stock/CustomAggregatingEnricherTest.java | 11 +- .../stock/EnricherWithDeferredSupplierTest.java | 132 ++++++++ .../brooklyn/enricher/stock/EnrichersTest.java | 3 - .../entity/group/DynamicFabricTest.java | 4 +- .../brooklyn/entity/group/DynamicGroupTest.java | 21 +- .../entity/group/DynamicMultiGroupTest.java | 5 - .../group/MembershipTrackingPolicyTest.java | 1 - .../entity/stock/BasicStartableTest.java | 5 - .../feed/ssh/SshFeedIntegrationTest.java | 11 +- ...lusterDatabaseExampleAppIntegrationTest.java | 1 - .../BalanceableWorkerPoolTest.java | 1 - .../BrooklynNodeUpgradeEffectorBody.java | 2 +- .../BrooklynNodeIntegrationTest.java | 1 - .../entity/brooklynnode/BrooklynNodeTest.java | 20 +- .../entity/java/VanillaJavaAppRebindTest.java | 4 +- .../software/base/SameServerEntityTest.java | 2 - ...ftwareProcessAndChildrenIntegrationTest.java | 1 - .../location/WinRmMachineLocationLiveTest.java | 3 + .../messaging/activemq/ActiveMQBrokerImpl.java | 2 - .../messaging/kafka/KafkaClusterImpl.java | 2 - .../entity/messaging/qpid/QpidBrokerImpl.java | 2 - .../messaging/rabbit/RabbitBrokerImpl.java | 1 - .../monitoring/monit/MonitIntegrationTest.java | 13 +- .../network/bind/BindDnsServerLiveTest.java | 2 - .../ControlledDynamicWebAppClusterImpl.java | 7 +- .../entity/proxy/AbstractControllerTest.java | 2 - .../nginx/NginxClusterIntegrationTest.java | 6 +- .../proxy/nginx/NginxRebindIntegrationTest.java | 7 +- .../nginx/NginxUrlMappingIntegrationTest.java | 66 ++-- .../BrooklynAssemblyTemplateInstantiator.java | 3 +- .../brooklyn/launcher/BrooklynLauncher.java | 4 + .../org/apache/brooklyn/qa/load/LoadTest.java | 5 +- .../rest/util/BrooklynRestResourceUtils.java | 20 +- .../brooklyn/rest/domain/ApplicationTest.java | 16 +- .../util/BrooklynRestResourceUtilsTest.java | 37 ++- 59 files changed, 686 insertions(+), 385 deletions(-) ----------------------------------------------------------------------
