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 C814F10942 for ; Thu, 5 Mar 2015 09:54:38 +0000 (UTC) Received: (qmail 73992 invoked by uid 500); 5 Mar 2015 09:54:16 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 73968 invoked by uid 500); 5 Mar 2015 09:54:16 -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 73959 invoked by uid 99); 5 Mar 2015 09:54:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2015 09:54:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,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; Thu, 05 Mar 2015 09:53:55 +0000 Received: (qmail 73365 invoked by uid 99); 5 Mar 2015 09:53:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2015 09:53:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D8481E05E2; Thu, 5 Mar 2015 09:53:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.incubator.apache.org Date: Thu, 05 Mar 2015 09:53:53 -0000 Message-Id: In-Reply-To: <17b2dafc78a3430a82031c1f2cf8d9e1@git.apache.org> References: <17b2dafc78a3430a82031c1f2cf8d9e1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-brooklyn git commit: This closes #540 X-Virus-Checked: Checked by ClamAV on apache.org This closes #540 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1b0037b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1b0037b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1b0037b6 Branch: refs/heads/master Commit: 1b0037b609b4ad11a803522e696d6bfcac00f57f Parents: 1f3bff4 f0fe508 Author: Aled Sage Authored: Thu Mar 5 09:53:37 2015 +0000 Committer: Aled Sage Committed: Thu Mar 5 09:53:37 2015 +0000 ---------------------------------------------------------------------- .../java/brooklyn/catalog/BrooklynCatalog.java | 3 ++ .../main/java/brooklyn/catalog/CatalogItem.java | 6 +++ .../main/java/brooklyn/entity/EntityType.java | 1 - .../brooklyn/mementos/CatalogItemMemento.java | 2 + .../brooklyn/catalog/CatalogPredicates.java | 9 ++++ .../catalog/internal/BasicBrooklynCatalog.java | 10 +++++ .../catalog/internal/CatalogItemDo.java | 12 ++++- .../internal/CatalogItemDtoAbstract.java | 11 +++++ .../rebind/BasicCatalogItemRebindSupport.java | 1 + .../rebind/dto/BasicCatalogItemMemento.java | 17 ++++++- .../entity/rebind/dto/MementosGenerators.java | 3 +- .../entity/rebind/RebindCatalogItemTest.java | 20 ++++++++- .../main/java/brooklyn/rest/api/CatalogApi.java | 7 +++ .../rest/domain/CatalogEntitySummary.java | 6 ++- .../rest/domain/CatalogItemSummary.java | 12 ++++- .../rest/domain/CatalogPolicySummary.java | 3 +- .../rest/resources/CatalogResource.java | 21 ++++++++- .../rest/transform/CatalogTransformer.java | 6 +-- .../rest/resources/CatalogResourceTest.java | 47 +++++++++++++++++++- 19 files changed, 180 insertions(+), 17 deletions(-) ----------------------------------------------------------------------