Return-Path: X-Original-To: apmail-brooklyn-dev-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 400DE186AA for ; Tue, 12 Jan 2016 16:58:18 +0000 (UTC) Received: (qmail 71751 invoked by uid 500); 12 Jan 2016 16:58:18 -0000 Delivered-To: apmail-brooklyn-dev-archive@brooklyn.apache.org Received: (qmail 71728 invoked by uid 500); 12 Jan 2016 16:58:18 -0000 Mailing-List: contact dev-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 dev@brooklyn.apache.org Received: (qmail 71716 invoked by uid 99); 12 Jan 2016 16:58:17 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jan 2016 16:58:17 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 5E5B2C3CB3 for ; Tue, 12 Jan 2016 16:58:17 +0000 (UTC) X-Quarantine-ID: X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Amavis-Alert: BAD HEADER SECTION, Non-encoded 8-bit data (char E2 hex): Subject: ...n pull request: YAML: don\303\242\302\200\302\231t wrap sub-en[...] X-Spam-Flag: NO X-Spam-Score: 2.185 X-Spam-Level: ** X-Spam-Status: No, score=2.185 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SUBJECT_NEEDS_ENCODING=0.1, SUBJ_ILLEGAL_CHARS=1.105, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id miHrvyDehkeF for ; Tue, 12 Jan 2016 16:58:09 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id E557E20498 for ; Tue, 12 Jan 2016 16:58:08 +0000 (UTC) Received: (qmail 71706 invoked by uid 99); 12 Jan 2016 16:58:08 -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; Tue, 12 Jan 2016 16:58:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AF48EE1804; Tue, 12 Jan 2016 16:58:08 +0000 (UTC) From: aledsage To: dev@brooklyn.incubator.apache.org Reply-To: dev@brooklyn.incubator.apache.org Message-ID: Subject: [GitHub] incubator-brooklyn pull request: YAML: don’t wrap sub-entities i... Content-Type: text/plain Date: Tue, 12 Jan 2016 16:58:08 +0000 (UTC) GitHub user aledsage opened a pull request: https://github.com/apache/incubator-brooklyn/pull/1138 YAML: don’t wrap sub-entities in BasicApplication Previously, any catalog item of type “template” would always be wrapped in a BasicApplication. This was being done in three places. The first is ok; the second two are bad: 1. When deploying a top-level “template” from the catalog. 2. When referring to a “template” catalog item in a member-spec (e.g. for a DynamicCluster) 3. When referring to a “template” catalog item in brooklyn.children. @johnmccabe @ahgittin @neykov you'll be interested in this. I don't like the approach (duplicating the fix in three places, to remove the wrapping app, for the different contexts that it might be used). It would feel better for the YAML-parsing to *not* wrap the entity at all, unless there was a really good reason to (e.g. the catalog item consists of multiple top-level services defined in its yaml). The caller could then decide if it needs to wrap it (i.e. if deliberately creating a top-level app), or leave as-is. You can merge this pull request into a Git repository by running: $ git pull https://github.com/aledsage/incubator-brooklyn fix/wraps-sub-entities-in-BasicApplication Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-brooklyn/pull/1138.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1138 ---- commit e3a16614055f83f68164d6cfe222668710a4f953 Author: Aled Sage Date: 2016-01-12T16:55:01Z YAML: don’t wrap sub-entities in BasicApplication Previously, any catalog item of type “template” would always be wrapped in a BasicApplication. This was being done in three places. The first is ok; the second two are bad: 1. When deploying a top-level “template” from the catalog. 2. When referring to a “template” catalog item in a member-spec (e.g. for a DynamicCluster) 3. When referring to a “template” catalog item in brooklyn.children. ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---