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 20:59:56 UTC
[9/9] incubator-brooklyn git commit: This closes #819
This closes #819
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e5289b84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e5289b84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e5289b84
Branch: refs/heads/master
Commit: e5289b84c20464a7e69e08be155d7ccc9f0c4599
Parents: 149eb73 2e2de8e
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Thu Aug 13 14:59:29 2015 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Thu Aug 13 14:59:29 2015 -0400
----------------------------------------------------------------------
.../brooklyn/location/LocationDefinition.java | 2 +-
.../brooklyn/location/LocationResolver.java | 2 +-
.../java/brooklyn/location/LocationSpec.java | 2 +-
.../apache/brooklyn/api/entity/Application.java | 2 +-
.../org/apache/brooklyn/api/entity/Entity.java | 2 +-
.../brooklyn/api/entity/basic/EntityLocal.java | 8 +-
.../api/entity/proxying/EntitySpec.java | 2 +-
.../api/entity/rebind/RebindManager.java | 2 +-
.../brooklyn/api/entity/trait/Configurable.java | 2 +-
.../api/management/AccessController.java | 66 +++++
.../brooklyn/api/management/EntityManager.java | 126 +++++++++
.../api/management/ExecutionContext.java | 67 +++++
.../api/management/ExecutionManager.java | 117 +++++++++
.../api/management/HasTaskChildren.java | 39 +++
.../api/management/LocationManager.java | 87 +++++++
.../api/management/ManagementContext.java | 255 +++++++++++++++++++
.../api/management/SubscriptionContext.java | 66 +++++
.../api/management/SubscriptionHandle.java | 27 ++
.../api/management/SubscriptionManager.java | 112 ++++++++
.../apache/brooklyn/api/management/Task.java | 128 ++++++++++
.../brooklyn/api/management/TaskAdaptable.java | 24 ++
.../brooklyn/api/management/TaskFactory.java | 25 ++
.../api/management/TaskQueueingContext.java | 62 +++++
.../brooklyn/api/management/TaskWrapper.java | 28 ++
.../BrooklynClassLoadingContext.java | 51 ++++
.../entitlement/EntitlementClass.java | 27 ++
.../entitlement/EntitlementContext.java | 24 ++
.../entitlement/EntitlementManager.java | 45 ++++
.../management/ha/HighAvailabilityManager.java | 129 ++++++++++
.../api/management/ha/HighAvailabilityMode.java | 67 +++++
.../api/management/ha/ManagementNodeState.java | 72 ++++++
.../management/ha/ManagementNodeSyncRecord.java | 62 +++++
.../ha/ManagementPlaneSyncRecord.java | 51 ++++
.../ha/ManagementPlaneSyncRecordPersister.java | 69 +++++
.../api/management/ha/MementoCopyMode.java | 29 +++
.../brooklyn/management/AccessController.java | 66 -----
.../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 | 255 -------------------
.../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 ---
.../mementos/BrooklynMementoPersister.java | 2 +-
.../apache/brooklyn/policy/EnricherSpec.java | 2 +-
.../org/apache/brooklyn/policy/PolicySpec.java | 2 +-
.../src/main/java/brooklyn/BrooklynVersion.java | 2 +-
.../brooklyn/basic/AbstractBrooklynObject.java | 2 +-
.../brooklyn/basic/BasicConfigurableObject.java | 4 +-
.../basic/internal/ApiObjectsFactoryImpl.java | 2 +-
.../api/AssemblyTemplateSpecInstantiator.java | 2 +-
.../api/HasBrooklynManagementContext.java | 2 +-
.../brooklyn/catalog/CatalogPredicates.java | 2 +-
.../catalog/internal/BasicBrooklynCatalog.java | 4 +-
.../brooklyn/catalog/internal/CatalogDo.java | 2 +-
.../catalog/internal/CatalogInitialization.java | 4 +-
.../catalog/internal/CatalogItemDo.java | 2 +-
.../brooklyn/catalog/internal/CatalogUtils.java | 4 +-
.../brooklyn/config/BrooklynServerConfig.java | 2 +-
.../brooklyn/config/BrooklynServerPaths.java | 2 +-
.../config/BrooklynServiceAttributes.java | 2 +-
.../brooklyn/entity/basic/AbstractEffector.java | 2 +-
.../brooklyn/entity/basic/AbstractEntity.java | 12 +-
.../entity/basic/ApplicationBuilder.java | 4 +-
.../java/brooklyn/entity/basic/Attributes.java | 2 +-
.../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 | 12 +-
.../brooklyn/entity/basic/EntityConfigMap.java | 4 +-
.../brooklyn/entity/basic/EntityFunctions.java | 2 +-
.../brooklyn/entity/basic/EntityInternal.java | 6 +-
.../java/brooklyn/entity/basic/EntityTasks.java | 2 +-
.../basic/EntityTransientCopyInternal.java | 4 +-
.../brooklyn/entity/effector/EffectorBody.java | 6 +-
.../brooklyn/entity/effector/EffectorTasks.java | 4 +-
.../brooklyn/entity/effector/Effectors.java | 2 +-
.../entity/group/DynamicClusterImpl.java | 2 +-
.../entity/group/DynamicFabricImpl.java | 2 +-
.../entity/group/DynamicRegionsFabricImpl.java | 2 +-
.../entity/group/QuarantineGroupImpl.java | 2 +-
.../entity/proxying/EntityProxyImpl.java | 4 +-
.../entity/proxying/InternalEntityFactory.java | 2 +-
.../proxying/InternalLocationFactory.java | 2 +-
.../entity/proxying/InternalPolicyFactory.java | 2 +-
.../rebind/ActivePartialRebindIteration.java | 2 +-
.../rebind/InitialFullRebindIteration.java | 2 +-
.../rebind/PeriodicDeltaChangeListener.java | 4 +-
.../entity/rebind/RebindContextImpl.java | 2 +-
.../rebind/RebindContextLookupContext.java | 2 +-
.../brooklyn/entity/rebind/RebindIteration.java | 4 +-
.../entity/rebind/RebindManagerImpl.java | 8 +-
.../entity/rebind/dto/MementosGenerators.java | 4 +-
.../persister/BrooklynPersistenceUtils.java | 10 +-
.../rebind/persister/FileBasedObjectStore.java | 4 +-
.../rebind/persister/MementoSerializer.java | 2 +-
.../persister/PersistenceObjectStore.java | 4 +-
.../rebind/persister/XmlMementoSerializer.java | 6 +-
.../dto/BasicManagementNodeSyncRecord.java | 4 +-
.../dto/ManagementPlaneSyncRecordImpl.java | 4 +-
.../brooklyn/entity/trait/StartableMethods.java | 2 +-
.../basic/AbstractCollectionConfigKey.java | 4 +-
.../basic/AbstractStructuredConfigKey.java | 2 +-
.../basic/AttributeSensorAndConfigKey.java | 2 +-
.../basic/BasicAttributeSensorAndConfigKey.java | 2 +-
.../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 | 2 +-
...platedStringAttributeSensorAndConfigKey.java | 2 +-
.../brooklyn/event/feed/ConfigToAttributes.java | 2 +-
.../main/java/brooklyn/event/feed/Poller.java | 2 +-
.../brooklyn/event/feed/shell/ShellFeed.java | 2 +-
.../windows/WindowsPerformanceCounterFeed.java | 2 +-
.../internal/BrooklynFeatureEnablement.java | 2 +-
.../location/basic/AbstractLocation.java | 2 +-
.../basic/AbstractLocationResolver.java | 2 +-
.../location/basic/BasicLocationRegistry.java | 2 +-
.../location/basic/BasicMachineDetails.java | 2 +-
.../location/basic/CatalogLocationResolver.java | 2 +-
.../basic/DefinedLocationByIdResolver.java | 2 +-
.../FixedListMachineProvisioningLocation.java | 2 +-
.../location/basic/LocationConfigUtils.java | 2 +-
.../location/basic/LocationInternal.java | 2 +-
.../java/brooklyn/location/basic/Locations.java | 4 +-
.../brooklyn/location/basic/MultiLocation.java | 2 +-
.../location/basic/MultiLocationResolver.java | 2 +-
.../location/basic/NamedLocationResolver.java | 2 +-
.../location/basic/SshMachineLocation.java | 2 +-
.../AbstractAvailabilityZoneExtension.java | 2 +-
.../management/ManagementContextInjectable.java | 2 +-
.../AbstractBrooklynClassLoadingContext.java | 4 +-
.../BrooklynClassLoadingContextSequential.java | 4 +-
...ssLoaderFromBrooklynClassLoadingContext.java | 2 +-
.../JavaBrooklynClassLoadingContext.java | 2 +-
.../OsgiBrooklynClassLoadingContext.java | 4 +-
.../BasicEntitlementClassDefinition.java | 2 +-
.../entitlement/EntitlementManagerAdapter.java | 6 +-
.../entitlement/EntitlementPredicates.java | 4 +-
.../management/entitlement/Entitlements.java | 10 +-
.../entitlement/NotEntitledException.java | 4 +-
.../entitlement/PerUserEntitlementManager.java | 6 +-
.../PerUserEntitlementManagerWithDefault.java | 2 +-
.../entitlement/WebEntitlementContext.java | 2 +-
.../management/ha/BasicMasterChooser.java | 6 +-
.../ha/HighAvailabilityManagerImpl.java | 18 +-
.../ha/ManagementPlaneSyncRecordDeltaImpl.java | 4 +-
...ntPlaneSyncRecordPersisterToObjectStore.java | 12 +-
.../brooklyn/management/ha/MasterChooser.java | 4 +-
.../brooklyn/management/ha/OsgiManager.java | 2 +-
.../internal/AbstractManagementContext.java | 14 +-
.../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/EntityManagementSupport.java | 8 +-
.../internal/EntityManagementUtils.java | 6 +-
.../internal/EntityManagerInternal.java | 2 +-
.../management/internal/LocalAccessManager.java | 2 +-
.../management/internal/LocalEntityManager.java | 4 +-
.../internal/LocalLocationManager.java | 2 +-
.../internal/LocalManagementContext.java | 14 +-
.../internal/LocalSubscriptionManager.java | 6 +-
.../management/internal/LocalUsageManager.java | 2 +-
.../internal/LocationManagerInternal.java | 2 +-
.../internal/ManagementContextInternal.java | 4 +-
.../internal/ManagementTransitionInfo.java | 2 +-
.../internal/NonDeploymentAccessManager.java | 2 +-
.../internal/NonDeploymentEntityManager.java | 2 +-
.../internal/NonDeploymentLocationManager.java | 2 +-
.../NonDeploymentManagementContext.java | 26 +-
.../internal/QueueingSubscriptionManager.java | 2 +-
.../management/internal/Subscription.java | 2 +-
.../internal/SubscriptionTracker.java | 4 +-
.../policy/basic/AbstractEntityAdjunct.java | 8 +-
.../brooklyn/policy/basic/ConfigMapImpl.java | 2 +-
.../main/java/brooklyn/util/ResourceUtils.java | 4 +-
.../java/brooklyn/util/file/ArchiveTasks.java | 4 +-
.../util/internal/ConfigKeySelfExtracting.java | 2 +-
.../brooklyn/util/mutex/SemaphoreForTasks.java | 4 +-
.../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 | 2 +-
.../java/brooklyn/util/task/ParallelTask.java | 2 +-
.../java/brooklyn/util/task/ScheduledTask.java | 2 +-
.../java/brooklyn/util/task/SequentialTask.java | 2 +-
.../util/task/SingleThreadedScheduler.java | 2 +-
.../java/brooklyn/util/task/TaskBuilder.java | 8 +-
.../java/brooklyn/util/task/TaskInternal.java | 4 +-
.../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 | 2 +-
.../util/task/system/ProcessTaskWrapper.java | 4 +-
.../brooklyn/util/text/TemplateProcessor.java | 2 +-
.../lite/CampPlatformWithJustBrooklynMgmt.java | 2 +-
.../brooklyn/camp/lite/CampYamlLiteTest.java | 2 +-
.../camp/lite/TestAppAssemblyInstantiator.java | 4 +-
.../catalog/internal/CatalogTestUtils.java | 4 +-
.../YamlRollingTimeWindowMeanEnricherTest.java | 2 +-
.../YamlTimeWeightedDeltaEnricherTest.java | 2 +-
.../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 +-
.../entity/basic/EntitySubscriptionTest.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 +-
.../group/MembershipTrackingPolicyTest.java | 2 +-
.../entity/hello/LocalEntitiesTest.java | 4 +-
.../ApplicationBuilderOverridingTest.java | 2 +-
.../entity/proxying/EntityManagerTest.java | 2 +-
.../entity/proxying/EntityProxyTest.java | 4 +-
.../entity/rebind/RebindCatalogEntityTest.java | 4 +-
.../entity/rebind/RebindCatalogItemTest.java | 2 +-
.../entity/rebind/RebindEntityTest.java | 2 +-
.../entity/rebind/RebindFailuresTest.java | 4 +-
.../entity/rebind/RebindFeedWithHaTest.java | 4 +-
.../entity/rebind/RebindManagerSorterTest.java | 2 +-
.../entity/rebind/RebindManagerTest.java | 2 +-
.../brooklyn/entity/rebind/RebindOptions.java | 2 +-
.../entity/rebind/RebindTestFixture.java | 6 +-
.../brooklyn/entity/rebind/RebindTestUtils.java | 6 +-
.../BrooklynMementoPersisterFileBasedTest.java | 2 +-
...ntoPersisterInMemorySizeIntegrationTest.java | 2 +-
.../BrooklynMementoPersisterInMemoryTest.java | 2 +-
.../BrooklynMementoPersisterTestFixture.java | 2 +-
.../persister/FileBasedObjectStoreTest.java | 2 +-
.../rebind/persister/InMemoryObjectStore.java | 4 +-
.../rebind/persister/ListeningObjectStore.java | 4 +-
.../persister/XmlMementoSerializerTest.java | 2 +-
.../transformer/CompoundTransformerTest.java | 4 +-
.../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 | 2 +-
.../location/basic/SshMachineLocationTest.java | 2 +-
.../entitlement/AcmeEntitlementManager.java | 6 +-
.../AcmeEntitlementManagerTestFixture.java | 2 +-
.../entitlement/EntitlementsTest.java | 4 +-
.../entitlement/EntityEntitlementTest.java | 2 +-
.../ha/HighAvailabilityManagerInMemoryTest.java | 2 +-
.../HighAvailabilityManagerSplitBrainTest.java | 10 +-
.../ha/HighAvailabilityManagerTestFixture.java | 10 +-
.../brooklyn/management/ha/HotStandbyTest.java | 6 +-
.../ha/ImmutableManagementPlaneSyncRecord.java | 4 +-
...agementPlaneSyncRecordPersisterInMemory.java | 6 +-
.../management/ha/MasterChooserTest.java | 4 +-
.../ha/MutableManagementPlaneSyncRecord.java | 4 +-
.../brooklyn/management/ha/WarmStandbyTest.java | 6 +-
.../internal/EntityExecutionManagerTest.java | 4 +-
.../internal/LocalManagementContextTest.java | 2 +-
.../internal/LocalSubscriptionManagerTest.java | 4 +-
.../osgi/OsgiVersionMoreEntityTest.java | 4 +-
.../policy/basic/PolicySubscriptionTest.java | 2 +-
.../qa/performance/AbstractPerformanceTest.java | 2 +-
.../qa/performance/EntityPerformanceTest.java | 2 +-
.../SubscriptionPerformanceTest.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/test/entity/TestApplication.java | 2 +-
.../test/entity/TestApplicationImpl.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 | 2 +-
.../provider/AbstractJcloudsLocationTest.java | 2 +-
.../AwsEc2LocationWindowsLiveTest.groovy | 2 +-
.../entity/brooklyn/BrooklynMetricsImpl.java | 2 +-
.../policy/ha/AbstractFailureDetector.java | 2 +-
.../enricher/DeltaEnrichersTests.groovy | 2 +-
.../enricher/RollingMeanEnricherTest.groovy | 2 +-
.../RollingTimeWindowMeanEnricherTest.groovy | 2 +-
.../enricher/TimeFractionDeltaEnricherTest.java | 2 +-
.../AbstractFollowTheSunPolicyTest.java | 2 +-
.../ha/ConnectionFailureDetectorTest.java | 2 +-
...ServiceFailureDetectorStabilizationTest.java | 2 +-
.../policy/ha/ServiceFailureDetectorTest.java | 2 +-
.../brooklyn/policy/ha/ServiceReplacerTest.java | 2 +-
.../policy/ha/ServiceRestarterTest.java | 2 +-
.../SameServerDriverLifecycleEffectorTasks.java | 2 +-
.../entity/basic/SameServerEntityImpl.java | 2 +-
...wareProcessDriverLifecycleEffectorTasks.java | 2 +-
.../entity/basic/SoftwareProcessImpl.java | 2 +-
.../entity/basic/lifecycle/ScriptHelper.java | 6 +-
.../brooklynnode/BrooklynClusterImpl.java | 2 +-
.../entity/brooklynnode/BrooklynNode.java | 4 +-
.../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 | 4 +-
.../brooklyn/entity/chef/ChefSoloTasks.java | 2 +-
.../java/brooklyn/entity/chef/ChefTasks.java | 4 +-
.../brooklyn/entity/pool/ServerPoolImpl.java | 4 +-
.../entity/pool/ServerPoolLocationResolver.java | 2 +-
.../entity/service/EntityLaunchListener.java | 4 +-
.../entity/service/InitdServiceInstaller.java | 2 +-
.../entity/service/SystemServiceEnricher.java | 4 +-
.../entity/service/SystemServiceInstaller.java | 2 +-
.../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 | 4 +-
.../entity/pool/AbstractServerPoolTest.java | 2 +-
.../entity/pool/ServerPoolLiveTest.java | 2 +-
.../entity/pool/ServerPoolRebindTest.java | 2 +-
.../entity/software/AbstractDockerLiveTest.java | 2 +-
.../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 +-
.../nosql/cassandra/CassandraNodeSshDriver.java | 2 +-
.../nosql/couchbase/CouchbaseNodeSshDriver.java | 2 +-
.../entity/proxy/AbstractControllerImpl.java | 2 +-
.../entity/proxy/nginx/NginxControllerImpl.java | 2 +-
.../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 | 2 +-
.../camp/brooklyn/YamlLauncherAbstract.java | 4 +-
.../BrooklynAssemblyTemplateInstantiator.java | 4 +-
.../BrooklynComponentTemplateResolver.java | 4 +-
.../BrooklynEntityDecorationResolver.java | 2 +-
.../spi/creation/BrooklynEntityMatcher.java | 4 +-
.../creation/BrooklynYamlLocationResolver.java | 2 +-
.../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 | 2 +-
.../lookup/AbstractTemplateBrooklynLookup.java | 2 +-
.../spi/lookup/AssemblyBrooklynLookup.java | 2 +-
.../lookup/AssemblyTemplateBrooklynLookup.java | 2 +-
.../brooklyn/spi/lookup/BrooklynUrlLookup.java | 2 +-
.../lookup/PlatformComponentBrooklynLookup.java | 2 +-
...PlatformComponentTemplateBrooklynLookup.java | 2 +-
.../platform/BrooklynImmutableCampPlatform.java | 2 +-
.../camp/brooklyn/AbstractYamlRebindTest.java | 4 +-
.../camp/brooklyn/AbstractYamlTest.java | 4 +-
.../BrooklynYamlTypeInstantiatorTest.java | 2 +-
.../camp/brooklyn/DslAndRebindYamlTest.java | 2 +-
.../camp/brooklyn/EntitiesYamlTest.java | 2 +-
...aWebAppWithDslYamlRebindIntegrationTest.java | 4 +-
.../brooklyn/JavaWebAppsIntegrationTest.java | 4 +-
.../camp/brooklyn/JavaWebAppsMatchingTest.java | 2 +-
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 4 +-
.../brooklyn/ReloadBrooklynPropertiesTest.java | 2 +-
.../brooklyn/VanillaBashNetcatYamlTest.java | 2 +-
.../main/java/org/apache/brooklyn/cli/Main.java | 6 +-
.../BrooklynJavascriptGuiLauncherTest.java | 2 +-
.../brooklyn/launcher/BrooklynLauncher.java | 12 +-
.../launcher/BrooklynServerDetails.java | 2 +-
.../brooklyn/launcher/BrooklynWebServer.java | 2 +-
.../camp/BrooklynCampPlatformLauncher.java | 2 +-
.../BrooklynEntityMirrorIntegrationTest.java | 4 +-
.../brooklynnode/BrooklynNodeRestTest.java | 2 +-
.../BrooklynLauncherHighAvailabilityTest.java | 6 +-
.../BrooklynLauncherRebindTestFixture.java | 4 +-
.../BrooklynLauncherRebindTestToFiles.java | 4 +-
...lynLauncherRebindToCloudObjectStoreTest.java | 2 +-
.../brooklyn/launcher/BrooklynLauncherTest.java | 2 +-
.../launcher/SimpleYamlLauncherForTests.java | 2 +-
.../blueprints/AbstractBlueprintTest.java | 2 +-
.../SoftlayerObtainPrivateLiveTest.java | 2 +-
.../org/apache/brooklyn/qa/load/LoadTest.java | 4 +-
.../org/apache/brooklyn/rest/api/ServerApi.java | 4 +-
.../ApplicationResourceIntegrationTest.java | 2 +-
.../rest/client/BrooklynApiRestClientTest.java | 2 +-
.../BrooklynPropertiesSecurityFilter.java | 2 +-
.../rest/filter/HaHotCheckResourceFilter.java | 4 +-
.../rest/filter/HaMasterCheckFilter.java | 4 +-
.../resources/AbstractBrooklynRestResource.java | 2 +-
.../rest/resources/ActivityResource.java | 4 +-
.../rest/resources/ApplicationResource.java | 2 +-
.../rest/resources/EffectorResource.java | 2 +-
.../brooklyn/rest/resources/EntityResource.java | 2 +-
.../brooklyn/rest/resources/ServerResource.java | 16 +-
...nUserWithRandomPasswordSecurityProvider.java | 2 +-
.../provider/DelegatingSecurityProvider.java | 2 +-
.../provider/ExplicitUsersSecurityProvider.java | 2 +-
.../security/provider/LdapSecurityProvider.java | 2 +-
.../transform/HighAvailabilityTransformer.java | 4 +-
.../rest/transform/LocationTransformer.java | 2 +-
.../rest/transform/TaskTransformer.java | 4 +-
.../rest/util/BrooklynRestResourceUtils.java | 4 +-
.../brooklyn/rest/util/EntityLocationUtils.java | 2 +-
.../rest/util/ManagementContextProvider.java | 2 +-
.../rest/util/json/BidiSerialization.java | 2 +-
.../util/json/BrooklynJacksonJsonProvider.java | 2 +-
.../brooklynnode/DeployBlueprintTest.java | 2 +-
.../brooklyn/rest/BrooklynRestApiLauncher.java | 2 +-
.../BrooklynRestApiLauncherTestFixture.java | 2 +-
.../apache/brooklyn/rest/HaHotCheckTest.java | 6 +-
.../brooklyn/rest/HaMasterCheckFilterTest.java | 8 +-
.../brooklyn/rest/domain/ApplicationTest.java | 2 +-
.../brooklyn/rest/domain/SensorSummaryTest.java | 2 +-
.../rest/resources/ScriptResourceTest.java | 2 +-
.../SensorResourceIntegrationTest.java | 2 +-
.../ServerResourceIntegrationTest.java | 2 +-
.../rest/resources/ServerResourceTest.java | 2 +-
.../rest/resources/ServerShutdownTest.java | 4 +-
.../rest/testing/BrooklynRestApiTest.java | 2 +-
.../json/BrooklynJacksonSerializerTest.java | 2 +-
.../apache/brooklyn/test/EntityTestUtils.java | 2 +-
506 files changed, 2599 insertions(+), 2599 deletions(-)
----------------------------------------------------------------------