Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8F598200CB7 for ; Fri, 30 Jun 2017 16:02:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8CBE7160BEB; Fri, 30 Jun 2017 14:02:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5702C160C08 for ; Fri, 30 Jun 2017 16:02:51 +0200 (CEST) Received: (qmail 42901 invoked by uid 500); 30 Jun 2017 14:02:50 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 42790 invoked by uid 99); 30 Jun 2017 14:02:50 -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; Fri, 30 Jun 2017 14:02:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 24A06F323C; Fri, 30 Jun 2017 14:02:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Fri, 30 Jun 2017 14:03:00 -0000 Message-Id: In-Reply-To: <00afe2e13af3478085e7a19f88c50735@git.apache.org> References: <00afe2e13af3478085e7a19f88c50735@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/27] brooklyn-server git commit: This closes #737 archived-at: Fri, 30 Jun 2017 14:02:52 -0000 This closes #737 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b46188e6 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b46188e6 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b46188e6 Branch: refs/heads/master Commit: b46188e60e62247f8ffbe09c11acf37aaee69fad Parents: 9ebc32c dc4942a Author: Alex Heneveld Authored: Wed Jun 21 18:33:06 2017 +0100 Committer: Alex Heneveld Committed: Wed Jun 21 18:33:06 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/objs/BrooklynObject.java | 3 + .../BrooklynComponentTemplateResolver.java | 9 +- .../service/BrooklynServiceTypeResolver.java | 78 ------------- .../creation/service/ServiceTypeResolver.java | 77 ------------- .../service/ServiceTypeResolverAdaptor.java | 70 ------------ .../service/ServiceTypeResolverTest.java | 39 ------- .../service/TestServiceTypeResolver.java | 54 --------- .../catalog/internal/BasicBrooklynCatalog.java | 98 +++++++++++++--- .../internal/CatalogItemDtoAbstract.java | 25 ++++- .../core/catalog/internal/CatalogUtils.java | 22 ++-- .../core/mgmt/rebind/RebindIteration.java | 5 +- .../core/typereg/BasicBrooklynTypeRegistry.java | 4 +- .../core/typereg/RegisteredTypeNaming.java | 111 +++++++++++++++++++ .../brooklyn/util/core/ClassLoaderUtils.java | 12 ++ .../catalog/internal/CatalogVersioningTest.java | 23 ++-- .../core/typereg/RegisteredTypeNamingTest.java | 87 +++++++++++++++ .../rest/transform/EntityTransformer.java | 13 +-- .../rest/util/BrooklynRestResourceUtils.java | 66 ----------- .../brooklyn/rest/util/WebResourceUtils.java | 3 +- .../util/BrooklynRestResourceUtilsTest.java | 39 +++++-- 20 files changed, 386 insertions(+), 452 deletions(-) ----------------------------------------------------------------------