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/10/18 23:26:44 UTC
[sling-org-apache-sling-installer-console] 05/31: SLING-2612 : Add
support for excluding artifacts for installation
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit e6a716e0b3dc5a3f70f43bf25623d664484b4e34
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 2 09:00:15 2012 +0000
SLING-2612 : Add support for excluding artifacts for installation
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1392797 13f79535-47bb-0310-9956-ffa450edef68
---
.../core/impl/console/OsgiInstallerWebConsolePlugin.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 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 003698b..8be72dd 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,15 +91,17 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
}
private String getState(final Resource rsrc) {
+ String stateInfo = rsrc.getState().toString();
// 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(*)";
+ if (rsrc.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
+ stateInfo = "EXCLUDED";
+ }
+ if (rsrc.getAttribute(TaskResource.ATTR_INSTALL_INFO) != null) {
+ stateInfo = stateInfo + "(*)";
}
}
- return rsrc.getState().toString();
+ return stateInfo;
}
private String getInfo(final RegisteredResource rsrc) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.