brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [04/10] brooklyn-server git commit: Merge branch 'master' into rest-entity-activities-recursive
Date Sat, 22 Jul 2017 02:14:43 GMT
Merge branch 'master' into rest-entity-activities-recursive


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fb04e20d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fb04e20d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/fb04e20d

Branch: refs/heads/master
Commit: fb04e20d1dca07f8fa06dc4624e6681ad8aab0d7
Parents: fd99a2e eb9795c
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Wed Jul 5 14:45:57 2017 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Jul 5 14:45:57 2017 +0100

----------------------------------------------------------------------
 .mvn/jvm.config                                 |    2 +-
 .../brooklyn/api/catalog/BrooklynCatalog.java   |   15 +-
 .../brooklyn/api/catalog/CatalogItem.java       |    2 +
 .../apache/brooklyn/api/entity/EntityType.java  |   12 -
 .../brooklyn/api/location/LocationSpec.java     |   21 -
 .../brooklyn/api/objs/BrooklynObject.java       |    3 +
 .../brooklyn/api/sensor/EnricherSpec.java       |    2 +-
 .../brooklyn/api/typereg/ManagedBundle.java     |    3 +
 .../brooklyn/api/typereg/OsgiBundleWithUrl.java |    6 +-
 .../brooklyn/api/typereg/RegisteredType.java    |   15 +
 .../interpret/PlanInterpretationContext.java    |    2 +-
 .../apache/brooklyn/camp/util/yaml/Yamls.java   |   24 -
 .../BrooklynComponentTemplateResolver.java      |   25 +-
 .../creation/BrooklynYamlTypeInstantiator.java  |    9 +
 .../service/BrooklynServiceTypeResolver.java    |   78 --
 .../creation/service/ServiceTypeResolver.java   |   77 --
 .../service/ServiceTypeResolverAdaptor.java     |   70 --
 .../brooklyn/spi/dsl/methods/DslComponent.java  |    4 +-
 .../brooklyn/AbstractJcloudsStubYamlTest.java   |    9 +-
 .../camp/brooklyn/AbstractWindowsYamlTest.java  |  138 +++
 .../camp/brooklyn/ByonLocationsYamlTest.java    |   17 +
 .../ConfigLocationInheritanceYamlTest.java      |    5 +-
 .../camp/brooklyn/ExternalConfigYamlTest.java   |    2 +-
 .../JcloudsTemplateOptionsYamlTest.java         |  118 ++
 .../camp/brooklyn/ReferencedYamlTest.java       |  126 ++-
 .../brooklyn/ValidationMissingTypeYamlTest.java |  222 ++++
 .../camp/brooklyn/WindowsYamlLiveTest.java      |   89 +-
 .../brooklyn/camp/brooklyn/WindowsYamlTest.java |  222 ++++
 .../catalog/CatalogMakeOsgiBundleTest.java      |   16 +-
 .../catalog/CatalogOsgiLibraryTest.java         |    9 +-
 .../CatalogOsgiVersionMoreEntityRebindTest.java |  195 +++-
 .../CatalogOsgiVersionMoreEntityTest.java       |   17 +-
 .../catalog/CatalogOsgiYamlEntityTest.java      |   15 +-
 .../camp/brooklyn/catalog/CatalogScanTest.java  |    9 +-
 .../brooklyn/catalog/CatalogYamlRebindTest.java |    4 +
 .../service/ServiceTypeResolverTest.java        |   39 -
 .../service/TestServiceTypeResolver.java        |   54 -
 .../camp/brooklyn/spi/dsl/DslYamlTest.java      |   31 +-
 .../brooklyn/test/lite/CampYamlLiteTest.java    |   21 +-
 ...lyn.spi.creation.service.ServiceTypeResolver |   19 -
 .../brooklyn/camp/server/dto/ApiErrorDto.java   |    3 +-
 .../core/BrooklynFeatureEnablement.java         |    8 -
 .../apache/brooklyn/core/BrooklynVersion.java   |    8 +-
 .../catalog/internal/BasicBrooklynCatalog.java  |  134 ++-
 .../core/catalog/internal/CatalogBundleDto.java |   13 +-
 .../catalog/internal/CatalogBundleLoader.java   |    7 +-
 .../catalog/internal/CatalogClasspathDo.java    |    7 +-
 .../core/catalog/internal/CatalogDto.java       |    4 +-
 .../core/catalog/internal/CatalogItemDo.java    |    5 +
 .../internal/CatalogItemDtoAbstract.java        |   42 +-
 .../core/catalog/internal/CatalogUtils.java     |   40 +-
 .../brooklyn/core/config/BasicConfigKey.java    |   14 +-
 .../apache/brooklyn/core/config/ConfigKeys.java |   11 +-
 .../brooklyn/core/config/ListConfigKey.java     |   53 +-
 .../brooklyn/core/config/MapConfigKey.java      |   34 +-
 .../brooklyn/core/config/SetConfigKey.java      |   55 +-
 .../external/UrlsExternalConfigSupplier.java    |    4 +-
 .../internal/AbstractCollectionConfigKey.java   |    7 +-
 .../internal/AbstractStructuredConfigKey.java   |    5 +
 .../core/effector/BasicParameterType.java       |    3 +-
 .../core/effector/http/HttpCommandEffector.java |   68 +-
 .../brooklyn/core/entity/AbstractEntity.java    |   49 -
 .../apache/brooklyn/core/entity/Entities.java   |    4 +-
 .../core/entity/EntityAndAttribute.java         |    3 +-
 .../core/entity/EntityTypeSnapshot.java         |   26 -
 .../downloads/BasicDownloadRequirement.java     |    4 +-
 .../downloads/BasicDownloadResolver.java        |    4 +-
 .../drivers/downloads/BasicDownloadTargets.java |    4 +-
 .../drivers/downloads/DownloadSubstituters.java |    4 +-
 .../core/entity/factory/ApplicationBuilder.java |  250 -----
 .../core/entity/lifecycle/PolicyDescriptor.java |    3 +-
 .../entity/lifecycle/ServiceStateLogic.java     |    1 -
 .../apache/brooklyn/core/feed/AbstractFeed.java |   20 -
 .../org/apache/brooklyn/core/feed/Poller.java   |    4 +-
 .../core/internal/BrooklynProperties.java       |    4 +-
 .../core/internal/BrooklynPropertiesImpl.java   |    4 +-
 .../core/location/AbstractLocation.java         |   38 -
 .../AggregatingMachineProvisioningLocation.java |    4 +-
 .../core/location/BasicHardwareDetails.java     |    6 +-
 .../core/location/BasicMachineDetails.java      |    4 +-
 .../core/location/BasicMachineMetadata.java     |    7 +-
 .../brooklyn/core/location/BasicOsDetails.java  |    6 +-
 .../core/location/LocationConfigUtils.java      |  102 --
 .../location/access/PortForwardManager.java     |    4 +-
 .../core/location/access/PortMapping.java       |    3 +-
 .../brooklyn/core/mgmt/BrooklynTasks.java       |   25 -
 .../BrooklynClassLoadingContextSequential.java  |    2 -
 ...rFromStackOfBrooklynClassLoadingContext.java |  145 +++
 .../BasicEntitlementClassDefinition.java        |    4 +-
 .../core/mgmt/ha/OsgiArchiveInstaller.java      |  428 +++++++
 .../mgmt/ha/OsgiBundleInstallationResult.java   |   80 ++
 .../brooklyn/core/mgmt/ha/OsgiManager.java      |  268 +++--
 .../ha/dto/BasicManagementNodeSyncRecord.java   |    6 +-
 .../ha/dto/ManagementPlaneSyncRecordImpl.java   |    4 +-
 .../internal/AbstractManagementContext.java     |   26 +-
 .../mgmt/internal/BrooklynShutdownHooks.java    |   24 +-
 .../core/mgmt/internal/EffectorUtils.java       |   34 -
 ...PropertyChangeToCollectionChangeAdapter.java |   68 --
 .../core/mgmt/internal/LocalEntityManager.java  |   14 +-
 .../mgmt/internal/LocalManagementContext.java   |    2 +-
 .../NonDeploymentManagementContext.java         |    4 +-
 .../core/mgmt/internal/ObservableSet.java       |   76 ++
 .../core/mgmt/persist/FileBasedObjectStore.java |    4 +-
 .../core/mgmt/persist/OsgiClassPrefixer.java    |   82 --
 .../core/mgmt/persist/XmlMementoSerializer.java |  171 +--
 .../mgmt/rebind/BasicEntityRebindSupport.java   |   18 -
 .../core/mgmt/rebind/RebindContextImpl.java     |   15 +-
 .../core/mgmt/rebind/RebindIteration.java       |   20 +-
 .../core/mgmt/rebind/dto/AbstractMemento.java   |    5 +-
 .../mgmt/rebind/dto/BrooklynMementoImpl.java    |    3 +
 .../mgmt/rebind/dto/MementosGenerators.java     |  130 +--
 .../mgmt/rebind/dto/MutableBrooklynMemento.java |  331 ------
 .../rebind/transformer/CompoundTransformer.java |   17 +-
 .../core/mgmt/usage/ApplicationUsage.java       |    3 +-
 .../core/objs/AbstractEntityAdjunct.java        |    4 +-
 .../apache/brooklyn/core/objs/AdjunctType.java  |    3 +-
 .../brooklyn/core/objs/BasicSpecParameter.java  |    3 +-
 .../objs/proxy/InternalLocationFactory.java     |   11 -
 .../core/sensor/DependentConfiguration.java     |   31 +-
 .../core/typereg/BasicBrooklynTypeRegistry.java |    4 +-
 .../core/typereg/BasicManagedBundle.java        |   25 +-
 .../core/typereg/BasicOsgiBundleWithUrl.java    |   12 +-
 .../core/typereg/BasicRegisteredType.java       |    6 +
 .../core/typereg/RegisteredTypeNaming.java      |  112 ++
 .../brooklyn/core/typereg/RegisteredTypes.java  |   10 +
 .../stock/AbstractAggregatingEnricher.java      |  175 ---
 .../stock/AbstractTransformingEnricher.java     |    4 +-
 .../stock/AbstractTypeTransformingEnricher.java |    6 +-
 .../brooklyn/enricher/stock/AddingEnricher.java |  109 --
 .../stock/CustomAggregatingEnricher.java        |  352 ------
 .../brooklyn/enricher/stock/Enrichers.java      |   15 +-
 .../stock/SensorPropagatingEnricher.java        |  186 ----
 .../stock/SensorTransformingEnricher.java       |  115 --
 .../brooklyn/enricher/stock/UpdatingMap.java    |    6 -
 .../entity/group/AbstractGroupImpl.java         |   25 -
 .../group/AbstractMembershipTrackingPolicy.java |    4 -
 .../brooklyn/entity/group/DynamicFabric.java    |    4 +
 .../entity/group/DynamicFabricImpl.java         |   13 +-
 .../brooklyn/entity/group/DynamicGroupImpl.java |    8 -
 .../brooklyn/entity/group/SequenceGroup.java    |    2 +-
 .../ProportionalZoneFailureDetector.java        |    4 +-
 .../FixedListMachineProvisioningLocation.java   |    4 +-
 .../location/ssh/SshMachineLocation.java        |    4 +-
 .../brooklyn/util/core/ClassLoaderUtils.java    |   17 +-
 .../brooklyn/util/core/flags/FlagUtils.java     |    3 +-
 .../util/core/flags/MethodCoercions.java        |   89 +-
 .../brooklyn/util/core/flags/TypeCoercions.java |   15 +-
 .../brooklyn/util/core/internal/Repeater.java   |  367 ------
 .../util/core/internal/ssh/SshTool.java         |    4 +
 .../internal/ssh/sshj/SshjClientConnection.java |    3 +-
 .../apache/brooklyn/util/core/osgi/Osgis.java   |   80 +-
 .../util/core/task/BasicExecutionContext.java   |   19 +-
 .../brooklyn/util/core/task/BasicTask.java      |   13 +-
 .../brooklyn/util/core/task/TaskInternal.java   |    4 +-
 .../system/internal/ExecWithLoggingHelpers.java |  112 +-
 .../util/core/xstream/ClassRenamingMapper.java  |   22 +-
 .../util/core/xstream/OsgiClassPrefixer.java    |   82 ++
 .../util/core/xstream/OsgiClassnameMapper.java  |   85 ++
 .../util/core/xstream/XmlSerializer.java        |   67 +-
 .../brooklyn/core/BrooklynVersionTest.java      |    4 +-
 .../internal/CatalogItemComparatorTest.java     |    9 +-
 .../catalog/internal/CatalogVersioningTest.java |   24 +-
 .../core/catalog/internal/MyCatalogItems.java   |    7 -
 .../config/MapConfigKeyAndFriendsMoreTest.java  |   76 ++
 .../core/effector/EffectorConcatenateTest.java  |  246 ----
 .../core/effector/MethodEffectorTest.java       |  419 +++++++
 .../http/HttpCommandEffectorHttpBinTest.java    |   35 +-
 .../effector/http/HttpCommandEffectorTest.java  |   24 +
 .../core/enricher/BasicEnricherTest.java        |   16 +-
 .../core/enricher/EnricherConfigTest.java       |   28 +-
 .../brooklyn/core/entity/AttributeTest.java     |   31 +-
 .../core/entity/EntityAutomanagedTest.java      |    3 +-
 .../brooklyn/core/entity/EntityNameTest.java    |   10 +-
 .../core/entity/EntitySetFromFlagTest.java      |  186 +---
 .../brooklyn/core/entity/EntitySpecTest.java    |    2 +-
 .../brooklyn/core/entity/EntityTypeTest.java    |   46 +-
 .../entity/OwnedChildrenDeprecatedTest.java     |  215 ++++
 .../brooklyn/core/entity/OwnedChildrenTest.java |  160 +--
 .../core/entity/PolicyRegistrationTest.java     |   39 +-
 .../core/entity/PolicySetFromFlagTest.java      |  211 ++++
 .../drivers/BasicEntityDriverManagerTest.java   |   33 +-
 .../drivers/EntityDriverRegistryTest.java       |   35 +-
 .../ReflectiveEntityDriverFactoryTest.java      |   63 +-
 .../RegistryEntityDriverFactoryTest.java        |   31 +-
 .../downloads/BasicDownloadsRegistryTest.java   |   39 +-
 .../DownloadProducerFromLocalRepoTest.java      |   26 +-
 .../DownloadProducerFromPropertiesTest.java     |   33 +-
 .../ApplicationBuilderOverridingTest.java       |  249 -----
 .../core/entity/proxying/EntityManagerTest.java |    3 +-
 .../core/entity/proxying/EntityProxyTest.java   |   20 -
 .../proxying/InternalEntityFactoryTest.java     |   32 +-
 .../core/location/AbstractLocationTest.java     |   33 +-
 .../location/cloud/CloudMachineNamerTest.java   |   31 +-
 .../location/cloud/CustomMachineNamerTest.java  |   20 +-
 ...mStackOfBrooklynClassLoadingContextTest.java |  143 +++
 .../AcmeEntitlementManagerTestFixture.java      |    6 +-
 .../core/mgmt/entitlement/EntitlementsTest.java |   31 +-
 .../mgmt/entitlement/EntityEntitlementTest.java |    5 +-
 .../HighAvailabilityManagerSplitBrainTest.java  |   11 +-
 .../brooklyn/core/mgmt/ha/HotStandbyTest.java   |   12 +-
 .../core/mgmt/internal/AccessManagerTest.java   |   62 +-
 .../internal/EntityExecutionManagerTest.java    |    4 +-
 .../core/mgmt/internal/ObservableSetTest.java   |  182 +++
 .../mgmt/internal/TestEntityWithEffectors.java  |    2 +-
 .../core/mgmt/osgi/OsgiStandaloneTest.java      |   23 +-
 .../mgmt/osgi/OsgiVersionMoreEntityTest.java    |   32 +-
 .../BrooklynMementoPersisterTestFixture.java    |    3 +-
 .../mgmt/persist/OsgiClassPrefixerTest.java     |  111 --
 ...nceStoreObjectAccessorWriterTestFixture.java |    2 +-
 ...entoSerializerDelegatingClassLoaderTest.java |  143 ---
 .../mgmt/persist/XmlMementoSerializerTest.java  |   13 +-
 .../mgmt/rebind/AbstractRebindHistoricTest.java |   66 ++
 .../mgmt/rebind/ActivePartialRebindTest.java    |    5 +-
 .../core/mgmt/rebind/MiscClassesRebindTest.java |  127 +++
 .../rebind/RebindAbstractCommandFeedTest.java   |   61 -
 .../core/mgmt/rebind/RebindCatalogItemTest.java |    3 +
 .../core/mgmt/rebind/RebindEntityTest.java      |   35 -
 .../mgmt/rebind/RebindHistoricSshFeedTest.java  |    2 +-
 .../mgmt/rebind/RebindManagerSorterTest.java    |    2 +-
 .../core/mgmt/rebind/RebindTestUtils.java       |   33 +-
 .../transformer/CompoundTransformerTest.java    |    1 -
 .../network/OnPublicNetworkEnricherTest.java    |    4 +-
 .../core/policy/basic/BasicPolicyTest.java      |   20 +
 .../core/policy/basic/EnricherTypeTest.java     |    8 +-
 .../core/policy/basic/PolicyConfigTest.java     |   68 +-
 .../policy/basic/PolicySubscriptionTest.java    |    9 +-
 .../core/policy/basic/PolicyTypeTest.java       |   16 +-
 .../core/server/entity/BrooklynMetricsTest.java |   28 +-
 .../core/test/entity/TestApplication.java       |    3 +-
 .../brooklyn/core/test/entity/TestEntity.java   |    4 +
 .../core/test/entity/TestEntityImpl.java        |   17 +-
 .../brooklyn/core/test/policy/TestPolicy.java   |    5 -
 .../EntityCleanupLongevityTestFixture.java      |    5 +-
 .../qa/performance/AbstractPerformanceTest.java |   34 +-
 .../EntityPersistencePerformanceTest.java       |    2 +-
 .../core/typereg/RegisteredTypeNamingTest.java  |   92 ++
 ...CustomAggregatingEnricherDeprecatedTest.java |  405 -------
 ...SensorPropagatingEnricherDeprecatedTest.java |  107 --
 .../TransformingEnricherDeprecatedTest.java     |   92 --
 .../YamlRollingTimeWindowMeanEnricherTest.java  |   23 +-
 .../AbstractDynamicClusterOrFabricTest.java     |   45 +
 .../entity/group/DynamicClusterTest.java        |   16 +-
 .../entity/group/DynamicFabricTest.java         |   24 +-
 .../brooklyn/entity/group/DynamicGroupTest.java |  285 ++---
 .../entity/group/DynamicRegionsFabricTest.java  |   62 +-
 .../group/MembershipTrackingPolicyTest.java     |   14 +-
 .../brooklyn/entity/stock/DataEntityTest.java   |   21 +-
 ...stMachineProvisioningLocationRebindTest.java |   32 +-
 .../location/multi/MultiLocationRebindTest.java |   50 +-
 .../ssh/SshMachineLocationIntegrationTest.java  |   36 +
 .../ssh/SshMachineLocationPerformanceTest.java  |    2 +-
 .../location/ssh/SshMachineLocationTest.java    |   51 +-
 .../util/core/ClassLoaderUtilsTest.java         |    2 +-
 .../util/core/flags/MethodCoercionsTest.java    |  133 ++-
 .../util/core/internal/FlagUtilsTest.java       |    3 +-
 .../util/core/internal/RepeaterTest.java        |  251 -----
 .../core/internal/ssh/RecordingSshTool.java     |   13 +-
 .../brooklyn/util/core/osgi/OsgiTestBase.java   |   41 +
 .../core/xstream/OsgiClassPrefixerTest.java     |  111 ++
 .../core/xstream/XmlSerializerOsgiTest.java     |  111 ++
 core/src/test/resources/catalog.bom             |   20 +
 .../effector/http/url-encoded-response.json     |   16 +
 ...7-06-versionedname-entity-n7p20t5h4o.memento |   42 +
 karaf/features/src/main/feature/feature.xml     |   20 +-
 .../brooklyn/launcher/osgi/OsgiLauncher.java    |    2 +
 .../command/support/CloudExplorerSupport.java   |    8 +-
 .../brooklyn/launcher/common/BasicLauncher.java |   59 +-
 .../BrooklynEntityMirrorIntegrationTest.java    |    3 +-
 .../brooklynnode/BrooklynNodeRestTest.java      |    3 +-
 .../brooklyn/launcher/BrooklynLauncherTest.java |   13 -
 locations/container/pom.xml                     |  154 +++
 .../entity/docker/DockerContainer.java          |   92 ++
 .../entity/docker/DockerContainerImpl.java      |   89 ++
 .../entity/kubernetes/KubernetesPod.java        |  102 ++
 .../entity/kubernetes/KubernetesPodImpl.java    |   25 +
 .../entity/kubernetes/KubernetesResource.java   |   58 +
 .../kubernetes/KubernetesResourceImpl.java      |   36 +
 .../entity/openshift/OpenShiftPod.java          |   27 +
 .../entity/openshift/OpenShiftPodImpl.java      |   25 +
 .../entity/openshift/OpenShiftResource.java     |   32 +
 .../entity/openshift/OpenShiftResourceImpl.java |   24 +
 .../location/docker/DockerJcloudsLocation.java  |  198 ++++
 .../location/docker/DockerLocationResolver.java |   89 ++
 .../location/kubernetes/ImageChooser.java       |   87 ++
 .../location/kubernetes/KubernetesCerts.java    |   82 ++
 .../kubernetes/KubernetesClientRegistry.java    |   29 +
 .../KubernetesClientRegistryImpl.java           |   96 ++
 .../location/kubernetes/KubernetesLocation.java | 1054 ++++++++++++++++++
 .../kubernetes/KubernetesLocationConfig.java    |  182 +++
 .../kubernetes/KubernetesLocationResolver.java  |   65 ++
 .../machine/KubernetesEmptyMachineLocation.java |   86 ++
 .../machine/KubernetesMachineLocation.java      |   45 +
 .../machine/KubernetesSshMachineLocation.java   |   46 +
 .../openshift/OpenShiftClientRegistryImpl.java  |   45 +
 .../location/openshift/OpenShiftLocation.java   |  263 +++++
 .../openshift/OpenShiftLocationConfig.java      |   32 +
 .../openshift/OpenShiftLocationResolver.java    |   65 ++
 ...pache.brooklyn.api.location.LocationResolver |   21 +
 .../resources/OSGI-INF/blueprint/blueprint.xml  |   37 +
 .../docker/DockerJcloudsLocationLiveTest.java   |  268 +++++
 .../docker/DockerLocationResolverTest.java      |  118 ++
 .../location/kubernetes/ImageChooserTest.java   |   85 ++
 .../kubernetes/KubernetesCertsTest.java         |  164 +++
 .../kubernetes/KubernetesLocationLiveTest.java  |  238 ++++
 .../KubernetesLocationResolverTest.java         |  102 ++
 .../KubernetesLocationYamlLiveTest.java         |  532 +++++++++
 .../openshift/OpenShiftLocationLiveTest.java    |   65 ++
 .../OpenShiftLocationResolverTest.java          |  103 ++
 .../OpenShiftLocationYamlLiveTest.java          |  146 +++
 .../resources/nginx-replication-controller.yaml |   37 +
 .../src/test/resources/nginx-service.yaml       |   29 +
 .../JcloudsBlobStoreBasedObjectStore.java       |    4 +-
 .../jclouds/AbstractComputeServiceRegistry.java |  151 +++
 ...wsEc2SessionAwareComputeServiceRegistry.java |  115 ++
 .../AwsEc2SessionAwareLocationConfig.java       |   28 +
 .../jclouds/BasicJcloudsLocationCustomizer.java |   20 +-
 .../jclouds/ComputeServiceRegistryImpl.java     |  202 +---
 .../jclouds/JCloudsPropertiesBuilder.java       |  166 +++
 .../jclouds/JcloudsByonLocationResolver.java    |    3 +-
 .../location/jclouds/JcloudsLocation.java       |  257 ++---
 .../jclouds/JcloudsLocationCustomizer.java      |   27 +
 .../jclouds/JcloudsLocationResolver.java        |    6 +-
 .../location/jclouds/JcloudsTypeCoercions.java  |  168 +++
 .../brooklyn/location/jclouds/JcloudsUtil.java  |  279 -----
 .../jclouds/JcloudsWinRmMachineLocation.java    |    4 +-
 .../jclouds/LocationCustomizerDelegate.java     |  239 ++++
 .../jclouds/RebindToMachinePredicate.java       |    4 +-
 .../aws/AbstractEbsVolumeCustomizer.java        |   96 ++
 .../jclouds/aws/EbsVolumeCustomizers.java       |  170 +++
 .../creator/DefaultAzureArmNetworkCreator.java  |  189 ++++
 .../BlobStorePersistencePerformanceTest.java    |    4 +
 .../jclouds/AbstractJcloudsStubbedUnitTest.java |   41 +-
 .../jclouds/BailOutJcloudsLocation.java         |    8 +-
 .../DefaultConnectivityResolverTest.java        |   30 +-
 .../JcloudsSshMachineLocationStubbedTest.java   |  108 ++
 .../jclouds/JcloudsStubTemplateBuilder.java     |  204 +++-
 .../JcloudsTemplateOptionsStubbedTest.java      |  102 ++
 .../JcloudsTypeCoercionsWithBuilderTest.java    |  308 +++++
 .../JcloudsTypeCoercionsWithCreateTest.java     |  278 +++++
 ...loudsLocationUserLoginAndConfigLiveTest.java |   12 +-
 .../DefaultAzureArmNetworkCreatorTest.java      |  280 +++++
 parent/pom.xml                                  |   26 +-
 .../policy/autoscaling/AutoScalerPolicy.java    |   11 +-
 .../autoscaling/MaxPoolSizeReachedEvent.java    |    4 +-
 .../policy/autoscaling/SizeHistory.java         |    4 +-
 .../brooklyn/policy/enricher/DeltaEnricher.java |    7 +-
 .../policy/enricher/HttpLatencyDetector.java    |   34 +-
 .../policy/enricher/RollingMeanEnricher.java    |   15 +-
 .../enricher/RollingTimeWindowMeanEnricher.java |   22 +-
 .../enricher/TimeFractionDeltaEnricher.java     |   56 +-
 .../enricher/TimeWeightedDeltaEnricher.java     |   36 +-
 .../apache/brooklyn/policy/ha/HASensors.java    |    4 +-
 .../policy/ha/ServiceFailureDetector.java       |   15 +-
 .../brooklyn/policy/ha/ServiceReplacer.java     |   20 +-
 .../brooklyn/policy/ha/ServiceRestarter.java    |   23 +-
 .../autoscaling/AutoScalerPolicyMetricTest.java |   79 +-
 .../AutoScalerPolicyReconfigurationTest.java    |   61 +-
 .../autoscaling/AutoScalerPolicyTest.java       |   93 +-
 .../autoscaling/LocallyResizableEntity.java     |   49 +-
 .../autoscaling/LocallyResizableEntityImpl.java |   76 ++
 .../policy/enricher/DeltaEnrichersTests.java    |   97 +-
 .../enricher/HttpLatencyDetectorTest.java       |    8 +-
 .../policy/enricher/RebindEnricherTest.java     |   32 +-
 .../enricher/RollingMeanEnricherTest.java       |   51 +-
 .../RollingTimeWindowMeanEnricherTest.java      |   45 +-
 .../enricher/TimeFractionDeltaEnricherTest.java |   52 +-
 .../AbstractFollowTheSunPolicyTest.java         |   42 +-
 .../followthesun/FollowTheSunModelTest.java     |   43 +-
 .../ha/ConnectionFailureDetectorTest.java       |   42 +-
 ...ServiceFailureDetectorStabilizationTest.java |   23 +-
 .../policy/ha/ServiceFailureDetectorTest.java   |   23 +-
 .../brooklyn/policy/ha/ServiceReplacerTest.java |   43 +-
 .../policy/ha/ServiceRestarterTest.java         |   15 +-
 .../AbstractLoadBalancingPolicyTest.java        |   19 +-
 .../BalanceableWorkerPoolTest.java              |   27 +-
 .../ItemsInContainersGroupTest.java             |   17 +-
 .../loadbalancing/LoadBalancingModelTest.java   |   28 +-
 .../LoadBalancingPolicyConcurrencyTest.java     |    8 +-
 .../loadbalancing/MockItemEntityImpl.java       |    5 +-
 pom.xml                                         |    4 +-
 .../apache/brooklyn/rest/api/CatalogApi.java    |   33 +-
 .../apache/brooklyn/rest/domain/ApiError.java   |   21 +-
 .../brooklyn/rest/domain/EffectorSummary.java   |    3 +-
 .../rest/resources/CatalogResource.java         |  175 ++-
 .../rest/transform/EntityTransformer.java       |   13 +-
 .../rest/util/BrooklynRestResourceUtils.java    |   89 +-
 .../brooklyn/rest/util/WebResourceUtils.java    |    3 +-
 .../rest/resources/ApplicationResourceTest.java |   25 -
 .../rest/resources/CatalogResourceTest.java     |  203 +++-
 .../rest/testing/mocks/RestMockAppBuilder.java  |   41 -
 .../testing/mocks/RestMockSimpleEntity.java     |   19 -
 .../testing/mocks/RestMockSimplePolicy.java     |    7 -
 .../util/BrooklynRestResourceUtilsTest.java     |   45 +-
 .../main/java/org/apache/brooklyn/cli/Main.java |   88 +-
 .../java/org/apache/brooklyn/cli/CliTest.java   |   79 +-
 .../src/test/resources/ExampleAppInFile.groovy  |   22 -
 .../entity/brooklynnode/BrooklynNodeImpl.java   |    8 -
 .../brooklyn/entity/java/JavaAppUtils.java      |   16 +-
 .../entity/java/VanillaJavaAppImpl.java         |   14 +-
 .../software/base/SoftwareProcessImpl.java      |   29 +-
 .../dynamic/clocker/StubContainerLocation.java  |    5 +-
 .../entity/AbstractGoogleComputeLiveTest.java   |   45 +-
 .../entity/AbstractSoftlayerLiveTest.java       |   42 +-
 .../brooklyn/entity/chef/ChefConfigsTest.java   |   16 +-
 .../chef/ChefServerTasksIntegrationTest.java    |   25 +-
 .../entity/java/VanillaJavaAppRebindTest.java   |   16 +-
 .../entity/machine/MachineEntityRebindTest.java |   72 +-
 .../software/base/AbstractDockerLiveTest.java   |   46 +-
 .../SoftwareProcessEntityFeedRebindTest.java    |    5 +-
 .../base/SoftwareProcessEntityTest.java         |   47 +-
 ...twareProcessOpenIptablesStreamsLiveTest.java |   13 +-
 ...SoftwareProcessSshDriverIntegrationTest.java |   31 +-
 ...laWindowsProcessWinrmExitStatusLiveTest.java |    3 +-
 ...nillaWindowsProcessWinrmStreamsLiveTest.java |    3 +-
 .../MachineLifecycleEffectorTasksTest.java      |   16 +-
 .../SoftwareProcessDriverCopyResourcesTest.java |   37 +-
 .../base/lifecycle/StartStopSshDriverTest.java  |   26 +-
 .../performance/ScalabilityPerformanceTest.java |  262 +++++
 .../apache/brooklyn/feed/jmx/JmxFeedTest.java   |   47 +-
 .../WindowsPerformanceCounterSensors.java       |    4 +-
 .../windows/WindowsPerformanceCounterFeed.java  |   14 +-
 .../util/core/internal/winrm/WinRmTool.java     |    4 +
 .../internal/winrm/winrm4j/Winrm4jTool.java     |   22 +-
 ...RebindWindowsPerformanceCounterFeedTest.java |   38 +
 .../feed/windows/RebindWinrmCmdFeedTest.java    |    8 +-
 .../core/internal/winrm/ExecCmdAsserts.java     |  120 ++
 .../core/internal/winrm/RecordingWinRmTool.java |    8 +-
 ...-counter-feed-no-bundle-prefixies-ueauyeu41d |   61 +
 .../windows-performance-counter-feed-tu4kk0xvf8 |   61 +
 .../framework/LoopOverGroupMembersTestCase.java |    1 +
 .../LoopOverGroupMembersTestCaseImpl.java       |   33 +-
 .../LoopOverGroupMembersTestCaseTest.java       |   71 +-
 .../framework/TestFrameworkAssertionsTest.java  |   10 +-
 .../apache/brooklyn/test/EntityTestUtils.java   |  192 ----
 .../org/apache/brooklyn/test/LogWatcher.java    |   14 +-
 .../brooklyn/test/PerformanceTestUtils.java     |   26 -
 .../org/apache/brooklyn/test/TestUtils.java     |   83 --
 .../test/performance/PerformanceMeasurer.java   |  165 ++-
 .../performance/PerformanceTestDescriptor.java  |   49 +-
 .../test/performance/PerformanceTestResult.java |    4 +-
 .../src/main/resources/catalog.bom              |    7 +-
 utils/common/pom.xml                            |   10 +
 .../org/apache/brooklyn/util/ShellUtils.java    |  185 ---
 .../brooklyn/util/http/HttpToolResponse.java    |    4 +-
 .../javalang/MethodAccessibleReflections.java   |  173 +++
 .../brooklyn/util/javalang/Reflections.java     |   47 +-
 .../coerce/CommonAdaptorTryCoercions.java       |  150 +++
 .../coerce/CommonAdaptorTypeCoercions.java      |    6 +-
 .../util/javalang/coerce/TryCoercer.java        |   45 +
 .../javalang/coerce/TypeCoercerExtensible.java  |  101 +-
 .../brooklyn/util/maven/MavenArtifact.java      |    3 +-
 .../java/org/apache/brooklyn/util/os/Os.java    |    5 +-
 .../apache/brooklyn/util/osgi/OsgiUtils.java    |   14 +-
 .../brooklyn/util/osgi/VersionedName.java       |  120 +-
 .../apache/brooklyn/util/pool/BasicPool.java    |    4 +-
 .../util/stream/LoggingOutputStream.java        |  157 +++
 .../brooklyn/util/stream/StreamGobbler.java     |    2 +
 .../util/text/BrooklynVersionSyntax.java        |  195 ++++
 .../util/text/NaturalOrderComparator.java       |   41 +-
 .../brooklyn/util/text/VersionComparator.java   |  214 ++--
 .../org/apache/brooklyn/util/time/Duration.java |    5 +
 .../util/javalang/MemoryUsageTrackerTest.java   |    4 +-
 .../brooklyn/util/javalang/ReflectionsTest.java |   64 ++
 .../coerce/TypeCoercerExtensibleTest.java       |   82 ++
 .../util/javalang/coerce/TypeCoercionsTest.java |   59 +
 .../brooklyn/util/osgi/OsgiTestResources.java   |    3 +-
 .../brooklyn/util/osgi/OsgiUtilsTest.java       |    3 +
 .../apache/brooklyn/util/osgi/OsgisTest.java    |    8 +-
 .../brooklyn/util/osgi/VersionedNameTest.java   |   63 ++
 .../util/stream/LoggingOutputStreamTest.java    |  104 ++
 .../util/text/BrooklynVersionSyntaxTest.java    |   98 ++
 .../util/text/ComparableVersionTest.java        |    5 +-
 .../util/text/NaturalOrderComparatorTest.java   |   63 +-
 .../util/text/VersionComparatorTest.java        |   72 +-
 .../brooklyn-test-osgi-com-example-entities.jar |  Bin 22130 -> 22139 bytes
 .../osgi/brooklyn-test-osgi-entities.jar        |  Bin 22900 -> 22902 bytes
 .../brooklyn-test-osgi-more-entities_0.1.0.jar  |  Bin 15997 -> 16003 bytes
 .../brooklyn-test-osgi-more-entities_0.2.0.jar  |  Bin 16903 -> 16922 bytes
 ...-test-osgi-more-entities_evil-twin_0.2.0.jar |  Bin 14091 -> 14098 bytes
 .../util/groovy/GroovJavaMethodsTest.java       |    4 +-
 480 files changed, 18063 insertions(+), 9638 deletions(-)
----------------------------------------------------------------------



Mime
View raw message