[jboss-osgi-commits] JBoss-OSGI SVN: r86384 - in projects/jboss-osgi/trunk: service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal and 1 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Thu Mar 26 11:24:48 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-03-26 11:24:48 -0400 (Thu, 26 Mar 2009)
New Revision: 86384
Added:
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigManagerPlugin.java
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java
Removed:
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigPlugin.java
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/DepPackPlugin.java
Modified:
projects/jboss-osgi/trunk/build/docbook/en/master.xml
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/LicensePlugin.java
Log:
Finish web console re-branding
Modified: projects/jboss-osgi/trunk/build/docbook/en/master.xml
===================================================================
--- projects/jboss-osgi/trunk/build/docbook/en/master.xml 2009-03-26 14:07:57 UTC (rev 86383)
+++ projects/jboss-osgi/trunk/build/docbook/en/master.xml 2009-03-26 15:24:48 UTC (rev 86384)
@@ -11,13 +11,16 @@
<!ENTITY ChapProvidedServices SYSTEM "modules/providedservices.xml">
<!ENTITY ChapReferences SYSTEM "modules/references.xml">
<!ENTITY ChapGettingSupport SYSTEM "modules/gettingsupport.xml">
+
<!ENTITY version "1.0.0.Alpha3">
+<!ENTITY pubdate "26-Mar-2009">
]>
<book lang="en">
<bookinfo>
<title>JBossOSGi - User Guide</title>
<releaseinfo>Version: &version;</releaseinfo>
+ <pubdate>Date: &pubdate;</pubdate>
<!--
<author>
Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-03-26 14:07:57 UTC (rev 86383)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-03-26 15:24:48 UTC (rev 86384)
@@ -23,7 +23,9 @@
//$Id$
+import org.apache.felix.webconsole.Render;
import org.apache.felix.webconsole.internal.servlet.OsgiManager;
+import org.jboss.osgi.service.webconsole.internal.plugins.RenderBridge;
import org.osgi.framework.BundleContext;
/**
@@ -36,9 +38,12 @@
{
private static final long serialVersionUID = 1L;
+ private BundleContext bundleContext;
+
public WebConsole(BundleContext bundleContext)
{
super(bundleContext);
+ this.bundleContext = bundleContext;
}
@Override
@@ -50,25 +55,34 @@
@Override
protected String[] getPluginClasses()
{
- return new String[] {
+ return new String[] {
+ "org.jboss.osgi.service.webconsole.internal.plugins.BundlesPlugin",
+ "org.jboss.osgi.service.webconsole.internal.plugins.ConfigManagerPlugin",
+ "org.jboss.osgi.service.webconsole.internal.plugins.EventAdminPlugin",
+ "org.jboss.osgi.service.webconsole.internal.plugins.LicensePlugin",
+
"org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter",
- "org.apache.felix.webconsole.internal.compendium.ComponentsServlet",
- "org.apache.felix.webconsole.internal.compendium.ConfigManager",
- "org.jboss.osgi.service.webconsole.internal.plugins.BundlesPlugin",
+ //"org.apache.felix.webconsole.internal.compendium.ComponentsServlet",
"org.apache.felix.webconsole.internal.core.InstallAction",
"org.apache.felix.webconsole.internal.core.SetStartLevelAction",
- "org.apache.felix.webconsole.internal.deppack.DepPackServlet",
- "org.apache.felix.webconsole.internal.misc.EventAdminServlet",
- "org.apache.felix.webconsole.internal.misc.LicenseServlet",
+ //"org.apache.felix.webconsole.internal.deppack.DepPackServlet",
"org.apache.felix.webconsole.internal.misc.ConfigurationRender",
- "org.apache.felix.webconsole.internal.misc.ShellServlet",
- "org.apache.felix.webconsole.internal.obr.BundleRepositoryRender",
+ //"org.apache.felix.webconsole.internal.misc.ShellServlet",
+ "org.apache.felix.webconsole.internal.obr.BundleRepositoryRender",
"org.apache.felix.webconsole.internal.obr.InstallFromRepoAction",
- "org.apache.felix.webconsole.internal.obr.RefreshRepoAction",
+ "org.apache.felix.webconsole.internal.obr.RefreshRepoAction",
"org.apache.felix.webconsole.internal.system.GCAction",
- "org.apache.felix.webconsole.internal.system.ShutdownAction",
+ "org.apache.felix.webconsole.internal.system.ShutdownAction",
"org.apache.felix.webconsole.internal.system.ShutdownRender",
- "org.apache.felix.webconsole.internal.system.VMStatRender"
+ "org.apache.felix.webconsole.internal.system.VMStatRender"
};
}
+
+ @Override
+ protected void bindRender(Render render)
+ {
+ RenderBridge bridge = new RenderBridge(render);
+ bridge.activate(bundleContext);
+ bindServlet(render.getName(), bridge);
+ }
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java 2009-03-26 14:07:57 UTC (rev 86383)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java 2009-03-26 15:24:48 UTC (rev 86384)
@@ -47,6 +47,7 @@
return PluginHelper.getHeader();
}
+ @Override
protected void endResponse(HttpServletRequest request, PrintWriter pw)
{
String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT);
Copied: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigManagerPlugin.java (from rev 86375, projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigPlugin.java)
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigManagerPlugin.java (rev 0)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigManagerPlugin.java 2009-03-26 15:24:48 UTC (rev 86384)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.service.webconsole.internal.plugins;
+
+//$Id$
+
+import java.io.PrintWriter;
+import java.text.MessageFormat;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.felix.webconsole.internal.compendium.ConfigManager;
+import org.apache.felix.webconsole.internal.servlet.OsgiManager;
+
+/**
+ * A Console plugin
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 12-Mar-2009
+ */
+public class ConfigManagerPlugin extends ConfigManager
+{
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getHeader()
+ {
+ return PluginHelper.getHeader();
+ }
+
+ @Override
+ protected void endResponse(HttpServletRequest request, PrintWriter pw)
+ {
+ String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT);
+ String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot });
+ pw.println(footer);
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigManagerPlugin.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigPlugin.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigPlugin.java 2009-03-26 14:07:57 UTC (rev 86383)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/ConfigPlugin.java 2009-03-26 15:24:48 UTC (rev 86384)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.service.webconsole.internal.plugins;
-
-//$Id$
-
-import java.io.PrintWriter;
-import java.text.MessageFormat;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.felix.webconsole.internal.core.BundlesServlet;
-import org.apache.felix.webconsole.internal.servlet.OsgiManager;
-
-/**
- * A Console plugin
- *
- * @author thomas.diesler at jboss.com
- * @since 12-Mar-2009
- */
-public class ConfigPlugin extends BundlesServlet
-{
- private static final long serialVersionUID = 1L;
-
- @Override
- protected String getHeader()
- {
- return PluginHelper.getHeader();
- }
-
- protected void endResponse(HttpServletRequest request, PrintWriter pw)
- {
- String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT);
- String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot });
- pw.println(footer);
- }
-}
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/DepPackPlugin.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/DepPackPlugin.java 2009-03-26 14:07:57 UTC (rev 86383)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/DepPackPlugin.java 2009-03-26 15:24:48 UTC (rev 86384)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.service.webconsole.internal.plugins;
-
-//$Id$
-
-import java.io.PrintWriter;
-import java.text.MessageFormat;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.felix.webconsole.internal.core.BundlesServlet;
-import org.apache.felix.webconsole.internal.servlet.OsgiManager;
-
-/**
- * A Console plugin
- *
- * @author thomas.diesler at jboss.com
- * @since 12-Mar-2009
- */
-public class DepPackPlugin extends BundlesServlet
-{
- private static final long serialVersionUID = 1L;
-
- @Override
- protected String getHeader()
- {
- return PluginHelper.getHeader();
- }
-
- protected void endResponse(HttpServletRequest request, PrintWriter pw)
- {
- String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT);
- String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot });
- pw.println(footer);
- }
-}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java 2009-03-26 14:07:57 UTC (rev 86383)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java 2009-03-26 15:24:48 UTC (rev 86384)
@@ -28,7 +28,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.felix.webconsole.internal.core.BundlesServlet;
+import org.apache.felix.webconsole.internal.misc.EventAdminServlet;
import org.apache.felix.webconsole.internal.servlet.OsgiManager;
/**
@@ -37,7 +37,7 @@
* @author thomas.diesler at jboss.com
* @since 12-Mar-2009
*/
-public class EventAdminPlugin extends BundlesServlet
+public class EventAdminPlugin extends EventAdminServlet
{
private static final long serialVersionUID = 1L;
@@ -47,6 +47,7 @@
return PluginHelper.getHeader();
}
+ @Override
protected void endResponse(HttpServletRequest request, PrintWriter pw)
{
String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT);
Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/LicensePlugin.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/LicensePlugin.java 2009-03-26 14:07:57 UTC (rev 86383)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/LicensePlugin.java 2009-03-26 15:24:48 UTC (rev 86384)
@@ -28,7 +28,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.felix.webconsole.internal.core.BundlesServlet;
+import org.apache.felix.webconsole.internal.misc.LicenseServlet;
import org.apache.felix.webconsole.internal.servlet.OsgiManager;
/**
@@ -37,7 +37,7 @@
* @author thomas.diesler at jboss.com
* @since 12-Mar-2009
*/
-public class LicensePlugin extends BundlesServlet
+public class LicensePlugin extends LicenseServlet
{
private static final long serialVersionUID = 1L;
@@ -47,6 +47,7 @@
return PluginHelper.getHeader();
}
+ @Override
protected void endResponse(HttpServletRequest request, PrintWriter pw)
{
String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT);
Added: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java (rev 0)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java 2009-03-26 15:24:48 UTC (rev 86384)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.service.webconsole.internal.plugins;
+
+//$Id$
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.MessageFormat;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.felix.webconsole.AbstractWebConsolePlugin;
+import org.apache.felix.webconsole.Render;
+import org.apache.felix.webconsole.internal.servlet.OsgiManager;
+
+ at SuppressWarnings("serial")
+public class RenderBridge extends AbstractWebConsolePlugin
+{
+ private final Render render;
+
+ public RenderBridge(Render render)
+ {
+ this.render = render;
+ }
+
+ public Render getRender()
+ {
+ return render;
+ }
+
+ public String getTitle()
+ {
+ return render.getLabel();
+ }
+
+ public String getLabel()
+ {
+ return render.getName();
+ }
+
+ protected void renderContent(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ render.render(request, response);
+ }
+
+ @Override
+ protected String getHeader()
+ {
+ return PluginHelper.getHeader();
+ }
+
+ @Override
+ protected void endResponse(HttpServletRequest request, PrintWriter pw)
+ {
+ String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT);
+ String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot });
+ pw.println(footer);
+ }
+}
Property changes on: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/RenderBridge.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jboss-osgi-commits
mailing list