Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 21457 invoked from network); 13 Jan 2011 15:34:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Jan 2011 15:34:43 -0000 Received: (qmail 89974 invoked by uid 500); 13 Jan 2011 15:34:43 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 89909 invoked by uid 500); 13 Jan 2011 15:34:41 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 89901 invoked by uid 99); 13 Jan 2011 15:34:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Jan 2011 15:34:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Jan 2011 15:34:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DF8B123889BF; Thu, 13 Jan 2011 15:34:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1058611 - /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java Date: Thu, 13 Jan 2011 15:34:13 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110113153413.DF8B123889BF@eris.apache.org> Author: cziegeler Date: Thu Jan 13 15:34:13 2011 New Revision: 1058611 URL: http://svn.apache.org/viewvc?rev=1058611&view=rev Log: SLING-755 : Web Console Plugin for the OSGi Installer Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java?rev=1058611&r1=1058610&r2=1058611&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java Thu Jan 13 15:34:13 2011 @@ -23,12 +23,14 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; import java.util.Hashtable; +import java.util.Iterator; import java.util.List; import javax.servlet.GenericServlet; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import org.apache.sling.installer.api.InstallableResource; import org.apache.sling.installer.api.tasks.RegisteredResource; import org.apache.sling.installer.api.tasks.TaskResource; import org.apache.sling.installer.core.impl.Activator; @@ -92,6 +94,20 @@ public class OsgiInstallerWebConsolePlug return state; } + private String getType(final RegisteredResource rsrc) { + final String type = rsrc.getType(); + if ( type.equals(InstallableResource.TYPE_BUNDLE) ) { + return "Bundle"; + } else if ( type.equals(InstallableResource.TYPE_CONFIG) ) { + return "Configuration"; + } else if ( type.equals(InstallableResource.TYPE_FILE) ) { + return "File"; + } else if ( type.equals(InstallableResource.TYPE_PROPERTIES) ) { + return "Properties"; + } + return type; + } + @Override public void service(ServletRequest req, ServletResponse res) throws IOException { @@ -105,24 +121,35 @@ public class OsgiInstallerWebConsolePlug pw.println("
    "); for(final EntityResourceList group : state.activeResources) { final TaskResource toActivate = group.getActiveResource(); - pw.printf("
  • %s: %s, %s, %s
    • %n", + pw.printf("
  • %s %s: %s, %s, %s
    • %n", + getType(toActivate), toActivate.getEntityId(), toActivate.getDigest(), - toActivate.getScheme(), + toActivate.getURL(), toActivate.getState()); } pw.println("
"); - pw.println("

Installed Resources

"); + pw.println("

Processed Resources

"); pw.println("
    "); for(final EntityResourceList group : state.installedResources) { final Collection resources = group.getResources(); if (resources.size() > 0) { + final Iterator iter = resources.iterator(); + final TaskResource first = iter.next(); pw.println("
      "); - for (TaskResource resource : resources) { - pw.printf("
    • %s: %s, %s, %s
      • %n", - resource.getEntityId(), resource.getDigest(), - resource.getScheme(), resource.getState()); + pw.printf("
    • %s %s: %s, %s, %s
      • %n", + getType(first), + first.getEntityId(), + first.getDigest(), + first.getURL(), + first.getState()); + while ( iter.hasNext() ) { + final TaskResource resource = iter.next(); + pw.printf("
    • %s, %s, %s
      • %n", + resource.getDigest(), + resource.getURL(), + resource.getState()); } pw.println("
    "); } @@ -133,8 +160,9 @@ public class OsgiInstallerWebConsolePlug pw.println("
      "); for(final RegisteredResource registeredResource : state.untransformedResources) { pw.printf("
    • %s: %s, %s
      • %n", - registeredResource.getEntityId(), - registeredResource.getDigest(), registeredResource.getScheme()); + getType(registeredResource), + registeredResource.getDigest(), + registeredResource.getURL()); } pw.println("
    "); } @@ -154,25 +182,34 @@ public class OsgiInstallerWebConsolePlug pw.println("Active Resources:"); for(final EntityResourceList group : state.activeResources) { final TaskResource toActivate = group.getActiveResource(); - pw.printf("- %s: %s, %s, %s%n", + pw.printf("- %s %s: %s, %s, %s%n", + getType(toActivate), toActivate.getEntityId(), toActivate.getDigest(), - toActivate.getScheme(), + toActivate.getURL(), toActivate.getState()); } pw.println(); - pw.println("Installed Resources:"); + pw.println("Processed Resources:"); for(final EntityResourceList group : state.installedResources) { final Collection resources = group.getResources(); if (resources.size() > 0) { - pw.print("* "); - for (TaskResource resource : resources) { - pw.printf("- %s: %s, %s, %s%n", - resource.getEntityId(), resource.getDigest(), - resource.getScheme(), resource.getState()); + final Iterator iter = resources.iterator(); + final TaskResource first = iter.next(); + pw.printf("* %s %s: %s, %s, %s%n", + getType(first), + first.getEntityId(), + first.getDigest(), + first.getURL(), + first.getState()); + while ( iter.hasNext() ) { + final TaskResource resource = iter.next(); + pw.printf(" - %s, %s, %s%n", + resource.getDigest(), + resource.getURL(), + resource.getState()); } - pw.println("
"); } } pw.println(); @@ -180,8 +217,9 @@ public class OsgiInstallerWebConsolePlug pw.println("Untransformed Resources:"); for(final RegisteredResource registeredResource : state.untransformedResources) { pw.printf("- %s: %s, %s%n", - registeredResource.getEntityId(), - registeredResource.getDigest(), registeredResource.getScheme()); + getType(registeredResource), + registeredResource.getDigest(), + registeredResource.getURL()); } } }