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:42 UTC
[sling-org-apache-sling-installer-console] 03/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 ac6fa5113625acf4c924165caa4d639751ad93a9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 2 07:50:50 2012 +0000
SLING-2612 : Add support for excluding artifacts for installation
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1392776 13f79535-47bb-0310-9956-ffa450edef68
---
.../console/OsgiInstallerWebConsolePlugin.java | 47 +++++++++++++++++-----
1 file changed, 36 insertions(+), 11 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 53a3374..dde505c 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
@@ -42,6 +42,7 @@ import org.apache.sling.installer.api.info.Resource;
import org.apache.sling.installer.api.info.ResourceGroup;
import org.apache.sling.installer.api.tasks.RegisteredResource;
import org.apache.sling.installer.api.tasks.ResourceState;
+import org.apache.sling.installer.api.tasks.TaskResource;
import org.osgi.framework.Constants;
@@ -89,6 +90,13 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
return rsrc.getURL();
}
+ private String getState(final Resource rsrc) {
+ if ( rsrc.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
+ return "EXCLUDED";
+ }
+ return rsrc.getState().toString();
+ }
+
private String getInfo(final RegisteredResource rsrc) {
return rsrc.getDigest() + '/' + String.valueOf(rsrc.getPriority());
}
@@ -109,7 +117,7 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
@Override
public void service(final ServletRequest req, final ServletResponse res)
- throws IOException {
+ throws IOException {
final PrintWriter pw = res.getWriter();
final InstallationState state = this.installer.getInstallationState();
@@ -167,7 +175,7 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
pw.print("</td><td>");
pw.print(getURL(first));
pw.print("</td><td>");
- pw.print(first.getState());
+ pw.print(getState(first));
if ( first.getState() == ResourceState.INSTALLED ) {
final long lastChange = first.getLastChange();
if ( lastChange > 0 ) {
@@ -176,13 +184,21 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
}
}
pw.print("</td></tr>");
+ if ( first.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
+ pw.printf("<tr><td></td><td colspan='2'>%s</td><td></td></tr>",
+ first.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED));
+ }
+ if ( first.getAttribute(TaskResource.ATTR_INSTALL_INFO) != null ) {
+ pw.printf("<tr><td></td><td colspan='2'>%s</td><td></td></tr>",
+ first.getAttribute(TaskResource.ATTR_INSTALL_INFO));
+ }
while ( iter.hasNext() ) {
final Resource resource = iter.next();
pw.printf("<tr><td></td><td>%s</td><td>%s</td><td>%s</td></tr>",
- getInfo(resource),
- getURL(resource),
- resource.getState());
+ getInfo(resource),
+ getURL(resource),
+ resource.getState());
}
}
}
@@ -205,8 +221,8 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
rt = registeredResource.getType();
}
pw.printf("<tr><td>%s</td><td>%s</td></tr>",
- getInfo(registeredResource),
- registeredResource.getURL());
+ getInfo(registeredResource),
+ registeredResource.getURL());
}
if ( rt != null ) {
pw.println("</tbody></table>");
@@ -256,13 +272,22 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
getEntityId(first, group.getAlias()),
getInfo(first),
getURL(first),
- first.getState());
+ getState(first));
+ if ( first.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
+ pw.printf(" : %s",
+ first.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED));
+ }
+ if ( first.getAttribute(TaskResource.ATTR_INSTALL_INFO) != null ) {
+ pw.printf(" : %s",
+ first.getAttribute(TaskResource.ATTR_INSTALL_INFO));
+
+ }
while ( iter.hasNext() ) {
final Resource resource = iter.next();
pw.printf(" - %s, %s, %s%n",
- getInfo(resource),
- getURL(resource),
- resource.getState());
+ getInfo(resource),
+ getURL(resource),
+ resource.getState());
}
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.