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 2017/03/20 15:57:34 UTC
[09/11] brooklyn-server git commit: Merge branch 'master' into
config-immediate-more
Merge branch 'master' into config-immediate-more
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d4e41074
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d4e41074
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d4e41074
Branch: refs/heads/master
Commit: d4e410749d9c938daf21ce8540de6038cc34e45e
Parents: d214ca9 a0f8840
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Mar 20 15:41:30 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Mar 20 15:41:30 2017 +0000
----------------------------------------------------------------------
.../internal/AbstractBrooklynObjectSpec.java | 10 +-
.../spi/dsl/methods/BrooklynDslCommon.java | 12 +-
.../brooklyn/spi/dsl/methods/DslComponent.java | 5 +
.../camp/brooklyn/ConfigParametersYamlTest.java | 97 +++++++
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 119 ++++++++
.../camp/brooklyn/WindowsYamlLiveTest.java | 12 +-
.../catalog/CatalogOsgiLibraryTest.java | 119 ++++++++
.../camp/brooklyn/rebind/RebindDslTest.java | 180 +++++++++++++
.../rebind/dsl-2016-07-entity-klcueb1ide | 58 ++++
core/pom.xml | 12 +-
.../core/catalog/internal/CatalogUtils.java | 1 +
.../core/enricher/AbstractEnricher.java | 5 +-
.../apache/brooklyn/core/entity/Entities.java | 42 +--
.../brooklyn/core/entity/EntityPredicates.java | 17 ++
.../core/mgmt/persist/OsgiClassPrefixer.java | 2 +-
.../core/objs/AbstractBrooklynObject.java | 19 +-
.../core/objs/proxy/InternalEntityFactory.java | 10 +-
.../enricher/stock/AbstractAggregator.java | 44 +--
.../enricher/stock/AbstractTransformer.java | 9 +-
.../brooklyn/enricher/stock/Aggregator.java | 24 +-
.../apache/brooklyn/enricher/stock/Joiner.java | 33 ++-
.../brooklyn/enricher/stock/Propagator.java | 16 +-
.../brooklyn/enricher/stock/Transformer.java | 9 +-
.../enricher/stock/reducer/Reducer.java | 22 +-
.../apache/brooklyn/feed/CommandPollConfig.java | 16 +-
.../apache/brooklyn/feed/ssh/SshPollConfig.java | 43 +++
.../WindowsPerformanceCounterPollConfig.java | 61 -----
.../brooklyn/util/core/ClassLoaderUtils.java | 33 ++-
.../brooklyn/util/core/flags/TypeCoercions.java | 14 +
.../util/core/xstream/ClassRenamingMapper.java | 144 +++++++++-
.../ObjectWithDefaultStringImplConverter.java | 89 ++++++
.../util/core/xstream/XmlSerializer.java | 13 +-
.../deserializingClassRenames.properties | 4 +-
.../brooklyn/core/entity/EntitiesTest.java | 20 +-
.../mgmt/persist/XmlMementoSerializerTest.java | 99 ++++++-
.../mgmt/rebind/RebindHistoricSshFeedTest.java | 95 +++++++
.../util/core/xstream/XmlSerializerTest.java | 134 ++++++++++
.../ssh-feed-no-bundle-prefixes-zv7t8bim62 | 268 +++++++++++++++++++
.../core/mgmt/rebind/ssh-feed-zv7t8bim62 | 268 +++++++++++++++++++
karaf/features/src/main/feature/feature.xml | 4 +-
.../Windows7zipBlueprintLiveTest.java | 4 +-
launcher/src/test/resources/install7zip.ps1 | 13 +-
locations/jclouds/pom.xml | 2 +-
.../jclouds/DefaultConnectivityResolver.java | 7 +-
.../location/jclouds/JcloudsLocation.java | 1 +
.../jclouds/BailOutJcloudsLocation.java | 12 +-
.../location/jclouds/JcloudsSshingLiveTest.java | 1 +
parent/pom.xml | 11 +-
pom.xml | 19 +-
rest/rest-api/pom.xml | 10 +-
.../BrooklynRestApiLauncherTestFixture.java | 2 +-
.../AbstractRestApiEntitlementsTest.java | 7 +
.../org/apache/brooklyn/cli/AbstractMain.java | 20 +-
.../org/apache/brooklyn/cli/CloudExplorer.java | 8 +-
.../org/apache/brooklyn/cli/ItemLister.java | 24 +-
.../main/java/org/apache/brooklyn/cli/Main.java | 30 +--
.../java/org/apache/brooklyn/cli/CliTest.java | 6 +-
.../brooklyn/cli/CloudExplorerLiveTest.java | 4 +-
...laWindowsProcessWinrmExitStatusLiveTest.java | 6 +-
.../MachineLifecycleEffectorTasksTest.java | 11 +-
.../lifecycle/WinRmExecuteHelperUnitTest.java | 5 +-
.../core/sensor/windows/WinRmCommandSensor.java | 16 +-
.../WindowsPerformanceCounterPollConfig.java | 61 +++++
.../location/winrm/WinRmMachineLocation.java | 4 +
.../internal/winrm/winrm4j/Winrm4jTool.java | 50 +++-
.../brooklyn/test/framework/TestHttpCall.java | 6 +
.../test/framework/TestHttpCallImpl.java | 7 +-
.../test/framework/TestHttpCallTest.java | 26 ++
.../org/apache/brooklyn/test/LogWatcher.java | 2 +-
.../apache/brooklyn/util/guava/Functionals.java | 12 +
.../brooklyn/util/javalang/Reflections.java | 77 +++++-
.../coerce/CommonAdaptorTypeCoercions.java | 19 ++
.../brooklyn/util/guava/FunctionalsTest.java | 13 +-
.../brooklyn/util/javalang/ReflectionsTest.java | 21 +-
.../util/javalang/coerce/TypeCoercionsTest.java | 13 +
75 files changed, 2394 insertions(+), 318 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4e41074/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d4e41074/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
----------------------------------------------------------------------