Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4F2011772B for ; Sun, 5 Oct 2014 22:44:48 +0000 (UTC) Received: (qmail 66067 invoked by uid 500); 5 Oct 2014 22:44:47 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 66014 invoked by uid 500); 5 Oct 2014 22:44:47 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 65943 invoked by uid 99); 5 Oct 2014 22:44:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Oct 2014 22:44:47 +0000 X-ASF-Spam-Status: No, hits=-1999.0 required=5.0 tests=ALL_TRUSTED,HK_RANDOM_FROM,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 05 Oct 2014 22:44:46 +0000 Received: (qmail 65847 invoked by uid 99); 5 Oct 2014 22:44:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Oct 2014 22:44:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9E67581A859; Sun, 5 Oct 2014 22:44:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: grkvlt@apache.org To: commits@brooklyn.incubator.apache.org Date: Sun, 05 Oct 2014 22:44:34 -0000 Message-Id: <27a26ffee9ec4ca09190a32bbdadb785@git.apache.org> In-Reply-To: <812cdc224d424d8ab9cc5bc362defcbb@git.apache.org> References: <812cdc224d424d8ab9cc5bc362defcbb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/13] git commit: Fix serialisation and persistence issues X-Virus-Checked: Checked by ClamAV on apache.org Fix serialisation and persistence issues Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/af5c8310 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/af5c8310 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/af5c8310 Branch: refs/heads/master Commit: af5c83108c08ecf7b54db8e21ebf618900360e69 Parents: 3fb2ef5 Author: Andrew Kennedy Authored: Sat Sep 27 01:58:42 2014 +0100 Committer: Andrew Kennedy Committed: Sun Oct 5 19:45:54 2014 +0100 ---------------------------------------------------------------------- .../brooklyn/spi/dsl/methods/BrooklynDslCommon.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/af5c8310/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java index a9a80a6..e5534b3 100644 --- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java +++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java @@ -182,7 +182,7 @@ public class BrooklynDslCommon { * * @see DependentConfiguration#formatString(String, Object...) */ - protected static final class DslFormatString extends BrooklynDslDeferredSupplier { + protected static class DslFormatString extends BrooklynDslDeferredSupplier { private static final long serialVersionUID = -4849297712650560863L; @@ -205,10 +205,18 @@ public class BrooklynDslCommon { } } + /** @deprecated since 0.7.0; use {@link DslFormatString} */ + @Deprecated + protected static class FormatString extends DslFormatString { + public FormatString(String pattern, Object[] args) { + super(pattern, args); + } + } + /** Deferred execution of Object creation. */ - protected static final class DslObject extends BrooklynDslDeferredSupplier { + protected static class DslObject extends BrooklynDslDeferredSupplier { - private static final long serialVersionUID = -1; + private static final long serialVersionUID = 8878388748085419L; private Class type; private Map fields;