brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geom...@apache.org
Subject [16/17] brooklyn-server git commit: Merge branch 'master' into bundle-uninstall-and-snapshot
Date Tue, 06 Jun 2017 12:25:36 GMT
Merge branch 'master' into bundle-uninstall-and-snapshot


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

Branch: refs/heads/master
Commit: 55def2e0f8ceb6380414877e40381507318efc65
Parents: 33d9fd6 97eaf5a
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Mon Jun 5 14:12:30 2017 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Mon Jun 5 14:12:30 2017 +0100

----------------------------------------------------------------------
 .mvn/jvm.config                                 |   2 +-
 .../apache/brooklyn/api/entity/EntityType.java  |  12 -
 .../brooklyn/api/location/LocationSpec.java     |  21 -
 .../brooklyn/api/sensor/EnricherSpec.java       |   2 +-
 .../interpret/PlanInterpretationContext.java    |   2 +-
 .../apache/brooklyn/camp/util/yaml/Yamls.java   |  24 --
 .../brooklyn/spi/dsl/methods/DslComponent.java  |   4 +-
 .../brooklyn/AbstractJcloudsStubYamlTest.java   |   9 +-
 .../camp/brooklyn/AbstractWindowsYamlTest.java  | 138 ++++++
 .../camp/brooklyn/ByonLocationsYamlTest.java    |  17 +
 .../JcloudsTemplateOptionsYamlTest.java         | 118 ++++++
 .../camp/brooklyn/WindowsYamlLiveTest.java      |  89 +---
 .../brooklyn/camp/brooklyn/WindowsYamlTest.java | 222 ++++++++++
 .../camp/brooklyn/spi/dsl/DslYamlTest.java      |  31 +-
 .../core/BrooklynFeatureEnablement.java         |   8 -
 .../brooklyn/core/entity/AbstractEntity.java    |  49 ---
 .../core/entity/EntityTypeSnapshot.java         |  26 --
 .../apache/brooklyn/core/feed/AbstractFeed.java |  20 -
 .../core/location/AbstractLocation.java         |  38 --
 .../core/location/LocationConfigUtils.java      | 102 -----
 .../brooklyn/core/mgmt/BrooklynTasks.java       |  25 --
 .../internal/AbstractManagementContext.java     |  26 +-
 .../core/mgmt/internal/EffectorUtils.java       |  34 --
 ...PropertyChangeToCollectionChangeAdapter.java |  68 ---
 .../core/mgmt/internal/LocalEntityManager.java  |  14 +-
 .../mgmt/internal/LocalManagementContext.java   |   2 +-
 .../core/mgmt/internal/ObservableSet.java       |  76 ++++
 .../core/mgmt/persist/XmlMementoSerializer.java |   1 -
 .../mgmt/rebind/BasicEntityRebindSupport.java   |  18 -
 .../mgmt/rebind/dto/BrooklynMementoImpl.java    |   3 +
 .../mgmt/rebind/dto/MementosGenerators.java     | 126 +-----
 .../mgmt/rebind/dto/MutableBrooklynMemento.java | 331 ---------------
 .../brooklyn/core/objs/BasicSpecParameter.java  |   3 +-
 .../objs/proxy/InternalLocationFactory.java     |  11 -
 .../core/sensor/DependentConfiguration.java     |  31 +-
 .../entity/group/AbstractGroupImpl.java         |  25 --
 .../brooklyn/entity/group/DynamicGroupImpl.java |   8 -
 .../brooklyn/entity/group/SequenceGroup.java    |   2 +-
 .../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 +
 .../util/core/task/BasicExecutionContext.java   |  19 +-
 .../brooklyn/util/core/task/BasicTask.java      |  13 +-
 .../core/effector/EffectorConcatenateTest.java  | 246 -----------
 .../core/effector/MethodEffectorTest.java       | 419 +++++++++++++++++++
 .../brooklyn/core/entity/AttributeTest.java     |  31 +-
 .../core/entity/EntitySetFromFlagTest.java      |  81 ++--
 .../brooklyn/core/entity/EntitySpecTest.java    |   2 +-
 .../brooklyn/core/entity/EntityTypeTest.java    |  46 +-
 .../entity/OwnedChildrenDeprecatedTest.java     | 215 ++++++++++
 .../brooklyn/core/entity/OwnedChildrenTest.java | 160 ++-----
 .../drivers/BasicEntityDriverManagerTest.java   |  33 +-
 .../drivers/EntityDriverRegistryTest.java       |  35 +-
 .../ReflectiveEntityDriverFactoryTest.java      |  63 +--
 .../RegistryEntityDriverFactoryTest.java        |  31 +-
 .../proxying/InternalEntityFactoryTest.java     |  32 +-
 .../core/location/AbstractLocationTest.java     |  33 +-
 .../core/mgmt/internal/ObservableSetTest.java   | 182 ++++++++
 .../mgmt/internal/TestEntityWithEffectors.java  |   2 +-
 .../core/mgmt/osgi/OsgiStandaloneTest.java      |   2 +-
 .../mgmt/osgi/OsgiVersionMoreEntityTest.java    |  28 +-
 .../core/mgmt/rebind/RebindCatalogItemTest.java |   3 +
 .../core/mgmt/rebind/RebindEntityTest.java      |  35 --
 .../mgmt/rebind/RebindManagerSorterTest.java    |   2 +-
 .../core/mgmt/rebind/RebindTestUtils.java       |  33 +-
 .../network/OnPublicNetworkEnricherTest.java    |   4 +-
 .../brooklyn/core/test/entity/TestEntity.java   |   4 +
 .../core/test/entity/TestEntityImpl.java        |  17 +-
 .../EntityPersistencePerformanceTest.java       |   2 +-
 .../YamlRollingTimeWindowMeanEnricherTest.java  |  23 +-
 .../brooklyn/entity/group/DynamicGroupTest.java | 285 +++++++------
 .../ssh/SshMachineLocationPerformanceTest.java  |   2 +-
 .../util/core/flags/MethodCoercionsTest.java    | 133 +++++-
 .../util/core/internal/RepeaterTest.java        | 251 -----------
 karaf/features/src/main/feature/feature.xml     |  11 +-
 .../brooklyn/launcher/common/BasicLauncher.java |  23 -
 .../jclouds/BasicJcloudsLocationCustomizer.java |   6 +
 .../jclouds/JcloudsByonLocationResolver.java    |   3 +-
 .../location/jclouds/JcloudsLocation.java       | 111 ++---
 .../jclouds/JcloudsLocationCustomizer.java      |   9 +
 .../jclouds/JcloudsLocationResolver.java        |   6 +-
 .../location/jclouds/JcloudsTypeCoercions.java  | 168 ++++++++
 .../brooklyn/location/jclouds/JcloudsUtil.java  | 279 ------------
 .../aws/AbstractEbsVolumeCustomizer.java        |  96 +++++
 .../jclouds/aws/EbsVolumeCustomizers.java       | 170 ++++++++
 .../jclouds/AbstractJcloudsStubbedUnitTest.java |  41 +-
 .../DefaultConnectivityResolverTest.java        |  30 +-
 .../JcloudsSshMachineLocationStubbedTest.java   |  21 +
 .../jclouds/JcloudsStubTemplateBuilder.java     | 204 ++++++---
 .../JcloudsTemplateOptionsStubbedTest.java      | 102 +++++
 .../JcloudsTypeCoercionsWithBuilderTest.java    | 308 ++++++++++++++
 .../JcloudsTypeCoercionsWithCreateTest.java     | 278 ++++++++++++
 ...loudsLocationUserLoginAndConfigLiveTest.java |  12 +-
 parent/pom.xml                                  |   4 +-
 .../autoscaling/AutoScalerPolicyTest.java       |  41 +-
 .../autoscaling/LocallyResizableEntity.java     |  49 +--
 .../autoscaling/LocallyResizableEntityImpl.java |  76 ++++
 .../policy/enricher/DeltaEnrichersTests.java    |  59 ++-
 .../enricher/RollingMeanEnricherTest.java       |  29 +-
 .../RollingTimeWindowMeanEnricherTest.java      |  30 +-
 .../AbstractFollowTheSunPolicyTest.java         |  42 +-
 .../followthesun/FollowTheSunModelTest.java     |  43 +-
 .../AbstractLoadBalancingPolicyTest.java        |  19 +-
 .../loadbalancing/LoadBalancingModelTest.java   |  28 +-
 .../LoadBalancingPolicyConcurrencyTest.java     |   8 +-
 .../loadbalancing/MockItemEntityImpl.java       |   5 +-
 pom.xml                                         |   2 +-
 .../rest/resources/CatalogResource.java         |   4 +-
 .../testing/mocks/RestMockSimpleEntity.java     |  19 -
 .../main/java/org/apache/brooklyn/cli/Main.java |  34 +-
 .../java/org/apache/brooklyn/cli/CliTest.java   |  26 +-
 .../src/test/resources/ExampleAppInFile.groovy  |  22 -
 .../entity/brooklynnode/BrooklynNodeImpl.java   |   8 -
 .../entity/java/VanillaJavaAppImpl.java         |  14 +-
 .../software/base/SoftwareProcessImpl.java      |  29 +-
 .../entity/machine/MachineEntityRebindTest.java |  72 +++-
 .../base/SoftwareProcessEntityTest.java         |  47 ++-
 .../MachineLifecycleEffectorTasksTest.java      |  16 +-
 .../base/lifecycle/StartStopSshDriverTest.java  |  26 +-
 .../apache/brooklyn/feed/jmx/JmxFeedTest.java   |  47 +--
 .../util/core/internal/winrm/WinRmTool.java     |   4 +
 .../internal/winrm/winrm4j/Winrm4jTool.java     |  22 +-
 .../core/internal/winrm/ExecCmdAsserts.java     | 120 ++++++
 .../core/internal/winrm/RecordingWinRmTool.java |   4 +
 .../framework/LoopOverGroupMembersTestCase.java |   1 +
 .../LoopOverGroupMembersTestCaseImpl.java       |  33 +-
 .../LoopOverGroupMembersTestCaseTest.java       |  69 ++-
 .../apache/brooklyn/test/EntityTestUtils.java   | 192 ---------
 .../brooklyn/test/PerformanceTestUtils.java     |  26 --
 .../org/apache/brooklyn/test/TestUtils.java     |  83 ----
 utils/common/pom.xml                            |   5 +
 .../org/apache/brooklyn/util/ShellUtils.java    | 185 --------
 .../javalang/MethodAccessibleReflections.java   | 173 ++++++++
 .../brooklyn/util/javalang/Reflections.java     |  47 ++-
 .../coerce/CommonAdaptorTryCoercions.java       | 150 +++++++
 .../coerce/CommonAdaptorTypeCoercions.java      |   4 -
 .../util/javalang/coerce/TryCoercer.java        |  45 ++
 .../javalang/coerce/TypeCoercerExtensible.java  | 101 ++---
 .../brooklyn/util/javalang/ReflectionsTest.java |  64 +++
 .../coerce/TypeCoercerExtensibleTest.java       |  82 ++++
 .../util/javalang/coerce/TypeCoercionsTest.java |  59 +++
 .../util/groovy/GroovJavaMethodsTest.java       |   4 +-
 143 files changed, 4858 insertions(+), 3972 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/55def2e0/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiVersionMoreEntityTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/55def2e0/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
----------------------------------------------------------------------


Mime
View raw message