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 853B1200CD4 for ; Fri, 14 Jul 2017 12:51:48 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 83BF116D892; Fri, 14 Jul 2017 10:51:48 +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 EF48216D871 for ; Fri, 14 Jul 2017 12:51:47 +0200 (CEST) Received: (qmail 57508 invoked by uid 500); 14 Jul 2017 10:51:47 -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 57441 invoked by uid 99); 14 Jul 2017 10:51:46 -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, 14 Jul 2017 10:51:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A09E9DFC28; Fri, 14 Jul 2017 10:51:44 +0000 (UTC) From: geomacy To: dev@brooklyn.apache.org Reply-To: dev@brooklyn.apache.org References: In-Reply-To: Subject: [GitHub] brooklyn-server pull request #746: Auto wrap YAML BOMs as catalog bundles Content-Type: text/plain Message-Id: <20170714105145.A09E9DFC28@git1-us-west.apache.org> Date: Fri, 14 Jul 2017 10:51:44 +0000 (UTC) archived-at: Fri, 14 Jul 2017 10:51:48 -0000 Github user geomacy commented on a diff in the pull request: https://github.com/apache/brooklyn-server/pull/746#discussion_r127412080 --- Diff: core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiManager.java --- @@ -372,33 +376,46 @@ public synchronized Bundle registerBundle(CatalogBundle bundleMetadata) { // it probably works even if that is true, but we should consider what to do; // possibly remove that other capability, so that bundles with BOMs _have_ to be installed via this method. // (load order gets confusing with auto-scanning...) - public List> loadCatalogBom(Bundle bundle) { - return MutableList.copyOf(loadCatalogBom(mgmt, bundle)); + public List> loadCatalogBomLegacy(Bundle bundle) { --- End diff -- This isn't called now that you've removed the `CatalogBomScanner`, so you can remove it and the method below as well, _and_ get rid of the `legacy` parameter in `loadCatalogBomInternal`, and also remove `legacy` methods in `CatalogBundleLoader`. --- 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. ---