You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/10/06 08:06:41 UTC
[17/23] brooklyn-server git commit: Merge branch 'master' into tasks-4
Merge branch 'master' into tasks-4
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0c2e1f60
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0c2e1f60
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0c2e1f60
Branch: refs/heads/master
Commit: 0c2e1f60e7781def8b4a8be744e4ee9244658212
Parents: bb26d32 baf8070
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 4 03:00:04 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 4 03:00:04 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/api/entity/Entity.java | 3 +
.../brooklyn/api/mgmt/rebind/RebindManager.java | 14 +-
.../org/apache/brooklyn/api/sensor/Feed.java | 2 +-
...loudsCustomizerInstantiationYamlDslTest.java | 156 +++++--
.../catalog/SpecParameterUnwrappingTest.java | 2 +-
.../brooklyn/core/catalog/CatalogLoadMode.java | 73 ----
.../catalog/internal/BasicBrooklynCatalog.java | 28 +-
.../catalog/internal/CatalogInitialization.java | 278 ++++++++-----
.../core/catalog/internal/CatalogUtils.java | 31 +-
.../brooklyn/core/entity/AbstractEntity.java | 34 +-
.../core/entity/BrooklynConfigKeys.java | 2 +-
.../brooklyn/core/entity/EntityAdjuncts.java | 28 +-
.../brooklyn/core/entity/EntityInternal.java | 16 +-
.../apache/brooklyn/core/feed/AbstractFeed.java | 2 +-
.../mgmt/ha/HighAvailabilityManagerImpl.java | 45 +-
.../core/mgmt/ha/OsgiArchiveInstaller.java | 210 +++++++---
.../brooklyn/core/mgmt/ha/OsgiManager.java | 36 +-
.../internal/AbstractManagementContext.java | 5 +-
.../core/mgmt/internal/LocalUsageManager.java | 31 +-
.../ManagementNodeStateListenerManager.java | 175 ++++++++
.../NonDeploymentManagementContext.java | 19 -
.../rebind/ImmediateDeltaChangeListener.java | 160 --------
.../core/mgmt/rebind/RebindIteration.java | 213 ++++------
.../core/mgmt/rebind/RebindManagerImpl.java | 30 --
.../mgmt/rebind/dto/BasicEntityMemento.java | 2 +-
.../mgmt/rebind/dto/MementosGenerators.java | 5 +-
.../mgmt/usage/ManagementNodeStateListener.java | 53 +++
.../core/objs/BasicConfigurableObject.java | 4 +-
.../apache/brooklyn/core/policy/Policies.java | 66 +--
.../core/server/BrooklynServerConfig.java | 28 +-
.../FixedListMachineProvisioningLocation.java | 3 +-
.../brooklyn/util/core/ClassLoaderUtils.java | 7 +-
.../brooklyn/util/core/flags/TypeCoercions.java | 21 +
.../brooklyn/util/core/osgi/BundleMaker.java | 38 +-
.../brooklyn/util/core/task/BasicTask.java | 5 +-
.../core/entity/EntityConcurrencyTest.java | 2 +-
.../ha/HighAvailabilityManagerInMemoryTest.java | 5 -
.../ha/HighAvailabilityManagerTestFixture.java | 61 ++-
.../mgmt/rebind/RebindCatalogEntityTest.java | 2 +-
.../core/mgmt/rebind/RebindCatalogItemTest.java | 2 -
.../core/mgmt/rebind/RebindFailuresTest.java | 18 +-
.../core/mgmt/rebind/RebindFeedWithHaTest.java | 2 +-
.../usage/ManagementNodeStateListenerTest.java | 160 ++++++++
.../util/core/ClassLoaderUtilsTest.java | 6 +-
.../util/core/internal/TypeCoercionsTest.java | 31 ++
.../core/internal/ssh/RecordingSshTool.java | 7 +
.../util/core/osgi/BundleMakerTest.java | 8 +-
.../bundlemaker/withmanifest/myemptyfile.txt | 0
.../launcher/osgi/OsgiLauncherImpl.java | 2 +-
.../init/src/main/resources/catalog-classes.bom | 364 ----------------
karaf/init/src/main/resources/catalog.bom | 25 ++
.../BrooklynLauncherRebindCatalogTest.java | 2 +-
.../brooklyn/launcher/BrooklynLauncherTest.java | 2 +-
.../launcher/CleanOrphanedAdjunctsTest.java | 6 +-
.../CleanOrphanedLocationsIntegrationTest.java | 2 +-
.../jclouds/LocationCustomizerDelegate.java | 8 +-
...ailabilityManagerJcloudsObjectStoreTest.java | 7 +-
.../apache/brooklyn/rest/api/AdjunctApi.java | 237 +++++++++++
.../apache/brooklyn/rest/api/CatalogApi.java | 34 +-
.../brooklyn/rest/api/EntityConfigApi.java | 10 +-
.../org/apache/brooklyn/rest/api/PolicyApi.java | 16 +-
.../brooklyn/rest/api/PolicyConfigApi.java | 35 +-
.../brooklyn/rest/domain/AdjunctDetail.java | 72 ++++
.../brooklyn/rest/domain/AdjunctSummary.java | 148 +++++++
.../brooklyn/rest/domain/ApplicationSpec.java | 12 +-
.../rest/domain/CatalogEnricherSummary.java | 4 +
.../rest/domain/CatalogEntitySummary.java | 4 +
.../rest/domain/CatalogItemSummary.java | 4 +
.../rest/domain/CatalogLocationSummary.java | 4 +
.../rest/domain/CatalogPolicySummary.java | 4 +
.../brooklyn/rest/domain/EffectorSummary.java | 9 +-
.../brooklyn/rest/domain/EntityDetail.java | 14 +-
.../brooklyn/rest/domain/EntitySummary.java | 11 +-
.../rest/domain/PolicyConfigSummary.java | 2 +-
.../brooklyn/rest/domain/PolicySummary.java | 83 +---
.../rest/domain/ScriptExecutionSummary.java | 11 +-
.../brooklyn/rest/domain/SensorSummary.java | 7 +-
.../org/apache/brooklyn/rest/domain/Status.java | 7 +-
.../apache/brooklyn/rest/BrooklynRestApi.java | 2 +
.../rest/resources/AdjunctResource.java | 273 ++++++++++++
.../rest/resources/CatalogResource.java | 21 +-
.../rest/resources/EntityConfigResource.java | 10 +-
.../rest/resources/PolicyConfigResource.java | 1 +
.../brooklyn/rest/resources/PolicyResource.java | 2 +-
.../rest/transform/AdjunctTransformer.java | 96 +++++
.../rest/transform/CatalogTransformer.java | 30 +-
.../rest/transform/ConfigTransformer.java | 175 ++++++++
.../rest/transform/EntityTransformer.java | 107 +++--
.../rest/transform/PolicyTransformer.java | 3 +
.../rest/transform/SensorTransformer.java | 21 +-
.../rest/transform/TypeTransformer.java | 10 +-
.../rest/util/BrooklynRestResourceUtils.java | 44 ++
.../rest/resources/AdjunctResourceTest.java | 198 +++++++++
.../rest/testing/BrooklynRestResourceTest.java | 2 +-
.../main/java/org/apache/brooklyn/cli/Main.java | 21 +-
.../brooklyn/cli/lister/ItemDescriptors.java | 26 +-
.../java/org/apache/brooklyn/cli/CliTest.java | 32 +-
.../brooklyn/entity/chef/ChefAttributeFeed.java | 411 -------------------
.../entity/chef/ChefAttributePollConfig.java | 61 ---
.../brooklyn/entity/chef/ChefBashCommands.java | 42 --
.../apache/brooklyn/entity/chef/ChefConfig.java | 94 -----
.../brooklyn/entity/chef/ChefConfigs.java | 102 -----
.../apache/brooklyn/entity/chef/ChefEntity.java | 26 --
.../brooklyn/entity/chef/ChefEntityImpl.java | 39 --
.../entity/chef/ChefLifecycleEffectorTasks.java | 364 ----------------
.../brooklyn/entity/chef/ChefServerTasks.java | 97 -----
.../brooklyn/entity/chef/ChefSoloDriver.java | 85 ----
.../brooklyn/entity/chef/ChefSoloTasks.java | 70 ----
.../apache/brooklyn/entity/chef/ChefTasks.java | 154 -------
.../entity/chef/KnifeConvergeTaskFactory.java | 249 -----------
.../brooklyn/entity/chef/KnifeTaskFactory.java | 241 -----------
.../entity/resolve/ChefEntitySpecResolver.java | 42 --
...oklyn.core.resolve.entity.EntitySpecResolver | 1 -
.../resources/OSGI-INF/blueprint/blueprint.xml | 5 -
software/base/src/main/resources/catalog.bom | 88 ----
.../brooklyn/entity/chef/ChefConfigsTest.java | 40 --
.../entity/chef/ChefLiveTestSupport.java | 99 -----
.../chef/ChefServerTasksIntegrationTest.java | 109 -----
.../AbstractChefToyMySqlEntityLiveTest.java | 41 --
.../ChefSoloDriverMySqlEntityLiveTest.java | 49 ---
.../mysql/ChefSoloDriverToyMySqlEntity.java | 89 ----
...micChefAutodetectToyMySqlEntityLiveTest.java | 43 --
...DynamicChefServerToyMySqlEntityLiveTest.java | 50 ---
.../DynamicChefSoloToyMySqlEntityLiveTest.java | 43 --
.../chef/mysql/DynamicToyMySqlEntityChef.java | 81 ----
.../chef/mysql/TypedToyMySqlEntityChef.java | 55 ---
.../apache/brooklyn/util/stream/Streams.java | 39 +-
.../brooklyn/util/stream/StreamsTest.java | 17 +
128 files changed, 2905 insertions(+), 4370 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0c2e1f60/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0c2e1f60/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0c2e1f60/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0c2e1f60/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
----------------------------------------------------------------------