Merge branch 'master' into bundle-rest-api
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/831db4ac Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/831db4ac Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/831db4ac Branch: refs/heads/master Commit: 831db4ac800b7418bc258609d5838949818814ff Parents: 1cd6bf4 3ac961d Author: Alex Heneveld <[email protected]> Authored: Fri Sep 22 10:20:17 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Fri Sep 22 10:20:17 2017 +0100 ---------------------------------------------------------------------- api/pom.xml | 2 +- .../brooklyn/api/objs/HighlightTuple.java | 23 +- .../brooklyn/api/typereg/RegisteredType.java | 5 +- 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 + .../java-web-app-and-db-with-function-2.yaml | 9 +- .../java-web-app-and-db-with-function.yaml | 7 +- ...-java-web-app-spec-and-db-with-function.yaml | 7 +- .../test/resources/visitors-creation-script.sql | 19 +- camp/camp-server/pom.xml | 2 +- camp/pom.xml | 2 +- core/pom.xml | 2 +- .../core/BrooklynFeatureEnablement.java | 2 +- .../apache/brooklyn/core/BrooklynVersion.java | 2 +- .../catalog/internal/CatalogInitialization.java | 1 + .../brooklyn/core/config/BasicConfigKey.java | 41 ++- .../core/enricher/AbstractEnricher.java | 19 +- .../brooklyn/core/entity/AbstractEntity.java | 6 +- .../apache/brooklyn/core/entity/Attributes.java | 10 +- .../core/entity/BrooklynConfigKeys.java | 124 ++++++-- .../entity/lifecycle/ServiceStateLogic.java | 3 + .../apache/brooklyn/core/feed/AbstractFeed.java | 16 +- .../core/feed/AttributePollHandler.java | 2 + .../org/apache/brooklyn/core/feed/Poller.java | 20 +- .../BasicExternalConfigSupplierRegistry.java | 12 +- .../mgmt/persist/BrooklynPersistenceUtils.java | 2 +- .../core/mgmt/rebind/RebindIteration.java | 5 +- .../core/objs/AbstractEntityAdjunct.java | 103 ++++++- .../core/sensor/BasicAttributeSensor.java | 11 +- .../brooklyn/core/sensor/BasicSensor.java | 19 +- .../apache/brooklyn/core/sensor/Sensors.java | 9 +- .../core/sensor/function/FunctionSensor.java | 89 ++++++ .../core/typereg/BasicBrooklynTypeRegistry.java | 20 +- .../typereg/BasicTypeImplementationPlan.java | 4 +- .../typereg/RegisteredTypeLoadingContexts.java | 6 +- .../enricher/stock/AbstractAggregator.java | 49 ++- .../stock/AbstractMultipleSensorAggregator.java | 2 - .../enricher/stock/AbstractTransformer.java | 21 +- .../stock/AbstractTypeTransformingEnricher.java | 3 + .../brooklyn/enricher/stock/Aggregator.java | 20 +- .../brooklyn/enricher/stock/Combiner.java | 35 ++- .../apache/brooklyn/enricher/stock/Joiner.java | 18 +- .../brooklyn/enricher/stock/MapAggregator.java | 11 +- .../enricher/stock/PercentageEnricher.java | 7 +- .../brooklyn/enricher/stock/Propagator.java | 6 + .../brooklyn/enricher/stock/Transformer.java | 23 +- .../brooklyn/enricher/stock/UpdatingMap.java | 25 +- .../YamlRollingTimeWindowMeanEnricher.java | 13 +- .../stock/YamlTimeWeightedDeltaEnricher.java | 7 +- .../enricher/stock/reducer/Reducer.java | 27 +- .../brooklyn/entity/group/AbstractGroup.java | 13 +- .../group/AbstractMembershipTrackingPolicy.java | 23 +- .../apache/brooklyn/entity/group/Cluster.java | 2 + .../brooklyn/entity/group/DynamicCluster.java | 21 +- .../brooklyn/entity/group/DynamicFabric.java | 23 +- .../brooklyn/entity/group/DynamicGroup.java | 6 +- .../SshCommandMembershipTrackingPolicy.java | 15 +- .../brooklyn/entity/stock/BasicStartable.java | 6 +- .../brooklyn/entity/stock/DelegateEntity.java | 7 +- core/src/main/resources/catalog.bom | 57 +++- .../entity/RecordingSensorEventListener.java | 12 + .../core/mgmt/osgi/OsgiStandaloneTest.java | 4 +- .../core/policy/basic/BasicPolicyTest.java | 9 +- .../sensor/function/FunctionSensorTest.java | 77 +++++ .../core/test/entity/TestEntityImpl.java | 2 +- .../stock/TransformingEnricherTest.java | 7 +- .../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 | 107 ++++++- karaf/jetty-config/pom.xml | 2 +- karaf/pom.xml | 2 +- karaf/start/pom.xml | 2 +- launcher-common/pom.xml | 2 +- launcher/pom.xml | 2 +- .../java-web-app-and-db-with-function.yaml | 3 +- .../test/resources/visitors-creation-script.sql | 19 +- locations/container/pom.xml | 2 +- .../resources/generic-application.tests.bom | 8 +- .../src/test/resources/generic.tests.bom | 2 +- locations/jclouds/pom.xml | 2 +- .../location/jclouds/JcloudsLocation.java | 73 ++++- .../api/JcloudsLocationConfigPublic.java | 6 + .../JcloudsMaxConcurrencyStubbedTest.java | 223 ++++++++++++++ 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 | 87 ++++-- .../policy/ha/ConnectionFailureDetector.java | 14 +- .../policy/ha/ServiceFailureDetector.java | 16 +- .../brooklyn/policy/ha/ServiceReplacer.java | 66 ++-- .../brooklyn/policy/ha/ServiceRestarter.java | 25 +- .../policy/ha/SshMachineFailureDetector.java | 4 +- policy/src/main/resources/catalog.bom | 92 ++++-- .../action/AbstractEffectorPolicyTest.java | 81 +++++ .../action/PeriodicEffectorPolicyTest.java | 123 ++++++++ .../action/ScheduledEffectorPolicyTest.java | 121 ++++++++ .../action/ScheduledPolicyRebindTest.java | 137 +++++++++ .../AutoScalerPolicyPoolSizeTest.java | 18 +- .../autoscaling/AutoScalerPolicyRebindTest.java | 5 +- pom.xml | 4 +- rest/rest-api/pom.xml | 2 +- rest/rest-resources/pom.xml | 2 +- .../resources/EntityConfigResourceTest.java | 2 +- .../testing/mocks/RestMockSimplePolicy.java | 4 +- rest/rest-server/pom.xml | 2 +- server-cli/pom.xml | 2 +- .../main/java/org/apache/brooklyn/cli/Main.java | 28 +- .../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 +- .../apache/brooklyn/entity/java/UsesJava.java | 10 +- .../apache/brooklyn/entity/java/UsesJmx.java | 37 ++- .../entity/machine/pool/ServerPoolImpl.java | 1 + .../software/base/AbstractVanillaProcess.java | 21 +- .../software/base/EmptySoftwareProcessImpl.java | 4 +- .../entity/software/base/SoftwareProcess.java | 37 ++- .../software/base/SoftwareProcessImpl.java | 4 +- .../software/base/VanillaSoftwareProcess.java | 5 +- .../base/VanillaSoftwareProcessImpl.java | 16 +- .../base/VanillaSoftwareProcessSshDriver.java | 12 +- .../software/base/VanillaWindowsProcess.java | 22 +- software/base/src/main/resources/catalog.bom | 17 +- .../brooklynnode/SelectMasterEffectorTest.java | 2 +- software/winrm/pom.xml | 2 +- test-framework/pom.xml | 2 +- test-framework/src/main/resources/catalog.bom | 12 +- test-support/pom.xml | 2 +- .../test/performance/PerformanceTestUtils.java | 50 +++- .../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 +- .../apache/brooklyn/util/guava/TypeTokens.java | 38 ++- .../javalang/coerce/TypeCoercerExtensible.java | 15 +- .../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 +- 160 files changed, 3358 insertions(+), 538 deletions(-) ----------------------------------------------------------------------
