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 3B0D2181EE for ; Wed, 27 Jan 2016 12:09:02 +0000 (UTC) Received: (qmail 76249 invoked by uid 500); 27 Jan 2016 12:08:52 -0000 Delivered-To: apmail-brooklyn-dev-archive@brooklyn.apache.org Received: (qmail 76217 invoked by uid 500); 27 Jan 2016 12:08:52 -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 76206 invoked by uid 99); 27 Jan 2016 12:08:52 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jan 2016 12:08:52 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 0BFBFC01AB for ; Wed, 27 Jan 2016 12:08:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.427 X-Spam-Level: X-Spam-Status: No, score=0.427 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.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 0WYQOpRPDOXb for ; Wed, 27 Jan 2016 12:08:42 +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 7B31720D10 for ; Wed, 27 Jan 2016 12:08:42 +0000 (UTC) Received: (qmail 76040 invoked by uid 99); 27 Jan 2016 12:08:42 -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; Wed, 27 Jan 2016 12:08:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 218AFDFE61; Wed, 27 Jan 2016 12:08:42 +0000 (UTC) From: neykov To: dev@brooklyn.incubator.apache.org Reply-To: dev@brooklyn.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-brooklyn pull request: Generate config/effector descript... Content-Type: text/plain Message-Id: <20160127120842.218AFDFE61@git1-us-west.apache.org> Date: Wed, 27 Jan 2016 12:08:42 +0000 (UTC) Github user neykov commented on a diff in the pull request: https://github.com/apache/incubator-brooklyn/pull/1176#discussion_r50975207 --- Diff: brooklyn-server/server-cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java --- @@ -98,88 +115,150 @@ public Void call() throws Exception { List urls = getUrls(); LOG.info("Retrieving objects from "+urls); - // TODO Remove duplication from separate ListPolicyCommand etc - List> entityTypes = getTypes(urls, Entity.class); - List> policyTypes = getTypes(urls, Policy.class); - List> enricherTypes = getTypes(urls, Enricher.class); - List> locationTypes = getTypes(urls, Location.class, Boolean.FALSE); + Map result = MutableMap.of(); + List jsonList = new ArrayList<>(); - Map result = ImmutableMap.builder() - .put("entities", ItemDescriptors.toItemDescriptors(entityTypes, headingsOnly, "name")) - .put("policies", ItemDescriptors.toItemDescriptors(policyTypes, headingsOnly, "name")) - .put("enrichers", ItemDescriptors.toItemDescriptors(enricherTypes, headingsOnly, "name")) - .put("locations", ItemDescriptors.toItemDescriptors(locationTypes, headingsOnly, "type")) - .put("locationResolvers", ItemDescriptors.toItemDescriptors(ImmutableList.copyOf(ServiceLoader.load(LocationResolver.class)), true)) - .build(); + if (!jars.isEmpty()) { + // TODO Remove duplication from separate ListPolicyCommand etc + List> entityTypes = getTypes(urls, Entity.class); + List> policyTypes = getTypes(urls, Policy.class); + List> enricherTypes = getTypes(urls, Enricher.class); + List> locationTypes = getTypes(urls, Location.class, Boolean.FALSE); - String json = toJson(result); + result = ImmutableMap.builder() + .put("entities", ItemDescriptors.toItemDescriptors(entityTypes, headingsOnly, "name")) + .put("policies", ItemDescriptors.toItemDescriptors(policyTypes, headingsOnly, "name")) + .put("enrichers", ItemDescriptors.toItemDescriptors(enricherTypes, headingsOnly, "name")) + .put("locations", ItemDescriptors.toItemDescriptors(locationTypes, headingsOnly, "type")) + .put("locationResolvers", ItemDescriptors.toItemDescriptors(ImmutableList.copyOf(ServiceLoader.load(LocationResolver.class)), true)) + .build(); + jsonList.add(toJson(result)); + } else if (!yaml.isEmpty()) { + LocalManagementContext lmgmt = new LocalManagementContext(); --- End diff -- This will read config from the user's `brooklyn.properties`. Better initialize it with an empty state using `new LocalManagementContext(BrooklynProperties.Factory.newEmpty());` --- 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. ---