9:17 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-04-01 03:17:02 -0400 (Wed, 01 Apr 2009)
New Revision: 86576
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/PluginHelper.java
Log:
Fix Bundles Plugin
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-04-01
06:49:07 UTC (rev 86575)
+++
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java 2009-04-01
07:17:02 UTC (rev 86576)
@@ -23,11 +23,14 @@
//$Id$
+import java.io.IOException;
import java.io.PrintWriter;
import java.text.MessageFormat;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.felix.webconsole.internal.Util;
import org.apache.felix.webconsole.internal.core.BundlesServlet;
import org.apache.felix.webconsole.internal.servlet.OsgiManager;
@@ -50,8 +53,11 @@
@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);
+ // Footer redered before content in bundle plugin
+ // https://issues.apache.org/jira/browse/FELIX-1020
+
+ //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/PluginHelper.java
===================================================================
---
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/PluginHelper.java 2009-04-01
06:49:07 UTC (rev 86575)
+++
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/PluginHelper.java 2009-04-01
07:17:02 UTC (rev 86576)
@@ -33,13 +33,15 @@
{
static String getHeader()
{
- return "<?xml version=\"1.0\" encoding=\"UTF-8\"
?>"
+ String htmlHeader = "<?xml version=\"1.0\"
encoding=\"UTF-8\" ?>"
+ "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0
Transitional//EN\" \"xhtml1-transitional.dtd\">"
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\">"
+ "<head>"
+ "<meta http-equiv=\"Content-Type\" content=\"text/html;
utf-8\">"
+ "<link rel=\"icon\"
href=\"{6}/res/imgs/favicon.ico\">"
+ "<title>{0} - {2}</title>"
+ + "<script src=\"{5}/res/ui/jquery-1.3.2.min.js\"
language=\"JavaScript\"></script>"
+ + "<script src=\"{5}/res/ui/jquery.tablesorter-2.0.3.min.js\"
language=\"JavaScript\"></script>"
+ "<script src=\"{5}/res/ui/admin.js\"
language=\"JavaScript\"></script>"
+ "<script src=\"{5}/res/ui/ui.js\"
language=\"JavaScript\"></script>"
+ "<script language=\"JavaScript\">"
@@ -57,6 +59,7 @@
+ "<p>"
+ "<a target=\"_blank\" href=\"{3}\"
title=\"{1}\"><img src=\"{5}/res/imgs/jboss_logo.png\"
width=\"123\" height=\"103\"
border=\"0\"></a>"
+ "</p></div>";
+ return htmlHeader;
}
static String getFooter()