Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D2208E5FF for ; Tue, 29 Jan 2013 15:27:23 +0000 (UTC) Received: (qmail 35772 invoked by uid 500); 29 Jan 2013 15:27:23 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 35724 invoked by uid 500); 29 Jan 2013 15:27:23 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 35710 invoked by uid 99); 29 Jan 2013 15:27:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jan 2013 15:27:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 29 Jan 2013 15:27:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A4F9B2388B1B; Tue, 29 Jan 2013 15:27:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1439934 - in /felix/trunk/webconsole: pom.xml src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java Date: Tue, 29 Jan 2013 15:27:02 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130129152702.A4F9B2388B1B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Tue Jan 29 15:27:02 2013 New Revision: 1439934 URL: http://svn.apache.org/viewvc?rev=1439934&view=rev Log: FELIX-3874 : Create new status printer module Modified: felix/trunk/webconsole/pom.xml felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java Modified: felix/trunk/webconsole/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/pom.xml?rev=1439934&r1=1439933&r2=1439934&view=diff ============================================================================== --- felix/trunk/webconsole/pom.xml (original) +++ felix/trunk/webconsole/pom.xml Tue Jan 29 15:27:02 2013 @@ -40,6 +40,11 @@ 20070829 0.0.0.${org.json.version} + + org.apache.felix.webconsole;version=3.1.3;provide:=true, + org.apache.felix.webconsole.bundleinfo;version=1.0.0;provide:=true, + org.apache.felix.webconsole.i18n;version=1.0.0;provide:=true + @@ -127,9 +132,7 @@ org.apache.felix.webconsole.internal.OsgiManagerActivator - org.apache.felix.webconsole;version=3.1.3;provide:=true, - org.apache.felix.webconsole.bundleinfo;version=1.0.0;provide:=true, - org.apache.felix.webconsole.i18n;version=1.0.0;provide:=true + ${webconsole.exports} org.json.*;version=0, @@ -235,7 +238,8 @@ org.apache.commons.io.filefilter, org.apache.commons.io.output, org.json;version=${org.json.version.osgi}, - org.apache.felix.status;version=1.0.0 + org.apache.felix.status;version=1.0.0, + ${webconsole.exports} Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java?rev=1439934&r1=1439933&r2=1439934&view=diff ============================================================================== --- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java (original) +++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java Tue Jan 29 15:27:02 2013 @@ -55,7 +55,7 @@ import org.apache.felix.webconsole.inter import org.apache.felix.webconsole.internal.core.BundlesServlet; import org.apache.felix.webconsole.internal.filter.FilteringResponseWrapper; import org.apache.felix.webconsole.internal.i18n.ResourceBundleManager; -import org.apache.felix.webconsole.internal.misc.ConfigurationRender; +import org.apache.felix.webconsole.internal.servlet.PluginHolder.InternalPlugin; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -294,10 +294,10 @@ public class OsgiManager extends Generic resourceBundleManager = new ResourceBundleManager(getBundleContext()); // start the configuration render, providing the resource bundle manager - ConfigurationRender cr = new ConfigurationRender(resourceBundleManager); - cr.activate(bundleContext); - osgiManagerPlugins.add(cr); - holder.addOsgiManagerPlugin(cr); + //ConfigurationRender cr = new ConfigurationRender(resourceBundleManager); + //cr.activate(bundleContext); + //osgiManagerPlugins.add(cr); + //holder.addOsgiManagerPlugin(cr); // start tracking external plugins after setting up our own plugins holder.open();