felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
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 GMT
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 @@
     <properties>
         <org.json.version>20070829</org.json.version>
         <org.json.version.osgi>0.0.0.${org.json.version}</org.json.version.osgi>
+        <webconsole.exports>
+            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>
     </properties>
 
     <scm>
@@ -127,9 +132,7 @@
                             org.apache.felix.webconsole.internal.OsgiManagerActivator
                         </Bundle-Activator>
                         <Export-Package>
-                            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}
                         </Export-Package>
                         <Import-Package>
                             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}
                                        </Export-Package>
                                        <Embed-Dependency>
                                            <!-- Import/Export-Package parsing -->

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();



Mime
View raw message