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:37 UTC
[13/23] brooklyn-server git commit: Merge branch 'master' into
tasks-better-tree
Merge branch 'master' into tasks-better-tree
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/80446ab1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/80446ab1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/80446ab1
Branch: refs/heads/master
Commit: 80446ab1f28d35d430899f19f0f46e6ccab777d4
Parents: 130a29b df83d44
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Sep 25 10:38:50 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Sep 25 10:38:50 2017 +0100
----------------------------------------------------------------------
api/pom.xml | 2 +-
.../brooklyn/api/catalog/BrooklynCatalog.java | 3 +
.../brooklyn/api/typereg/RegisteredType.java | 5 +-
.../typereg/RegisteredTypeLoadingContext.java | 2 +-
camp/camp-base/pom.xml | 2 +-
camp/camp-brooklyn/pom.xml | 2 +-
.../camp/brooklyn/AbstractYamlTest.java | 31 +-
.../brooklyn/EmptySoftwareProcessYamlTest.java | 94 +-
.../camp/brooklyn/FunctionSensorYamlTest.java | 123 ++
.../VanillaSoftwareProcessYamlTest.java | 299 +++++
.../CatalogOsgiVersionMoreEntityRebindTest.java | 10 +-
.../CatalogOsgiVersionMoreEntityTest.java | 3 +
camp/camp-server/pom.xml | 2 +-
camp/pom.xml | 2 +-
core/pom.xml | 2 +-
.../apache/brooklyn/core/BrooklynVersion.java | 2 +-
.../catalog/internal/BasicBrooklynCatalog.java | 106 +-
.../core/mgmt/entitlement/Entitlements.java | 1 +
.../core/mgmt/ha/OsgiArchiveInstaller.java | 18 +-
.../mgmt/ha/OsgiBundleInstallationResult.java | 21 +-
.../brooklyn/core/mgmt/ha/OsgiManager.java | 89 +-
.../core/sensor/function/FunctionSensor.java | 89 ++
.../core/typereg/BasicBrooklynTypeRegistry.java | 20 +-
.../typereg/BasicTypeImplementationPlan.java | 4 +-
.../typereg/RegisteredTypeLoadingContexts.java | 6 +-
.../core/typereg/RegisteredTypePredicates.java | 98 +-
.../brooklyn/core/typereg/RegisteredTypes.java | 43 +-
core/src/main/resources/catalog.bom | 2 +-
.../entity/RecordingSensorEventListener.java | 12 +
.../core/mgmt/osgi/OsgiStandaloneTest.java | 4 +-
.../core/policy/basic/EnricherTypeTest.java | 6 -
.../sensor/function/FunctionSensorTest.java | 77 ++
.../core/test/entity/TestEntityImpl.java | 2 +-
.../util/core/internal/ssh/ExecCmdAsserts.java | 12 +-
core/src/test/resources/catalog.bom | 2 +-
karaf/commands/pom.xml | 2 +-
karaf/features/pom.xml | 2 +-
karaf/httpcomponent-extension/pom.xml | 2 +-
karaf/init/pom.xml | 2 +-
.../init/src/main/resources/catalog-classes.bom | 14 +-
karaf/jetty-config/pom.xml | 2 +-
karaf/pom.xml | 2 +-
karaf/start/pom.xml | 2 +-
launcher-common/pom.xml | 2 +-
launcher/pom.xml | 2 +-
locations/container/pom.xml | 2 +-
.../resources/generic-application.tests.bom | 2 +-
.../src/test/resources/generic.tests.bom | 2 +-
locations/jclouds/pom.xml | 2 +-
.../location/jclouds/JcloudsLocation.java | 73 +-
.../api/JcloudsLocationConfigPublic.java | 6 +
.../JcloudsMaxConcurrencyStubbedTest.java | 225 ++++
logging/logback-includes/pom.xml | 2 +-
logging/logback-xml/pom.xml | 2 +-
parent/pom.xml | 2 +-
policy/pom.xml | 2 +-
.../action/AbstractScheduledEffectorPolicy.java | 292 +++++
.../policy/action/PeriodicEffectorPolicy.java | 116 ++
.../policy/action/ScheduledEffectorPolicy.java | 100 ++
.../policy/autoscaling/AutoScalerPolicy.java | 4 +-
policy/src/main/resources/catalog.bom | 25 +-
.../action/AbstractEffectorPolicyTest.java | 81 ++
.../action/PeriodicEffectorPolicyTest.java | 123 ++
.../action/ScheduledEffectorPolicyTest.java | 121 ++
.../action/ScheduledPolicyRebindTest.java | 137 +++
.../AutoScalerPolicyPoolSizeTest.java | 18 +-
.../AbstractLoadBalancingPolicyTest.java | 1 -
pom.xml | 4 +-
rest/rest-api/pom.xml | 2 +-
.../org/apache/brooklyn/rest/api/BundleApi.java | 147 +++
.../apache/brooklyn/rest/api/CatalogApi.java | 53 +
.../org/apache/brooklyn/rest/api/TypeApi.java | 100 ++
.../domain/BundleInstallationRestResult.java | 67 ++
.../brooklyn/rest/domain/BundleSummary.java | 106 ++
.../brooklyn/rest/domain/ConfigSummary.java | 79 +-
.../rest/domain/EnricherConfigSummary.java | 52 +-
.../rest/domain/EntityConfigSummary.java | 67 +-
.../rest/domain/LocationConfigSummary.java | 40 +-
.../rest/domain/PolicyConfigSummary.java | 53 +-
.../brooklyn/rest/domain/TaskSummary.java | 9 +-
.../apache/brooklyn/rest/domain/TypeDetail.java | 87 ++
.../brooklyn/rest/domain/TypeSummary.java | 293 +++++
rest/rest-resources/pom.xml | 2 +-
.../apache/brooklyn/rest/BrooklynRestApi.java | 6 +-
.../brooklyn/rest/resources/BundleResource.java | 169 +++
.../rest/resources/CatalogResource.java | 40 +-
.../brooklyn/rest/resources/TypeResource.java | 207 ++++
.../rest/transform/EntityTransformer.java | 26 +-
.../rest/transform/PolicyTransformer.java | 3 +-
.../rest/transform/TypeTransformer.java | 197 ++++
.../resources/BundleAndTypeResourcesTest.java | 1098 ++++++++++++++++++
rest/rest-server/pom.xml | 2 +-
server-cli/pom.xml | 2 +-
.../main/resources/brooklyn/default.catalog.bom | 2 +-
server-cli/src/main/resources/catalog.bom | 2 +-
software/base/pom.xml | 2 +-
.../entity/brooklynnode/BrooklynNode.java | 2 +-
.../brooklynnode/BrooklynNodeSshDriver.java | 2 +-
.../brooklyn/entity/java/JmxmpSslSupport.java | 2 +-
.../software/base/EmptySoftwareProcessImpl.java | 4 +-
.../software/base/VanillaSoftwareProcess.java | 6 +
.../base/VanillaSoftwareProcessImpl.java | 16 +-
software/base/src/main/resources/catalog.bom | 2 +-
software/winrm/pom.xml | 2 +-
test-framework/pom.xml | 2 +-
test-framework/src/main/resources/catalog.bom | 6 +-
test-support/pom.xml | 2 +-
.../osgi/com-example-entities/pom.xml | 2 +-
utils/common/dependencies/osgi/entities/pom.xml | 2 +-
.../dependencies/osgi/more-entities-v1/pom.xml | 2 +-
.../osgi/more-entities-v2-evil-twin/pom.xml | 2 +-
.../dependencies/osgi/more-entities-v2/pom.xml | 2 +-
utils/common/pom.xml | 2 +-
.../brooklyn/util/osgi/VersionedName.java | 24 +-
.../brooklyn/util/maven/MavenArtifactTest.java | 4 +-
utils/groovy/pom.xml | 2 +-
utils/jmx/jmxmp-ssl-agent/pom.xml | 2 +-
utils/jmx/jmxrmi-agent/pom.xml | 2 +-
utils/rest-swagger/pom.xml | 2 +-
utils/rt-felix/pom.xml | 2 +-
utils/test-support/pom.xml | 2 +-
121 files changed, 5095 insertions(+), 486 deletions(-)
----------------------------------------------------------------------