This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
The following commit(s) were added to refs/heads/master by this push:
new 8081c73 SLING-7503 always expose the error string
8081c73 is described below
commit 8081c7363ff427280e5ed6c36014b83237b75b9d
Author: Konrad Windszus <[email protected]>
AuthorDate: Sun Feb 18 13:29:39 2018 +0100
SLING-7503 always expose the error string
both for active resources in the HTML web console
and for both active and installed resources in the txt rendition
---
.../impl/console/OsgiInstallerWebConsolePlugin.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
index 35ada5c..8c5c244 100644
---
a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
+++
b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
@@ -153,7 +153,7 @@ public class OsgiInstallerWebConsolePlugin extends
GenericServlet {
pw.printf("<tr><th>Entity
ID</th><th>Digest/Priority</th><th>URL
(Version)</th><th>State</th><th>Error</th></tr>");
rt = toActivate.getType();
}
- pw.printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>",
+
pw.printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>",
getEntityId(toActivate, group.getAlias()),
getInfo(toActivate),
getURL(toActivate),
@@ -264,11 +264,12 @@ public class OsgiInstallerWebConsolePlugin extends
GenericServlet {
pw.printf("%s:%n", getType(toActivate));
rt = toActivate.getType();
}
- pw.printf("- %s: %s, %s, %s%n",
+ pw.printf("- %s: %s, %s, %s, %s%n",
getEntityId(toActivate, group.getAlias()),
getInfo(toActivate),
getURL(toActivate),
- toActivate.getState());
+ toActivate.getState(),
+ getError(toActivate));
}
pw.println();
@@ -284,11 +285,12 @@ public class OsgiInstallerWebConsolePlugin extends
GenericServlet {
pw.printf("%s:%n", getType(first));
rt = first.getType();
}
- pw.printf("* %s: %s, %s, %s%n",
+ pw.printf("* %s: %s, %s, %s, %s%n",
getEntityId(first, group.getAlias()),
getInfo(first),
getURL(first),
- getState(first));
+ getState(first),
+ getError(first));
if ( first.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) !=
null ) {
pw.printf(" : %s",
first.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED));
@@ -300,10 +302,11 @@ public class OsgiInstallerWebConsolePlugin extends
GenericServlet {
}
while ( iter.hasNext() ) {
final Resource resource = iter.next();
- pw.printf(" - %s, %s, %s%n",
+ pw.printf(" - %s, %s, %s, %s%n",
getInfo(resource),
getURL(resource),
- resource.getState());
+ resource.getState(),
+ getError(resource));
}
}
}
--
To stop receiving notification emails like this one, please contact
[email protected].
