Merge branch 'master' into adjunct-rest-api-and-highlights
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4f4507a7 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4f4507a7 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4f4507a7 Branch: refs/heads/master Commit: 4f4507a7df90c739ea5b76f6945a888f3b7d2f1a Parents: 83c3d50 e2c0247 Author: Alex Heneveld <[email protected]> Authored: Tue Oct 3 09:17:05 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Oct 3 09:17:05 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/mgmt/rebind/RebindManager.java | 14 +- ...loudsCustomizerInstantiationYamlDslTest.java | 156 +++++-- .../brooklyn/core/catalog/CatalogLoadMode.java | 73 ---- .../catalog/internal/BasicBrooklynCatalog.java | 28 +- .../catalog/internal/CatalogInitialization.java | 88 +--- .../core/catalog/internal/CatalogUtils.java | 31 +- .../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 | 60 +-- .../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 +- .../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 +- .../ha/HighAvailabilityManagerInMemoryTest.java | 5 - .../ha/HighAvailabilityManagerTestFixture.java | 61 ++- .../core/mgmt/rebind/RebindCatalogItemTest.java | 2 - .../core/mgmt/rebind/RebindFailuresTest.java | 18 +- .../core/mgmt/rebind/RebindFeedWithHaTest.java | 3 +- .../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 +- .../CleanOrphanedLocationsIntegrationTest.java | 2 +- .../jclouds/LocationCustomizerDelegate.java | 8 +- ...ailabilityManagerJcloudsObjectStoreTest.java | 7 +- .../main/java/org/apache/brooklyn/cli/Main.java | 21 +- .../java/org/apache/brooklyn/cli/CliTest.java | 32 +- .../brooklyn/entity/chef/ChefAttributeFeed.java | 413 ------------------- .../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 + 77 files changed, 1091 insertions(+), 3925 deletions(-) ----------------------------------------------------------------------
