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 13AA211642 for ; Fri, 4 Jul 2014 09:51:10 +0000 (UTC) Received: (qmail 84942 invoked by uid 500); 4 Jul 2014 09:51:10 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 84914 invoked by uid 500); 4 Jul 2014 09:51:09 -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 84875 invoked by uid 99); 4 Jul 2014 09:51:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2014 09:51:09 +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; Fri, 04 Jul 2014 09:51:09 +0000 Received: (qmail 83817 invoked by uid 99); 4 Jul 2014 09:50:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2014 09:50:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 57EB999A715; Fri, 4 Jul 2014 09:50:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Fri, 04 Jul 2014 09:51:20 -0000 Message-Id: In-Reply-To: <96b42d2c22f54b53bf81fc0f4b0b4983@git.apache.org> References: <96b42d2c22f54b53bf81fc0f4b0b4983@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [38/45] git commit: Merge pull request #1 from sjcorbett/feature/brooklyn-catalogue-yaml X-Virus-Checked: Checked by ClamAV on apache.org Merge pull request #1 from sjcorbett/feature/brooklyn-catalogue-yaml Feature/brooklyn catalogue yaml Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/343fe332 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/343fe332 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/343fe332 Branch: refs/heads/master Commit: 343fe332ae86c1237eeabf8b9a506b69330033a2 Parents: d709b7e f03f52f Author: Alex Heneveld Authored: Thu Jul 3 18:28:55 2014 +0300 Committer: Alex Heneveld Committed: Thu Jul 3 18:28:55 2014 +0300 ---------------------------------------------------------------------- .../brooklyn/camp/spi/pdp/DeploymentPlan.java | 27 +++++- .../catalog/internal/BasicBrooklynCatalog.java | 24 +++++- .../catalog/internal/CatalogLibrariesDto.java | 40 ++++++++- .../brooklyn/camp/lite/CampYamlLiteTest.java | 13 ++- .../camp/lite/test-app-service-blueprint.yaml | 9 ++ .../spi/creation/BrooklynEntityMatcher.java | 88 ++++++++++---------- .../spi/dsl/BrooklynDslInterpreter.java | 2 +- 7 files changed, 150 insertions(+), 53 deletions(-) ----------------------------------------------------------------------