This closes #440
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/56496fa5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/56496fa5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/56496fa5 Branch: refs/heads/master Commit: 56496fa54c90d7f5de45514d06356c5be152ad99 Parents: 721ced7 e28c4b3 Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Tue Nov 29 13:40:02 2016 +0000 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Tue Nov 29 13:40:02 2016 +0000 ---------------------------------------------------------------------- .../api/mgmt/rebind/mementos/EntityMemento.java | 3 + .../BrooklynComponentTemplateResolver.java | 36 +++- .../camp/brooklyn/AbstractYamlRebindTest.java | 1 + .../camp/brooklyn/ConfigNestedYamlTest.java | 2 +- .../camp/brooklyn/ConfigParametersYamlTest.java | 192 +++++++++++++++--- .../camp/brooklyn/DslAndRebindYamlTest.java | 18 ++ .../ServiceFailureDetectorYamlRebindTest.java | 148 ++++++++++++++ .../ServiceFailureDetectorYamlTest.java | 200 +++++++++++++++++++ .../catalog/SpecParameterUnwrappingTest.java | 9 +- .../brooklyn/core/config/ListConfigKey.java | 5 + .../brooklyn/core/config/MapConfigKey.java | 5 + .../brooklyn/core/config/SetConfigKey.java | 5 + .../config/internal/AbstractConfigMapImpl.java | 15 +- .../mgmt/rebind/BasicEntityRebindSupport.java | 20 +- .../mgmt/rebind/dto/BasicEntityMemento.java | 49 +++-- .../mgmt/rebind/dto/MementosGenerators.java | 2 + .../brooklyn/core/objs/BasicSpecParameter.java | 2 +- .../core/sensor/SensorEventPredicates.java | 81 ++++++++ .../entity/RecordingSensorEventListener.java | 23 +++ .../rebind/RecordingRebindExceptionHandler.java | 33 ++- .../core/sensor/SensorEventPredicatesTest.java | 65 ++++++ .../policy/ha/ServiceFailureDetector.java | 97 +++++---- .../org/apache/brooklyn/util/time/Duration.java | 6 +- .../org/apache/brooklyn/util/time/Time.java | 74 ++++--- .../org/apache/brooklyn/util/time/TimeTest.java | 31 ++- 25 files changed, 994 insertions(+), 128 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/56496fa5/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java ----------------------------------------------------------------------