You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/08/12 11:01:08 UTC
[15/15] incubator-brooklyn git commit: This closes #812
This closes #812
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e0ee89eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e0ee89eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e0ee89eb
Branch: refs/heads/master
Commit: e0ee89eb5b9f9480fdec93a2e2af3a4904f05af6
Parents: d85719b f7f0358
Author: Aled Sage <al...@gmail.com>
Authored: Wed Aug 12 10:00:29 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Aug 12 10:00:29 2015 +0100
----------------------------------------------------------------------
.../main/java/brooklyn/entity/Application.java | 2 +-
api/src/main/java/brooklyn/entity/Entity.java | 11 +-
api/src/main/java/brooklyn/entity/Feed.java | 5 +-
.../java/brooklyn/entity/basic/EntityLocal.java | 9 +-
.../brooklyn/entity/proxying/EntitySpec.java | 10 +-
.../entity/rebind/BrooklynObjectType.java | 6 +-
.../rebind/PersistenceExceptionHandler.java | 3 +-
.../brooklyn/entity/rebind/RebindContext.java | 3 +-
.../entity/rebind/RebindExceptionHandler.java | 6 +-
.../brooklyn/entity/rebind/RebindManager.java | 7 +-
.../brooklyn/entity/rebind/RebindSupport.java | 4 +-
.../java/brooklyn/entity/rebind/Rebindable.java | 2 +-
.../brooklyn/entity/trait/Configurable.java | 3 +-
.../brooklyn/location/LocationDefinition.java | 2 +-
.../brooklyn/location/LocationResolver.java | 4 +-
.../java/brooklyn/location/LocationSpec.java | 2 +-
.../brooklyn/management/AccessController.java | 65 -----
.../java/brooklyn/management/EntityManager.java | 126 ---------
.../brooklyn/management/ExecutionContext.java | 67 -----
.../brooklyn/management/ExecutionManager.java | 117 ---------
.../brooklyn/management/HasTaskChildren.java | 39 ---
.../brooklyn/management/LocationManager.java | 87 -------
.../brooklyn/management/ManagementContext.java | 254 ------------------
.../management/SubscriptionContext.java | 66 -----
.../brooklyn/management/SubscriptionHandle.java | 27 --
.../management/SubscriptionManager.java | 112 --------
api/src/main/java/brooklyn/management/Task.java | 128 ----------
.../java/brooklyn/management/TaskAdaptable.java | 24 --
.../java/brooklyn/management/TaskFactory.java | 25 --
.../management/TaskQueueingContext.java | 62 -----
.../java/brooklyn/management/TaskWrapper.java | 28 --
.../BrooklynClassLoadingContext.java | 50 ----
.../entitlement/EntitlementClass.java | 27 --
.../entitlement/EntitlementContext.java | 24 --
.../entitlement/EntitlementManager.java | 45 ----
.../management/ha/HighAvailabilityManager.java | 129 ----------
.../management/ha/HighAvailabilityMode.java | 67 -----
.../management/ha/ManagementNodeState.java | 72 ------
.../management/ha/ManagementNodeSyncRecord.java | 62 -----
.../ha/ManagementPlaneSyncRecord.java | 51 ----
.../ha/ManagementPlaneSyncRecordPersister.java | 68 -----
.../brooklyn/management/ha/MementoCopyMode.java | 29 ---
.../java/brooklyn/mementos/BrooklynMemento.java | 64 -----
.../mementos/BrooklynMementoManifest.java | 58 -----
.../mementos/BrooklynMementoPersister.java | 137 ----------
.../mementos/BrooklynMementoRawData.java | 185 --------------
.../brooklyn/mementos/CatalogItemMemento.java | 49 ----
.../java/brooklyn/mementos/EnricherMemento.java | 33 ---
.../java/brooklyn/mementos/EntityMemento.java | 80 ------
.../java/brooklyn/mementos/FeedMemento.java | 33 ---
.../java/brooklyn/mementos/LocationMemento.java | 38 ---
.../main/java/brooklyn/mementos/Memento.java | 83 ------
.../java/brooklyn/mementos/PolicyMemento.java | 35 ---
.../main/java/brooklyn/mementos/TreeNode.java | 48 ----
api/src/main/java/brooklyn/policy/Enricher.java | 70 -----
.../main/java/brooklyn/policy/EnricherSpec.java | 214 ----------------
.../main/java/brooklyn/policy/EnricherType.java | 36 ---
.../java/brooklyn/policy/EntityAdjunct.java | 55 ----
api/src/main/java/brooklyn/policy/Policy.java | 82 ------
.../main/java/brooklyn/policy/PolicySpec.java | 152 -----------
.../main/java/brooklyn/policy/PolicyType.java | 36 ---
.../apache/brooklyn/catalog/CatalogItem.java | 3 +-
.../brooklyn/management/AccessController.java | 65 +++++
.../brooklyn/management/EntityManager.java | 127 +++++++++
.../brooklyn/management/ExecutionContext.java | 67 +++++
.../brooklyn/management/ExecutionManager.java | 117 +++++++++
.../brooklyn/management/HasTaskChildren.java | 39 +++
.../brooklyn/management/LocationManager.java | 87 +++++++
.../brooklyn/management/ManagementContext.java | 256 +++++++++++++++++++
.../management/SubscriptionContext.java | 66 +++++
.../brooklyn/management/SubscriptionHandle.java | 27 ++
.../management/SubscriptionManager.java | 112 ++++++++
.../org/apache/brooklyn/management/Task.java | 128 ++++++++++
.../brooklyn/management/TaskAdaptable.java | 24 ++
.../apache/brooklyn/management/TaskFactory.java | 25 ++
.../management/TaskQueueingContext.java | 62 +++++
.../apache/brooklyn/management/TaskWrapper.java | 28 ++
.../BrooklynClassLoadingContext.java | 51 ++++
.../entitlement/EntitlementClass.java | 27 ++
.../entitlement/EntitlementContext.java | 24 ++
.../entitlement/EntitlementManager.java | 45 ++++
.../management/ha/HighAvailabilityManager.java | 129 ++++++++++
.../management/ha/HighAvailabilityMode.java | 67 +++++
.../management/ha/ManagementNodeState.java | 72 ++++++
.../management/ha/ManagementNodeSyncRecord.java | 62 +++++
.../ha/ManagementPlaneSyncRecord.java | 51 ++++
.../ha/ManagementPlaneSyncRecordPersister.java | 69 +++++
.../brooklyn/management/ha/MementoCopyMode.java | 29 +++
.../brooklyn/mementos/BrooklynMemento.java | 64 +++++
.../mementos/BrooklynMementoManifest.java | 58 +++++
.../mementos/BrooklynMementoPersister.java | 139 ++++++++++
.../mementos/BrooklynMementoRawData.java | 185 ++++++++++++++
.../brooklyn/mementos/CatalogItemMemento.java | 49 ++++
.../brooklyn/mementos/EnricherMemento.java | 33 +++
.../apache/brooklyn/mementos/EntityMemento.java | 80 ++++++
.../apache/brooklyn/mementos/FeedMemento.java | 33 +++
.../brooklyn/mementos/LocationMemento.java | 38 +++
.../org/apache/brooklyn/mementos/Memento.java | 84 ++++++
.../apache/brooklyn/mementos/PolicyMemento.java | 35 +++
.../org/apache/brooklyn/mementos/TreeNode.java | 48 ++++
.../org/apache/brooklyn/policy/Enricher.java | 71 +++++
.../apache/brooklyn/policy/EnricherSpec.java | 214 ++++++++++++++++
.../apache/brooklyn/policy/EnricherType.java | 36 +++
.../apache/brooklyn/policy/EntityAdjunct.java | 55 ++++
.../java/org/apache/brooklyn/policy/Policy.java | 83 ++++++
.../org/apache/brooklyn/policy/PolicySpec.java | 152 +++++++++++
.../org/apache/brooklyn/policy/PolicyType.java | 36 +++
.../src/main/java/brooklyn/BrooklynVersion.java | 4 +-
.../brooklyn/basic/AbstractBrooklynObject.java | 2 +-
.../brooklyn/basic/BasicConfigurableObject.java | 5 +-
.../main/java/brooklyn/basic/BrooklynTypes.java | 5 +-
.../basic/internal/ApiObjectsFactoryImpl.java | 3 +-
.../api/AssemblyTemplateSpecInstantiator.java | 3 +-
.../api/HasBrooklynManagementContext.java | 2 +-
.../brooklyn/catalog/CatalogPredicates.java | 6 +-
.../catalog/internal/BasicBrooklynCatalog.java | 10 +-
.../catalog/internal/CatalogClasspathDo.java | 4 +-
.../brooklyn/catalog/internal/CatalogDo.java | 2 +-
.../catalog/internal/CatalogInitialization.java | 6 +-
.../catalog/internal/CatalogItemDo.java | 6 +-
.../internal/CatalogItemDtoAbstract.java | 4 +-
.../catalog/internal/CatalogPolicyItemDto.java | 4 +-
.../brooklyn/catalog/internal/CatalogUtils.java | 6 +-
.../brooklyn/config/BrooklynServerConfig.java | 2 +-
.../brooklyn/config/BrooklynServerPaths.java | 2 +-
.../config/BrooklynServiceAttributes.java | 3 +-
.../main/java/brooklyn/enricher/Enrichers.java | 5 +-
.../enricher/basic/AbstractEnricher.java | 7 +-
.../enricher/basic/EnricherDynamicType.java | 5 +-
.../enricher/basic/EnricherTypeSnapshot.java | 3 +-
.../brooklyn/entity/basic/AbstractEffector.java | 2 +-
.../brooklyn/entity/basic/AbstractEntity.java | 24 +-
.../entity/basic/ApplicationBuilder.java | 4 +-
.../java/brooklyn/entity/basic/Attributes.java | 3 +-
.../entity/basic/BasicStartableImpl.java | 2 +-
.../entity/basic/BrooklynShutdownHooks.java | 4 +-
.../brooklyn/entity/basic/BrooklynTaskTags.java | 6 +-
.../brooklyn/entity/basic/DynamicGroupImpl.java | 2 +-
.../java/brooklyn/entity/basic/Entities.java | 16 +-
.../brooklyn/entity/basic/EntityAdjuncts.java | 5 +-
.../brooklyn/entity/basic/EntityConfigMap.java | 4 +-
.../brooklyn/entity/basic/EntityFunctions.java | 3 +-
.../brooklyn/entity/basic/EntityInternal.java | 9 +-
.../java/brooklyn/entity/basic/EntityTasks.java | 3 +-
.../basic/EntityTransientCopyInternal.java | 11 +-
.../brooklyn/entity/basic/PolicyDescriptor.java | 2 +-
.../entity/basic/ServiceStateLogic.java | 6 +-
.../brooklyn/entity/effector/EffectorBody.java | 7 +-
.../brooklyn/entity/effector/EffectorTasks.java | 4 +-
.../brooklyn/entity/effector/Effectors.java | 2 +-
.../entity/group/DynamicClusterImpl.java | 4 +-
.../entity/group/DynamicFabricImpl.java | 2 +-
.../entity/group/DynamicRegionsFabricImpl.java | 2 +-
.../entity/group/QuarantineGroupImpl.java | 2 +-
.../entity/proxying/EntityProxyImpl.java | 4 +-
.../entity/proxying/InternalEntityFactory.java | 10 +-
.../proxying/InternalLocationFactory.java | 3 +-
.../entity/proxying/InternalPolicyFactory.java | 11 +-
.../AbstractBrooklynObjectRebindSupport.java | 4 +-
.../rebind/ActivePartialRebindIteration.java | 10 +-
.../rebind/BasicCatalogItemRebindSupport.java | 2 +-
.../rebind/BasicEnricherRebindSupport.java | 3 +-
.../entity/rebind/BasicEntityRebindSupport.java | 2 +-
.../entity/rebind/BasicFeedRebindSupport.java | 3 +-
.../rebind/BasicLocationRebindSupport.java | 2 +-
.../entity/rebind/BasicPolicyRebindSupport.java | 3 +-
.../rebind/ImmediateDeltaChangeListener.java | 20 +-
.../rebind/InitialFullRebindIteration.java | 4 +-
.../rebind/PeriodicDeltaChangeListener.java | 12 +-
.../rebind/PersistenceExceptionHandlerImpl.java | 2 +-
.../entity/rebind/PersisterDeltaImpl.java | 18 +-
.../entity/rebind/RebindContextImpl.java | 10 +-
.../rebind/RebindContextLookupContext.java | 10 +-
.../rebind/RebindExceptionHandlerImpl.java | 6 +-
.../brooklyn/entity/rebind/RebindIteration.java | 36 +--
.../entity/rebind/RebindManagerImpl.java | 14 +-
.../entity/rebind/dto/AbstractMemento.java | 3 +-
.../rebind/dto/AbstractTreeNodeMemento.java | 4 +-
.../rebind/dto/BasicCatalogItemMemento.java | 4 +-
.../entity/rebind/dto/BasicEnricherMemento.java | 3 +-
.../entity/rebind/dto/BasicEntityMemento.java | 6 +-
.../entity/rebind/dto/BasicFeedMemento.java | 3 +-
.../entity/rebind/dto/BasicLocationMemento.java | 5 +-
.../entity/rebind/dto/BasicPolicyMemento.java | 3 +-
.../entity/rebind/dto/BrooklynMementoImpl.java | 17 +-
.../rebind/dto/BrooklynMementoManifestImpl.java | 5 +-
.../rebind/dto/EntityMementoManifestImpl.java | 2 +-
.../entity/rebind/dto/MementoValidators.java | 6 +-
.../entity/rebind/dto/MementosGenerators.java | 28 +-
.../rebind/dto/MutableBrooklynMemento.java | 15 +-
.../BrooklynMementoPersisterToObjectStore.java | 14 +-
.../persister/BrooklynPersistenceUtils.java | 20 +-
.../rebind/persister/FileBasedObjectStore.java | 4 +-
.../rebind/persister/MementoSerializer.java | 6 +-
.../persister/PersistenceObjectStore.java | 5 +-
.../persister/RetryingMementoSerializer.java | 3 +-
.../rebind/persister/XmlMementoSerializer.java | 14 +-
.../dto/BasicManagementNodeSyncRecord.java | 4 +-
.../dto/ManagementPlaneSyncRecordImpl.java | 5 +-
.../transformer/BrooklynMementoTransformer.java | 2 +-
.../rebind/transformer/CompoundTransformer.java | 3 +-
.../DeleteOrphanedLocationsTransformer.java | 7 +-
.../brooklyn/entity/trait/StartableMethods.java | 2 +-
.../basic/AbstractCollectionConfigKey.java | 4 +-
.../basic/AbstractStructuredConfigKey.java | 3 +-
.../basic/AttributeSensorAndConfigKey.java | 2 +-
.../basic/BasicAttributeSensorAndConfigKey.java | 3 +-
.../brooklyn/event/basic/BasicConfigKey.java | 2 +-
.../event/basic/DependentConfiguration.java | 10 +-
.../java/brooklyn/event/basic/MapConfigKey.java | 2 +-
.../basic/PortAttributeSensorAndConfigKey.java | 2 +-
.../event/basic/SubElementConfigKey.java | 3 +-
...platedStringAttributeSensorAndConfigKey.java | 2 +-
.../java/brooklyn/event/feed/AbstractFeed.java | 2 +-
.../brooklyn/event/feed/ConfigToAttributes.java | 3 +-
.../main/java/brooklyn/event/feed/Poller.java | 2 +-
.../brooklyn/event/feed/shell/ShellFeed.java | 2 +-
.../windows/WindowsPerformanceCounterFeed.java | 2 +-
.../internal/BrooklynFeatureEnablement.java | 2 +-
.../location/access/PortForwardManagerImpl.java | 2 +-
.../location/basic/AbstractLocation.java | 4 +-
.../basic/AbstractLocationResolver.java | 2 +-
.../location/basic/BasicLocationRegistry.java | 4 +-
.../location/basic/BasicMachineDetails.java | 2 +-
.../location/basic/CatalogLocationResolver.java | 4 +-
.../basic/DefinedLocationByIdResolver.java | 2 +-
.../FixedListMachineProvisioningLocation.java | 2 +-
.../location/basic/LocationConfigUtils.java | 2 +-
.../location/basic/LocationInternal.java | 5 +-
.../location/basic/LocationTypeSnapshot.java | 3 +-
.../java/brooklyn/location/basic/Locations.java | 4 +-
.../brooklyn/location/basic/MultiLocation.java | 3 +-
.../location/basic/MultiLocationResolver.java | 2 +-
.../location/basic/NamedLocationResolver.java | 2 +-
.../location/basic/SshMachineLocation.java | 2 +-
.../AbstractAvailabilityZoneExtension.java | 3 +-
.../management/ManagementContextInjectable.java | 2 +-
.../AbstractBrooklynClassLoadingContext.java | 4 +-
.../BrooklynClassLoadingContextSequential.java | 3 +-
...ssLoaderFromBrooklynClassLoadingContext.java | 2 +
.../JavaBrooklynClassLoadingContext.java | 3 +-
.../OsgiBrooklynClassLoadingContext.java | 5 +-
.../BasicEntitlementClassDefinition.java | 2 +
.../entitlement/EntitlementManagerAdapter.java | 3 +
.../entitlement/EntitlementPredicates.java | 3 +
.../management/entitlement/Entitlements.java | 7 +-
.../entitlement/NotEntitledException.java | 3 +
.../entitlement/PerUserEntitlementManager.java | 3 +
.../PerUserEntitlementManagerWithDefault.java | 2 +
.../entitlement/WebEntitlementContext.java | 2 +
.../management/ha/BasicMasterChooser.java | 3 +
.../ha/HighAvailabilityManagerImpl.java | 11 +-
.../ha/ManagementPlaneSyncRecordDeltaImpl.java | 3 +-
...ntPlaneSyncRecordPersisterToObjectStore.java | 7 +-
.../brooklyn/management/ha/MasterChooser.java | 3 +
.../brooklyn/management/ha/OsgiManager.java | 4 +-
.../internal/AbstractManagementContext.java | 16 +-
.../internal/AbstractSubscriptionManager.java | 4 +-
.../management/internal/AccessManager.java | 2 +-
.../internal/AsyncCollectionChangeAdapter.java | 2 +-
.../internal/BasicSubscriptionContext.java | 6 +-
.../internal/BrooklynGarbageCollector.java | 4 +-
.../management/internal/EffectorUtils.java | 2 +-
.../internal/EntityChangeListener.java | 5 +-
.../internal/EntityManagementSupport.java | 12 +-
.../internal/EntityManagementUtils.java | 6 +-
.../internal/EntityManagerInternal.java | 3 +-
.../management/internal/LocalAccessManager.java | 3 +-
.../management/internal/LocalEntityManager.java | 12 +-
.../internal/LocalLocationManager.java | 2 +-
.../internal/LocalManagementContext.java | 14 +-
.../internal/LocalSubscriptionManager.java | 6 +-
.../management/internal/LocalUsageManager.java | 2 +-
.../internal/LocationManagerInternal.java | 3 +-
.../internal/ManagementContextInternal.java | 5 +-
.../internal/ManagementTransitionInfo.java | 2 +-
.../internal/NonDeploymentAccessManager.java | 2 +-
.../internal/NonDeploymentEntityManager.java | 11 +-
.../internal/NonDeploymentLocationManager.java | 3 +-
.../NonDeploymentManagementContext.java | 32 +--
.../internal/QueueingSubscriptionManager.java | 3 +-
.../management/internal/Subscription.java | 3 +-
.../internal/SubscriptionTracker.java | 5 +-
.../policy/basic/AbstractEntityAdjunct.java | 10 +-
.../brooklyn/policy/basic/AbstractPolicy.java | 6 +-
.../java/brooklyn/policy/basic/AdjunctType.java | 2 +-
.../brooklyn/policy/basic/ConfigMapImpl.java | 2 +-
.../java/brooklyn/policy/basic/Policies.java | 3 +-
.../policy/basic/PolicyDynamicType.java | 5 +-
.../policy/basic/PolicyTypeSnapshot.java | 3 +-
.../main/java/brooklyn/util/ResourceUtils.java | 4 +-
.../java/brooklyn/util/file/ArchiveTasks.java | 5 +-
.../util/internal/ConfigKeySelfExtracting.java | 3 +-
.../brooklyn/util/mutex/SemaphoreForTasks.java | 5 +-
.../util/task/AbstractExecutionContext.java | 8 +-
.../util/task/BasicExecutionContext.java | 12 +-
.../util/task/BasicExecutionManager.java | 8 +-
.../main/java/brooklyn/util/task/BasicTask.java | 4 +-
.../java/brooklyn/util/task/CompoundTask.java | 6 +-
.../util/task/DynamicSequentialTask.java | 6 +-
.../java/brooklyn/util/task/DynamicTasks.java | 22 +-
.../brooklyn/util/task/ExecutionListener.java | 2 +-
.../java/brooklyn/util/task/ForwardingTask.java | 3 +-
.../java/brooklyn/util/task/ParallelTask.java | 3 +-
.../java/brooklyn/util/task/ScheduledTask.java | 3 +-
.../java/brooklyn/util/task/SequentialTask.java | 2 +-
.../util/task/SingleThreadedScheduler.java | 3 +-
.../java/brooklyn/util/task/TaskBuilder.java | 9 +-
.../java/brooklyn/util/task/TaskInternal.java | 5 +-
.../java/brooklyn/util/task/TaskScheduler.java | 2 +-
.../main/java/brooklyn/util/task/TaskTags.java | 4 +-
.../src/main/java/brooklyn/util/task/Tasks.java | 12 +-
.../java/brooklyn/util/task/ValueResolver.java | 6 +-
.../util/task/ssh/SshFetchTaskFactory.java | 2 +-
.../util/task/ssh/SshFetchTaskWrapper.java | 4 +-
.../util/task/ssh/SshPutTaskFactory.java | 2 +-
.../util/task/ssh/SshPutTaskWrapper.java | 4 +-
.../java/brooklyn/util/task/ssh/SshTasks.java | 10 +-
.../util/task/system/ProcessTaskFactory.java | 3 +-
.../util/task/system/ProcessTaskWrapper.java | 4 +-
.../brooklyn/util/text/TemplateProcessor.java | 2 +-
.../lite/CampPlatformWithJustBrooklynMgmt.java | 3 +-
.../brooklyn/camp/lite/CampYamlLiteTest.java | 5 +-
.../camp/lite/TestAppAssemblyInstantiator.java | 5 +-
.../catalog/internal/CatalogTestUtils.java | 5 +-
.../java/brooklyn/enricher/EnrichersTest.java | 2 +-
.../enricher/SensorPropagatingEnricherTest.java | 2 +-
.../enricher/basic/BasicEnricherTest.java | 4 +-
.../YamlRollingTimeWindowMeanEnricherTest.java | 4 +-
.../YamlTimeWeightedDeltaEnricherTest.java | 4 +-
.../entity/EffectorSayHiGroovyTest.groovy | 4 +-
.../java/brooklyn/entity/EffectorSayHiTest.java | 4 +-
.../entity/EntityPreManagementTest.java | 4 +-
.../entity/basic/BasicStartableTest.java | 2 +-
.../brooklyn/entity/basic/ConfigMapTest.java | 4 +-
.../brooklyn/entity/basic/DataEntityTest.java | 2 +-
.../basic/DependentConfigurationTest.java | 2 +-
.../brooklyn/entity/basic/EntityConfigTest.java | 2 +-
.../brooklyn/entity/basic/EntitySpecTest.java | 8 +-
.../entity/basic/EntitySubscriptionTest.java | 2 +-
.../entity/basic/PolicyRegistrationTest.java | 6 +-
.../entity/basic/ServiceStateLogicTest.java | 2 +-
.../drivers/EntityDriverRegistryTest.java | 2 +-
.../entity/effector/EffectorBasicTest.java | 4 +-
.../effector/EffectorConcatenateTest.java | 4 +-
.../entity/effector/EffectorTaskTest.java | 4 +-
.../entity/group/DynamicClusterTest.java | 2 +-
...DynamicClusterWithAvailabilityZonesTest.java | 2 +-
.../entity/group/DynamicFabricTest.java | 2 +-
.../entity/group/GroupPickUpEntitiesTest.java | 2 +-
.../group/MembershipTrackingPolicyTest.java | 4 +-
.../entity/hello/LocalEntitiesTest.java | 4 +-
.../ApplicationBuilderOverridingTest.java | 2 +-
.../entity/proxying/EntityManagerTest.java | 2 +-
.../entity/proxying/EntityProxyTest.java | 4 +-
.../entity/rebind/RebindCatalogEntityTest.java | 6 +-
.../entity/rebind/RebindCatalogItemTest.java | 4 +-
.../entity/rebind/RebindEnricherTest.java | 4 +-
.../entity/rebind/RebindEntityTest.java | 6 +-
.../entity/rebind/RebindFailuresTest.java | 12 +-
.../entity/rebind/RebindFeedWithHaTest.java | 4 +-
.../rebind/RebindLocalhostLocationTest.java | 2 +-
.../entity/rebind/RebindLocationTest.java | 2 +-
.../entity/rebind/RebindManagerSorterTest.java | 6 +-
.../entity/rebind/RebindManagerTest.java | 2 +-
.../brooklyn/entity/rebind/RebindOptions.java | 3 +-
.../entity/rebind/RebindPolicyTest.java | 8 +-
.../entity/rebind/RebindTestFixture.java | 10 +-
.../brooklyn/entity/rebind/RebindTestUtils.java | 10 +-
.../BrooklynMementoPersisterFileBasedTest.java | 2 +-
...ntoPersisterInMemorySizeIntegrationTest.java | 2 +-
.../BrooklynMementoPersisterInMemoryTest.java | 2 +-
.../BrooklynMementoPersisterTestFixture.java | 12 +-
.../persister/FileBasedObjectStoreTest.java | 2 +-
.../rebind/persister/InMemoryObjectStore.java | 4 +-
.../rebind/persister/ListeningObjectStore.java | 4 +-
.../persister/XmlMementoSerializerTest.java | 11 +-
.../transformer/CompoundTransformerTest.java | 6 +-
.../entity/trait/FailingEntityImpl.java | 2 +-
.../entity/trait/StartableMethodsTest.java | 2 +-
.../access/PortForwardManagerRebindTest.java | 2 +-
.../location/basic/AbstractLocationTest.java | 2 +-
...stMachineProvisioningLocationRebindTest.java | 2 +-
.../location/basic/LocationConfigTest.java | 2 +-
.../location/basic/LocationExtensionsTest.java | 2 +-
.../location/basic/LocationManagementTest.java | 2 +-
.../location/basic/MachineDetailsTest.java | 4 +-
.../location/basic/MultiLocationRebindTest.java | 2 +-
.../SshMachineLocationIntegrationTest.java | 4 +-
.../location/basic/SshMachineLocationTest.java | 2 +-
.../entitlement/AcmeEntitlementManager.java | 4 +
.../AcmeEntitlementManagerTestFixture.java | 2 +-
.../entitlement/EntitlementsTest.java | 3 +-
.../entitlement/EntityEntitlementTest.java | 2 +-
.../ha/HighAvailabilityManagerInMemoryTest.java | 1 +
.../HighAvailabilityManagerSplitBrainTest.java | 5 +
.../ha/HighAvailabilityManagerTestFixture.java | 5 +
.../brooklyn/management/ha/HotStandbyTest.java | 3 +
.../ha/ImmutableManagementPlaneSyncRecord.java | 3 +
...agementPlaneSyncRecordPersisterInMemory.java | 3 +
.../management/ha/MasterChooserTest.java | 2 +
.../ha/MutableManagementPlaneSyncRecord.java | 3 +
.../brooklyn/management/ha/WarmStandbyTest.java | 3 +
.../internal/EntityExecutionManagerTest.java | 4 +-
.../internal/LocalManagementContextTest.java | 2 +-
.../internal/LocalSubscriptionManagerTest.java | 4 +-
.../osgi/OsgiVersionMoreEntityTest.java | 10 +-
.../brooklyn/policy/basic/BasicPolicyTest.java | 2 +-
.../brooklyn/policy/basic/EnricherTypeTest.java | 2 +-
.../policy/basic/PolicySubscriptionTest.java | 4 +-
.../brooklyn/policy/basic/PolicyTypeTest.java | 2 +-
.../qa/performance/AbstractPerformanceTest.java | 2 +-
.../qa/performance/EntityPerformanceTest.java | 2 +-
.../EntityPersistencePerformanceTest.java | 4 +-
.../SubscriptionPerformanceTest.java | 2 +-
.../brooklyn/test/entity/TestApplication.java | 3 +-
.../test/entity/TestApplicationImpl.java | 2 +-
.../brooklyn/util/internal/FlagUtilsTest.java | 2 +-
.../util/ssh/BashCommandsIntegrationTest.java | 2 +-
.../task/BasicTaskExecutionPerformanceTest.java | 2 +-
.../util/task/BasicTaskExecutionTest.java | 2 +-
.../util/task/BasicTasksFutureTest.java | 2 +-
.../util/task/CompoundTaskExecutionTest.java | 2 +-
.../util/task/DynamicSequentialTaskTest.java | 4 +-
.../util/task/NonBasicTaskExecutionTest.java | 2 +-
.../util/task/ScheduledExecutionTest.java | 2 +-
.../util/task/TaskFinalizationTest.java | 2 +-
.../test/java/brooklyn/util/task/TasksTest.java | 4 +-
.../brooklyn/util/task/ValueResolverTest.java | 4 +-
.../brooklyn/util/task/ssh/SshTasksTest.java | 2 +-
.../util/task/system/SystemTasksTest.java | 2 +-
.../brooklyn/demo/CumulusRDFApplication.java | 7 +-
.../demo/HighAvailabilityCassandraCluster.java | 6 +-
.../brooklyn/demo/RiakClusterExample.java | 6 +-
.../brooklyn/demo/WideAreaCassandraCluster.java | 6 +-
...lusterDatabaseExampleAppIntegrationTest.java | 2 +-
.../JcloudsBlobStoreBasedObjectStore.java | 4 +-
.../location/jclouds/BrooklynMachinePool.java | 2 +-
.../jclouds/JcloudsByonLocationResolver.java | 2 +-
.../location/jclouds/JcloudsLocation.java | 2 +-
.../jclouds/JcloudsLocationResolver.java | 2 +-
.../zone/AwsAvailabilityZoneExtension.java | 2 +-
.../persister/jclouds/BlobStoreExpiryTest.java | 2 +-
.../BlobStorePersistencePerformanceTest.java | 2 +-
.../rebind/persister/jclouds/BlobStoreTest.java | 2 +-
.../jclouds/JcloudsExpect100ContinueTest.java | 2 +-
.../JcloudsObjectStoreAccessorWriterTest.java | 2 +-
.../jclouds/BailOutJcloudsLocation.java | 3 +-
.../provider/AbstractJcloudsLocationTest.java | 2 +-
.../AwsEc2LocationWindowsLiveTest.groovy | 2 +-
.../os/AdvertiseWinrmLoginPolicyTest.java | 2 +-
.../policy/os/CreateUserPolicyLiveTest.java | 2 +-
.../policy/os/CreateUserPolicyTest.java | 2 +-
.../entity/brooklyn/BrooklynMetricsImpl.java | 3 +-
.../policy/autoscaling/AutoScalerPolicy.java | 4 +-
.../policy/ha/AbstractFailureDetector.java | 2 +-
.../policy/ha/ConditionalSuspendPolicy.java | 2 +-
.../enricher/DeltaEnrichersTests.groovy | 2 +-
.../enricher/RollingMeanEnricherTest.groovy | 2 +-
.../RollingTimeWindowMeanEnricherTest.groovy | 2 +-
.../enricher/TimeFractionDeltaEnricherTest.java | 2 +-
.../autoscaling/AutoScalerPolicyTest.java | 2 +-
.../AbstractFollowTheSunPolicyTest.java | 2 +-
.../ha/ConnectionFailureDetectorTest.java | 4 +-
.../brooklyn/policy/ha/HaPolicyRebindTest.java | 4 +-
...ServiceFailureDetectorStabilizationTest.java | 4 +-
.../policy/ha/ServiceFailureDetectorTest.java | 4 +-
.../brooklyn/policy/ha/ServiceReplacerTest.java | 4 +-
.../policy/ha/ServiceRestarterTest.java | 4 +-
.../SameServerDriverLifecycleEffectorTasks.java | 2 +-
.../entity/basic/SameServerEntityImpl.java | 3 +-
...wareProcessDriverLifecycleEffectorTasks.java | 2 +-
.../entity/basic/SoftwareProcessImpl.java | 4 +-
.../entity/basic/lifecycle/ScriptHelper.java | 7 +-
.../brooklynnode/BrooklynClusterImpl.java | 2 +-
.../entity/brooklynnode/BrooklynNode.java | 6 +-
.../entity/brooklynnode/BrooklynNodeImpl.java | 6 +-
.../BrooklynClusterUpgradeEffectorBody.java | 6 +-
.../BrooklynNodeUpgradeEffectorBody.java | 4 +-
.../effector/SelectMasterEffectorBody.java | 4 +-
.../SetHighAvailabilityModeEffectorBody.java | 4 +-
.../brooklyn/entity/chef/ChefAttributeFeed.java | 2 +-
.../brooklyn/entity/chef/ChefSoloDriver.java | 5 +-
.../brooklyn/entity/chef/ChefSoloTasks.java | 3 +-
.../java/brooklyn/entity/chef/ChefTasks.java | 4 +-
.../brooklyn/entity/pool/ServerPoolImpl.java | 6 +-
.../entity/pool/ServerPoolLocationResolver.java | 2 +-
.../entity/service/EntityLaunchListener.java | 5 +-
.../entity/service/InitdServiceInstaller.java | 5 +-
.../entity/service/SystemServiceEnricher.java | 7 +-
.../entity/service/SystemServiceInstaller.java | 2 +-
.../service/SystemServiceInstallerFactory.java | 3 +-
.../entity/software/MachineInitTasks.java | 2 +-
.../software/MachineLifecycleEffectorTasks.java | 2 +-
.../entity/software/SshEffectorTasks.java | 2 +-
.../brooklyn/entity/software/StaticSensor.java | 2 +-
.../software/java/JmxAttributeSensor.java | 2 +-
.../entity/AbstractGoogleComputeLiveTest.java | 2 +-
.../entity/AbstractSoftlayerLiveTest.java | 2 +-
.../entity/basic/SameServerEntityTest.java | 2 +-
.../basic/SoftwareProcessEntityLatchTest.java | 2 +-
.../basic/SoftwareProcessEntityRebindTest.java | 2 +-
.../entity/basic/SoftwareProcessEntityTest.java | 6 +-
.../basic/lifecycle/NaiveScriptRunnerTest.java | 2 +-
.../brooklynnode/SelectMasterEffectorTest.java | 2 +-
.../entity/chef/ChefLiveTestSupport.java | 2 +-
.../chef/ChefServerTasksIntegrationTest.java | 2 +-
.../mysql/ChefSoloDriverToyMySqlEntity.java | 5 +-
.../entity/pool/AbstractServerPoolTest.java | 2 +-
.../entity/pool/ServerPoolLiveTest.java | 2 +-
.../entity/pool/ServerPoolRebindTest.java | 2 +-
.../service/SystemServiceEnricherTest.java | 2 +-
.../entity/software/AbstractDockerLiveTest.java | 4 +-
.../MachineLifecycleEffectorTasksTest.java | 2 +-
.../entity/software/SoftwareEffectorTest.java | 4 +-
.../entity/software/SshEffectorTasksTest.java | 6 +-
.../mariadb/MariaDbIntegrationTest.java | 2 +-
.../postgresql/PostgreSqlIntegrationTest.java | 2 +-
.../rubyrep/RubyRepIntegrationTest.java | 2 +-
.../entity/messaging/kafka/KafkaCluster.java | 2 +-
.../entity/zookeeper/ZooKeeperEnsembleImpl.java | 2 +-
.../entity/network/bind/BindDnsServerImpl.java | 2 +-
.../bind/BindDnsServerIntegrationTest.java | 2 +-
.../network/bind/BindDnsServerLiveTest.java | 2 +-
.../cassandra/CassandraDatacenterImpl.java | 2 +-
.../nosql/cassandra/CassandraFabricImpl.java | 2 +-
.../nosql/cassandra/CassandraNodeSshDriver.java | 2 +-
.../nosql/couchbase/CouchbaseClusterImpl.java | 2 +-
.../nosql/couchbase/CouchbaseNodeSshDriver.java | 2 +-
.../nosql/mongodb/MongoDBReplicaSetImpl.java | 2 +-
.../sharding/MongoDBRouterClusterImpl.java | 3 +-
.../sharding/MongoDBShardedDeploymentImpl.java | 2 +-
.../entity/nosql/riak/RiakClusterImpl.java | 4 +-
.../entity/dns/AbstractGeoDnsServiceImpl.java | 2 +-
.../entity/proxy/AbstractControllerImpl.java | 6 +-
.../AbstractNonProvisionedControllerImpl.java | 2 +-
.../entity/proxy/nginx/NginxControllerImpl.java | 4 +-
.../entity/proxy/nginx/NginxSshDriver.java | 2 +-
.../entity/proxy/nginx/UrlMappingImpl.java | 2 +-
.../ControlledDynamicWebAppClusterImpl.java | 2 +-
.../entity/webapp/DynamicWebAppClusterImpl.java | 4 +-
.../entity/dns/AbstractGeoDnsServiceTest.java | 2 +-
.../geoscaling/GeoscalingIntegrationTest.java | 2 +-
.../nginx/NginxClusterIntegrationTest.java | 2 +-
.../proxy/nginx/NginxRebindIntegrationTest.java | 2 +-
.../nginx/NginxRebindWithHaIntegrationTest.java | 4 +-
.../nginx/NginxUrlMappingIntegrationTest.java | 2 +-
.../proxy/nginx/NginxWebClusterEc2LiveTest.java | 2 +-
.../AbstractWebAppFixtureIntegrationTest.java | 6 +-
.../webapp/TomcatAutoScalerPolicyTest.java | 2 +-
.../webapp/WebAppConcurrentDeployTest.java | 2 +-
.../NodeJsWebAppFixtureIntegrationTest.java | 2 +-
.../app/SampleLocalhostIntegrationTest.java | 2 +-
.../brooklyn/sample/app/SampleUnitTest.java | 2 +-
.../camp/brooklyn/BrooklynCampPlatform.java | 4 +-
.../BrooklynCampPlatformLauncherAbstract.java | 3 +-
.../camp/brooklyn/YamlLauncherAbstract.java | 4 +-
.../BrooklynAssemblyTemplateInstantiator.java | 5 +-
.../BrooklynComponentTemplateResolver.java | 5 +-
.../BrooklynEntityDecorationResolver.java | 11 +-
.../spi/creation/BrooklynEntityMatcher.java | 4 +-
.../creation/BrooklynYamlLocationResolver.java | 3 +-
.../creation/BrooklynYamlTypeInstantiator.java | 2 +-
.../spi/dsl/BrooklynDslDeferredSupplier.java | 4 +-
.../spi/dsl/methods/BrooklynDslCommon.java | 6 +-
.../brooklyn/spi/dsl/methods/DslComponent.java | 2 +-
.../lookup/AbstractBrooklynResourceLookup.java | 3 +-
.../lookup/AbstractTemplateBrooklynLookup.java | 4 +-
.../spi/lookup/AssemblyBrooklynLookup.java | 3 +-
.../lookup/AssemblyTemplateBrooklynLookup.java | 3 +-
.../brooklyn/spi/lookup/BrooklynUrlLookup.java | 3 +-
.../lookup/PlatformComponentBrooklynLookup.java | 3 +-
...PlatformComponentTemplateBrooklynLookup.java | 3 +-
.../platform/BrooklynImmutableCampPlatform.java | 2 +-
.../camp/brooklyn/AbstractYamlRebindTest.java | 4 +-
.../camp/brooklyn/AbstractYamlTest.java | 4 +-
.../BrooklynYamlTypeInstantiatorTest.java | 4 +-
.../camp/brooklyn/DslAndRebindYamlTest.java | 2 +-
.../camp/brooklyn/EnrichersYamlTest.java | 2 +-
.../camp/brooklyn/EntitiesYamlTest.java | 2 +-
...aWebAppWithDslYamlRebindIntegrationTest.java | 4 +-
.../brooklyn/JavaWebAppsIntegrationTest.java | 6 +-
.../camp/brooklyn/JavaWebAppsMatchingTest.java | 2 +-
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 4 +-
.../camp/brooklyn/PoliciesYamlTest.java | 2 +-
.../brooklyn/ReloadBrooklynPropertiesTest.java | 2 +-
.../brooklyn/VanillaBashNetcatYamlTest.java | 2 +-
.../CatalogOsgiVersionMoreEntityTest.java | 7 +-
.../brooklyn/catalog/CatalogYamlCombiTest.java | 3 +-
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 4 +-
.../brooklyn/catalog/CatalogYamlRebindTest.java | 4 +-
.../org/apache/brooklyn/cli/ItemLister.java | 6 +-
.../main/java/org/apache/brooklyn/cli/Main.java | 13 +-
.../apache/brooklyn/cli/lister/ClassFinder.java | 4 +-
.../BrooklynJavascriptGuiLauncherTest.java | 4 +-
.../brooklyn/launcher/BrooklynLauncher.java | 18 +-
.../launcher/BrooklynServerDetails.java | 2 +-
.../brooklyn/launcher/BrooklynWebServer.java | 7 +-
.../camp/BrooklynCampPlatformLauncher.java | 4 +-
.../BrooklynEntityMirrorIntegrationTest.java | 6 +-
.../brooklynnode/BrooklynNodeRestTest.java | 4 +-
.../BrooklynLauncherHighAvailabilityTest.java | 7 +-
.../BrooklynLauncherRebindTestFixture.java | 5 +-
.../BrooklynLauncherRebindTestToFiles.java | 5 +-
...lynLauncherRebindToCloudObjectStoreTest.java | 5 +-
.../brooklyn/launcher/BrooklynLauncherTest.java | 3 +-
.../launcher/SimpleYamlLauncherForTests.java | 3 +-
.../blueprints/AbstractBlueprintTest.java | 4 +-
.../qa/load/SimulatedNginxControllerImpl.java | 3 +-
.../SoftlayerObtainPrivateLiveTest.java | 4 +-
.../org/apache/brooklyn/qa/load/LoadTest.java | 6 +-
.../qa/longevity/webcluster/WebClusterApp.java | 4 +-
.../org/apache/brooklyn/rest/api/ServerApi.java | 4 +-
.../ApplicationResourceIntegrationTest.java | 4 +-
.../rest/client/BrooklynApiRestClientTest.java | 4 +-
.../BrooklynPropertiesSecurityFilter.java | 4 +-
.../rest/filter/HaHotCheckResourceFilter.java | 6 +-
.../rest/filter/HaMasterCheckFilter.java | 6 +-
.../resources/AbstractBrooklynRestResource.java | 4 +-
.../rest/resources/ActivityResource.java | 5 +-
.../rest/resources/ApplicationResource.java | 5 +-
.../rest/resources/CatalogResource.java | 8 +-
.../rest/resources/EffectorResource.java | 4 +-
.../brooklyn/rest/resources/EntityResource.java | 4 +-
.../rest/resources/PolicyConfigResource.java | 4 +-
.../brooklyn/rest/resources/PolicyResource.java | 6 +-
.../brooklyn/rest/resources/ServerResource.java | 18 +-
...nUserWithRandomPasswordSecurityProvider.java | 4 +-
.../provider/DelegatingSecurityProvider.java | 4 +-
.../provider/ExplicitUsersSecurityProvider.java | 3 +-
.../security/provider/LdapSecurityProvider.java | 5 +-
.../rest/transform/CatalogTransformer.java | 8 +-
.../transform/HighAvailabilityTransformer.java | 4 +-
.../rest/transform/LocationTransformer.java | 4 +-
.../rest/transform/PolicyTransformer.java | 3 +-
.../rest/transform/TaskTransformer.java | 6 +-
.../rest/util/BrooklynRestResourceUtils.java | 10 +-
.../brooklyn/rest/util/EntityLocationUtils.java | 3 +-
.../rest/util/ManagementContextProvider.java | 2 +-
.../rest/util/json/BidiSerialization.java | 2 +-
.../util/json/BrooklynJacksonJsonProvider.java | 2 +-
.../brooklynnode/DeployBlueprintTest.java | 4 +-
.../brooklyn/rest/BrooklynRestApiLauncher.java | 4 +-
.../BrooklynRestApiLauncherTestFixture.java | 4 +-
.../apache/brooklyn/rest/HaHotCheckTest.java | 7 +-
.../brooklyn/rest/HaMasterCheckFilterTest.java | 10 +-
.../brooklyn/rest/domain/ApplicationTest.java | 2 +-
.../brooklyn/rest/domain/SensorSummaryTest.java | 4 +-
.../rest/resources/ScriptResourceTest.java | 3 +-
.../SensorResourceIntegrationTest.java | 4 +-
.../ServerResourceIntegrationTest.java | 4 +-
.../rest/resources/ServerResourceTest.java | 4 +-
.../rest/resources/ServerShutdownTest.java | 6 +-
.../rest/testing/BrooklynRestApiTest.java | 4 +-
.../util/BrooklynRestResourceUtilsTest.java | 6 +-
.../json/BrooklynJacksonSerializerTest.java | 4 +-
.../apache/brooklyn/test/EntityTestUtils.java | 3 +-
.../osgi/tests/more/MoreEntityImpl.java | 2 +-
.../osgi/tests/more/MoreEntityImpl.java | 2 +-
659 files changed, 4753 insertions(+), 4385 deletions(-)
----------------------------------------------------------------------