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 2022/07/04 11:05:04 UTC
[brooklyn-server] 01/03: Merge remote-tracking branch 'origin/master' into feature/Childrem-batch-effector
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 c843622e6ed66f1284335b1eca6e9ed1b866d526
Merge: 812b886705 a3d37cea44
Author: Juan Cabrerizo <ju...@cabrerizo.es>
AuthorDate: Mon Jul 4 09:52:07 2022 +0100
Merge remote-tracking branch 'origin/master' into feature/Childrem-batch-effector
.gitignore | 1 +
.mvn/jvm.config | 1 -
DEPENDENCIES | 292 +++---
Jenkinsfile | 4 +-
README.md | 3 +-
api/pom.xml | 12 +-
.../brooklyn/api/catalog/BrooklynCatalog.java | 81 +-
.../apache/brooklyn/api/catalog/CatalogItem.java | 10 +-
.../brooklyn/api/entity/EntityInitializer.java | 8 +-
.../org/apache/brooklyn/api/entity/EntitySpec.java | 23 +-
.../brooklyn/api/framework/FrameworkLookup.java | 8 +-
.../api/internal/AbstractBrooklynObjectSpec.java | 41 +-
.../api/internal/BrooklynLoggingCategories.java | 23 +-
.../brooklyn/api/location/MachineLocation.java | 7 +
.../api/location/MachineManagementMixins.java | 39 +-
.../apache/brooklyn/api/location/OsDetails.java | 2 +-
.../apache/brooklyn/api/mgmt/EntityManager.java | 34 +-
.../api/mgmt/ha/HighAvailabilityManager.java | 5 +
.../ha/ManagementPlaneSyncRecordPersister.java | 3 +
.../mgmt/rebind/PersistenceExceptionHandler.java | 7 +
.../brooklyn/api/mgmt/rebind/RebindManager.java | 9 +-
.../rebind/mementos/BrooklynMementoPersister.java | 12 +-
.../api/mgmt/rebind/mementos/EntityMemento.java | 2 +-
.../mgmt/rebind/mementos/ManagedBundleMemento.java | 6 +
.../brooklyn/api/mgmt/rebind/mementos/Memento.java | 5 +-
.../apache/brooklyn/api/objs/BrooklynObject.java | 14 +-
.../brooklyn/api/objs/BrooklynObjectType.java | 2 +-
.../apache/brooklyn/api/objs/EntityAdjunct.java | 4 +-
.../brooklyn/api/typereg/BrooklynTypeRegistry.java | 6 +-
.../apache/brooklyn/api/typereg/ManagedBundle.java | 5 +-
.../brooklyn/api/typereg/OsgiBundleWithUrl.java | 4 +
camp/camp-base/pom.xml | 10 +-
.../apache/brooklyn/camp/BasicCampPlatform.java | 2 +-
.../resolve/interpret/PlanInterpretationNode.java | 2 +-
camp/camp-brooklyn/pom.xml | 12 +-
.../camp/brooklyn/BrooklynCampConstants.java | 7 +-
.../BrooklynAssemblyTemplateInstantiator.java | 10 +-
.../BrooklynComponentTemplateResolver.java | 190 ++--
.../creation/BrooklynEntityDecorationResolver.java | 194 ++--
.../spi/creation/BrooklynEntityMatcher.java | 2 +-
.../spi/creation/BrooklynYamlTypeInstantiator.java | 14 +-
.../camp/brooklyn/spi/creation/CampResolver.java | 159 +++-
.../spi/creation/CampTypePlanTransformer.java | 37 +-
.../spi/creation/EntitySpecConfiguration.java | 2 +-
.../camp/brooklyn/spi/dsl/AppGroupTraverser.java | 139 +++
.../spi/dsl/BrooklynDslDeferredSupplier.java | 22 +-
.../brooklyn/spi/dsl/BrooklynDslInterpreter.java | 27 +-
.../brooklyn/spi/dsl/DslDeferredFunctionCall.java | 34 +-
.../spi/dsl/DslDeferredPropertyAccess.java | 152 ++++
.../brooklyn/camp/brooklyn/spi/dsl/DslUtils.java | 34 +-
.../spi/dsl/methods/BrooklynDslCommon.java | 238 ++++-
.../brooklyn/spi/dsl/methods/DslComponent.java | 229 +++--
.../spi/dsl/methods/DslToStringHelpers.java | 2 +-
.../camp/brooklyn/spi/dsl/parse/DslParser.java | 129 ++-
.../brooklyn/spi/dsl/parse/PropertyAccess.java | 24 +-
...apache.brooklyn.core.plan.PlanToSpecTransformer | 4 +
...ooklyn.core.typereg.BrooklynTypePlanTransformer | 4 +
.../camp/brooklyn/AbstractJcloudsStubYamlTest.java | 7 +-
.../camp/brooklyn/AbstractWindowsYamlTest.java | 2 +-
.../camp/brooklyn/AbstractYamlRebindTest.java | 11 +-
.../brooklyn/camp/brooklyn/AbstractYamlTest.java | 29 +-
.../camp/brooklyn/AddChildrenEffectorYamlTest.java | 133 ++-
.../brooklyn/AddChildrenInitializerYamlTest.java | 139 +++
.../camp/brooklyn/ApplicationsYamlTest.java | 5 +-
.../camp/brooklyn/ByonLocationsYamlTest.java | 4 +-
.../camp/brooklyn/ConfigParametersYamlTest.java | 377 +++++---
.../camp/brooklyn/ConfigTypeCoercionYamlTest.java | 16 +-
.../brooklyn/camp/brooklyn/ConfigYamlTest.java | 208 +++++
.../brooklyn/CustomTypeConfigYamlOsgiTest.java | 58 ++
.../camp/brooklyn/CustomTypeConfigYamlTest.java | 367 ++++++++
.../brooklyn/CustomTypeInitializerYamlTest.java | 354 ++++++++
.../brooklyn/DynamicMultiGroupYamlRebindTest.java | 173 ++++
.../brooklyn/camp/brooklyn/EntitiesYamlTest.java | 188 +++-
.../brooklyn/camp/brooklyn/LocationsYamlTest.java | 67 ++
.../camp/brooklyn/MapReferenceYamlTest.java | 1 +
.../camp/brooklyn/MultiLocationYamlTest.java | 2 +-
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 53 ++
.../brooklyn/camp/brooklyn/RebindOsgiTest.java | 2 +-
.../camp/brooklyn/ReferencedOsgiYamlTest.java | 2 +-
.../camp/brooklyn/ReferencingYamlTestEntity.java | 6 +
...a => TestSensorAndEffectorInitializerBase.java} | 73 +-
.../brooklyn/ValidationMissingTypeYamlTest.java | 9 +-
.../camp/brooklyn/WindowsYamlLiveTest.java | 165 +++-
.../catalog/CatalogMakeOsgiBundleTest.java | 5 +-
.../CatalogOsgiVersionMoreEntityRebindTest.java | 31 +-
.../catalog/CatalogOsgiVersionMoreEntityTest.java | 2 +-
.../catalog/CatalogOsgiYamlEntityTest.java | 194 +++-
.../catalog/CatalogOsgiYamlLocationTest.java | 4 +-
.../catalog/CatalogOsgiYamlPolicyTest.java | 8 +-
.../catalog/CatalogOsgiYamlTemplateTest.java | 38 +-
.../camp/brooklyn/catalog/CatalogScanOsgiTest.java | 113 ++-
.../camp/brooklyn/catalog/CatalogYamlAppTest.java | 8 +-
.../brooklyn/catalog/CatalogYamlCombiTest.java | 10 +-
.../CatalogYamlEntityOsgiTypeRegistryTest.java | 100 ++-
.../brooklyn/catalog/CatalogYamlEntityTest.java | 173 +++-
.../brooklyn/catalog/CatalogYamlLocationTest.java | 12 +-
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 12 +-
.../brooklyn/catalog/CatalogYamlTemplateTest.java | 8 +-
.../catalog/CatalogYamlVersioningTest.java | 26 +-
.../brooklyn/catalog/GetFileContentsEffector.java | 12 +-
.../catalog/SpecParameterParsingOsgiTest.java | 3 +-
.../brooklyn/policy/GroupsChangePolicyTest.java | 440 +++++++++
.../camp/brooklyn/rebind/RebindMiscTest.java | 166 ++++
.../brooklyn/spi/dsl/AppGroupTraverserTest.java | 154 ++++
.../camp/brooklyn/spi/dsl/DslParseTest.java | 97 +-
.../brooklyn/spi/dsl/DslSerializationTest.java | 177 ++++
.../camp/brooklyn/spi/dsl/DslYamlTest.java | 113 ++-
.../camp/brooklyn/spi/dsl/TagsYamlTest.java | 36 +-
.../brooklyn/spi/dsl/methods/DslTestObjects.java | 20 +-
.../camp/brooklyn/test/lite/CampYamlLiteTest.java | 2 +-
.../test/policy/failover/ElectPrimaryTest.java | 15 +-
.../rebind/misc-guava-2021-12-entity-hrxo4j0dcs | 192 ++++
...illa-bash-netcat-w-client-and-effector-ui.yaml} | 28 +-
.../resources/vanilla-bash-netcat-w-client.yaml | 2 +-
camp/camp-server/pom.xml | 7 +-
.../apache/brooklyn/camp/server/RestApiSetup.java | 2 +-
core/pom.xml | 38 +-
.../brooklyn/core/BrooklynFeatureEnablement.java | 7 +-
.../org/apache/brooklyn/core/BrooklynLogging.java | 1 +
.../org/apache/brooklyn/core/BrooklynVersion.java | 14 +-
.../brooklyn/core/catalog/CatalogPredicates.java | 11 +-
.../catalog/internal/BasicBrooklynCatalog.java | 986 ++++++++++++--------
.../core/catalog/internal/CatalogBundleDto.java | 14 +-
.../core/catalog/internal/CatalogBundleLoader.java | 18 +-
.../core/catalog/internal/CatalogClasspathDo.java | 4 +-
.../catalog/internal/CatalogInitialization.java | 142 ++-
.../core/catalog/internal/CatalogItemBuilder.java | 1 +
.../catalog/internal/CatalogItemDtoAbstract.java | 3 +-
.../catalog/internal/CatalogUpgradeScanner.java | 8 +-
.../core/catalog/internal/CatalogUtils.java | 46 +-
.../brooklyn/core/config/BasicConfigKey.java | 39 +-
.../brooklyn/core/config/ConfigConstraints.java | 261 ++++--
.../apache/brooklyn/core/config/ConfigUtils.java | 23 +
.../core/config/ConstraintViolationException.java | 190 +++-
.../apache/brooklyn/core/config/MapConfigKey.java | 30 +-
.../org/apache/brooklyn/core/config/Sanitizer.java | 247 ++++-
.../PropertiesFileExternalConfigSupplier.java | 5 +-
.../external/UrlsExternalConfigSupplier.java | 2 +-
.../vault/VaultExternalConfigSupplier.java | 66 +-
.../vault/VaultUserPassExternalConfigSupplier.java | 16 +-
.../internal/AbstractCollectionConfigKey.java | 17 +-
.../config/internal/AbstractConfigMapImpl.java | 135 ++-
.../internal/AbstractStructuredConfigKey.java | 5 +-
.../config/internal/LazyContainerAndKeyValue.java | 19 +-
.../core/effector/AddChildrenEffector.java | 98 +-
.../core/effector/AddDeploySensorsInitializer.java | 98 ++
.../apache/brooklyn/core/effector/AddEffector.java | 94 +-
.../effector/AddEffectorInitializerAbstract.java | 71 ++
...va => AddEffectorInitializerAbstractProto.java} | 86 +-
.../apache/brooklyn/core/effector/AddSensor.java | 87 +-
.../core/effector/AddSensorInitializer.java | 112 +++
.../AddSensorInitializerAbstractProto.java | 55 ++
.../brooklyn/core/effector/BasicParameterType.java | 7 +-
.../brooklyn/core/effector/CompositeEffector.java | 18 +-
.../brooklyn/core/effector/ProxyEffector.java | 12 +-
.../core/effector/http/HttpCommandEffector.java | 17 +-
.../core/effector/ssh/SshCommandEffector.java | 20 +-
.../core/effector/ssh/SshEffectorTasks.java | 7 +-
.../brooklyn/core/enricher/AbstractEnricher.java | 3 +-
.../core/enricher/EnricherDynamicType.java | 2 +-
.../brooklyn/core/entity/AbstractApplication.java | 37 +-
.../brooklyn/core/entity/AbstractEntity.java | 122 ++-
.../core/entity/AddChildrenInitializer.java | 61 ++
.../brooklyn/core/entity/BrooklynConfigKeys.java | 6 +
.../org/apache/brooklyn/core/entity/Dumper.java | 4 +-
.../org/apache/brooklyn/core/entity/Entities.java | 73 +-
.../brooklyn/core/entity/EntityAdjuncts.java | 47 +
.../brooklyn/core/entity/EntityDynamicType.java | 14 +-
.../brooklyn/core/entity/EntityInitializers.java | 159 +++-
.../brooklyn/core/entity/EntityInternal.java | 3 +
.../core/entity/EntityPostInitializable.java | 22 +-
.../brooklyn/core/entity/EntityPredicates.java | 23 +
.../brooklyn/core/entity/StartableApplication.java | 4 +
.../core/entity/internal/ConfigUtilsInternal.java | 55 ++
.../core/entity/internal/EntityConfigMap.java | 7 +
.../internal/EntityTransientCopyInternal.java | 16 +-
.../core/entity/lifecycle/ServiceStateLogic.java | 30 +-
.../core/entity/trait/StartableMethods.java | 13 +-
.../apache/brooklyn/core/feed/AbstractFeed.java | 3 +-
.../brooklyn/core/feed/AttributePollHandler.java | 27 +-
.../java/org/apache/brooklyn/core/feed/Poller.java | 14 +-
.../core/internal/BrooklynPropertiesImpl.java | 2 +-
.../brooklyn/core/location/AbstractLocation.java | 11 +-
.../core/location/AbstractMachineLocation.java | 4 +
.../core/location/BasicLocationRegistry.java | 76 +-
.../core/location/BasicMachineMetadata.java | 25 +-
.../brooklyn/core/location/BasicOsDetails.java | 9 +-
.../apache/brooklyn/core/location/Locations.java | 6 +-
.../core/location/MachineLifecycleUtils.java | 288 ++++++
.../location/access/PortForwardManagerImpl.java | 21 +-
.../core/location/internal/LocationConfigMap.java | 16 +-
.../location/internal/LocationDynamicType.java | 2 +-
.../apache/brooklyn/core/mgmt/BrooklynTags.java | 277 +++++-
.../brooklyn/core/mgmt/BrooklynTaskTags.java | 37 +-
.../brooklyn/core/mgmt/EntityManagementUtils.java | 86 +-
.../OsgiBrooklynClassLoadingContext.java | 23 +-
.../entitlement/EntitlementManagerAdapter.java | 13 +
.../core/mgmt/entitlement/Entitlements.java | 104 ++-
.../mgmt/entitlement/WebEntitlementContext.java | 16 +-
...r.java => BrooklynBomOsgiArchiveInstaller.java} | 596 +++++++-----
.../core/mgmt/ha/HighAvailabilityManagerImpl.java | 135 ++-
...ementPlaneSyncRecordPersisterToObjectStore.java | 33 +-
.../apache/brooklyn/core/mgmt/ha/OsgiManager.java | 180 ++--
.../mgmt/internal/AbstractManagementContext.java | 10 +-
.../mgmt/internal/AbstractSubscriptionManager.java | 10 +
.../internal/AsyncCollectionChangeAdapter.java | 21 +-
.../BasicExternalConfigSupplierRegistry.java | 5 +-
.../mgmt/internal/BrooklynGarbageCollector.java | 171 +++-
.../mgmt/internal/CollectionChangeListener.java | 6 +
.../mgmt/internal/EntityManagementSupport.java | 98 +-
.../core/mgmt/internal/EntityManagerInternal.java | 13 +-
.../core/mgmt/internal/LocalEntityManager.java | 312 +++++--
.../core/mgmt/internal/LocalLocationManager.java | 26 +-
.../mgmt/internal/LocalSubscriptionManager.java | 18 +-
.../core/mgmt/internal/LocalUsageManager.java | 20 +-
.../mgmt/internal/NonDeploymentEntityManager.java | 13 +-
.../internal/NonDeploymentManagementContext.java | 21 +-
.../BrooklynMementoPersisterToObjectStore.java | 232 +++--
.../mgmt/persist/BrooklynPersistenceUtils.java | 20 +-
.../mgmt/persist/RetryingMementoSerializer.java | 11 +-
.../core/mgmt/persist/XmlMementoSerializer.java | 79 +-
.../AbstractBrooklynObjectRebindSupport.java | 9 +-
.../core/mgmt/rebind/BasicEntityRebindSupport.java | 3 +-
.../mgmt/rebind/PeriodicDeltaChangeListener.java | 55 +-
.../rebind/PersistenceExceptionHandlerImpl.java | 18 +-
.../core/mgmt/rebind/RebindContextImpl.java | 8 +-
.../mgmt/rebind/RebindExceptionHandlerImpl.java | 66 +-
.../brooklyn/core/mgmt/rebind/RebindIteration.java | 669 ++++++++------
.../core/mgmt/rebind/RebindManagerImpl.java | 157 +++-
.../core/mgmt/rebind/dto/AbstractMemento.java | 6 +-
.../mgmt/rebind/dto/BasicManagedBundleMemento.java | 43 +-
.../core/mgmt/rebind/dto/MementosGenerators.java | 14 +-
.../core/network/AbstractOnNetworkEnricher.java | 2 +-
.../brooklyn/core/objs/AbstractBrooklynObject.java | 4 +
.../objs/AbstractConfigurationSupportInternal.java | 41 +-
.../brooklyn/core/objs/AbstractEntityAdjunct.java | 37 +-
.../brooklyn/core/objs/AdjunctConfigMap.java | 6 +
.../org/apache/brooklyn/core/objs/AdjunctType.java | 62 +-
.../core/objs/BasicEntityTypeRegistry.java | 4 +
.../brooklyn/core/objs/BasicSpecParameter.java | 81 +-
.../brooklyn/core/objs/BrooklynDynamicType.java | 40 +-
.../brooklyn/core/objs/BrooklynObjectInternal.java | 5 +
...l.java => AbstractBrooklynObjectProxyImpl.java} | 184 ++--
.../core/objs/proxy/EntityAdjunctProxyImpl.java | 83 ++
.../brooklyn/core/objs/proxy/EntityProxyImpl.java | 195 +---
.../core/objs/proxy/InternalEntityFactory.java | 357 +++++---
.../brooklyn/core/plan/PlanToSpecFactory.java | 9 +-
.../brooklyn/core/policy/AbstractPolicy.java | 3 +-
.../brooklyn/core/policy/PolicyDynamicType.java | 2 +-
.../resolve/entity/CatalogEntitySpecResolver.java | 6 +-
.../entity/DelegatingEntitySpecResolver.java | 5 +-
.../resolve/jackson/AsPropertyIfAmbiguous.java | 272 ++++++
.../jackson/BeanWithTypePlanTransformer.java | 94 ++
.../core/resolve/jackson/BeanWithTypeUtils.java | 275 ++++++
.../jackson/BrooklynJacksonSerializationUtils.java | 269 ++++++
.../core/resolve/jackson/BrooklynJacksonType.java | 196 ++++
...BrooklynRegisteredTypeJacksonSerialization.java | 293 ++++++
.../resolve/jackson/CommonTypesSerialization.java | 460 ++++++++++
.../JacksonBetterDelegatingDeserializer.java | 170 ++++
.../jackson/JsonSymbolDependentDeserializer.java | 151 ++++
.../jackson/ObjectReferencingSerialization.java | 179 ++++
.../core/resolve/jackson/WrappedValue.java | 139 +++
.../jackson/WrappedValuesSerialization.java | 257 ++++++
.../core/sensor/AbstractAddSensorFeed.java | 4 +-
.../brooklyn/core/sensor/DurationSinceSensor.java | 35 +-
.../brooklyn/core/sensor/MaxConcurrencySensor.java | 19 +-
.../apache/brooklyn/core/sensor/StaticSensor.java | 32 +-
.../core/sensor/function/FunctionSensor.java | 12 +-
.../core/sensor/http/HttpRequestSensor.java | 44 +-
.../core/sensor/password/CreatePasswordSensor.java | 28 +-
.../brooklyn/core/sensor/ssh/SshCommandSensor.java | 183 +++-
.../brooklyn/core/server/BrooklynServerConfig.java | 16 +-
.../typereg/AbstractCatalogBundleResolver.java | 286 ++++++
.../core/typereg/AbstractTypePlanTransformer.java | 150 +++-
.../core/typereg/BasicBrooklynTypeRegistry.java | 114 ++-
.../brooklyn/core/typereg/BasicManagedBundle.java | 81 +-
.../core/typereg/BasicOsgiBundleWithUrl.java | 16 +-
.../BrooklynBomBundleCatalogBundleResolver.java | 80 ++
.../BrooklynBomYamlCatalogBundleResolver.java | 148 +++
.../typereg/BrooklynCatalogBundleResolver.java | 168 ++++
.../typereg/BrooklynCatalogBundleResolvers.java | 221 +++++
.../core/typereg/BrooklynTypePlanTransformer.java | 23 +-
.../typereg/JavaClassNameTypePlanTransformer.java | 52 +-
.../typereg/ReferencedUnresolvedTypeException.java | 2 +-
.../typereg/RegisteredTypeLoadingContexts.java | 20 +-
.../brooklyn/core/typereg/RegisteredTypes.java | 13 +-
...pePlanException.java => TypePlanException.java} | 13 +-
.../core/typereg/TypePlanTransformers.java | 82 +-
...java => UnsupportedCatalogBundleException.java} | 10 +-
.../core/typereg/UnsupportedTypePlanException.java | 3 +-
.../apache/brooklyn/enricher/stock/Enrichers.java | 8 +-
.../enricher/stock/MathAggregatorFunctions.java | 4 +-
.../enricher/stock/PercentageEnricher.java | 3 +-
.../enricher/stock/PropagateToMembers.java | 92 ++
.../brooklyn/enricher/stock/Transformer.java | 50 +-
.../enricher/stock/aggregator/AggregationJob.java | 2 +
.../stock/aggregator/DashboardAggregator.java | 6 +-
.../brooklyn/entity/group/AbstractGroupImpl.java | 10 +-
.../brooklyn/entity/group/DynamicClusterImpl.java | 10 +-
.../brooklyn/entity/group/DynamicGroupImpl.java | 10 +-
.../brooklyn/entity/group/DynamicMultiGroup.java | 8 +
.../entity/group/DynamicMultiGroupImpl.java | 13 +-
.../brooklyn/entity/group/GroupsChangePolicy.java | 236 +++++
.../group/SshCommandMembershipTrackingPolicy.java | 2 +-
.../entity/stock/AsyncApplicationImpl.java | 2 +-
.../java/org/apache/brooklyn/feed/ssh/SshFeed.java | 34 +-
.../location/byon/ByonLocationResolver.java | 10 +-
.../LocalhostMachineProvisioningLocation.java | 18 +-
.../brooklyn/location/ssh/SshMachineLocation.java | 28 +-
.../policy/AbstractInvokeEffectorPolicy.java | 2 +-
.../policy/InvokeEffectorOnSensorChange.java | 39 +-
.../brooklyn/util/core/BrooklynEntityUtils.java | 106 +++
.../brooklyn/util/core/ClassLoaderUtils.java | 111 ++-
.../apache/brooklyn/util/core/ResourceUtils.java | 22 +
.../brooklyn/util/core/config/ConfigBag.java | 45 +-
.../util/core/config/ResolvingConfigBag.java | 4 +-
.../brooklyn/util/core/file/ArchiveBuilder.java | 8 +-
.../brooklyn/util/core/file/ArchiveUtils.java | 3 +
.../core/flags/BrooklynTypeNameResolution.java | 412 +++++++++
.../brooklyn/util/core/flags/MethodCoercions.java | 12 +-
.../brooklyn/util/core/flags/TypeCoercions.java | 111 ++-
.../util/core/internal/ssh/SshAbstractTool.java | 38 +-
.../internal/ssh/sshj/SshjClientConnection.java | 2 +-
.../util/core/internal/ssh/sshj/SshjTool.java | 8 +
.../brooklyn/util/core/json/BidiSerialization.java | 25 +-
.../util/core/json/BrooklynObjectsJsonMapper.java | 16 +-
...blyStrictPreferringFieldsVisibilityChecker.java | 8 +-
.../util/core/json/ShellEnvironmentSerializer.java | 25 +-
.../util/core/logbook/BrooklynLogEntry.java | 151 ++++
.../util/core/logbook/DelegatingLogStore.java | 129 +++
.../util/core/logbook/LogBookQueryParams.java | 124 +++
.../brooklyn/util/core/logbook/LogStore.java | 69 ++
.../brooklyn/util/core/logbook/LogbookConfig.java | 39 +
.../util/core/logbook/file/FileLogStore.java | 267 ++++++
.../opensearch/BrooklynOpenSearchModel.java | 120 +++
.../logbook/opensearch/OpenSearchLogStore.java | 320 +++++++
.../brooklyn/util/core/osgi/BundleMaker.java | 3 +-
.../org/apache/brooklyn/util/core/osgi/Osgis.java | 23 +-
.../util/core/predicates/DslPredicates.java | 550 ++++++++++++
.../util/core/task/BasicExecutionContext.java | 111 ++-
.../util/core/task/BasicExecutionManager.java | 997 ++++++++++++++-------
.../apache/brooklyn/util/core/task/BasicTask.java | 37 +-
.../brooklyn/util/core/task/DeferredSupplier.java | 4 +-
.../util/core/task/DynamicSequentialTask.java | 14 +-
.../core/task/InterruptingImmediateSupplier.java | 3 +-
.../brooklyn/util/core/task/ScheduledTask.java | 21 +-
.../apache/brooklyn/util/core/task/TaskTags.java | 3 +-
.../org/apache/brooklyn/util/core/task/Tasks.java | 188 ++--
.../brooklyn/util/core/task/ValueResolver.java | 277 +++---
.../ssh/internal/AbstractSshExecTaskFactory.java | 79 +-
.../task/ssh/internal/PlainSshExecTaskFactory.java | 3 +
.../util/core/task/system/ProcessTaskFactory.java | 3 +-
.../util/core/task/system/ProcessTaskStub.java | 5 +-
.../util/core/task/system/ProcessTaskWrapper.java | 60 +-
.../internal/AbstractProcessTaskFactory.java | 8 +-
.../system/internal/SystemProcessTaskFactory.java | 3 +-
.../brooklyn/util/core/text/TemplateProcessor.java | 296 ++++--
.../brooklyn/util/core/units/AbstractUnit.java | 80 ++
.../core/units/ByteSize.java} | 39 +-
.../util/core/units/DurationOrBoolean.java | 72 ++
.../core/units/Frequency.java} | 39 +-
.../org/apache/brooklyn/util/core/units/Range.java | 76 ++
.../util/core/xstream/HashMultimapConverter.java | 120 +++
.../util/core/xstream/LambdaPreventionMapper.java | 117 +++
.../util/core/xstream/MutableListConverter.java | 77 ++
.../util/core/xstream/MutableSetConverter.java | 12 +
.../util/core/xstream/StringKeyMapConverter.java | 21 +-
.../brooklyn/util/core/xstream/XmlSerializer.java | 92 +-
...rooklyn.api.internal.ApiObjectsFactoryInterface | 4 +
...g.apache.brooklyn.api.location.LocationResolver | 4 +
...apache.brooklyn.core.plan.PlanToSpecTransformer | 4 +
...brooklyn.core.resolve.entity.EntitySpecResolver | 4 +
...lyn.core.typereg.BrooklynCatalogBundleResolver} | 7 +-
...ooklyn.core.typereg.BrooklynTypePlanTransformer | 5 +
.../resources/OSGI-INF/blueprint/blueprint.xml | 18 +
core/src/main/resources/catalog.bom | 66 +-
.../persist/deserializingClassRenames.properties | 3 +-
.../internal/StaticTypePlanTransformer.java | 19 +-
.../core/config/ConfigKeyConstraintTest.java | 41 +-
.../core/config/ConfigKeyDeprecationTest.java | 13 +-
.../MapListAndOtherStructuredConfigKeyTest.java | 63 +-
.../apache/brooklyn/core/config/SanitizerTest.java | 32 +-
.../PropertiesFileExternalConfigSupplierTest.java | 9 +-
.../vault/VaultExternalConfigSupplierLiveTest.java | 1 -
.../core/effector/CompositeEffectorTest.java | 9 +-
.../brooklyn/core/effector/ProxyEffectorTest.java | 6 +-
.../core/effector/SampleManyTasksEffector.java | 14 +-
.../effector/http/HttpCommandEffectorTest.java | 8 +-
.../core/entity/ApplicationLoggingTest.java | 87 +-
.../brooklyn/core/entity/DynamicEntityTest.java | 14 +-
.../brooklyn/core/entity/EntityAssertsTest.java | 8 +-
.../brooklyn/core/entity/EntityConfigTest.java | 263 +++++-
.../core/entity/EntityInitializersTest.java | 47 +
.../brooklyn/core/entity/EntitySpecTest.java | 3 +
.../core/entity/OwnedChildrenDeprecatedTest.java | 38 +-
.../core/entity/proxying/EntityManagerTest.java | 75 +-
.../entity/proxying/InternalEntityFactoryTest.java | 10 +-
.../brooklyn/core/location/BasicOsDetailsTest.java | 59 ++
.../core/location/LocationManagementTest.java | 2 +-
.../brooklyn/core/location/SimulatedLocation.java | 18 +-
.../brooklyn/core/mgmt/DeployFailureTest.java | 5 +-
.../core/mgmt/entitlement/EntitlementsTest.java | 80 ++
...va => BrooklynBomOsgiArchiveInstallerTest.java} | 22 +-
.../ha/HighAvailabilityManagerSplitBrainTest.java | 5 +-
.../ha/HighAvailabilityManagerTestFixture.java | 4 +-
.../brooklyn/core/mgmt/ha/HotStandbyTest.java | 114 ++-
.../mgmt/internal/EntityExecutionManagerTest.java | 223 ++++-
.../core/mgmt/osgi/OsgiStandaloneTest.java | 1 +
.../core/mgmt/osgi/OsgiVersionMoreEntityTest.java | 2 +-
.../BrooklynMementoPersisterTestFixture.java | 2 +-
.../XmlMementoSerializerPerformanceTest.java | 5 +-
.../mgmt/persist/XmlMementoSerializerTest.java | 36 +-
.../core/mgmt/rebind/ManagementPlaneIdTest.java | 6 +-
.../core/mgmt/rebind/RebindEntityTest.java | 51 +-
.../rebind/RebindHistoricSshCommandSensorTest.java | 14 +-
.../rebind/RebindManagerExceptionHandlerTest.java | 16 +-
.../brooklyn/core/mgmt/rebind/RebindOptions.java | 6 +
.../core/mgmt/rebind/RebindTestFixture.java | 16 +-
.../brooklyn/core/mgmt/rebind/RebindTestUtils.java | 11 +-
.../transformer/CompoundTransformerTest.java | 2 +-
.../core/objs/BasicSpecParameterFromListTest.java | 29 +
.../core/policy/basic/BasicPolicyTest.java | 93 +-
.../resolve/jackson/BrooklynJacksonTypeTest.java | 61 ++
.../BrooklynMiscJacksonSerializationTest.java | 221 +++++
...klynRegisteredTypeJacksonSerializationTest.java | 170 ++++
.../resolve/jackson/LoggingSerializationTest.java | 56 ++
.../core/resolve/jackson/MapperTestFixture.java | 107 +++
.../resolve/jackson/PerverseSerializationTest.java | 147 +++
.../jackson/WrappedValuesSerializationTest.java | 162 ++++
.../ssh/SshCommandSensorIntegrationTest.java | 36 +-
.../core/test/BrooklynMgmtUnitTestSupport.java | 2 +
.../brooklyn/core/test/entity/TestApplication.java | 4 +
.../core/test/entity/TestApplicationImpl.java | 2 +-
.../brooklyn/core/test/entity/TestEntity.java | 2 +
.../typereg/ExampleXmlTypePlanTransformer.java | 22 +-
.../core/typereg/RegisteredTypeNamingTest.java | 6 +-
.../enricher/stock/PropagateToMembersTest.java | 184 ++++
.../enricher/stock/TransformingEnricherTest.java | 39 +-
.../YamlRollingTimeWindowMeanEnricherTest.java | 20 +-
.../stock/YamlTimeWeightedDeltaEnricherTest.java | 18 +-
.../entity/group/DynamicMultiGroupRebindTest.java | 44 +
.../entity/group/DynamicMultiGroupTest.java | 4 +
.../brooklyn/feed/ssh/SshFeedIntegrationTest.java | 7 +-
.../location/ssh/SshMachineLocationTest.java | 6 +-
...nvokeEffectorOnSensorChangeIntegrationTest.java | 74 +-
.../brooklyn/util/core/ClassLoaderUtilsTest.java | 81 +-
.../core/flags/BrooklynTypeNameResolutionTest.java | 62 ++
.../util/core/internal/TypeCoercionsTest.java | 120 ++-
.../util/core/internal/ssh/RecordingSshTool.java | 8 +-
.../util/core/logbook/file/FileLogStoreTest.java | 512 +++++++++++
.../logbook/opensearch/OpenSearchLogStoreTest.java | 187 ++++
.../core/predicates/DslPredicateEntityTest.java | 117 +++
.../util/core/predicates/DslPredicateTest.java | 264 ++++++
.../util/core/task/ScheduledExecutionTest.java | 248 +++--
.../brooklyn/util/core/task/ValueResolverTest.java | 20 +-
.../util/core/text/TemplateProcessorTest.java | 24 +
.../core/xstream/CompilerCompatibilityTest.java | 3 +-
.../util/core/xstream/ConverterTestFixture.java | 39 +-
.../core/xstream/HashMultimapConverterTest.java | 140 +++
.../core/xstream/TransformedMapConverterTest.java | 107 +++
.../util/core/xstream/XmlSerializerTest.java | 106 ++-
.../brooklyn/util/core/logbook/file/log-sample.txt | 31 +
.../test/resources/ssh-command-sensor-command.sh | 4 +-
karaf/commands/pom.xml | 2 +-
.../apache/brooklyn/karaf/commands/EntityInfo.java | 2 +-
karaf/features/pom.xml | 7 +
karaf/features/src/main/feature/feature.xml | 406 ++++++---
.../brooklyn/launcher/osgi/OsgiLauncherImpl.java | 213 ++++-
karaf/pom.xml | 2 +-
.../brooklyn/launcher/common/BasicLauncher.java | 18 +-
launcher/pom.xml | 9 +-
.../apache/brooklyn/launcher/BrooklynLauncher.java | 19 +-
.../camp/BrooklynCampPlatformLauncher.java | 20 +-
.../AbstractBrooklynLauncherRebindTest.java | 8 +-
.../BrooklynLauncherHighAvailabilityTest.java | 6 +-
.../BrooklynLauncherRebindCatalogOsgiTest.java | 13 +-
...ncherRebindManagementNodeStateListenerTest.java | 2 +-
.../brooklyn/launcher/BrooklynLauncherTest.java | 112 ++-
.../BrooklynLauncherUpgradeCatalogOsgiTest.java | 6 +-
.../brooklyn/launcher/BrooklynViewerLauncher.java | 22 +-
.../launcher/blueprints/AbstractBlueprintTest.java | 209 ++++-
.../launcher/blueprints/SimpleBlueprintTest.java | 48 +
locations/container/pom.xml | 22 +-
.../brooklyn/container/entity/helm/HelmEntity.java | 72 +-
.../container/entity/helm/HelmEntityImpl.java | 33 +-
.../location/kubernetes/KubernetesLocation.java | 73 +-
.../location/openshift/OpenShiftLocation.java | 2 +-
...g.apache.brooklyn.api.location.LocationResolver | 4 +
.../kubernetes/KubernetesLocationLiveTest.java | 4 +-
.../kubernetes/KubernetesLocationYamlLiveTest.java | 4 +-
locations/jclouds/pom.xml | 20 +-
.../jclouds/DefaultConnectivityResolver.java | 20 +-
.../brooklyn/location/jclouds/JcloudsLocation.java | 132 ++-
.../location/jclouds/JcloudsMachineLocation.java | 10 +-
.../jclouds/JcloudsSshMachineLocation.java | 12 +-
.../location/jclouds/JcloudsTypeCoercions.java | 5 +-
.../brooklyn/location/jclouds/JcloudsUtil.java | 2 +-
.../jclouds/api/JcloudsLocationPublic.java | 2 +-
.../templates/customize/TemplateOptionsOption.java | 2 +-
...g.apache.brooklyn.api.location.LocationResolver | 4 +
.../core/mgmt/persist/jclouds/BlobStoreTest.java | 4 +-
.../JcloudsBlobStoreBasedObjectStoreTest.java | 6 +-
.../jclouds/DefaultConnectivityResolverTest.java | 6 +-
.../jclouds/JcloudsLocationMetadataTest.java | 6 +-
...tionReachabilityPredicateInstantiationTest.java | 8 +-
...cloudsLocationSuspendResumeMachineLiveTest.java | 46 +-
.../jclouds/JcloudsStubTemplateBuilder.java | 4 +-
.../JcloudsTypeCoercionsWithBuilderTest.java | 2 +-
.../JcloudsReachableAddressStubbedTest.java | 2 +-
.../jclouds/provider/AwsEc2LocationLiveTest.java | 15 +-
.../resources/brooklyn/logback-appender-file.xml | 6 +-
.../brooklyn/logback-appender-jclouds.xml | 3 +-
.../resources/brooklyn/logback-appender-stdout.xml | 4 +-
.../resources/brooklyn/logback-logger-excludes.xml | 13 +-
parent/pom.xml | 568 +-----------
.../action/AbstractScheduledEffectorPolicy.java | 37 +-
.../policy/autoscaling/AutoScalerPolicy.java | 16 +
.../policy/failover/ElectPrimaryEffector.java | 19 +-
.../policy/failover/ElectPrimaryPolicy.java | 39 +-
.../policy/failover/PrimaryRunningEnricher.java | 5 +
policy/src/main/resources/catalog.bom | 20 +-
.../policy/enricher/DeltaEnrichersTests.java | 22 +-
.../policy/enricher/RollingMeanEnricherTest.java | 6 +-
.../RollingTimeWindowMeanEnricherTest.java | 20 +-
.../enricher/TimeFractionDeltaEnricherTest.java | 6 +-
.../loadbalancing/LoadBalancingModelTest.java | 2 +-
.../loadbalancing/LoadBalancingPolicyTest.java | 4 +-
pom.xml | 762 +++++++++++++++-
rest/rest-api/pom.xml | 16 +-
.../org/apache/brooklyn/rest/api/AccessApi.java | 16 +-
.../org/apache/brooklyn/rest/api/ActivityApi.java | 38 +-
.../org/apache/brooklyn/rest/api/AdjunctApi.java | 70 +-
.../apache/brooklyn/rest/api/ApplicationApi.java | 219 ++++-
.../org/apache/brooklyn/rest/api/BundleApi.java | 154 +++-
.../org/apache/brooklyn/rest/api/CatalogApi.java | 254 ++++--
.../org/apache/brooklyn/rest/api/EffectorApi.java | 12 +-
.../org/apache/brooklyn/rest/api/EntityApi.java | 204 ++++-
.../apache/brooklyn/rest/api/EntityConfigApi.java | 70 +-
.../org/apache/brooklyn/rest/api/LocationApi.java | 44 +-
.../rest/api/{ScriptApi.java => LogbookApi.java} | 42 +-
.../org/apache/brooklyn/rest/api/LogoutApi.java | 24 +-
.../org/apache/brooklyn/rest/api/PolicyApi.java | 2 +-
.../apache/brooklyn/rest/api/PolicyConfigApi.java | 2 +-
.../org/apache/brooklyn/rest/api/ScriptApi.java | 10 +-
.../org/apache/brooklyn/rest/api/SensorApi.java | 66 +-
.../org/apache/brooklyn/rest/api/ServerApi.java | 159 +++-
.../java/org/apache/brooklyn/rest/api/TypeApi.java | 49 +-
.../org/apache/brooklyn/rest/api/UsageApi.java | 25 +-
.../apache/brooklyn/rest/domain/BundleSummary.java | 11 +-
.../rest/domain/HighAvailabilitySummary.java | 8 +-
.../brooklyn/rest/domain/RelationSummary.java | 72 ++
.../apache/brooklyn/rest/domain/RelationType.java | 79 ++
rest/rest-resources/pom.xml | 28 +-
.../org/apache/brooklyn/rest/BrooklynRestApi.java | 42 +-
.../org/apache/brooklyn/rest/BrooklynRestApp.java | 2 +-
.../apache/brooklyn/rest/BrooklynWebConfig.java | 29 +-
.../BrooklynSecurityProviderFilterHelper.java | 65 +-
.../BrooklynSecurityProviderFilterJavax.java | 35 +-
.../BrooklynSecurityProviderFilterJersey.java | 10 +-
.../brooklyn/rest/filter/CsrfTokenFilter.java | 9 +-
.../rest/filter/EntitlementContextFilter.java | 35 +-
.../rest/filter/HaHotCheckHelperAbstract.java | 23 +-
.../rest/filter/HaHotCheckResourceFilter.java | 43 +-
.../rest/filter/LoggingResourceFilter.java | 29 +-
.../resources/AbstractBrooklynRestResource.java | 64 +-
.../brooklyn/rest/resources/ApidocResource.java | 30 +-
.../rest/resources/ApplicationResource.java | 216 +++--
.../brooklyn/rest/resources/BundleResource.java | 102 ++-
.../brooklyn/rest/resources/CatalogResource.java | 131 ++-
.../brooklyn/rest/resources/EffectorResource.java | 6 +-
.../rest/resources/EntityConfigResource.java | 56 +-
.../brooklyn/rest/resources/EntityResource.java | 133 ++-
.../brooklyn/rest/resources/LocationResource.java | 3 +
.../brooklyn/rest/resources/LogbookResource.java | 60 ++
.../brooklyn/rest/resources/PolicyResource.java | 27 +-
.../brooklyn/rest/resources/ScriptResource.java | 2 +-
.../brooklyn/rest/resources/SensorResource.java | 24 +-
.../brooklyn/rest/resources/ServerResource.java | 232 ++++-
.../brooklyn/rest/resources/TypeResource.java | 23 +-
.../provider/DelegatingSecurityProvider.java | 29 +-
.../security/provider/LdapSecurityProvider.java | 209 ++++-
.../rest/transform/ApplicationTransformer.java | 6 +-
.../transform/HighAvailabilityTransformer.java | 2 +-
.../brooklyn/rest/transform/SensorTransformer.java | 3 +-
.../brooklyn/rest/transform/TaskTransformer.java | 5 +-
.../brooklyn/rest/transform/TypeTransformer.java | 86 +-
.../brooklyn/rest/util/DefaultExceptionMapper.java | 6 +-
.../brooklyn/rest/util/EntityAttributesUtils.java | 49 +
.../brooklyn/rest/util/EntityRelationUtils.java | 49 +
.../rest/util/MultiSessionAttributeAdapter.java | 166 +++-
.../brooklyn/rest/util/ScannerInjectHelper.java | 6 +-
.../brooklyn/rest/util/WebResourceUtils.java | 5 +-
.../main/resources/OSGI-INF/blueprint/service.xml | 2 +
.../brooklyn/rest/resources/ActivityRestTest.java | 47 +-
.../rest/resources/AdjunctResourceTest.java | 12 +-
.../rest/resources/ApidocResourceTest.java | 2 +-
.../rest/resources/ApplicationResourceTest.java | 82 +-
.../rest/resources/BundleAndTypeResourcesTest.java | 41 +-
.../rest/resources/CatalogResourceTest.java | 23 +-
.../rest/resources/EffectorResourceTest.java | 4 +-
.../rest/resources/EffectorUtilsRestTest.java | 2 +-
.../rest/resources/EntityConfigResourceTest.java | 76 +-
.../resources/EntityRelationsResourceTest.java | 162 ++++
.../rest/resources/EntityResourceTest.java | 44 +-
.../rest/resources/LocationResourceTest.java | 51 ++
.../rest/resources/LogbookResourceTest.java | 219 +++++
.../rest/resources/SensorResourceTest.java | 33 +-
.../provider/LdapSecurityProviderLiveTest.java | 88 ++
.../provider/LdapSecurityProviderTest.java | 55 ++
.../brooklyn/rest/testing/BrooklynRestApiTest.java | 16 +-
.../rest/testing/BrooklynRestResourceTest.java | 25 +-
.../rest/testing/mocks/RestMockSimpleEntity.java | 3 +
.../util/json/BrooklynJacksonSerializerTest.java | 354 +++++++-
.../test/resources/localhost.default.location.zip | Bin 0 -> 19629 bytes
.../src/test/resources/logbook.log.sample | 5 +
rest/rest-server/pom.xml | 16 +-
.../org/apache/brooklyn/rest/RestApiSetup.java | 2 +-
.../brooklyn/rest/filter/HaMasterCheckFilter.java | 21 +-
rest/rest-server/src/main/webapp/WEB-INF/web.xml | 1 +
.../rest/BrooklynRestApiLauncherTestFixture.java | 5 +
.../brooklyn/rest/api/ApplicationApiTest.java | 89 ++
server-cli/DEPENDENCIES | 288 +++---
.../java/org/apache/brooklyn/cli/AbstractMain.java | 10 +-
.../org/apache/brooklyn/cli/CloudExplorer.java | 4 +-
.../java/org/apache/brooklyn/cli/ItemLister.java | 4 +
.../main/java/org/apache/brooklyn/cli/Main.java | 2 +-
software/base/README.adoc | 110 +++
software/base/pom.xml | 12 +-
.../entity/brooklynnode/BrooklynNodeImpl.java | 4 +-
.../entity/brooklynnode/BrooklynNodeSshDriver.java | 4 +
.../entity/java/JavaSoftwareProcessSshDriver.java | 2 +-
.../brooklyn/entity/java/JmxAttributeSensor.java | 29 +-
.../apache/brooklyn/entity/java/JmxSupport.java | 6 +-
.../entity/java/VanillaJavaAppSshDriver.java | 5 +-
.../brooklyn/entity/machine/AddMachineMetrics.java | 4 +-
.../base/AbstractSoftwareProcessSshDriver.java | 6 +-
.../base/AbstractSoftwareProcessWinRmDriver.java | 38 +-
.../SameServerDriverLifecycleEffectorTasks.java | 3 +-
...oftwareProcessDriverLifecycleEffectorTasks.java | 52 +-
.../entity/software/base/SoftwareProcessImpl.java | 3 -
.../lifecycle/MachineLifecycleEffectorTasks.java | 239 +++--
.../software/base/lifecycle/ScriptHelper.java | 6 +-
.../base/lifecycle/WinRmExecuteHelper.java | 44 +-
.../org/apache/brooklyn/feed/jmx/JmxHelper.java | 24 +-
.../brooklyn/tasks/kubectl/ContainerCommons.java | 60 ++
.../brooklyn/tasks/kubectl/ContainerEffector.java | 82 ++
.../brooklyn/tasks/kubectl/ContainerSensor.java | 102 +++
.../tasks/kubectl/ContainerTaskFactory.java | 151 ++++
.../apache/brooklyn/tasks/kubectl/JobBuilder.java | 507 +++++++++++
.../apache/brooklyn/tasks/kubectl/PullPolicy.java | 22 +-
...g.apache.brooklyn.api.location.LocationResolver | 4 +
...brooklyn.core.resolve.entity.EntitySpecResolver | 4 +
software/base/src/main/resources/catalog.bom | 17 +
.../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 | 35 +-
.../base/ShellEnvironmentSerializerTest.java | 6 +-
.../SoftwareProcessEntityHttpFeedRebindTest.java | 2 +-
.../base/SoftwareProcessShellEnvironmentTest.java | 3 +-
...nillaSoftwareProcessStreamsIntegrationTest.java | 14 +-
.../base/VanillaSoftwareProcessStreamsTest.java | 146 +++
.../VanillaWindowsProcessWinrmStreamsLiveTest.java | 4 +-
.../SoftwareProcessLocationUnmanageTest.java | 4 +-
.../base/test/location/WindowsTestFixture.java | 5 +-
.../test/mysql/DynamicToyMySqlEntityBuilder.java | 7 +-
.../tasks/kubectl/ContainerEffectorTest.java | 116 +++
.../tasks/kubectl/ContainerSensorTest.java | 126 +++
.../brooklyn/tasks/kubectl/ContainerTaskTest.java | 125 +++
.../brooklyn/tasks/kubectl/JobBuilderTest.java | 178 ++++
.../org/apache/brooklyn/kubectl/sample-both.yaml | 40 +
.../brooklyn/kubectl/sample-effector-dev.yaml | 34 +
.../apache/brooklyn/kubectl/sample-effector.yaml | 33 +
.../org/apache/brooklyn/kubectl/sample-sensor.yaml | 30 +
software/winrm/pom.xml | 5 +-
.../core/sensor/windows/WinRmCommandSensor.java | 51 +-
.../windows/WindowsPerformanceCounterSensors.java | 23 +-
.../location/winrm/PlainWinRmExecTaskFactory.java | 100 +++
.../location/winrm/WinRmMachineLocation.java | 147 ++-
.../location/winrm/WinRmPutTaskFactory.java | 120 +++
.../brooklyn/location/winrm/WinRmPutTaskStub.java | 68 ++
.../location/winrm/WinRmPutTaskWrapper.java | 185 ++++
.../apache/brooklyn/location/winrm/WinRmTasks.java | 57 ++
.../util/core/internal/winrm/WinRmTool.java | 4 +-
.../internal/winrm/winrm4j/PrettyXmlWriter.java | 146 +++
.../core/internal/winrm/winrm4j/Winrm4jTool.java | 38 +-
.../feed/windows/WinRmCommandSensorTest.java | 21 +-
.../brooklyn/feed/windows/WinRmFeedLiveTest.java | 7 +-
.../WindowsPerformanceCounterSensorsTest.java | 6 +-
.../winrm/winrm4j/PrettyXmlWriterTest.java | 187 ++++
.../test/framework/TestEndpointReachableTest.java | 6 +-
.../example-catalog-test.bom | 2 +-
.../test-framework-examples/example-catalog.bom | 2 +-
.../java/org/apache/brooklyn/test/LogWatcher.java | 60 +-
.../META-INF/services/org.testng.ITestNGListener | 24 +-
utils/common/dependencies/osgi/beans/pom.xml | 84 ++
.../org/apache/brooklyn/test/osgi/SampleBean.java | 10 +-
.../osgi/beans/src/main/resources/catalog.bom | 14 +-
utils/common/pom.xml | 14 +-
.../java/org/apache/brooklyn/config/ConfigMap.java | 8 +-
.../core/validation/BrooklynValidation.java | 116 +++
.../java/org/apache/brooklyn/test/Asserts.java | 129 ++-
.../util/collections/CollectionFunctionals.java | 40 +-
.../brooklyn/util/collections/MutableList.java | 56 +-
.../brooklyn/util/collections/MutableMap.java | 22 +-
.../brooklyn/util/collections/MutableSet.java | 12 +-
.../brooklyn/util/exceptions/Exceptions.java | 2 +-
.../util/exceptions/ReferenceWithError.java | 2 +-
.../exceptions/RuntimeInterruptedException.java | 12 +-
.../brooklyn/util/guava/EmptyImmutableBiMap.java | 133 +++
.../java/org/apache/brooklyn/util/guava/Maybe.java | 267 +++++-
.../org/apache/brooklyn/util/guava/TypeTokens.java | 134 ++-
.../java/org/apache/brooklyn/util/io/FileUtil.java | 18 +
.../org/apache/brooklyn/util/javalang/Boxing.java | 3 +-
.../brooklyn/util/javalang/JavaClassNames.java | 3 +-
.../apache/brooklyn/util/javalang/Reflections.java | 17 +-
.../javalang/coerce/CommonAdaptorTryCoercions.java | 13 +-
.../coerce/CommonAdaptorTypeCoercions.java | 71 +-
.../coerce/PrimitiveStringTypeCoercions.java | 66 +-
.../javalang/coerce/TypeCoercerExtensible.java | 26 +-
.../org/apache/brooklyn/util/net/Networking.java | 4 +-
.../brooklyn/util/net/UserAndHostAndPort.java | 2 +-
.../main/java/org/apache/brooklyn/util/os/Os.java | 17 +
.../apache/brooklyn/util/osgi/OsgiActivator.java | 11 +
.../apache/brooklyn/util/osgi/VersionedName.java | 2 +-
.../org/apache/brooklyn/util/ssh/BashCommands.java | 29 +-
.../brooklyn/util/stream/InputStreamSource.java | 109 +++
.../brooklyn/util/stream/InputStreamSupplier.java | 51 --
.../apache/brooklyn/util/stream/StreamGobbler.java | 86 +-
.../brooklyn/util/text/BrooklynVersionSyntax.java | 6 +-
.../apache/brooklyn/util/text/StringFunctions.java | 10 +-
.../org/apache/brooklyn/util/text/Strings.java | 81 +-
.../apache/brooklyn/util/text/WildcardGlobs.java | 6 +-
.../org/apache/brooklyn/util/time/Duration.java | 18 +-
.../java/org/apache/brooklyn/util/time/Time.java | 249 +++--
.../org/apache/brooklyn/util/time/Timestamp.java | 57 ++
.../java/org/apache/brooklyn/util/yaml/Yamls.java | 81 +-
.../core/validation/BrooklynValidationTest.java | 152 ++++
.../collections/CollectionFunctionalsTest.java | 28 +-
.../apache/brooklyn/util/guava/TypeTokensTest.java | 47 +
.../org/apache/brooklyn/util/io/FileUtilTest.java | 44 +-
.../javalang/coerce/TypeCoercerExtensibleTest.java | 3 +-
.../util/javalang/coerce/TypeCoercionsTest.java | 31 +-
.../brooklyn/util/net/UserAndHostAndPortTest.java | 4 +-
.../brooklyn/util/osgi/OsgiTestResources.java | 6 +-
.../brooklyn/util/stream/StreamGobblerTest.java | 74 +-
.../util/text/BrooklynVersionSyntaxTest.java | 5 +-
.../org/apache/brooklyn/util/text/StringsTest.java | 11 +
.../apache/brooklyn/util/time/DurationTest.java | 21 +-
.../org/apache/brooklyn/util/time/TimeTest.java | 35 +-
.../org/apache/brooklyn/util/yaml/YamlsTest.java | 10 +-
.../brooklyn/files/testNoJava-0.1.0-SNAPSHOT.jar | Bin 0 -> 1636 bytes
.../brooklyn/files/testWithJava-0.1.0-SNAPSHOT.jar | Bin 0 -> 4436 bytes
.../brooklyn/osgi/brooklyn-osgi-test-a_0.1.0.txt | 2 +-
.../brooklyn/osgi/brooklyn-test-osgi-beans.jar | Bin 0 -> 11696 bytes
...st-a_0.1.0.txt => brooklyn-test-osgi-beans.txt} | 8 +-
.../brooklyn/osgi/brooklyn-test-osgi-entities.txt | 4 +-
.../brooklyn-test-osgi-more-entities_0.1.0.txt | 4 +-
.../brooklyn-test-osgi-more-entities_0.2.0.txt | 4 +-
...lyn-test-osgi-more-entities_evil-twin_0.2.0.txt | 4 +-
.../brooklyn/util/jmx/jmxmp/JmxmpAgentSslTest.java | 2 +-
utils/rest-swagger/pom.xml | 12 +-
.../rest/apidoc/RestApiResourceScanner.java | 115 ++-
utils/rt-felix/pom.xml | 4 +
.../brooklyn/rt/felix/EmbeddedFelixFramework.java | 23 +-
.../org.apache.brooklyn.util.osgi.SystemFramework | 4 +
.../rt/felix/EmbeddedFelixFrameworkTest.java | 15 +-
.../brooklyn/test/support/VerboseReporter.java | 11 +-
.../resources/brooklyn/logback-appender-file.xml | 3 +-
.../src/main/resources/logback-test.xml | 3 +
782 files changed, 38830 insertions(+), 8486 deletions(-)