You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/08/13 03:18:57 UTC
[19/19] incubator-brooklyn git commit: [BROOKLYN-162] Rename
./api/entity; use the no split package convention
[BROOKLYN-162] Rename ./api/entity; use the no split package convention
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a76dac4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a76dac4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a76dac4f
Branch: refs/heads/master
Commit: a76dac4f087cba2abad325108d2545e460def0bb
Parents: 9bb882c
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Wed Aug 12 20:39:19 2015 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Wed Aug 12 20:39:19 2015 -0400
----------------------------------------------------------------------
.../main/java/brooklyn/entity/Application.java | 34 --
api/src/main/java/brooklyn/entity/Effector.java | 54 ---
api/src/main/java/brooklyn/entity/Entity.java | 265 -----------
.../main/java/brooklyn/entity/EntityType.java | 73 ---
api/src/main/java/brooklyn/entity/Feed.java | 71 ---
api/src/main/java/brooklyn/entity/Group.java | 73 ---
.../java/brooklyn/entity/ParameterType.java | 48 --
.../java/brooklyn/entity/basic/EntityLocal.java | 180 -------
.../entity/drivers/DriverDependentEntity.java | 36 --
.../brooklyn/entity/drivers/EntityDriver.java | 54 ---
.../entity/drivers/EntityDriverManager.java | 49 --
.../drivers/downloads/DownloadResolver.java | 58 ---
.../downloads/DownloadResolverManager.java | 158 -------
.../entity/proxying/EntityInitializer.java | 43 --
.../brooklyn/entity/proxying/EntitySpec.java | 473 -------------------
.../entity/proxying/EntityTypeRegistry.java | 64 ---
.../brooklyn/entity/proxying/ImplementedBy.java | 48 --
.../entity/rebind/BrooklynObjectType.java | 69 ---
.../brooklyn/entity/rebind/ChangeListener.java | 44 --
.../rebind/PersistenceExceptionHandler.java | 43 --
.../brooklyn/entity/rebind/RebindContext.java | 52 --
.../entity/rebind/RebindExceptionHandler.java | 110 -----
.../brooklyn/entity/rebind/RebindManager.java | 133 ------
.../brooklyn/entity/rebind/RebindSupport.java | 57 ---
.../java/brooklyn/entity/rebind/Rebindable.java | 40 --
.../brooklyn/entity/trait/Configurable.java | 94 ----
.../brooklyn/entity/trait/HasShortName.java | 26 -
.../brooklyn/entity/trait/Identifiable.java | 24 -
api/src/main/java/brooklyn/event/Sensor.java | 4 +-
.../main/java/brooklyn/event/SensorEvent.java | 2 +-
.../brooklyn/event/SensorEventListener.java | 2 +-
.../brooklyn/api/basic/BrooklynObject.java | 4 +-
.../apache/brooklyn/api/entity/Application.java | 34 ++
.../apache/brooklyn/api/entity/Effector.java | 54 +++
.../org/apache/brooklyn/api/entity/Entity.java | 265 +++++++++++
.../apache/brooklyn/api/entity/EntityType.java | 73 +++
.../org/apache/brooklyn/api/entity/Feed.java | 70 +++
.../org/apache/brooklyn/api/entity/Group.java | 73 +++
.../brooklyn/api/entity/ParameterType.java | 48 ++
.../brooklyn/api/entity/basic/EntityLocal.java | 180 +++++++
.../entity/drivers/DriverDependentEntity.java | 36 ++
.../api/entity/drivers/EntityDriver.java | 55 +++
.../api/entity/drivers/EntityDriverManager.java | 49 ++
.../drivers/downloads/DownloadResolver.java | 58 +++
.../downloads/DownloadResolverManager.java | 158 +++++++
.../api/entity/proxying/EntityInitializer.java | 43 ++
.../api/entity/proxying/EntitySpec.java | 473 +++++++++++++++++++
.../api/entity/proxying/EntityTypeRegistry.java | 65 +++
.../api/entity/proxying/ImplementedBy.java | 48 ++
.../api/entity/rebind/BrooklynObjectType.java | 69 +++
.../api/entity/rebind/ChangeListener.java | 44 ++
.../rebind/PersistenceExceptionHandler.java | 43 ++
.../api/entity/rebind/RebindContext.java | 52 ++
.../entity/rebind/RebindExceptionHandler.java | 110 +++++
.../api/entity/rebind/RebindManager.java | 133 ++++++
.../api/entity/rebind/RebindSupport.java | 57 +++
.../brooklyn/api/entity/rebind/Rebindable.java | 40 ++
.../brooklyn/api/entity/trait/Configurable.java | 94 ++++
.../brooklyn/api/entity/trait/HasShortName.java | 26 +
.../brooklyn/api/entity/trait/Identifiable.java | 24 +
.../apache/brooklyn/catalog/CatalogItem.java | 5 +-
.../brooklyn/management/AccessController.java | 3 +-
.../brooklyn/management/EntityManager.java | 9 +-
.../brooklyn/management/ExecutionContext.java | 2 +-
.../brooklyn/management/ExecutionManager.java | 2 +-
.../brooklyn/management/ManagementContext.java | 12 +-
.../management/SubscriptionContext.java | 5 +-
.../management/SubscriptionManager.java | 5 +-
.../mementos/BrooklynMementoManifest.java | 2 +-
.../mementos/BrooklynMementoPersister.java | 12 +-
.../mementos/BrooklynMementoRawData.java | 2 +-
.../brooklyn/mementos/EnricherMemento.java | 2 +-
.../apache/brooklyn/mementos/EntityMemento.java | 5 +-
.../apache/brooklyn/mementos/FeedMemento.java | 2 +-
.../brooklyn/mementos/LocationMemento.java | 2 +-
.../org/apache/brooklyn/mementos/Memento.java | 5 +-
.../apache/brooklyn/mementos/PolicyMemento.java | 2 +-
.../org/apache/brooklyn/policy/Enricher.java | 6 +-
.../java/org/apache/brooklyn/policy/Policy.java | 6 +-
.../brooklyn/basic/BasicConfigurableObject.java | 4 +-
.../brooklyn/basic/BrooklynObjectInternal.java | 6 +-
.../main/java/brooklyn/basic/BrooklynTypes.java | 2 +-
.../basic/internal/ApiObjectsFactoryImpl.java | 2 +-
.../api/AssemblyTemplateSpecInstantiator.java | 3 +-
.../brooklyn/catalog/CatalogPredicates.java | 6 +-
.../catalog/internal/CatalogClasspathDo.java | 6 +-
.../catalog/internal/CatalogEntityItemDto.java | 4 +-
.../catalog/internal/CatalogItemDo.java | 2 +-
.../internal/CatalogItemDtoAbstract.java | 2 +-
.../internal/CatalogTemplateItemDto.java | 4 +-
.../brooklyn/catalog/internal/CatalogUtils.java | 2 +-
.../java/brooklyn/config/BrooklynLogging.java | 2 +-
.../main/java/brooklyn/config/ConfigUtils.java | 2 +-
.../brooklyn/config/render/RendererHints.java | 2 +-
.../main/java/brooklyn/enricher/Enrichers.java | 2 +-
.../basic/AbstractAggregatingEnricher.java | 6 +-
.../enricher/basic/AbstractAggregator.java | 6 +-
.../enricher/basic/AbstractEnricher.java | 4 +-
.../basic/AbstractMultipleSensorAggregator.java | 2 +-
.../enricher/basic/AbstractTransformer.java | 4 +-
.../basic/AbstractTransformingEnricher.java | 3 +-
.../basic/AbstractTypeTransformingEnricher.java | 5 +-
.../brooklyn/enricher/basic/AddingEnricher.java | 3 +-
.../brooklyn/enricher/basic/Aggregator.java | 2 +-
.../java/brooklyn/enricher/basic/Combiner.java | 4 +-
.../java/brooklyn/enricher/basic/Joiner.java | 4 +-
.../brooklyn/enricher/basic/Propagator.java | 4 +-
.../basic/SensorPropagatingEnricher.java | 4 +-
.../basic/SensorTransformingEnricher.java | 3 +-
.../brooklyn/enricher/basic/UpdatingMap.java | 2 +-
.../entity/basic/AbstractApplication.java | 4 +-
.../AbstractConfigurableEntityFactory.java | 2 +-
.../brooklyn/entity/basic/AbstractEffector.java | 6 +-
.../brooklyn/entity/basic/AbstractEntity.java | 17 +-
.../brooklyn/entity/basic/AbstractGroup.java | 5 +-
.../entity/basic/AbstractGroupImpl.java | 7 +-
.../entity/basic/ApplicationBuilder.java | 5 +-
.../brooklyn/entity/basic/BasicApplication.java | 2 +-
.../basic/BasicConfigurableEntityFactory.java | 2 +-
.../java/brooklyn/entity/basic/BasicEntity.java | 4 +-
.../java/brooklyn/entity/basic/BasicGroup.java | 3 +-
.../brooklyn/entity/basic/BasicGroupImpl.java | 2 +-
.../entity/basic/BasicParameterType.java | 2 +-
.../brooklyn/entity/basic/BasicStartable.java | 5 +-
.../entity/basic/BasicStartableImpl.java | 2 +-
.../entity/basic/BrooklynShutdownHooks.java | 2 +-
.../brooklyn/entity/basic/BrooklynTaskTags.java | 4 +-
.../entity/basic/ClosureEntityFactory.java | 3 +-
.../entity/basic/ConfigurableEntityFactory.java | 3 +-
...figurableEntityFactoryFromEntityFactory.java | 4 +-
.../java/brooklyn/entity/basic/DataEntity.java | 5 +-
.../brooklyn/entity/basic/DelegateEntity.java | 7 +-
.../entity/basic/DelegateEntityImpl.java | 3 +-
.../brooklyn/entity/basic/DynamicGroup.java | 5 +-
.../brooklyn/entity/basic/DynamicGroupImpl.java | 2 +-
.../java/brooklyn/entity/basic/Entities.java | 15 +-
.../brooklyn/entity/basic/EntityAdjuncts.java | 2 +-
.../entity/basic/EntityAndAttribute.java | 5 +-
.../entity/basic/EntityDynamicType.java | 6 +-
.../brooklyn/entity/basic/EntityFactory.java | 2 +-
.../entity/basic/EntityFactoryForLocation.java | 3 +-
.../brooklyn/entity/basic/EntityFunctions.java | 7 +-
.../entity/basic/EntityInitializers.java | 3 +-
.../brooklyn/entity/basic/EntityInternal.java | 9 +-
.../brooklyn/entity/basic/EntityPredicates.java | 5 +-
.../brooklyn/entity/basic/EntitySuppliers.java | 3 +-
.../java/brooklyn/entity/basic/EntityTasks.java | 2 +-
.../basic/EntityTransientCopyInternal.java | 12 +-
.../entity/basic/EntityTypeSnapshot.java | 7 +-
.../brooklyn/entity/basic/ExplicitEffector.java | 4 +-
.../java/brooklyn/entity/basic/Lifecycle.java | 2 +-
.../brooklyn/entity/basic/MethodEffector.java | 6 +-
.../entity/basic/ServiceStateLogic.java | 7 +-
.../entity/basic/StartableApplication.java | 3 +-
.../drivers/BasicEntityDriverManager.java | 4 +
.../drivers/ReflectiveEntityDriverFactory.java | 2 +
.../drivers/RegistryEntityDriverFactory.java | 6 +-
.../downloads/BasicDownloadRequirement.java | 5 +-
.../downloads/BasicDownloadResolver.java | 2 +
.../drivers/downloads/BasicDownloadTargets.java | 3 +-
.../downloads/BasicDownloadsManager.java | 5 +-
.../DownloadProducerFromCloudsoftRepo.java | 4 +-
.../DownloadProducerFromLocalRepo.java | 4 +-
.../DownloadProducerFromProperties.java | 8 +-
.../DownloadProducerFromUrlAttribute.java | 5 +-
.../drivers/downloads/DownloadSubstituters.java | 8 +-
.../drivers/downloads/FilenameProducers.java | 5 +-
.../entity/effector/AddChildrenEffector.java | 4 +-
.../brooklyn/entity/effector/AddEffector.java | 9 +-
.../brooklyn/entity/effector/AddSensor.java | 5 +-
.../entity/effector/EffectorAndBody.java | 5 +-
.../brooklyn/entity/effector/EffectorBase.java | 4 +-
.../brooklyn/entity/effector/EffectorTasks.java | 10 +-
.../entity/effector/EffectorWithBody.java | 3 +-
.../brooklyn/entity/effector/Effectors.java | 8 +-
.../group/AbstractMembershipTrackingPolicy.java | 6 +-
.../java/brooklyn/entity/group/Cluster.java | 3 +-
.../brooklyn/entity/group/DynamicCluster.java | 9 +-
.../entity/group/DynamicClusterImpl.java | 6 +-
.../brooklyn/entity/group/DynamicFabric.java | 5 +-
.../entity/group/DynamicFabricImpl.java | 6 +-
.../entity/group/DynamicMultiGroup.java | 9 +-
.../entity/group/DynamicMultiGroupImpl.java | 7 +-
.../entity/group/DynamicRegionsFabric.java | 3 +-
.../entity/group/DynamicRegionsFabricImpl.java | 2 +-
.../brooklyn/entity/group/QuarantineGroup.java | 3 +-
.../entity/group/QuarantineGroupImpl.java | 2 +-
.../main/java/brooklyn/entity/group/Tier.java | 2 +-
.../zoneaware/AbstractZoneFailureDetector.java | 3 +-
.../BalancingNodePlacementStrategy.java | 2 +-
.../zoneaware/CombiningZoneFailureDetector.java | 3 +-
.../proxying/BasicEntityTypeRegistry.java | 8 +-
.../entity/proxying/EntityProxyImpl.java | 6 +-
.../entity/proxying/InternalEntityFactory.java | 11 +-
.../entity/proxying/InternalPolicyFactory.java | 2 +-
.../AbstractBrooklynObjectRebindSupport.java | 2 +
.../rebind/ActivePartialRebindIteration.java | 4 +-
.../rebind/BasicCatalogItemRebindSupport.java | 1 +
.../rebind/BasicEnricherRebindSupport.java | 1 +
.../entity/rebind/BasicEntityRebindSupport.java | 8 +-
.../entity/rebind/BasicFeedRebindSupport.java | 1 +
.../rebind/BasicLocationRebindSupport.java | 1 +
.../entity/rebind/BasicPolicyRebindSupport.java | 1 +
.../rebind/ImmediateDeltaChangeListener.java | 4 +-
.../rebind/InitialFullRebindIteration.java | 3 +-
.../rebind/PeriodicDeltaChangeListener.java | 7 +-
.../rebind/PersistenceExceptionHandlerImpl.java | 2 +
.../entity/rebind/PersisterDeltaImpl.java | 1 +
.../entity/rebind/RebindContextImpl.java | 6 +-
.../rebind/RebindContextLookupContext.java | 7 +-
.../rebind/RebindExceptionHandlerImpl.java | 12 +-
.../brooklyn/entity/rebind/RebindIteration.java | 10 +-
.../entity/rebind/RebindManagerImpl.java | 8 +-
.../entity/rebind/dto/BasicEntityMemento.java | 8 +-
.../rebind/dto/BrooklynMementoManifestImpl.java | 3 +-
.../entity/rebind/dto/MementosGenerators.java | 8 +-
.../BrooklynMementoPersisterToObjectStore.java | 6 +-
.../persister/BrooklynPersistenceUtils.java | 8 +-
.../rebind/persister/XmlMementoSerializer.java | 8 +-
.../rebind/transformer/CompoundTransformer.java | 4 +-
.../java/brooklyn/entity/trait/Changeable.java | 3 +-
.../java/brooklyn/entity/trait/Startable.java | 10 +-
.../brooklyn/entity/trait/StartableMethods.java | 4 +-
.../java/brooklyn/event/basic/AttributeMap.java | 2 +-
.../basic/AttributeSensorAndConfigKey.java | 4 +-
.../basic/BasicAttributeSensorAndConfigKey.java | 2 +-
.../java/brooklyn/event/basic/BasicSensor.java | 3 +-
.../brooklyn/event/basic/BasicSensorEvent.java | 2 +-
.../event/basic/DependentConfiguration.java | 4 +-
.../basic/PortAttributeSensorAndConfigKey.java | 2 +-
...platedStringAttributeSensorAndConfigKey.java | 2 +-
.../java/brooklyn/event/feed/AbstractFeed.java | 6 +-
.../event/feed/AttributePollHandler.java | 2 +-
.../brooklyn/event/feed/ConfigToAttributes.java | 2 +-
.../main/java/brooklyn/event/feed/Poller.java | 2 +-
.../event/feed/function/FunctionFeed.java | 2 +-
.../java/brooklyn/event/feed/http/HttpFeed.java | 4 +-
.../brooklyn/event/feed/shell/ShellFeed.java | 2 +-
.../java/brooklyn/event/feed/ssh/SshFeed.java | 4 +-
.../windows/WindowsPerformanceCounterFeed.java | 4 +-
.../location/access/BrooklynAccessUtils.java | 2 +-
.../access/PortForwardManagerAuthority.java | 3 +-
.../access/PortForwardManagerClient.java | 3 +-
.../location/access/PortForwardManagerImpl.java | 4 +-
.../location/basic/AbstractLocation.java | 4 +-
.../location/basic/LocationInternal.java | 2 +-
.../java/brooklyn/location/basic/Locations.java | 2 +-
.../java/brooklyn/location/basic/Machines.java | 2 +-
.../cloud/names/AbstractCloudMachineNamer.java | 5 +-
.../cloud/names/BasicCloudMachineNamer.java | 5 +-
.../location/cloud/names/CloudMachineNamer.java | 3 +-
.../cloud/names/CustomMachineNamer.java | 3 +-
.../location/dynamic/DynamicLocation.java | 3 +-
.../location/dynamic/LocationOwner.java | 3 +-
.../java/brooklyn/location/geo/HostGeoInfo.java | 2 +-
.../entitlement/EntitlementManagerAdapter.java | 2 +-
.../management/entitlement/Entitlements.java | 2 +-
.../management/ha/BasicMasterChooser.java | 2 +-
.../ha/HighAvailabilityManagerImpl.java | 8 +-
.../internal/AbstractManagementContext.java | 10 +-
.../internal/AbstractSubscriptionManager.java | 4 +-
.../internal/BasicSubscriptionContext.java | 4 +-
.../internal/BrooklynGarbageCollector.java | 2 +-
.../management/internal/EffectorUtils.java | 6 +-
.../internal/EntityChangeListener.java | 4 +-
.../internal/EntityManagementSupport.java | 8 +-
.../internal/EntityManagementUtils.java | 8 +-
.../internal/EntityManagerInternal.java | 5 +-
.../management/internal/LocalAccessManager.java | 2 +-
.../management/internal/LocalEntityManager.java | 10 +-
.../internal/LocalManagementContext.java | 6 +-
.../internal/LocalSubscriptionManager.java | 2 +-
.../management/internal/LocalUsageManager.java | 4 +-
.../internal/ManagementContextInternal.java | 4 +-
.../internal/NonDeploymentEntityManager.java | 9 +-
.../NonDeploymentManagementContext.java | 18 +-
.../internal/NonDeploymentUsageManager.java | 3 +-
.../internal/QueueingSubscriptionManager.java | 2 +-
.../management/internal/Subscription.java | 2 +-
.../internal/SubscriptionTracker.java | 4 +-
.../management/internal/UsageListener.java | 3 +-
.../management/internal/UsageManager.java | 3 +-
.../policy/basic/AbstractEntityAdjunct.java | 8 +-
.../brooklyn/policy/basic/AbstractPolicy.java | 4 +-
.../brooklyn/policy/basic/ConfigMapImpl.java | 2 +-
.../java/brooklyn/policy/basic/Policies.java | 4 +-
.../main/java/brooklyn/util/ResourceUtils.java | 2 +-
.../java/brooklyn/util/flags/FlagUtils.java | 2 +-
.../java/brooklyn/util/flags/TypeCoercions.java | 2 +-
.../util/task/BasicExecutionContext.java | 2 +-
.../java/brooklyn/util/task/DynamicTasks.java | 2 +-
.../java/brooklyn/util/task/ValueResolver.java | 2 +-
.../java/brooklyn/util/task/ssh/SshTasks.java | 2 +-
.../brooklyn/util/text/TemplateProcessor.java | 4 +-
.../brooklyn/camp/lite/CampYamlLiteTest.java | 4 +-
.../camp/lite/TestAppAssemblyInstantiator.java | 2 +-
.../catalog/internal/CatalogScanTest.java | 6 +-
.../catalog/internal/CatalogTestUtils.java | 3 +-
...stomAggregatingEnricherDeprecatedTest.groovy | 2 +-
.../enricher/CustomAggregatingEnricherTest.java | 4 +-
.../java/brooklyn/enricher/EnrichersTest.java | 2 +-
...SensorPropagatingEnricherDeprecatedTest.java | 2 +-
.../enricher/SensorPropagatingEnricherTest.java | 2 +-
.../TransformingEnricherDeprecatedTest.groovy | 2 +-
.../enricher/TransformingEnricherTest.java | 2 +-
.../enricher/basic/BasicEnricherTest.java | 2 +-
.../YamlRollingTimeWindowMeanEnricherTest.java | 2 +-
.../YamlTimeWeightedDeltaEnricherTest.java | 2 +-
.../entity/BrooklynAppUnitTestSupport.java | 2 +-
.../brooklyn/entity/EffectorMetadataTest.java | 9 +-
.../entity/EffectorSayHiGroovyTest.groovy | 9 +-
.../java/brooklyn/entity/EffectorSayHiTest.java | 7 +-
.../entity/EntityPreManagementTest.java | 4 +-
.../java/brooklyn/entity/SetFromFlagTest.java | 1 +
.../basic/AbstractApplicationLegacyTest.java | 2 +-
.../entity/basic/AbstractEntityLegacyTest.java | 6 +-
.../brooklyn/entity/basic/AttributeMapTest.java | 2 +-
.../entity/basic/BasicStartableTest.java | 4 +-
.../entity/basic/BrooklynShutdownHooksTest.java | 2 +-
.../basic/ConfigEntityInheritanceTest.java | 4 +-
.../brooklyn/entity/basic/ConfigMapTest.java | 2 +-
.../brooklyn/entity/basic/DataEntityTest.java | 2 +-
.../basic/DependentConfigurationTest.java | 2 +-
.../entity/basic/DynamicEntityTest.java | 5 +-
.../brooklyn/entity/basic/DynamicGroupTest.java | 5 +-
.../brooklyn/entity/basic/EntitiesTest.java | 2 +-
.../entity/basic/EntityConfigMapUsageTest.java | 3 +-
.../brooklyn/entity/basic/EntityConfigTest.java | 2 +-
.../entity/basic/EntityFunctionsTest.java | 2 +-
.../entity/basic/EntityPredicatesTest.java | 2 +-
.../entity/basic/EntityRegistrationTest.java | 4 +-
.../brooklyn/entity/basic/EntitySpecTest.java | 4 +-
.../entity/basic/EntitySubscriptionTest.java | 3 +-
.../entity/basic/EntitySuppliersTest.java | 2 +-
.../brooklyn/entity/basic/EntityTypeTest.java | 6 +-
.../basic/MapConfigKeyAndFriendsMoreTest.java | 2 +-
...apListAndOtherStructuredConfigKeyTest.groovy | 4 +-
.../entity/basic/OwnedChildrenTest.java | 5 +-
.../entity/basic/PolicyRegistrationTest.java | 2 +-
.../entity/basic/ServiceStateLogicTest.java | 4 +-
.../drivers/BasicEntityDriverManagerTest.java | 1 +
.../drivers/EntityDriverRegistryTest.java | 1 +
.../ReflectiveEntityDriverFactoryTest.java | 7 +-
.../RegistryEntityDriverFactoryTest.java | 5 +-
.../downloads/BasicDownloadsRegistryTest.java | 3 +-
.../DownloadProducerFromLocalRepoTest.java | 6 +-
.../DownloadProducerFromPropertiesTest.java | 6 +-
.../downloads/DownloadSubstitutersTest.java | 4 +-
.../drivers/downloads/MyEntityDriver.java | 7 +-
.../entity/effector/EffectorBasicTest.java | 4 +-
.../effector/EffectorConcatenateTest.java | 2 +-
.../entity/effector/EffectorTaskTest.java | 6 +-
.../entity/group/DynamicClusterTest.java | 4 +-
...DynamicClusterWithAvailabilityZonesTest.java | 6 +-
.../entity/group/DynamicFabricTest.java | 6 +-
.../entity/group/DynamicMultiGroupTest.java | 4 +-
.../entity/group/DynamicRegionsFabricTest.java | 4 +-
.../entity/group/GroupPickUpEntitiesTest.java | 8 +-
.../java/brooklyn/entity/group/GroupTest.java | 6 +-
.../group/MembershipTrackingPolicyTest.java | 4 +-
.../entity/group/QuarantineGroupTest.java | 2 +-
.../BalancingNodePlacementStrategyTest.java | 4 +-
.../ProportionalZoneFailureDetectorTest.java | 2 +-
.../java/brooklyn/entity/hello/HelloEntity.java | 3 +-
.../entity/hello/LocalEntitiesTest.java | 4 +-
.../ApplicationBuilderOverridingTest.java | 5 +-
.../proxying/BasicEntityTypeRegistryTest.java | 3 +-
.../entity/proxying/EntityManagerTest.java | 1 +
.../entity/proxying/EntityProxyTest.java | 5 +-
.../proxying/InternalEntityFactoryTest.java | 5 +-
.../entity/rebind/ActivePartialRebindTest.java | 4 +-
.../rebind/ActivePartialRebindVersionTest.java | 6 +-
.../entity/rebind/CheckpointEntityTest.java | 4 +-
.../entity/rebind/RebindCatalogEntityTest.java | 4 +-
.../entity/rebind/RebindCatalogItemTest.java | 2 +-
...talogWhenCatalogPersistenceDisabledTest.java | 3 +-
.../entity/rebind/RebindDynamicGroupTest.java | 4 +-
.../entity/rebind/RebindEnricherTest.java | 4 +-
.../rebind/RebindEntityDynamicTypeInfoTest.java | 4 +-
.../entity/rebind/RebindEntityTest.java | 14 +-
.../entity/rebind/RebindFailuresTest.java | 9 +-
.../brooklyn/entity/rebind/RebindFeedTest.java | 4 +-
.../entity/rebind/RebindFeedWithHaTest.java | 4 +-
.../brooklyn/entity/rebind/RebindGroupTest.java | 6 +-
.../entity/rebind/RebindLocationTest.java | 4 +-
.../entity/rebind/RebindManagerSorterTest.java | 6 +-
.../entity/rebind/RebindManagerTest.java | 4 +-
.../brooklyn/entity/rebind/RebindOptions.java | 1 +
.../entity/rebind/RebindPolicyTest.java | 6 +-
.../entity/rebind/RebindTestFixture.java | 4 +-
.../entity/rebind/RebindTestFixtureWithApp.java | 2 +-
.../brooklyn/entity/rebind/RebindTestUtils.java | 8 +-
.../rebind/RecordingRebindExceptionHandler.java | 4 +-
.../BrooklynMementoPersisterTestFixture.java | 8 +-
.../persister/XmlMementoSerializerTest.java | 8 +-
.../CompoundTransformerLoaderTest.java | 2 +-
.../transformer/CompoundTransformerTest.java | 10 +-
.../brooklyn/entity/trait/FailingEntity.java | 4 +-
.../entity/trait/StartableMethodsTest.java | 2 +-
.../event/feed/ConfigToAttributesTest.java | 2 +-
.../java/brooklyn/event/feed/PollerTest.java | 2 +-
.../event/feed/function/FunctionFeedTest.java | 6 +-
.../feed/http/HttpFeedIntegrationTest.java | 4 +-
.../brooklyn/event/feed/http/HttpFeedTest.java | 4 +-
.../feed/shell/ShellFeedIntegrationTest.java | 4 +-
.../event/feed/ssh/SshFeedIntegrationTest.java | 6 +-
.../WindowsPerformanceCounterFeedLiveTest.java | 4 +-
.../WindowsPerformanceCounterFeedTest.java | 4 +-
.../access/PortForwardManagerRebindTest.java | 2 +-
.../location/basic/MultiLocationRebindTest.java | 2 +-
.../location/basic/SshMachineLocationTest.java | 8 +-
.../basic/TestPortSupplierLocation.java | 2 +-
.../location/cloud/CloudMachineNamerTest.java | 2 +-
.../location/cloud/CustomMachineNamerTest.java | 2 +-
.../AcmeEntitlementManagerTestFixture.java | 4 +-
.../entitlement/EntitlementsTest.java | 4 +-
.../entitlement/EntityEntitlementTest.java | 4 +-
.../ha/HighAvailabilityManagerInMemoryTest.java | 4 +-
.../HighAvailabilityManagerSplitBrainTest.java | 2 +-
.../brooklyn/management/ha/HotStandbyTest.java | 8 +-
.../management/internal/AccessManagerTest.java | 2 +-
.../internal/EntityExecutionManagerTest.java | 4 +-
.../internal/LocalSubscriptionManagerTest.java | 4 +-
.../management/osgi/OsgiStandaloneTest.java | 4 +-
.../osgi/OsgiVersionMoreEntityTest.java | 4 +-
.../policy/basic/PolicySubscriptionTest.java | 2 +-
.../EntityCleanupLongevityTestFixture.java | 2 +-
.../qa/performance/EntityPerformanceTest.java | 2 +-
.../EntityPersistencePerformanceTest.java | 2 +-
.../SubscriptionPerformanceTest.java | 2 +-
.../java/brooklyn/test/policy/TestEnricher.java | 3 +-
.../brooklyn/util/internal/FlagUtilsTest.java | 2 +-
.../util/text/TemplateProcessorTest.java | 2 +-
.../brooklyn/test/entity/BlockingEntity.java | 3 +-
.../brooklyn/test/entity/TestApplication.java | 6 +-
.../test/entity/TestApplicationImpl.java | 6 +-
.../brooklyn/test/entity/TestCluster.java | 5 +-
.../apache/brooklyn/test/entity/TestEntity.java | 8 +-
.../brooklyn/test/entity/TestEntityImpl.java | 4 +-
.../brooklyn/demo/GlobalWebFabricExample.java | 5 +-
.../brooklyn/demo/KafkaClusterExample.java | 4 +-
.../demo/StandaloneQpidBrokerExample.java | 4 +-
.../brooklyn/demo/CumulusRDFApplication.java | 6 +-
.../demo/HighAvailabilityCassandraCluster.java | 2 +-
.../brooklyn/demo/ResilientMongoDbApp.java | 7 +-
.../brooklyn/demo/RiakClusterExample.java | 2 +-
.../brooklyn/demo/SimpleCassandraCluster.java | 4 +-
.../brooklyn/demo/SimpleCouchDBCluster.java | 2 +-
.../brooklyn/demo/SimpleMongoDBReplicaSet.java | 2 +-
.../brooklyn/demo/SimpleRedisCluster.java | 2 +-
.../apache/brooklyn/demo/StormSampleApp.java | 6 +-
.../brooklyn/demo/WideAreaCassandraCluster.java | 2 +-
.../brooklyn/demo/NodeJsTodoApplication.java | 3 +-
.../brooklyn/demo/SingleWebServerExample.java | 3 +-
.../demo/WebClusterDatabaseExample.java | 3 +-
.../demo/WebClusterDatabaseExampleApp.java | 5 +-
.../apache/brooklyn/demo/WebClusterExample.java | 3 +-
...lusterDatabaseExampleAppIntegrationTest.java | 4 +-
.../location/jclouds/BrooklynMachinePool.java | 2 +-
.../location/jclouds/JcloudsLocation.java | 2 +-
.../JcloudsLocationSecurityGroupCustomizer.java | 2 +-
.../policy/os/AdvertiseWinrmLoginPolicy.java | 4 +-
.../brooklyn/policy/os/CreateUserPolicy.java | 4 +-
.../location/jclouds/LiveTestEntity.java | 2 +-
.../jclouds/RebindJcloudsLocationLiveTest.java | 2 +-
.../os/AdvertiseWinrmLoginPolicyTest.java | 2 +-
.../policy/os/CreateUserPolicyLiveTest.java | 2 +-
.../policy/os/CreateUserPolicyTest.java | 2 +-
.../java/brooklyn/enricher/DeltaEnricher.java | 4 +-
.../brooklyn/enricher/HttpLatencyDetector.java | 4 +-
.../brooklyn/enricher/RollingMeanEnricher.java | 3 +-
.../enricher/RollingTimeWindowMeanEnricher.java | 3 +-
.../enricher/TimeFractionDeltaEnricher.java | 4 +-
.../enricher/TimeWeightedDeltaEnricher.java | 2 +-
.../entity/brooklyn/BrooklynMetrics.java | 5 +-
.../policy/autoscaling/AutoScalerPolicy.java | 4 +-
.../policy/autoscaling/ResizeOperator.java | 2 +-
.../policy/followthesun/FollowTheSunPolicy.java | 4 +-
.../policy/followthesun/FollowTheSunPool.java | 7 +-
.../followthesun/FollowTheSunPoolImpl.java | 4 +-
.../followthesun/FollowTheSunStrategy.java | 2 +-
.../policy/ha/AbstractFailureDetector.java | 2 +-
.../policy/ha/ConditionalSuspendPolicy.java | 2 +-
.../brooklyn/policy/ha/ServiceReplacer.java | 8 +-
.../brooklyn/policy/ha/ServiceRestarter.java | 4 +-
.../loadbalancing/BalanceableContainer.java | 3 +-
.../loadbalancing/BalanceableWorkerPool.java | 7 +-
.../BalanceableWorkerPoolImpl.java | 4 +-
.../policy/loadbalancing/BalancingStrategy.java | 2 +-
.../loadbalancing/ItemsInContainersGroup.java | 7 +-
.../ItemsInContainersGroupImpl.java | 4 +-
.../loadbalancing/LoadBalancingPolicy.java | 4 +-
.../brooklyn/policy/loadbalancing/Movable.java | 3 +-
.../enricher/DeltaEnrichersTests.groovy | 2 +-
.../enricher/HttpLatencyDetectorTest.java | 4 +-
.../enricher/RollingMeanEnricherTest.groovy | 2 +-
.../RollingTimeWindowMeanEnricherTest.groovy | 2 +-
.../enricher/TimeFractionDeltaEnricherTest.java | 4 +-
.../entity/brooklyn/BrooklynMetricsTest.java | 4 +-
.../autoscaling/AutoScalerPolicyMetricTest.java | 2 +-
.../autoscaling/AutoScalerPolicyRebindTest.java | 2 +-
.../AutoScalerPolicyReconfigurationTest.java | 2 +-
.../autoscaling/AutoScalerPolicyTest.java | 4 +-
.../autoscaling/LocallyResizableEntity.java | 2 +-
.../AbstractFollowTheSunPolicyTest.java | 8 +-
.../FollowTheSunPolicySoakTest.java | 4 +-
.../followthesun/FollowTheSunPolicyTest.java | 4 +-
.../brooklyn/policy/ha/HaPolicyRebindTest.java | 4 +-
...ServiceFailureDetectorStabilizationTest.java | 2 +-
.../policy/ha/ServiceFailureDetectorTest.java | 2 +-
.../brooklyn/policy/ha/ServiceReplacerTest.java | 4 +-
.../policy/ha/ServiceRestarterTest.java | 2 +-
.../AbstractLoadBalancingPolicyTest.java | 8 +-
.../BalanceableWorkerPoolTest.java | 6 +-
.../ItemsInContainersGroupTest.java | 6 +-
.../LoadBalancingPolicyConcurrencyTest.java | 2 +-
.../LoadBalancingPolicySoakTest.java | 4 +-
.../loadbalancing/LoadBalancingPolicyTest.java | 2 +-
.../loadbalancing/MockContainerEntity.java | 7 +-
.../loadbalancing/MockContainerEntityImpl.java | 2 +-
.../policy/loadbalancing/MockItemEntity.java | 5 +-
.../loadbalancing/MockItemEntityImpl.java | 2 +-
.../basic/AbstractSoftwareProcessDriver.java | 5 +-
.../basic/AbstractSoftwareProcessSshDriver.java | 3 +-
.../AbstractSoftwareProcessWinRmDriver.java | 1 +
.../entity/basic/EmptySoftwareProcess.java | 2 +-
.../SameServerDriverLifecycleEffectorTasks.java | 2 +-
.../brooklyn/entity/basic/SameServerEntity.java | 5 +-
.../brooklyn/entity/basic/SoftwareProcess.java | 3 +-
.../entity/basic/SoftwareProcessDriver.java | 4 +-
.../entity/basic/SoftwareProcessImpl.java | 7 +-
.../entity/basic/VanillaSoftwareProcess.java | 3 +-
.../basic/VanillaSoftwareProcessSshDriver.java | 4 +-
.../entity/basic/VanillaWindowsProcess.java | 3 +-
.../basic/VanillaWindowsProcessWinRmDriver.java | 2 +
.../entity/brooklynnode/BrooklynCluster.java | 7 +-
.../brooklynnode/BrooklynClusterImpl.java | 2 +-
.../brooklynnode/BrooklynEntityMirror.java | 5 +-
.../brooklynnode/BrooklynEntityMirrorImpl.java | 2 +-
.../entity/brooklynnode/BrooklynNode.java | 4 +-
.../entity/brooklynnode/BrooklynNodeImpl.java | 4 +-
.../brooklynnode/EntityHttpClientImpl.java | 2 +-
.../entity/brooklynnode/LocalBrooklynNode.java | 2 +-
.../brooklynnode/RemoteEffectorBuilder.java | 3 +-
.../BrooklynClusterUpgradeEffectorBody.java | 8 +-
.../BrooklynNodeUpgradeEffectorBody.java | 8 +-
.../effector/SelectMasterEffectorBody.java | 6 +-
.../SetHighAvailabilityModeEffectorBody.java | 2 +-
...SetHighAvailabilityPriorityEffectorBody.java | 2 +-
.../brooklyn/entity/chef/ChefAttributeFeed.java | 2 +-
.../java/brooklyn/entity/chef/ChefConfigs.java | 5 +-
.../java/brooklyn/entity/chef/ChefEntity.java | 3 +-
.../entity/chef/ChefLifecycleEffectorTasks.java | 2 +-
.../brooklyn/entity/chef/ChefSoloDriver.java | 2 +-
.../java/brooklyn/entity/chef/ChefTasks.java | 2 +-
.../entity/chef/KnifeConvergeTaskFactory.java | 3 +-
.../brooklyn/entity/chef/KnifeTaskFactory.java | 3 +-
.../java/brooklyn/entity/java/JavaAppUtils.java | 5 +-
.../java/JavaSoftwareProcessSshDriver.java | 2 +-
.../java/brooklyn/entity/java/JmxSupport.java | 4 +-
.../main/java/brooklyn/entity/java/UsesJmx.java | 3 +-
.../brooklyn/entity/java/VanillaJavaApp.java | 3 +-
.../entity/java/VanillaJavaAppImpl.java | 2 +-
.../brooklyn/entity/machine/MachineEntity.java | 3 +-
.../java/brooklyn/entity/pool/ServerPool.java | 7 +-
.../brooklyn/entity/pool/ServerPoolImpl.java | 2 +-
.../entity/pool/ServerPoolLocationResolver.java | 2 +-
.../entity/service/EntityLaunchListener.java | 2 +-
.../entity/service/InitdServiceInstaller.java | 4 +-
.../entity/service/SystemServiceEnricher.java | 4 +-
.../service/SystemServiceInstallerFactory.java | 3 +-
.../software/MachineLifecycleEffectorTasks.java | 4 +-
.../entity/software/SshEffectorTasks.java | 4 +-
.../brooklyn/entity/software/StaticSensor.java | 2 +-
.../entity/software/http/HttpRequestSensor.java | 4 +-
.../software/java/JmxAttributeSensor.java | 4 +-
.../entity/software/ssh/SshCommandEffector.java | 5 +-
.../entity/software/ssh/SshCommandSensor.java | 4 +-
.../winrm/WindowsPerformanceCounterSensors.java | 4 +-
.../java/brooklyn/event/feed/jmx/JmxFeed.java | 2 +-
.../java/brooklyn/event/feed/jmx/JmxHelper.java | 2 +-
...ctSoftwareProcessRestartIntegrationTest.java | 4 +-
.../entity/basic/DoNothingSoftwareProcess.java | 3 +-
.../basic/DoNothingSoftwareProcessDriver.java | 2 +
.../entity/basic/SameServerEntityTest.java | 4 +-
.../basic/SoftwareProcessEntityLatchTest.java | 5 +-
.../basic/SoftwareProcessEntityRebindTest.java | 3 +-
.../entity/basic/SoftwareProcessEntityTest.java | 7 +-
...SoftwareProcessSshDriverIntegrationTest.java | 5 +-
.../basic/SoftwareProcessSubclassTest.java | 4 +-
...ftwareProcessAndChildrenIntegrationTest.java | 2 +-
.../entity/basic/lifecycle/MyEntity.java | 3 +-
.../basic/lifecycle/ScriptHelperTest.java | 4 +-
.../basic/lifecycle/StartStopSshDriverTest.java | 2 +-
.../BrooklynClusterIntegrationTest.java | 4 +-
.../BrooklynNodeIntegrationTest.java | 8 +-
.../entity/brooklynnode/BrooklynNodeTest.java | 4 +-
.../brooklynnode/CallbackEntityHttpClient.java | 2 +-
.../brooklynnode/SelectMasterEffectorTest.java | 8 +-
.../entity/chef/ChefLiveTestSupport.java | 2 +-
.../ChefSoloDriverMySqlEntityLiveTest.java | 4 +-
...micChefAutodetectToyMySqlEntityLiveTest.java | 3 +-
...DynamicChefServerToyMySqlEntityLiveTest.java | 2 +-
.../DynamicChefSoloToyMySqlEntityLiveTest.java | 3 +-
.../chef/mysql/DynamicToyMySqlEntityChef.java | 4 +-
.../brooklyn/entity/driver/MockSshDriver.java | 3 +-
...rWithAvailabilityZonesMultiLocationTest.java | 6 +-
.../brooklyn/entity/java/EntityPollingTest.java | 2 +-
.../java/brooklyn/entity/java/JavaOptsTest.java | 2 +-
...SoftwareProcessSshDriverIntegrationTest.java | 4 +-
.../entity/java/VanillaJavaAppRebindTest.java | 2 +-
.../entity/java/VanillaJavaAppTest.java | 4 +-
.../machine/MachineEntityEc2LiveTest.java | 2 +-
.../entity/machine/MachineEntityRebindTest.java | 4 +-
.../entity/pool/AbstractServerPoolTest.java | 2 +-
.../entity/pool/ServerPoolLiveTest.java | 2 +-
.../pool/ServerPoolLocationResolverTest.java | 4 +-
.../entity/pool/ServerPoolRebindTest.java | 4 +-
.../brooklyn/entity/pool/ServerPoolTest.java | 2 +-
.../service/SystemServiceEnricherTest.java | 2 +-
.../MachineLifecycleEffectorTasksTest.java | 6 +-
.../entity/software/SoftwareEffectorTest.java | 2 +-
.../entity/software/StaticSensorTest.java | 2 +-
.../software/http/HttpRequestSensorTest.java | 4 +-
.../mysql/AbstractToyMySqlEntityTest.java | 2 +-
.../mysql/DynamicToyMySqlEntityBuilder.java | 8 +-
.../mysql/DynamicToyMySqlEntityTest.java | 2 +-
.../software/ssh/SshCommandIntegrationTest.java | 6 +-
.../PortAttributeSensorAndConfigKeyTest.java | 4 +-
.../brooklyn/event/feed/jmx/JmxFeedTest.java | 4 +-
.../event/feed/jmx/RebindJmxFeedTest.java | 4 +-
.../basic/MachineDetailsEc2LiveTest.java | 4 +-
.../MachineDetailsGoogleComputeLiveTest.java | 4 +-
.../usage/ApplicationUsageTrackingTest.java | 2 +-
.../usage/LocationUsageTrackingTest.java | 4 +-
.../src/test/java/brooklyn/test/JmxService.java | 2 +-
.../entity/database/DatastoreMixins.java | 5 +-
.../entity/database/crate/CrateNode.java | 3 +-
.../database/crate/CrateNodeSshDriver.java | 3 +-
.../entity/database/mariadb/MariaDbNode.java | 5 +-
.../entity/database/mysql/MySqlCluster.java | 2 +-
.../entity/database/mysql/MySqlClusterImpl.java | 7 +-
.../entity/database/mysql/MySqlNode.java | 5 +-
.../entity/database/mysql/MySqlNodeImpl.java | 2 +-
.../database/postgresql/PostgreSqlNode.java | 7 +-
.../PostgreSqlNodeChefImplFromScratch.java | 2 +-
.../database/postgresql/PostgreSqlSpecs.java | 3 +-
.../entity/database/rubyrep/RubyRepNode.java | 3 +-
.../database/rubyrep/RubyRepSshDriver.java | 2 +-
.../crate/CrateNodeIntegrationTest.java | 2 +-
.../mariadb/MariaDbIntegrationTest.java | 2 +-
.../database/mariadb/MariaDbLiveEc2Test.java | 2 +-
.../mariadb/MariaDbLiveRackspaceTest.java | 2 +-
.../mysql/MySqlClusterIntegrationTest.java | 2 +-
.../database/mysql/MySqlClusterTestHelper.java | 2 +-
.../database/mysql/MySqlIntegrationTest.java | 2 +-
.../entity/database/mysql/MySqlLiveEc2Test.java | 2 +-
.../entity/database/mysql/MySqlLiveGceTest.java | 2 +-
.../database/mysql/MySqlLiveRackspaceTest.java | 2 +-
.../mysql/MySqlRestartIntegrationTest.java | 2 +-
.../database/mysql/MysqlDockerLiveTest.java | 4 +-
.../postgresql/PostgreSqDockerLiveTest.java | 4 +-
.../postgresql/PostgreSqlEc2LiveTest.java | 2 +-
.../postgresql/PostgreSqlGceLiveTest.java | 2 +-
.../postgresql/PostgreSqlIntegrationTest.java | 2 +-
.../postgresql/PostgreSqlRackspaceLiveTest.java | 2 +-
.../PostgreSqlRebindIntegrationTest.java | 2 +-
.../PostgreSqlRestartIntegrationTest.java | 2 +-
.../database/rubyrep/RubyRepEc2LiveTest.java | 2 +-
.../rubyrep/RubyRepIntegrationTest.java | 2 +-
.../rubyrep/RubyRepRackspaceLiveTest.java | 2 +-
.../entity/messaging/MessageBroker.java | 3 +-
.../messaging/activemq/ActiveMQBroker.java | 5 +-
.../messaging/activemq/ActiveMQBrokerImpl.java | 4 +-
.../activemq/ActiveMQDestinationImpl.java | 5 +-
.../messaging/activemq/ActiveMQQueue.java | 3 +-
.../messaging/activemq/ActiveMQSpecs.java | 2 +-
.../messaging/activemq/ActiveMQTopic.java | 3 +-
.../entity/messaging/amqp/AmqpServer.java | 3 +-
.../entity/messaging/jms/JMSDestination.java | 2 +-
.../kafka/AbstractfKafkaSshDriver.java | 2 +-
.../entity/messaging/kafka/KafkaBroker.java | 5 +-
.../entity/messaging/kafka/KafkaBrokerImpl.java | 4 +-
.../entity/messaging/kafka/KafkaCluster.java | 9 +-
.../messaging/kafka/KafkaClusterImpl.java | 4 +-
.../entity/messaging/kafka/KafkaZooKeeper.java | 5 +-
.../messaging/kafka/KafkaZooKeeperImpl.java | 2 +-
.../entity/messaging/qpid/QpidBroker.java | 5 +-
.../entity/messaging/qpid/QpidBrokerImpl.java | 4 +-
.../messaging/qpid/QpidDestinationImpl.java | 2 +-
.../entity/messaging/qpid/QpidQueue.java | 3 +-
.../entity/messaging/qpid/QpidTopic.java | 3 +-
.../entity/messaging/rabbit/RabbitBroker.java | 5 +-
.../messaging/rabbit/RabbitBrokerImpl.java | 4 +-
.../brooklyn/entity/messaging/storm/Storm.java | 7 +-
.../entity/messaging/storm/StormDeployment.java | 5 +-
.../messaging/storm/StormDeploymentImpl.java | 2 +-
.../entity/messaging/storm/StormSshDriver.java | 4 +-
.../entity/zookeeper/AbstractZooKeeperImpl.java | 2 +-
.../entity/zookeeper/ZooKeeperEnsemble.java | 3 +-
.../entity/zookeeper/ZooKeeperEnsembleImpl.java | 4 +-
.../entity/zookeeper/ZooKeeperNode.java | 5 +-
.../entity/zookeeper/ZooKeeperNodeImpl.java | 2 +-
.../entity/zookeeper/ZooKeeperSshDriver.java | 3 +-
.../messaging/activemq/ActiveMQEc2LiveTest.java | 2 +-
.../activemq/ActiveMQGoogleComputeLiveTest.java | 2 +-
.../activemq/ActiveMQIntegrationTest.java | 2 +-
.../messaging/kafka/KafkaIntegrationTest.java | 2 +-
.../entity/messaging/kafka/KafkaLiveTest.java | 3 +-
.../entity/messaging/kafka/KafkaSupport.java | 2 +-
.../entity/messaging/qpid/QpidEc2LiveTest.java | 2 +-
.../messaging/qpid/QpidIntegrationTest.java | 2 +-
.../messaging/rabbit/RabbitEc2LiveTest.java | 2 +-
.../messaging/rabbit/RabbitIntegrationTest.java | 2 +-
.../storm/StormAbstractCloudLiveTest.java | 2 +-
.../messaging/storm/StormEc2LiveTest.java | 2 +-
.../zookeeper/ZooKeeperEc2LiveTest.java | 2 +-
.../zookeeper/ZooKeeperEnsembleLiveTest.java | 4 +-
.../entity/monitoring/monit/MonitNode.java | 5 +-
.../entity/monitoring/monit/MonitNodeImpl.java | 2 +-
.../monitoring/monit/MonitIntegrationTest.java | 2 +-
.../entity/network/bind/BindDnsServer.java | 5 +-
.../entity/network/bind/BindDnsServerImpl.java | 4 +-
.../bind/BindDnsServerIntegrationTest.java | 6 +-
.../network/bind/BindDnsServerLiveTest.java | 2 +-
.../bind/DoNothingSoftwareProcessDriver.java | 3 +-
.../network/bind/PrefixAndIdEnricher.java | 3 +-
.../network/bind/TestBindDnsServerImpl.java | 4 +-
.../nosql/cassandra/CassandraCluster.java | 2 +-
.../nosql/cassandra/CassandraDatacenter.java | 6 +-
.../cassandra/CassandraDatacenterImpl.java | 4 +-
.../entity/nosql/cassandra/CassandraFabric.java | 5 +-
.../nosql/cassandra/CassandraFabricImpl.java | 4 +-
.../entity/nosql/cassandra/CassandraNode.java | 9 +-
.../nosql/cassandra/CassandraNodeImpl.java | 2 +-
.../nosql/cassandra/CassandraNodeSshDriver.java | 4 +-
.../nosql/couchbase/CouchbaseCluster.java | 5 +-
.../nosql/couchbase/CouchbaseClusterImpl.java | 4 +-
.../entity/nosql/couchbase/CouchbaseNode.java | 5 +-
.../nosql/couchbase/CouchbaseNodeDriver.java | 3 +-
.../nosql/couchbase/CouchbaseNodeImpl.java | 2 +-
.../nosql/couchbase/CouchbaseNodeSshDriver.java | 4 +-
.../nosql/couchbase/CouchbaseSyncGateway.java | 5 +-
.../CouchbaseSyncGatewaySshDriver.java | 7 +-
.../entity/nosql/couchdb/CouchDBCluster.java | 3 +-
.../nosql/couchdb/CouchDBClusterImpl.java | 2 +-
.../entity/nosql/couchdb/CouchDBNode.java | 4 +-
.../elasticsearch/ElasticSearchCluster.java | 3 +-
.../elasticsearch/ElasticSearchClusterImpl.java | 3 +-
.../nosql/elasticsearch/ElasticSearchNode.java | 4 +-
.../ElasticSearchNodeSshDriver.java | 3 +-
.../nosql/mongodb/AbstractMongoDBServer.java | 3 +-
.../nosql/mongodb/AbstractMongoDBSshDriver.java | 2 +-
.../entity/nosql/mongodb/MongoDBClient.java | 4 +-
.../nosql/mongodb/MongoDBClientSshDriver.java | 4 +-
.../entity/nosql/mongodb/MongoDBReplicaSet.java | 3 +-
.../nosql/mongodb/MongoDBReplicaSetImpl.java | 4 +-
.../entity/nosql/mongodb/MongoDBServer.java | 4 +-
.../sharding/CoLocatedMongoDBRouter.java | 5 +-
.../sharding/CoLocatedMongoDBRouterImpl.java | 3 +-
.../mongodb/sharding/MongoDBConfigServer.java | 3 +-
.../sharding/MongoDBConfigServerCluster.java | 3 +-
.../MongoDBConfigServerClusterImpl.java | 5 +-
.../nosql/mongodb/sharding/MongoDBRouter.java | 2 +-
.../mongodb/sharding/MongoDBRouterCluster.java | 3 +-
.../sharding/MongoDBRouterClusterImpl.java | 4 +-
.../mongodb/sharding/MongoDBShardCluster.java | 3 +-
.../sharding/MongoDBShardClusterImpl.java | 4 +-
.../sharding/MongoDBShardedDeployment.java | 8 +-
.../sharding/MongoDBShardedDeploymentImpl.java | 6 +-
.../entity/nosql/redis/RedisCluster.java | 5 +-
.../entity/nosql/redis/RedisClusterImpl.java | 3 +-
.../brooklyn/entity/nosql/redis/RedisShard.java | 4 +-
.../brooklyn/entity/nosql/redis/RedisSlave.java | 3 +-
.../brooklyn/entity/nosql/redis/RedisStore.java | 3 +-
.../brooklyn/entity/nosql/riak/RiakCluster.java | 5 +-
.../entity/nosql/riak/RiakClusterImpl.java | 4 +-
.../brooklyn/entity/nosql/riak/RiakNode.java | 3 +-
.../brooklyn/entity/nosql/solr/SolrServer.java | 5 +-
.../CassandraDatacenterIntegrationTest.java | 2 +-
.../cassandra/CassandraDatacenterLiveTest.java | 4 +-
...assandraDatacenterRebindIntegrationTest.java | 2 +-
.../cassandra/CassandraDatacenterTest.java | 4 +-
.../nosql/cassandra/CassandraFabricTest.java | 8 +-
.../cassandra/CassandraNodeEc2LiveTest.java | 2 +-
.../cassandra/CassandraNodeIntegrationTest.java | 2 +-
.../nosql/cassandra/CassandraNodeLiveTest.java | 2 +-
.../CouchbaseSyncGatewayEc2LiveTest.java | 2 +-
.../nosql/couchdb/CouchDBClusterLiveTest.java | 2 +-
.../nosql/couchdb/CouchDBNodeEc2LiveTest.java | 2 +-
.../couchdb/CouchDBNodeIntegrationTest.java | 2 +-
.../nosql/couchdb/CouchDBNodeLiveTest.java | 2 +-
.../ElasticSearchClusterIntegrationTest.java | 4 +-
.../ElasticSearchNodeIntegrationTest.java | 2 +-
.../nosql/mongodb/MongoDBEc2LiveTest.java | 2 +-
.../nosql/mongodb/MongoDBIntegrationTest.java | 2 +-
.../mongodb/MongoDBRebindIntegrationTest.java | 2 +-
.../mongodb/MongoDBReplicaSetEc2LiveTest.java | 2 +-
.../MongoDBReplicaSetIntegrationTest.java | 4 +-
.../mongodb/MongoDBRestartIntegrationTest.java | 2 +-
.../nosql/mongodb/MongoDBSoftLayerLiveTest.java | 2 +-
.../MongoDBConfigServerIntegrationTest.java | 2 +-
.../MongoDBShardedDeploymentEc2LiveTest.java | 4 +-
...MongoDBShardedDeploymentIntegrationTest.java | 4 +-
.../redis/RedisClusterIntegrationTest.java | 2 +-
.../entity/nosql/redis/RedisEc2LiveTest.java | 2 +-
.../nosql/redis/RedisIntegrationTest.java | 2 +-
.../nosql/riak/RiakClusterEc2LiveTest.java | 2 +-
.../entity/nosql/riak/RiakNodeEc2LiveTest.java | 2 +-
.../riak/RiakNodeGoogleComputeLiveTest.java | 2 +-
.../nosql/riak/RiakNodeIntegrationTest.java | 2 +-
.../nosql/riak/RiakNodeSoftlayerLiveTest.java | 2 +-
.../nosql/solr/SolrServerEc2LiveTest.java | 2 +-
.../nosql/solr/SolrServerIntegrationTest.java | 2 +-
.../entity/nosql/solr/SolrServerLiveTest.java | 2 +-
.../entity/osgi/karaf/KarafContainer.java | 3 +-
.../osgi/karaf/KarafContainerEc2LiveTest.java | 2 +-
.../entity/osgi/karaf/KarafContainerTest.java | 2 +-
.../entity/dns/AbstractGeoDnsService.java | 5 +-
.../entity/dns/AbstractGeoDnsServiceImpl.java | 4 +-
.../dns/geoscaling/GeoscalingDnsService.java | 2 +-
.../entity/proxy/AbstractController.java | 3 +-
.../entity/proxy/AbstractControllerImpl.java | 4 +-
.../proxy/AbstractNonProvisionedController.java | 4 +-
.../AbstractNonProvisionedControllerImpl.java | 4 +-
.../brooklyn/entity/proxy/LoadBalancer.java | 4 +-
.../entity/proxy/LoadBalancerCluster.java | 3 +-
.../entity/proxy/LoadBalancerClusterImpl.java | 3 +-
.../entity/proxy/nginx/NginxController.java | 4 +-
.../entity/proxy/nginx/NginxControllerImpl.java | 4 +-
.../entity/proxy/nginx/NginxSshDriver.java | 2 +-
.../brooklyn/entity/proxy/nginx/UrlMapping.java | 4 +-
.../entity/proxy/nginx/UrlMappingImpl.java | 2 +-
.../webapp/ControlledDynamicWebAppCluster.java | 8 +-
.../ControlledDynamicWebAppClusterImpl.java | 6 +-
.../entity/webapp/DynamicWebAppCluster.java | 3 +-
.../entity/webapp/DynamicWebAppClusterImpl.java | 2 +-
.../entity/webapp/DynamicWebAppFabric.java | 3 +-
.../entity/webapp/ElasticJavaWebAppService.java | 5 +-
.../entity/webapp/JavaWebAppService.java | 3 +-
.../webapp/JavaWebAppSoftwareProcessImpl.java | 2 +-
.../brooklyn/entity/webapp/WebAppService.java | 2 +-
.../entity/webapp/WebAppServiceMethods.java | 5 +-
.../entity/webapp/jboss/JBoss6Server.java | 2 +-
.../entity/webapp/jboss/JBoss6ServerImpl.java | 2 +-
.../entity/webapp/jboss/JBoss7Server.java | 4 +-
.../entity/webapp/jboss/JBoss7ServerImpl.java | 2 +-
.../entity/webapp/jetty/Jetty6Server.java | 6 +-
.../entity/webapp/jetty/Jetty6ServerImpl.java | 2 +-
.../webapp/nodejs/NodeJsWebAppService.java | 2 +-
.../entity/webapp/tomcat/Tomcat8Server.java | 5 +-
.../entity/webapp/tomcat/Tomcat8ServerImpl.java | 2 +-
.../entity/webapp/tomcat/TomcatServer.java | 6 +-
.../entity/webapp/tomcat/TomcatServerImpl.java | 2 +-
.../entity/dns/AbstractGeoDnsServiceTest.java | 6 +-
.../geoscaling/GeoscalingIntegrationTest.java | 4 +-
.../entity/proxy/AbstractControllerTest.java | 6 +-
.../brooklyn/entity/proxy/StubAppServer.java | 3 +-
.../proxy/TrackingAbstractController.java | 3 +-
.../brooklyn/entity/proxy/UrlMappingTest.java | 4 +-
.../nginx/NginxClusterIntegrationTest.java | 4 +-
.../entity/proxy/nginx/NginxEc2LiveTest.java | 2 +-
.../nginx/NginxHttpsSslIntegrationTest.java | 4 +-
.../proxy/nginx/NginxIntegrationTest.java | 4 +-
.../proxy/nginx/NginxLightIntegrationTest.java | 4 +-
.../proxy/nginx/NginxRebindIntegrationTest.java | 6 +-
.../nginx/NginxRebindWithHaIntegrationTest.java | 4 +-
.../nginx/NginxUrlMappingIntegrationTest.java | 6 +-
.../proxy/nginx/NginxWebClusterEc2LiveTest.java | 4 +-
.../AbstractWebAppFixtureIntegrationTest.java | 8 +-
...lledDynamicWebAppClusterIntegrationTest.java | 4 +-
.../ControlledDynamicWebAppClusterTest.java | 4 +-
.../entity/webapp/DynamicWebAppClusterTest.java | 6 +-
.../entity/webapp/DynamicWebAppFabricTest.java | 6 +-
.../webapp/ElasticCustomLocationTest.java | 2 +-
.../webapp/TomcatAutoScalerPolicyTest.java | 2 +-
.../webapp/WebAppConcurrentDeployTest.java | 2 +-
.../webapp/WebAppLiveIntegrationTest.groovy | 2 +-
...namicWebAppClusterRebindIntegrationTest.java | 4 +-
...namicWebAppClusterRebindIntegrationTest.java | 4 +-
.../jboss/JBoss6ServerAwsEc2LiveTest.java | 2 +-
...Boss6ServerNonInheritingIntegrationTest.java | 2 +-
.../jboss/JBoss7ServerAwsEc2LiveTest.java | 2 +-
.../jboss/JBoss7ServerDockerLiveTest.java | 2 +-
...Boss7ServerNonInheritingIntegrationTest.java | 2 +-
.../JBoss7ServerRebindingIntegrationTest.java | 2 +-
...ultiVersionWebAppFixtureIntegrationTest.java | 2 +-
.../Jboss7ServerGoogleComputeLiveTest.java | 2 +-
.../JettyWebAppFixtureIntegrationTest.java | 2 +-
.../webapp/nodejs/NodeJsWebAppEc2LiveTest.java | 2 +-
.../NodeJsWebAppFixtureIntegrationTest.java | 6 +-
.../NodeJsWebAppSimpleIntegrationTest.java | 2 +-
.../nodejs/NodeJsWebAppSoftlayerLiveTest.java | 2 +-
.../webapp/tomcat/Tomcat8ServerEc2LiveTest.java | 2 +-
.../Tomcat8ServerRestartIntegrationTest.java | 2 +-
.../tomcat/Tomcat8ServerSoftlayerLiveTest.java | 2 +-
...mcat8ServerWebAppFixtureIntegrationTest.java | 2 +-
...ableRetrieveUsageMetricsIntegrationTest.java | 2 +-
.../webapp/tomcat/TomcatServerEc2LiveTest.java | 2 +-
.../TomcatServerRestartIntegrationTest.java | 2 +-
.../tomcat/TomcatServerSoftlayerLiveTest.java | 2 +-
...omcatServerWebAppFixtureIntegrationTest.java | 2 +-
.../test/entity/TestJavaWebAppEntity.java | 4 +-
.../test/entity/TestJavaWebAppEntityImpl.java | 2 +-
.../impl/hazelcast/EntityStreamSerializer.java | 4 +-
.../impl/hazelcast/HazelcastDataGrid.java | 3 +-
.../app/ClusterWebServerDatabaseSample.java | 2 +-
.../sample/app/SingleWebServerSample.java | 2 +-
.../app/SampleLocalhostIntegrationTest.java | 4 +-
.../brooklyn/sample/app/SampleUnitTest.java | 4 +-
.../camp/brooklyn/YamlLauncherAbstract.java | 4 +-
.../BrooklynAssemblyTemplateInstantiator.java | 6 +-
.../BrooklynComponentTemplateResolver.java | 6 +-
.../BrooklynEntityDecorationResolver.java | 4 +-
.../spi/creation/EntitySpecConfiguration.java | 3 +-
.../service/BrooklynServiceTypeResolver.java | 5 +-
.../service/CatalogServiceTypeResolver.java | 2 +-
.../service/ChefServiceTypeResolver.java | 5 +-
.../service/JavaServiceTypeResolver.java | 3 +-
.../creation/service/ServiceTypeResolver.java | 4 +-
.../spi/dsl/BrooklynDslDeferredSupplier.java | 2 +-
.../spi/dsl/methods/BrooklynDslCommon.java | 4 +-
.../brooklyn/spi/dsl/methods/DslComponent.java | 2 +-
.../lookup/AbstractTemplateBrooklynLookup.java | 4 +-
.../spi/lookup/AssemblyBrooklynLookup.java | 5 +-
.../lookup/AssemblyTemplateBrooklynLookup.java | 6 +-
.../brooklyn/spi/lookup/BrooklynUrlLookup.java | 2 +-
.../lookup/PlatformComponentBrooklynLookup.java | 3 +-
...PlatformComponentTemplateBrooklynLookup.java | 4 +-
.../camp/brooklyn/ApplicationsYamlTest.java | 2 +-
.../camp/brooklyn/AbstractYamlRebindTest.java | 2 +-
.../camp/brooklyn/AbstractYamlTest.java | 2 +-
.../camp/brooklyn/ByonLocationsYamlTest.java | 2 +-
.../camp/brooklyn/DslAndRebindYamlTest.java | 4 +-
.../brooklyn/EmptySoftwareProcessYamlTest.java | 2 +-
.../EnrichersSlightlySimplerYamlTest.java | 2 +-
.../camp/brooklyn/EnrichersYamlTest.java | 2 +-
.../brooklyn/EntitiesYamlIntegrationTest.java | 4 +-
.../camp/brooklyn/EntitiesYamlTest.java | 8 +-
...aWebAppWithDslYamlRebindIntegrationTest.java | 2 +-
.../brooklyn/JavaWebAppsIntegrationTest.java | 2 +-
.../camp/brooklyn/LocationsYamlTest.java | 2 +-
.../camp/brooklyn/MapReferenceYamlTest.java | 2 +-
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 4 +-
.../camp/brooklyn/PoliciesYamlTest.java | 2 +-
.../camp/brooklyn/ReferencedYamlTest.java | 2 +-
.../brooklyn/ReferencingYamlTestEntity.java | 5 +-
.../brooklyn/ReloadBrooklynPropertiesTest.java | 2 +-
.../camp/brooklyn/TestEntityWithInitConfig.java | 7 +-
.../brooklyn/TestEntityWithInitConfigImpl.java | 2 +-
.../camp/brooklyn/TestReferencingEnricher.java | 3 +-
.../camp/brooklyn/TestReferencingPolicy.java | 3 +-
.../TestSensorAndEffectorInitializer.java | 6 +-
.../brooklyn/VanillaBashNetcatYamlTest.java | 4 +-
.../catalog/AbstractCatalogXmlTest.java | 2 +-
.../CatalogOsgiVersionMoreEntityTest.java | 4 +-
.../brooklyn/catalog/CatalogXmlVersionTest.java | 3 +-
.../brooklyn/catalog/CatalogYamlCombiTest.java | 2 +-
.../brooklyn/catalog/CatalogYamlEntityTest.java | 4 +-
.../catalog/CatalogYamlLocationTest.java | 5 +-
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 2 +-
.../catalog/CatalogYamlVersioningTest.java | 3 +-
.../camp/brooklyn/catalog/TestBasicApp.java | 3 +-
.../org/apache/brooklyn/cli/ItemLister.java | 4 +-
.../main/java/org/apache/brooklyn/cli/Main.java | 6 +-
.../apache/brooklyn/cli/lister/ClassFinder.java | 4 +-
.../brooklyn/cli/lister/ItemDescriptors.java | 4 +-
.../java/org/apache/brooklyn/cli/CliTest.java | 6 +-
.../brooklyn/launcher/BrooklynLauncher.java | 8 +-
.../entity/basic/VanillaSoftwareYamlTest.java | 6 +-
.../BrooklynEntityMirrorIntegrationTest.java | 4 +-
.../brooklynnode/BrooklynNodeRestTest.java | 4 +-
.../BrooklynLauncherHighAvailabilityTest.java | 4 +-
.../BrooklynLauncherRebindTestFixture.java | 4 +-
.../BrooklynLauncherRebindTestToFiles.java | 2 +-
...lynLauncherRebindToCloudObjectStoreTest.java | 2 +-
.../brooklyn/launcher/BrooklynLauncherTest.java | 4 +-
.../blueprints/AbstractBlueprintTest.java | 4 +-
.../qa/load/SimulatedNginxControllerImpl.java | 2 +-
.../brooklyn/qa/load/SimulatedTheeTierApp.java | 3 +-
.../SoftlayerObtainPrivateLiveTest.java | 2 +-
.../org/apache/brooklyn/qa/load/LoadTest.java | 2 +-
.../webcluster/SinusoidalLoadGenerator.java | 2 +-
.../qa/longevity/webcluster/WebClusterApp.java | 2 +-
.../ApplicationResourceIntegrationTest.java | 2 +-
.../rest/client/BrooklynApiRestClientTest.java | 2 +-
.../resources/AbstractBrooklynRestResource.java | 4 +-
.../rest/resources/ApplicationResource.java | 6 +-
.../rest/resources/CatalogResource.java | 6 +-
.../rest/resources/EffectorResource.java | 4 +-
.../rest/resources/EntityConfigResource.java | 6 +-
.../brooklyn/rest/resources/EntityResource.java | 4 +-
.../rest/resources/PolicyConfigResource.java | 4 +-
.../brooklyn/rest/resources/PolicyResource.java | 4 +-
.../brooklyn/rest/resources/SensorResource.java | 4 +-
.../brooklyn/rest/resources/ServerResource.java | 4 +-
.../rest/transform/ApplicationTransformer.java | 3 +-
.../rest/transform/CatalogTransformer.java | 8 +-
.../rest/transform/EffectorTransformer.java | 9 +-
.../rest/transform/EntityTransformer.java | 9 +-
.../rest/transform/PolicyTransformer.java | 4 +-
.../rest/transform/SensorTransformer.java | 4 +-
.../rest/transform/TaskTransformer.java | 2 +-
.../rest/util/BrooklynRestResourceUtils.java | 30 +-
.../brooklyn/rest/util/EntityLocationUtils.java | 2 +-
.../rest/util/json/BidiSerialization.java | 2 +-
.../brooklynnode/DeployBlueprintTest.java | 4 +-
.../brooklyn/rest/HaMasterCheckFilterTest.java | 4 +-
.../brooklyn/rest/domain/ApplicationTest.java | 2 +-
.../brooklyn/rest/domain/SensorSummaryTest.java | 2 +-
.../rest/resources/ApplicationResourceTest.java | 6 +-
.../rest/resources/DescendantsTest.java | 8 +-
.../rest/resources/EntityResourceTest.java | 3 +-
.../SensorResourceIntegrationTest.java | 4 +-
.../rest/resources/ServerResourceTest.java | 2 +-
.../rest/resources/ServerShutdownTest.java | 2 +-
.../rest/resources/UsageResourceTest.java | 4 +-
.../rest/testing/BrooklynRestResourceTest.java | 4 +-
.../rest/testing/mocks/CapitalizePolicy.java | 3 +-
.../rest/testing/mocks/EverythingGroup.java | 4 +-
.../rest/testing/mocks/NameMatcherGroup.java | 5 +-
.../rest/testing/mocks/RestMockAppBuilder.java | 5 +-
.../testing/mocks/RestMockSimpleEntity.java | 4 +-
.../util/BrooklynRestResourceUtilsTest.java | 6 +-
.../rest/util/EntityLocationUtilsTest.java | 3 +-
.../json/BrooklynJacksonSerializerTest.java | 2 +-
.../apache/brooklyn/test/EntityTestUtils.java | 6 +-
.../org/apache/brooklyn/test/TestUtils.groovy | 2 +-
.../brooklyn/osgi/tests/SimpleApplication.java | 3 +-
.../java/brooklyn/osgi/tests/SimpleEntity.java | 4 +-
.../brooklyn/osgi/tests/more/MoreEntity.java | 7 +-
.../brooklyn/osgi/tests/more/MoreTemplate.java | 9 +-
.../brooklyn/osgi/tests/more/MoreEntity.java | 6 +-
.../brooklyn/osgi/tests/more/MoreEntity.java | 6 +-
.../brooklyn/osgi/tests/more/MoreTemplate.java | 8 +-
1035 files changed, 4491 insertions(+), 4160 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/api/src/main/java/brooklyn/entity/Application.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/entity/Application.java b/api/src/main/java/brooklyn/entity/Application.java
deleted file mode 100644
index 4697186..0000000
--- a/api/src/main/java/brooklyn/entity/Application.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.entity;
-
-import org.apache.brooklyn.management.ManagementContext;
-
-
-/**
- * An application is the root of the entity hierarchy. In the parent-child relationship, it is
- * the top-level entity under which the application's entities are all places.
- *
- * The recommended ways to write a new application are to either extend {@link brooklyn.entity.basic.ApplicationBuilder}
- * or to extend {@link brooklyn.entity.basic.AbstractApplication}.
- */
-public interface Application extends Entity {
-
- ManagementContext getManagementContext();
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/api/src/main/java/brooklyn/entity/Effector.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/entity/Effector.java b/api/src/main/java/brooklyn/entity/Effector.java
deleted file mode 100644
index 2a4e424..0000000
--- a/api/src/main/java/brooklyn/entity/Effector.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.entity;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.management.MBeanOperationInfo;
-
-/**
- * An operation of some kind, carried out by an {@link Entity}.
- *
- * Similar to the concepts in the JMX {@link MBeanOperationInfo} class.
- */
-public interface Effector<T> extends Serializable {
- /**
- * human-friendly name of the effector (although frequently this uses java method naming convention)
- */
- String getName();
-
- Class<T> getReturnType();
-
- /**
- * canonical name of return type (in case return type does not resolve after serialization)
- */
- String getReturnTypeName();
-
- /**
- * parameters expected by method, including name and type, optional description and default value
- */
- List<ParameterType<?>> getParameters();
-
- /**
- * optional description for the effector
- */
- String getDescription();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/api/src/main/java/brooklyn/entity/Entity.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/entity/Entity.java b/api/src/main/java/brooklyn/entity/Entity.java
deleted file mode 100644
index 336ebd1..0000000
--- a/api/src/main/java/brooklyn/entity/Entity.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.entity;
-
-import java.util.Collection;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.apache.brooklyn.api.basic.BrooklynObject;
-import org.apache.brooklyn.management.Task;
-import org.apache.brooklyn.policy.Enricher;
-import org.apache.brooklyn.policy.EnricherSpec;
-import org.apache.brooklyn.policy.Policy;
-import org.apache.brooklyn.policy.PolicySpec;
-
-import brooklyn.config.ConfigKey;
-import brooklyn.config.ConfigKey.HasConfigKey;
-import brooklyn.entity.proxying.EntitySpec;
-import brooklyn.event.AttributeSensor;
-import brooklyn.location.Location;
-import brooklyn.util.guava.Maybe;
-
-/**
- * The basic interface for a Brooklyn entity.
- * <p>
- * Implementors of entities are strongly encouraged to extend {@link brooklyn.entity.basic.AbstractEntity}.
- * <p>
- * To instantiate an entity, see {@code managementContext.getEntityManager().createEntity(entitySpec)}.
- * Also see {@link brooklyn.entity.basic.ApplicationBuilder},
- * {@link brooklyn.entity.basic.AbstractEntity#addChild(EntitySpec)}, and
- * {@link brooklyn.entity.proxying.EntitySpec}.
- * <p>
- *
- * @see brooklyn.entity.basic.AbstractEntity
- */
-public interface Entity extends BrooklynObject {
- /**
- * The unique identifier for this entity.
- */
- @Override
- String getId();
-
- /**
- * Returns the creation time for this entity, in UTC.
- */
- long getCreationTime();
-
- /**
- * A display name; recommended to be a concise single-line description.
- */
- String getDisplayName();
-
- /**
- * A URL pointing to an image which can be used to represent this entity.
- */
- @Nullable String getIconUrl();
-
- /**
- * Information about the type of this entity; analogous to Java's object.getClass.
- */
- EntityType getEntityType();
-
- /**
- * @return the {@link Application} this entity is registered with, or null if not registered.
- */
- Application getApplication();
-
- /**
- * @return the id of the {@link Application} this entity is registered with, or null if not registered.
- */
- String getApplicationId();
-
- /**
- * The parent of this entity, null if no parent.
- *
- * The parent is normally the entity responsible for creating/destroying/managing this entity.
- *
- * @see #setParent(Entity)
- * @see #clearParent
- */
- Entity getParent();
-
- /**
- * Return the entities that are children of (i.e. "owned by") this entity
- */
- Collection<Entity> getChildren();
-
- /**
- * Sets the parent (i.e. "owner") of this entity. Returns this entity, for convenience.
- *
- * @see #getParent
- * @see #clearParent
- */
- Entity setParent(Entity parent);
-
- /**
- * Clears the parent (i.e. "owner") of this entity. Also cleans up any references within its parent entity.
- *
- * @see #getParent
- * @see #setParent
- */
- void clearParent();
-
- /**
- * Add a child {@link Entity}, and set this entity as its parent,
- * returning the added child.
- * <p>
- * As with {@link #addChild(EntitySpec)} the child is <b>not</b> brought under management
- * as part of this call. It should not be managed prior to this call either.
- */
- <T extends Entity> T addChild(T child);
-
- /**
- * Creates an {@link Entity} from the given spec and adds it, setting this entity as the parent,
- * returning the added child.
- * <p>
- * The added child is <b>not</b> managed as part of this call, even if the parent is managed,
- * so if adding post-management an explicit call to manage the child will be needed;
- * see the convenience method <code>Entities.manage(...)</code>.
- * */
- <T extends Entity> T addChild(EntitySpec<T> spec);
-
- /**
- * Removes the specified child {@link Entity}; its parent will be set to null.
- *
- * @return True if the given entity was contained in the set of children
- */
- boolean removeChild(Entity child);
-
- /**
- * @return an immutable thread-safe view of the policies.
- */
- Collection<Policy> getPolicies();
-
- /**
- * @return an immutable thread-safe view of the enrichers.
- */
- Collection<Enricher> getEnrichers();
-
- /**
- * The {@link Collection} of {@link Group}s that this entity is a member of.
- *
- * Groupings can be used to allow easy management/monitoring of a group of entities.
- */
- Collection<Group> getGroups();
-
- /**
- * Add this entity as a member of the given {@link Group}. Called by framework.
- * <p>
- * Users should call {@link Group#addMember(Entity)} instead; this method will then
- * automatically be called. However, the reverse is not true (calling this method will
- * not tell the group; this behaviour may change in a future release!)
- */
- void addGroup(Group group);
-
- /**
- * Removes this entity as a member of the given {@link Group}. Called by framework.
- * <p>
- * Users should call {@link Group#removeMember(Entity)} instead; this method will then
- * automatically be called. However, the reverse is not true (calling this method will
- * not tell the group; this behaviour may change in a future release!)
- */
- void removeGroup(Group group);
-
- /**
- * Return all the {@link Location}s this entity is deployed to.
- */
- Collection<Location> getLocations();
-
- /**
- * Gets the value of the given attribute on this entity, or null if has not been set.
- *
- * Attributes can be things like workrate and status information, as well as
- * configuration (e.g. url/jmxHost/jmxPort), etc.
- */
- <T> T getAttribute(AttributeSensor<T> sensor);
-
- /**
- * Convenience for calling {@link ConfigurationSupport#getConfig(ConfigKey)},
- * via code like {@code config().get(key)}.
- */
- <T> T getConfig(ConfigKey<T> key);
-
- /**
- * @see #getConfig(ConfigKey)}
- */
- <T> T getConfig(HasConfigKey<T> key);
-
- /**
- * Returns the uncoerced value for this config key as set on this entity, if available,
- * not following any inheritance chains and not taking any default.
- *
- * @deprecated since 0.7.0; use {@code ((EntityInternal)entity).config().getRaw()} or
- * {@code ((EntityInternal)entity).config().getLocalRaw()}
- */
- @Deprecated
- Maybe<Object> getConfigRaw(ConfigKey<?> key, boolean includeInherited);
-
- /**
- * @see {@link #getConfigRaw(ConfigKey, boolean)}.
- *
- * @deprecated since 0.7.0
- */
- @Deprecated
- Maybe<Object> getConfigRaw(HasConfigKey<?> key, boolean includeInherited);
-
- /**
- * Invokes the given effector, with the given parameters to that effector.
- */
- <T> Task<T> invoke(Effector<T> eff, Map<String,?> parameters);
-
- /**
- * Adds the given policy to this entity. Also calls policy.setEntity if available.
- */
- void addPolicy(Policy policy);
-
- /**
- * Adds the given policy to this entity. Also calls policy.setEntity if available.
- */
- <T extends Policy> T addPolicy(PolicySpec<T> enricher);
-
- /**
- * Removes the given policy from this entity.
- * @return True if the policy existed at this entity; false otherwise
- */
- boolean removePolicy(Policy policy);
-
- /**
- * Adds the given enricher to this entity. Also calls enricher.setEntity if available.
- */
- void addEnricher(Enricher enricher);
-
- /**
- * Adds the given enricher to this entity. Also calls enricher.setEntity if available.
- */
- <T extends Enricher> T addEnricher(EnricherSpec<T> enricher);
-
- /**
- * Removes the given enricher from this entity.
- * @return True if the policy enricher at this entity; false otherwise
- */
- boolean removeEnricher(Enricher enricher);
-
- /**
- * Adds the given feed to this entity. Also calls feed.setEntity if available.
- */
- <T extends Feed> T addFeed(T feed);
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/api/src/main/java/brooklyn/entity/EntityType.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/entity/EntityType.java b/api/src/main/java/brooklyn/entity/EntityType.java
deleted file mode 100644
index 673a448..0000000
--- a/api/src/main/java/brooklyn/entity/EntityType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.entity;
-
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import org.apache.brooklyn.api.basic.BrooklynType;
-
-import brooklyn.event.Sensor;
-import brooklyn.util.guava.Maybe;
-
-/**
- * Gives type information for an {@link Entity}. It is an immutable snapshot.
- *
- * It reflects a given entity at the time the snapshot was created: if sensors
- * were added or removed on-the-fly then those changes will be included in subsequent
- * snapshots. Therefore instances of a given class of entity could have different
- * EntityTypes.
- */
-public interface EntityType extends BrooklynType {
-
- /**
- * Sensors available on this entity.
- */
- Set<Sensor<?>> getSensors();
-
- /**
- * Effectors available on this entity.
- */
- Set<Effector<?>> getEffectors();
-
- /** @return an effector with the given name, if it exists.
- */
- public Maybe<Effector<?>> getEffectorByName(String name);
-
- /**
- * @return the matching effector on this entity
- * @throws NoSuchElementException If there is no exact match for this signature
- * <p>
- * @deprecated since 0.7.0 use {@link #getEffectorByName(String)};
- * use of multiple effectors with the same name is not supported by the EntityDynamicType implementation,
- * so should be discouraged. overloading can be achieved by inspecting the parameters map.
- */
- @Deprecated
- Effector<?> getEffector(String name, Class<?>... parameterTypes);
-
- /**
- * The Sensor with the given name, or null if not found.
- */
- Sensor<?> getSensor(String name);
-
- /**
- * @return True if has the sensor with the given name; false otherwise.
- */
- boolean hasSensor(String name);
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/api/src/main/java/brooklyn/entity/Feed.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/entity/Feed.java b/api/src/main/java/brooklyn/entity/Feed.java
deleted file mode 100644
index 4cbe021..0000000
--- a/api/src/main/java/brooklyn/entity/Feed.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.entity;
-
-import org.apache.brooklyn.mementos.FeedMemento;
-import org.apache.brooklyn.policy.EntityAdjunct;
-
-import brooklyn.entity.rebind.RebindSupport;
-import brooklyn.entity.rebind.Rebindable;
-
-import com.google.common.annotations.Beta;
-
-/**
- * A sensor feed.
- * These generally poll or subscribe to get sensor values for an entity.
- * They make it easy to poll over http, jmx, etc.
- *
- * Assumes:
- * <ul>
- * <li>There will not be concurrent calls to start and stop.
- * <li>There will only be one call to start and that will be done immediately after construction,
- * in the same thread.
- * <li>Once stopped, the feed will not be re-started.
- * </ul>
- */
-@Beta
-public interface Feed extends EntityAdjunct, Rebindable {
-
- /**
- * True if everything has been _started_ (or it is starting) but not stopped,
- * even if it is suspended; see also {@link #isActive()}
- */
- boolean isActivated();
-
- void start();
-
- /** suspends this feed (stops the poller, or indicates that the feed should start in a state where the poller is stopped) */
- void suspend();
-
- boolean isSuspended();
-
- /** resumes this feed if it has been suspended and not stopped */
- void resume();
-
- void stop();
-
- /**
- * Users are strongly discouraged from calling or overriding this method.
- * It is for internal calls only, relating to persisting/rebinding entities.
- * This method may change (or be removed) in a future release without notice.
- */
- @Override
- @Beta
- RebindSupport<FeedMemento> getRebindSupport();
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/api/src/main/java/brooklyn/entity/Group.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/entity/Group.java b/api/src/main/java/brooklyn/entity/Group.java
deleted file mode 100644
index f2cd0b8..0000000
--- a/api/src/main/java/brooklyn/entity/Group.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.entity;
-
-import java.util.Collection;
-
-import brooklyn.entity.proxying.EntitySpec;
-
-/**
- * An {@link Entity} that groups together other entities.
- *
- * The grouping can be for any purpose, such as allowing easy management/monitoring of
- * a group of entities. The grouping could be static (i.e. a fixed set of entities)
- * or dynamic (i.e. contains all entities that match some filter).
- */
-public interface Group extends Entity {
-
- /**
- * Return the entities that are members of this group.
- */
- Collection<Entity> getMembers();
-
- /**
- * @return True if it is a member of this group.
- */
- boolean hasMember(Entity member);
-
- /**
- * Adds the given member, returning true if this modifies the set of members (i.e. it was not already a member).
- */
- boolean addMember(Entity member);
-
- /**
- * Removes the given member, returning true if this modifies the set of members (i.e. it was a member).
- */
- boolean removeMember(Entity member);
-
- /**
- * @return The number of members in this group.
- */
- Integer getCurrentSize();
-
- /** As {@link #addChild(EntitySpec)} followed by {@link #addMember(Entity)} */
- <T extends Entity> T addMemberChild(EntitySpec<T> spec);
-
- /** As {@link #addChild(Entity)} followed by {@link #addMember(Entity)} */
- <T extends Entity> T addMemberChild(T child);
-
- /** As in super, but note this does NOT by default add it as a member; see {@link #addMemberChild(EntitySpec)} */
- @Override
- <T extends Entity> T addChild(EntitySpec<T> spec);
-
- /** As in super, but note this does NOT by default add it as a member; see {@link #addMemberChild(Entity)} */
- @Override
- <T extends Entity> T addChild(T child);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/api/src/main/java/brooklyn/entity/ParameterType.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/entity/ParameterType.java b/api/src/main/java/brooklyn/entity/ParameterType.java
deleted file mode 100644
index d0981b3..0000000
--- a/api/src/main/java/brooklyn/entity/ParameterType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.entity;
-
-import java.io.Serializable;
-
-import javax.management.MBeanParameterInfo;
-
-/**
- * Similar to the concepts in the JMX {@link MBeanParameterInfo} class.
- *
- * @see Effector
- */
-public interface ParameterType<T> extends Serializable {
-
- public String getName();
-
- public Class<T> getParameterClass();
-
- /**
- * The canonical name of the parameter class; especially useful if the class
- * cannot be resolved after deserialization.
- */
- public String getParameterClassName();
-
- public String getDescription();
-
- /**
- * @return The default value for this parameter, if not supplied during an effector call.
- */
- public T getDefaultValue();
-}