Merge pull request #1457 from ahgittin/fix-attr-when-ready-rebind-1422 Fix attr when ready rebind 1422
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c5dd1c1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c5dd1c1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c5dd1c1f Branch: refs/heads/master Commit: c5dd1c1fa176b5180008d264a5e342464dfb47fb Parents: 4a480b5 fcf345e Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Tue Jun 10 03:27:59 2014 +0100 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Tue Jun 10 03:27:59 2014 +0100 ---------------------------------------------------------------------- .../mementos/BrooklynMementoPersister.java | 2 + .../java/brooklyn/entity/basic/Entities.java | 43 ++++++- .../rebind/RebindContextLookupContext.java | 19 +++ .../entity/rebind/RebindManagerImpl.java | 2 +- .../BrooklynMementoPersisterInMemory.java | 5 + .../rebind/persister/XmlMementoSerializer.java | 40 +++++- .../brooklyn/util/xstream/MapConverter.java | 35 +++++- .../brooklyn/entity/basic/EntitiesTest.java | 12 +- .../java/brooklyn/entity/rebind/Dumpers.java | 7 +- .../BrooklynMementoPersisterTestFixture.java | 2 +- .../persister/XmlMementoSerializerTest.java | 18 ++- pom.xml | 2 +- .../BrooklynComponentTemplateResolver.java | 94 +++++++------- .../spi/dsl/BrooklynDslDeferredSupplier.java | 5 +- .../spi/dsl/methods/BrooklynDslCommon.java | 32 +++-- .../brooklyn/spi/dsl/methods/DslComponent.java | 123 +++++++++++-------- ...aWebAppWithDslYamlRebindIntegrationTest.java | 10 +- .../main/java/brooklyn/util/time/Duration.java | 5 +- 18 files changed, 314 insertions(+), 142 deletions(-) ----------------------------------------------------------------------
