You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:41:05 UTC
[sling-org-apache-sling-installer-console] 04/08: SLING-2612 -
EXCLUDED applies only to INSTALLED state IMO,
and add (*) after INSTALLED if there's additional info
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.console-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit cd66f40ef23739709f4af13d62bc9d740d11489e
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Oct 2 08:12:38 2012 +0000
SLING-2612 - EXCLUDED applies only to INSTALLED state IMO, and add (*) after INSTALLED if there's additional info
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/console@1392785 13f79535-47bb-0310-9956-ffa450edef68
---
.../core/impl/console/OsgiInstallerWebConsolePlugin.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 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 dde505c..003698b 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
@@ -91,8 +91,13 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
}
private String getState(final Resource rsrc) {
- if ( rsrc.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
- return "EXCLUDED";
+ // INSTALLED state has some variants
+ if ( rsrc.getState() == ResourceState.INSTALLED) {
+ if(rsrc.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
+ return "EXCLUDED";
+ } else if(rsrc.getAttribute(TaskResource.ATTR_INSTALL_INFO) != null) {
+ return "INSTALLED(*)";
+ }
}
return rsrc.getState().toString();
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.