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 365D911628 for ; Fri, 4 Jul 2014 09:51:06 +0000 (UTC) Received: (qmail 83971 invoked by uid 500); 4 Jul 2014 09:51:06 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 83949 invoked by uid 500); 4 Jul 2014 09:51:06 -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 83940 invoked by uid 99); 4 Jul 2014 09:51:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2014 09:51:06 +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:03 +0000 Received: (qmail 83747 invoked by uid 99); 4 Jul 2014 09:50:43 -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:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8E56199A6A6; Fri, 4 Jul 2014 09:50:43 +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:50:48 -0000 Message-Id: <058fa8d455e444688c85dd37885f6a53@git.apache.org> In-Reply-To: <96b42d2c22f54b53bf81fc0f4b0b4983@git.apache.org> References: <96b42d2c22f54b53bf81fc0f4b0b4983@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/45] git commit: Note problem with BrooklynAssemblyTemplateInstantiator catalog path X-Virus-Checked: Checked by ClamAV on apache.org Note problem with BrooklynAssemblyTemplateInstantiator catalog path Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/76ff185a Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/76ff185a Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/76ff185a Branch: refs/heads/master Commit: 76ff185a0675ae916c053470609480d987a16128 Parents: edcaee4 Author: Sam Corbett Authored: Mon Jun 30 17:24:33 2014 +0100 Committer: Sam Corbett Committed: Tue Jul 1 13:37:37 2014 +0100 ---------------------------------------------------------------------- .../BrooklynAssemblyTemplateInstantiator.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/76ff185a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java index a06d716..05d6efb 100644 --- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java +++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java @@ -1,7 +1,6 @@ package io.brooklyn.camp.brooklyn.spi.creation; import io.brooklyn.camp.CampPlatform; -import io.brooklyn.camp.brooklyn.BrooklynCampPlatform; import io.brooklyn.camp.brooklyn.spi.platform.HasBrooklynManagementContext; import io.brooklyn.camp.spi.Assembly; import io.brooklyn.camp.spi.AssemblyTemplate; @@ -63,20 +62,12 @@ public class BrooklynAssemblyTemplateInstantiator implements AssemblyTemplateIns ManagementContext mgmt = getBrooklynManagementContext(platform); BrooklynCatalog catalog = mgmt.getCatalog(); + // TODO: item is always null because template.id is a random String, so + // createApplicationFromCatalog branch below is never taken. If `id' + // key is given in blueprint it is available with: + // Object customId = template.getCustomAttributes().get("id"); CatalogItem item = catalog.getCatalogItem(template.getId()); - if (item == null) { - // This doesn't seem the most appropriate way to do this! - // Especially since YAML will only reach here if a services section was given (so that - // PdpProcessor calls into BrooklynEntityMatcher [via applyMatchers] which sets the - // instantiator to BrooklynAssemblyTemplateInstantiator). So services must be given - // but will be disregarded. - Object customId = template.getCustomAttributes().get("id"); - if (customId != null) { - item = catalog.getCatalogItem(customId.toString()); - } - } - if (item==null) { return createApplicationFromNonCatalogCampTemplate(template, platform); } else {