You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2011/07/14 10:03:08 UTC
svn commit: r1146590 - in
/felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal:
Activator.java PackageAdminPlugin.java
Author: cziegeler
Date: Thu Jul 14 08:03:08 2011
New Revision: 1146590
URL: http://svn.apache.org/viewvc?rev=1146590&view=rev
Log:
FELIX-3026 : Add PackageAdmin information to Configuration Status dump
Modified:
felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/Activator.java
felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/PackageAdminPlugin.java
Modified: felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/Activator.java?rev=1146590&r1=1146589&r2=1146590&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/Activator.java (original)
+++ felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/Activator.java Thu Jul 14 08:03:08 2011
@@ -21,18 +21,18 @@ package org.apache.felix.webconsole.plug
import java.util.Dictionary;
import java.util.Hashtable;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
+import org.osgi.framework.*;
import org.osgi.util.tracker.ServiceTracker;
-public class Activator implements BundleActivator {
+public class Activator implements BundleActivator
+{
private ServiceTracker pkgAdminTracker;
private ServiceRegistration pkgAdminPlugin;
- public void start(BundleContext context) throws Exception {
+ public void start(final BundleContext context) throws Exception
+ {
this.pkgAdminTracker = new ServiceTracker(context,
"org.osgi.service.packageadmin.PackageAdmin", null);
this.pkgAdminTracker.open();
@@ -42,13 +42,23 @@ public class Activator implements Bundle
final Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put("felix.webconsole.label", PackageAdminPlugin.LABEL);
props.put("felix.webconsole.title", PackageAdminPlugin.TITLE);
+ props.put("felix.webconsole.configprinter.modes", new String[] {"zip", "txt"});
this.pkgAdminPlugin = context.registerService("javax.servlet.Servlet",
plugin, props);
}
- public void stop(BundleContext context) throws Exception {
- this.pkgAdminPlugin.unregister();
- this.pkgAdminTracker.close();
+ public void stop(final BundleContext context) throws Exception
+ {
+ if ( this.pkgAdminPlugin != null )
+ {
+ this.pkgAdminPlugin.unregister();
+ this.pkgAdminPlugin = null;
+ }
+ if ( this.pkgAdminTracker != null )
+ {
+ this.pkgAdminTracker.close();
+ this.pkgAdminTracker = null;
+ }
}
}
Modified: felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/PackageAdminPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/PackageAdminPlugin.java?rev=1146590&r1=1146589&r2=1146590&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/PackageAdminPlugin.java (original)
+++ felix/trunk/webconsole-plugins/packageadmin/src/main/java/org/apache/felix/webconsole/plugins/packageadmin/internal/PackageAdminPlugin.java Thu Jul 14 08:03:08 2011
@@ -20,16 +20,10 @@ package org.apache.felix.webconsole.plug
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.Comparator;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+
+import javax.servlet.*;
import javax.servlet.http.HttpServletResponse;
import org.osgi.framework.Bundle;
@@ -144,6 +138,79 @@ public class PackageAdminPlugin extends
pw.println("</table>");
}
+ private void dumpDuplicatesAsTxt(final PrintWriter pw,
+ final Map<String, Set<ExportedPackage>> exports)
+ {
+ pw.println("Duplicate Exported Packages");
+ pw.println("---------------------------");
+ final List<String[]> lines = new ArrayList<String[]>();
+ lines.add(new String[] {"Package", "Exports", "Imports"});
+
+ for (Entry<String, Set<ExportedPackage>> exportEntry : exports.entrySet())
+ {
+ final Set<ExportedPackage> exportSet = exportEntry.getValue();
+ if (exportSet.size() > 1)
+ {
+ String firstCol = exportEntry.getKey();
+ for (ExportedPackage exportedPackage : exportSet)
+ {
+ final Bundle[] importers = exportedPackage.getImportingBundles();
+ final String secondCol = "version=" + exportedPackage.getVersion() + ", Bundle " + exportedPackage.getExportingBundle();
+ if (importers != null && importers.length > 0) {
+ boolean first = true;
+ for (Bundle bundle : importers)
+ {
+ if ( first )
+ {
+ lines.add(new String[] {firstCol, secondCol, bundle.toString()});
+ first = false;
+ }
+ else
+ {
+ lines.add(new String[] {"", "", bundle.toString()});
+
+ }
+ }
+ }
+ else
+ {
+ lines.add(new String[] {firstCol, secondCol, ""});
+ }
+ firstCol = "";
+ }
+ }
+ }
+ int maxFirst = 0, maxSecond = 0;
+ for(final String[] entry : lines)
+ {
+ if ( entry[0].length() > maxFirst )
+ {
+ maxFirst = entry[0].length();
+ }
+ if ( entry[1].length() > maxSecond )
+ {
+ maxSecond = entry[1].length();
+ }
+ }
+ maxFirst += 2;
+ maxSecond += 2;
+ for(final String[] entry : lines)
+ {
+ padText(pw, entry[0], maxFirst);
+ padText(pw, entry[1], maxSecond);
+ pw.println(entry[2]);
+ }
+ }
+
+ private void padText(final PrintWriter pw, final String text, final int length)
+ {
+ pw.print(text);
+ final int padLength = length - text.length();
+ for(int i=0;i<padLength;i++) {
+ pw.print(' ');
+ }
+ }
+
private static class ExportedPackageComparator implements
Comparator<ExportedPackage> {
@@ -167,4 +234,30 @@ public class PackageAdminPlugin extends
}
}
+
+ /**
+ * Configuration printer
+ */
+ public void printConfiguration(final PrintWriter pw)
+ {
+ final PackageAdmin pa = (PackageAdmin) this.pkgAdminTracker.getService();
+ if (pa == null)
+ {
+ pw.println("PackageAdmin Service not registered");
+ return;
+ }
+
+ try {
+ Map<String, Set<ExportedPackage>> exports = collectExportedPackages(pa);
+
+ pw.print("PackageAdmin service reports ");
+ pw.print(String.valueOf(exports.size()));
+ pw.println(" exported packages.");
+ pw.println();
+
+ dumpDuplicatesAsTxt(pw, exports);
+ } catch (Exception e) {
+ pw.println("failure ...." + e);
+ }
+ }
}