Mailing-List: contact commits-help@felix.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@felix.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1022527 -
 /felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
Date: Thu, 14 Oct 2010 13:46:28 -0000
To: commits@felix.apache.org
From: fmeschbe@apache.org
Message-Id: <20101014134628.B71A72388993@eris.apache.org>

Author: fmeschbe
Date: Thu Oct 14 13:46:28 2010
New Revision: 1022527

URL: http://svn.apache.org/viewvc?rev=1022527&view=rev
Log:
FELIX-2660 Prevent bundles from being displayed in the web output
of the configuration status page

Modified:
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java?rev=1022527&r1=1022526&r2=1022527&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java Thu Oct 14 13:46:28 2010
@@ -30,6 +30,7 @@ import java.util.Date;
 import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -150,7 +151,10 @@ public class BundlesServlet extends Simp
             bootPkgs[i] = bootDelegation;
         }
 
-        configurationPrinter = bundleContext.registerService( ConfigurationPrinter.SERVICE, this, null );
+        Hashtable props = new Hashtable();
+        props.put( WebConsoleConstants.CONFIG_PRINTER_MODES, new String[] { ConfigurationPrinter.MODE_TXT,
+            ConfigurationPrinter.MODE_ZIP } );
+        configurationPrinter = bundleContext.registerService( ConfigurationPrinter.SERVICE, this, props );
     }
 
 
@@ -581,7 +585,7 @@ public class BundlesServlet extends Simp
 
             jw.key( "status" );
             jw.value( statusLine );
-            
+
             // add raw status
             jw.key( "s" );
             jw.array();