You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2017/07/19 16:26:04 UTC
[34/39] brooklyn-server git commit: address misc PR comments
address misc PR comments
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c39eb71a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c39eb71a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c39eb71a
Branch: refs/heads/master
Commit: c39eb71ad0ef066b479cec10ff4e97166b3558c1
Parents: d6fd2ae
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Jul 17 11:41:22 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Jul 17 11:41:22 2017 +0100
----------------------------------------------------------------------
.../core/catalog/internal/CatalogItemDtoAbstract.java | 2 +-
.../brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c39eb71a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
index 0557a8c..9f6e3d4 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
@@ -391,7 +391,7 @@ public abstract class CatalogItemDtoAbstract<T, SpecT> extends AbstractBrooklynO
* <p>
* If a string is supplied, this tries heuristically to identify whether a reference is a bundle or a URL, as follows:
* - if the string contains a slash, it is treated as a URL (or classpath reference), e.g. <code>/file.txt</code>;
- * - if the string is {@link RegisteredTypeNaming#isGoodTypeColonVersion(String)} with an OSGi version it is treated as a bundle, e.g. <code>file:1</code>;
+ * - if the string is {@link RegisteredTypeNaming#isGoodBrooklynTypeColonVersion(String))} with an OSGi version it is treated as a bundle, e.g. <code>file:1</code>;
* - if the string is ambiguous (has a single colon) a warning is given,
* and typically it is treated as a URL because OSGi versions are needed here, e.g. <code>file:v1</code> is a URL,
* but for a transitional period (possibly ending in 0.13 as warning is introduced in 0.12) for compatibility with previous versions,
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c39eb71a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
index 247bebd..bd51767 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
@@ -411,9 +411,13 @@ class OsgiArchiveInstaller {
if (!result.catalogItemsInstalled.isEmpty()) {
// show fewer info messages, only for 'interesting' and non-deferred installations
// (rebind is deferred, as are tests, but REST is not)
- MutableList<String> firstFive = MutableList.copyOf(Iterables.limit(result.catalogItemsInstalled, 5));
- log.info(result.message+", items: "+firstFive+
- (result.catalogItemsInstalled.size() > 5 ? " (and others, "+result.catalogItemsInstalled.size()+" total)" : "") );
+ final int MAX_TO_LIST_EXPLICITLY = 5;
+ MutableList<String> firstN = MutableList.copyOf(Iterables.limit(result.catalogItemsInstalled, MAX_TO_LIST_EXPLICITLY));
+ log.info(result.message+", items: "+firstN+
+ (result.catalogItemsInstalled.size() > MAX_TO_LIST_EXPLICITLY ? " (and others, "+result.catalogItemsInstalled.size()+" total)" : "") );
+ if (log.isDebugEnabled() && result.catalogItemsInstalled.size()>MAX_TO_LIST_EXPLICITLY) {
+ log.debug(result.message+", all items: "+result.catalogItemsInstalled);
+ }
} else {
log.debug(result.message+" (into Brooklyn), with no catalog items");
}