This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 150bee1b3c12028fd2dba6bf68e15738a8a34fa9 Merge: daba0bb 32730a7 Author: iuliana <[email protected]> AuthorDate: Mon May 24 10:39:20 2021 +0100 Merge branch 'master' into spec-hierarchy-tag DEPENDENCIES | 172 ++++------- .../apache/brooklyn/api/mgmt/EntityManager.java | 32 +- .../BrooklynComponentTemplateResolver.java | 88 ++++-- .../spi/creation/BrooklynEntityMatcher.java | 2 +- .../spi/creation/EntitySpecConfiguration.java | 2 +- .../brooklyn/spi/dsl/BrooklynDslInterpreter.java | 4 +- .../spi/dsl/DslDeferredPropertyAccess.java | 83 +++-- .../spi/dsl/methods/BrooklynDslCommon.java | 52 +++- .../brooklyn/spi/dsl/methods/DslComponent.java | 98 +++++- .../camp/brooklyn/spi/dsl/parse/DslParser.java | 4 +- .../camp/brooklyn/AbstractWindowsYamlTest.java | 2 +- .../camp/brooklyn/ConfigParametersYamlTest.java | 1 + .../camp/brooklyn/WindowsYamlLiveTest.java | 201 +++++-------- .../CatalogYamlEntityOsgiTypeRegistryTest.java | 27 +- core/pom.xml | 9 - .../org/apache/brooklyn/core/BrooklynVersion.java | 2 +- .../catalog/internal/BasicBrooklynCatalog.java | 6 +- .../brooklyn/core/config/ConfigConstraints.java | 122 ++++---- .../core/config/ConstraintViolationException.java | 190 +++++++++++- .../apache/brooklyn/core/config/MapConfigKey.java | 30 +- .../vault/VaultExternalConfigSupplier.java | 53 +++- .../vault/VaultUserPassExternalConfigSupplier.java | 16 +- .../internal/AbstractCollectionConfigKey.java | 17 +- .../config/internal/AbstractConfigMapImpl.java | 37 ++- .../core/enricher/EnricherDynamicType.java | 2 +- .../brooklyn/core/entity/AbstractApplication.java | 6 +- .../brooklyn/core/entity/AbstractEntity.java | 24 +- .../brooklyn/core/entity/EntityDynamicType.java | 14 +- .../core/entity/internal/ConfigUtilsInternal.java | 55 ++++ .../location/internal/LocationDynamicType.java | 2 +- .../brooklyn/core/mgmt/BrooklynTaskTags.java | 25 +- .../mgmt/internal/AbstractManagementContext.java | 10 +- .../mgmt/internal/BrooklynGarbageCollector.java | 5 +- .../mgmt/internal/EntityManagementSupport.java | 78 +++-- .../core/mgmt/internal/EntityManagerInternal.java | 13 +- .../core/mgmt/internal/LocalEntityManager.java | 102 ++++--- .../mgmt/internal/NonDeploymentEntityManager.java | 13 +- .../org/apache/brooklyn/core/objs/AdjunctType.java | 62 +--- .../brooklyn/core/objs/BasicSpecParameter.java | 6 +- .../brooklyn/core/objs/BrooklynDynamicType.java | 40 ++- .../core/objs/proxy/InternalEntityFactory.java | 144 +++++---- .../brooklyn/core/policy/PolicyDynamicType.java | 2 +- .../resolve/jackson/AsPropertyIfAmbiguous.java | 21 +- .../jackson/BrooklynJacksonSerializationUtils.java | 21 ++ .../brooklyn/entity/group/DynamicClusterImpl.java | 6 +- .../LocalhostMachineProvisioningLocation.java | 8 + .../apache/brooklyn/util/core/ResourceUtils.java | 10 + .../brooklyn/util/core/osgi/BundleMaker.java | 3 +- .../brooklyn/util/core/task/ValueResolver.java | 10 + .../core/config/ConfigKeyConstraintTest.java | 34 +++ .../MapListAndOtherStructuredConfigKeyTest.java | 35 ++- .../PropertiesFileExternalConfigSupplierTest.java | 5 - .../vault/VaultExternalConfigSupplierLiveTest.java | 1 - .../brooklyn/core/entity/EntityAssertsTest.java | 8 +- .../brooklyn/core/entity/EntityConfigTest.java | 6 +- .../core/entity/proxying/EntityManagerTest.java | 75 ++++- .../entity/proxying/InternalEntityFactoryTest.java | 10 +- .../brooklyn/core/mgmt/DeployFailureTest.java | 5 +- .../brooklyn/core/mgmt/ha/HotStandbyTest.java | 53 ++-- .../core/mgmt/osgi/OsgiVersionMoreEntityTest.java | 2 +- karaf/features/src/main/feature/feature.xml | 17 +- .../resources/brooklyn/logback-logger-excludes.xml | 9 +- parent/pom.xml | 3 +- pom.xml | 18 +- .../org/apache/brooklyn/rest/api/BundleApi.java | 20 +- .../org/apache/brooklyn/rest/api/EntityApi.java | 9 + .../brooklyn/rest/domain/RelationSummary.java | 72 +++++ .../apache/brooklyn/rest/domain/RelationType.java | 79 +++++ .../BrooklynSecurityProviderFilterHelper.java | 25 +- .../BrooklynSecurityProviderFilterJavax.java | 25 +- .../rest/resources/ApplicationResource.java | 5 +- .../brooklyn/rest/resources/BundleResource.java | 24 +- .../brooklyn/rest/resources/EntityResource.java | 22 +- .../brooklyn/rest/resources/TypeResource.java | 9 +- .../security/provider/LdapSecurityProvider.java | 73 ++++- .../brooklyn/rest/transform/TypeTransformer.java | 10 +- .../brooklyn/rest/util/DefaultExceptionMapper.java | 6 +- .../brooklyn/rest/util/EntityRelationUtils.java | 49 +++ .../rest/util/MultiSessionAttributeAdapter.java | 112 ++++--- .../rest/resources/ApplicationResourceTest.java | 11 - .../rest/resources/BundleAndTypeResourcesTest.java | 10 +- .../resources/EntityRelationsResourceTest.java | 162 ++++++++++ .../rest/resources/LocationResourceTest.java | 48 ++- .../provider/LdapSecurityProviderTest.java | 73 +++++ .../rest/testing/BrooklynRestResourceTest.java | 11 + .../test/resources/localhost.default.location.zip | Bin 0 -> 19629 bytes server-cli/DEPENDENCIES | 168 ++++------- .../OnTheFlyDynamicLocationPatternRebindTest.java} | 8 +- .../OnTheFlyDynamicLocationPatternTest.java} | 6 +- .../{clocker => onthefly}/StubAttributes.java | 2 +- .../{clocker => onthefly}/StubContainer.java | 2 +- .../{clocker => onthefly}/StubContainerImpl.java | 2 +- .../StubContainerLocation.java | 2 +- .../dynamic/{clocker => onthefly}/StubHost.java | 2 +- .../{clocker => onthefly}/StubHostImpl.java | 2 +- .../{clocker => onthefly}/StubHostLocation.java | 2 +- .../{clocker => onthefly}/StubInfrastructure.java | 2 +- .../StubInfrastructureImpl.java | 2 +- .../StubInfrastructureLocation.java | 2 +- .../{clocker => onthefly}/StubResolver.java | 2 +- .../{clocker => onthefly}/StubResolverTest.java | 2 +- .../dynamic/{clocker => onthefly}/StubUtils.java | 2 +- .../base/AbstractSoftwareProcessStreamsTest.java | 20 +- ...nillaSoftwareProcessStreamsIntegrationTest.java | 2 +- .../base/VanillaSoftwareProcessStreamsTest.java | 142 +++++++++ .../VanillaWindowsProcessWinrmStreamsLiveTest.java | 4 +- .../location/winrm/PlainWinRmExecTaskFactory.java | 70 +---- .../internal/winrm/winrm4j/FilteringXmlWriter.java | 335 --------------------- .../internal/winrm/winrm4j/PrettyXmlWriter.java | 92 +++--- .../internal/winrm/winrm4j/ErrorXmlWriterTest.java | 109 ------- .../winrm/winrm4j/PrettyXmlWriterTest.java | 21 +- .../java/org/apache/brooklyn/config/ConfigMap.java | 8 +- .../java/org/apache/brooklyn/test/Asserts.java | 71 ++++- .../org/apache/brooklyn/util/text/Strings.java | 17 ++ .../org/apache/brooklyn/util/text/StringsTest.java | 11 + 115 files changed, 2663 insertions(+), 1515 deletions(-)
