[jboss-cvs] JBossAS SVN: r84162 - in projects/jboss-felix/trunk/modules/webconsole/src/main: java/org/apache/felix/webconsole/internal/servlet and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-02-13 05:36:32 -0500 (Fri, 13 Feb 2009)
New Revision: 84162

Added:
   projects/jboss-felix/trunk/modules/webconsole/src/main/resources/res/imgs/felix_logo.png
Modified:
   projects/jboss-felix/trunk/modules/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
   projects/jboss-felix/trunk/modules/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
   projects/jboss-felix/trunk/modules/webconsole/src/main/resources/res/imgs/logo.png
Log:
jboss.org branding

Modified: projects/jboss-felix/trunk/modules/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
===================================================================
--- projects/jboss-felix/trunk/modules/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java	2009-02-13 10:08:29 UTC (rev 84161)
+++ projects/jboss-felix/trunk/modules/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java	2009-02-13 10:36:32 UTC (rev 84162)
@@ -74,7 +74,7 @@
         + "{0}<br>{2}"
         + "</h1>"
         + "<p>"
-        + "<a target=\"_blank\" href=\"{3}\" title=\"{1}\"><img src=\"{5}/res/imgs/logo.png\" width=\"165\" height=\"63\" border=\"0\"></a>"
+        + "<a target=\"_blank\" href=\"{3}\" title=\"{1}\"><img src=\"{5}/res/imgs/logo.png\" width=\"123\" height=\"103\" border=\"0\"></a>"
         + "</p>" + "</div>";
 
     /**
@@ -117,7 +117,7 @@
         PrintWriter pw = startResponse( request, response );
         renderTopNavigation( request, pw );
         renderContent( request, response );
-        endResponse( pw );
+        endResponse( request, pw );
     }
 
 
@@ -234,8 +234,10 @@
     }
 
 
-    protected void endResponse( PrintWriter pw )
+    protected void endResponse( HttpServletRequest request, PrintWriter pw )
     {
+        String appRoot = ( String ) request.getAttribute( OsgiManager.ATTR_APP_ROOT );
+        pw.println( "<img src='" + appRoot + "/res/imgs/felix_logo.png' width='55' height='21' border='0'>&nbsp;<a target='_blank' href='http://felix.apache.org/site/apache-felix-web-console.html'>Apache Felix Web Console</a>" );
         pw.println( "</body>" );
         pw.println( "</html>" );
     }

Modified: projects/jboss-felix/trunk/modules/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
===================================================================
--- projects/jboss-felix/trunk/modules/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java	2009-02-13 10:08:29 UTC (rev 84161)
+++ projects/jboss-felix/trunk/modules/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java	2009-02-13 10:36:32 UTC (rev 84162)
@@ -110,7 +110,7 @@
      * The default value for the {@link #PROP_MANAGER_ROOT} configuration
      * property (value is "/system/console").
      */
-    private static final String DEFAULT_MANAGER_ROOT = "/system/console";
+    private static final String DEFAULT_MANAGER_ROOT = "/jboss-osgi";
 
     private static final String[] PLUGIN_CLASSES =
         { "org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter",

Copied: projects/jboss-felix/trunk/modules/webconsole/src/main/resources/res/imgs/felix_logo.png (from rev 84160, projects/jboss-felix/trunk/modules/webconsole/src/main/resources/res/imgs/logo.png)
===================================================================
(Binary files differ)


Property changes on: projects/jboss-felix/trunk/modules/webconsole/src/main/resources/res/imgs/felix_logo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
Name: svn:mergeinfo
   + 

Modified: projects/jboss-felix/trunk/modules/webconsole/src/main/resources/res/imgs/logo.png
===================================================================
(Binary files differ)