[jboss-cvs] JBoss Profiler SVN: r532 - in branches/JBossProfiler2/src: main/www and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun May 10 11:12:39 EDT 2009
Author: jesper.pedersen
Date: 2009-05-10 11:12:39 -0400 (Sun, 10 May 2009)
New Revision: 532
Added:
branches/JBossProfiler2/src/main/www/template/template.xhtml
Modified:
branches/JBossProfiler2/src/etc/faces-config.xml
branches/JBossProfiler2/src/etc/web.xml
branches/JBossProfiler2/src/main/www/css/style.css
branches/JBossProfiler2/src/main/www/index.xhtml
branches/JBossProfiler2/src/main/www/template/head.xhtml
Log:
initial web ui layout
Modified: branches/JBossProfiler2/src/etc/faces-config.xml
===================================================================
--- branches/JBossProfiler2/src/etc/faces-config.xml 2009-05-09 17:27:23 UTC (rev 531)
+++ branches/JBossProfiler2/src/etc/faces-config.xml 2009-05-10 15:12:39 UTC (rev 532)
@@ -1,107 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
-<faces-config
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
- version="1.2">
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
+ version="1.2">
<application>
- <message-bundle>jboss-profiler</message-bundle>
+ <message-bundle>resources/messages</message-bundle>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
<locale-config>
- <default-locale>en</default-locale>
+ <default-locale>en_US</default-locale>
+ <supported-locale>en_US</supported-locale>
</locale-config>
</application>
+
<managed-bean>
<managed-bean-name>overviewBean</managed-bean-name>
<managed-bean-class>org.jboss.profiler.client.web.OverviewBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
<managed-bean>
<managed-bean-name>classBean</managed-bean-name>
<managed-bean-class>org.jboss.profiler.client.web.ClassBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
<managed-bean>
- <managed-bean-name>frameInfo</managed-bean-name>
- <managed-bean-class>org.jboss.profiler.shared.FrameInfo</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
- <managed-bean>
<managed-bean-name>methodBean</managed-bean-name>
<managed-bean-class>org.jboss.profiler.client.web.MethodBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
<managed-bean>
- <managed-bean-name>threadInfoBean</managed-bean-name>
- <managed-bean-class>org.jboss.profiler.shared.ThreadInfo</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
- <managed-bean>
<managed-bean-name>treeThreadBean</managed-bean-name>
<managed-bean-class>org.jboss.profiler.client.web.TreeThreadBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
<managed-bean>
- <managed-bean-name>treeFrameBean</managed-bean-name>
- <managed-bean-class>org.jboss.profiler.client.web.TreeFrameBean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
- <managed-bean>
<managed-bean-name>threadHotspotBean</managed-bean-name>
<managed-bean-class>org.jboss.profiler.client.web.ThreadHotspotBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
<managed-bean>
- <managed-bean-name>snapshot</managed-bean-name>
- <managed-bean-class>org.jboss.profiler.shared.Snapshot</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
- <managed-bean>
- <managed-bean-name>allocationInfo</managed-bean-name>
- <managed-bean-class>org.jboss.profiler.shared.AllocationInfo</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
- <managed-bean>
- <managed-bean-name>threadInfo</managed-bean-name>
- <managed-bean-class>org.jboss.profiler.shared.ThreadInfo</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
- <managed-bean>
- <managed-bean-name>classInfo</managed-bean-name>
- <managed-bean-class>org.jboss.profiler.shared.ClassInfo</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
- <managed-bean>
- <managed-bean-name>combinedFrameInfo</managed-bean-name>
- <managed-bean-class>org.jboss.profiler.client.CombinedFrameInfo</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
- <managed-bean>
<managed-bean-name>selectItem</managed-bean-name>
<managed-bean-class>javax.faces.model.SelectItem</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
<managed-bean>
<managed-bean-name>basicOptBean</managed-bean-name>
<managed-bean-class>org.jboss.profiler.client.web.BasicOptBean</managed-bean-class>
<managed-bean-scope>application</managed-bean-scope>
</managed-bean>
+
<managed-bean>
<managed-bean-name>loadSnapshotBean</managed-bean-name>
<managed-bean-class>org.jboss.profiler.client.web.LoadSnapshotBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
<managed-bean>
<managed-bean-name>compareSnapshotBean</managed-bean-name>
<managed-bean-class>org.jboss.profiler.client.web.CompareSnapshotBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
<managed-bean>
<managed-bean-name>treeDemoStateAdvisor</managed-bean-name>
<managed-bean-class>org.jboss.profiler.client.web.util.TreeDemoStateAdvisor</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
<managed-bean>
<managed-bean-name>timedClassInfo</managed-bean-name>
<managed-bean-class>org.jboss.profiler.client.TimedClassInfo</managed-bean-class>
@@ -117,6 +89,7 @@
<value>3.0</value>
</managed-property>
</managed-bean>
+
<navigation-rule>
<display-name>profilerstatus.xhtml</display-name>
<from-view-id>/profilerstatus.xhtml</from-view-id>
@@ -126,4 +99,5 @@
<to-view-id>/connecterr.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
+
</faces-config>
Modified: branches/JBossProfiler2/src/etc/web.xml
===================================================================
--- branches/JBossProfiler2/src/etc/web.xml 2009-05-09 17:27:23 UTC (rev 531)
+++ branches/JBossProfiler2/src/etc/web.xml 2009-05-10 15:12:39 UTC (rev 532)
@@ -6,17 +6,17 @@
version="2.5">
<display-name>JBoss Profiler 2</display-name>
-
+
<context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
-
+
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>server</param-value>
</context-param>
-
+
<context-param>
<param-name>javax.faces.PARTIAL_STATE_SAVING_METHOD</param-name>
<param-value>false</param-value>
@@ -26,41 +26,50 @@
<param-name>javax.faces.PARTIAL_STATE_SAVING_DISPATCH_EVERY_TIME</param-name>
<param-value>true</param-value>
</context-param>
-
- <context-param>
- <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
- <param-value>false</param-value>
+
+ <context-param>
+ <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
+ <param-value>false</param-value>
</context-param>
-
+
<context-param>
- <param-name>com.sun.faces.verifyObjects</param-name>
- <param-value>true</param-value>
+ <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+ <param-value>com.sun.facelets.FaceletViewHandler</param-value>
</context-param>
<context-param>
- <param-name>com.sun.faces.validateXml</param-name>
- <param-value>true</param-value>
+ <param-name>org.richfaces.SKIN</param-name>
+ <param-value>blueSky</param-value>
</context-param>
<context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
- <param-value>false</param-value>
+ <param-name>org.richfaces.CONTROL_SKINNING</param-name>
+ <param-value>enable</param-value>
</context-param>
<context-param>
<param-name>facelets.SKIP_COMMENTS</param-name>
- <param-value>true</param-value>
+ <param-value>false</param-value>
</context-param>
<context-param>
- <param-name>org.richfaces.SKIN</param-name>
- <param-value>blueSky</param-value>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
</context-param>
- <context-param>
- <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
- <param-value>com.sun.facelets.FaceletViewHandler</param-value>
- </context-param>
+ <filter>
+ <display-name>RichFaces Filter</display-name>
+ <filter-name>richfaces</filter-name>
+ <filter-class>org.ajax4jsf.Filter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>richfaces</filter-name>
+ <servlet-name>FacesServlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ </filter-mapping>
<servlet>
<servlet-name>FacesServlet</servlet-name>
@@ -73,20 +82,11 @@
<url-pattern>*.xhtml</url-pattern>
</servlet-mapping>
- <filter>
- <display-name>Ajax4jsf Filter</display-name>
- <filter-name>ajax4jsf</filter-name>
- <filter-class>org.ajax4jsf.Filter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>ajax4jsf</filter-name>
- <servlet-name>FacesServlet</servlet-name>
- <dispatcher>REQUEST</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>INCLUDE</dispatcher>
- </filter-mapping>
-
+ <welcome-file-list>
+ <welcome-file>index.xhtml</welcome-file>
+ </welcome-file-list>
+
+<!--
<error-page>
<exception-type>org.jboss.remoting.CannotConnectException</exception-type>
<location>/connecterr.xhtml</location>
@@ -108,8 +108,14 @@
</error-page>
<error-page>
+ <error-code>404</error-code>
+ <location>/connecterr.xhtml</location>
+ </error-page>
+
+ <error-page>
<error-code>500</error-code>
<location>/connecterr.xhtml</location>
</error-page>
-
+-->
+
</web-app>
Modified: branches/JBossProfiler2/src/main/www/css/style.css
===================================================================
--- branches/JBossProfiler2/src/main/www/css/style.css 2009-05-09 17:27:23 UTC (rev 531)
+++ branches/JBossProfiler2/src/main/www/css/style.css 2009-05-10 15:12:39 UTC (rev 532)
@@ -27,11 +27,97 @@
padding: 0px;
}
+input[type='submit'] {
+ color: white;
+ background-color: #454545;
+ border:1px solid;
+ border-color:black;
+ font-family : "Trebuchet MS", sans-serif;
+ font-size: 10pt;
+ text-align : left;
+}
+
+h1 {
+ font-family : "Trebuchet MS", sans-serif;
+ font-size : 14pt;
+ font-weight : bold;
+ background-color: white;
+ color : #454545;
+}
+
+h2 {
+ font-family : "Trebuchet MS", sans-serif;
+ font-size : 11pt;
+ font-weight : bold;
+ background-color: white;
+ color : #454545;
+}
+
+h3 {
+ font-family : "Trebuchet MS", sans-serif;
+ font-size : 10pt;
+ background-color: white;
+ color : #454545;
+}
+
+h4 {
+ font-family : "Trebuchet MS", sans-serif;
+ font-size : 10pt;
+ background-color: white;
+ color : #454545;
+}
+
+input {
+ border : 1px solid #454545;
+ background-color : white;
+ color: black;
+ font-family : "Trebuchet MS", sans-serif;
+ font-size : 9pt;
+ font-weight : normal;
+}
+
+a {
+ background-color : white;
+ color : #454545;
+ font-family : "Trebuchet MS", sans-serif;
+ font-size : 10pt;
+ text-decoration : none;
+}
+
+a:link {
+ background-color : white;
+ color : #454545;
+ text-decoration : none;
+}
+
+a:visited {
+ background-color : white;
+ color : #454545;
+ text-decoration : none;
+}
+
+a:hover {
+ background-color : white;
+ color: #454545;
+ text-decoration : underline;
+}
+
+a img {
+ border: none;
+ display: block;
+}
+
+/*
+ ------------------------------------------------------------
+ Panels
+ ------------------------------------------------------------
+*/
+
.leftPanel {
width : 20%;
height: 100%;
min-height: 100%;
- background-color : white;
+ background-color : #EFF2F4;
color: #000000;
font-family : "Trebuchet MS", sans-serif;
font-size : 10pt;
@@ -41,7 +127,7 @@
vertical-align : top;
}
-.centerPanel {
+.mainPanel {
width : 80%;
height: 100%;
min-height: 100%;
@@ -61,6 +147,49 @@
------------------------------------------------------------
*/
+.layout {
+ margin : 0px auto;
+ font-family : "Trebuchet MS", sans-serif;
+ color: #454545;
+ background-color : #becee1;
+ width : 100%;
+ border-width: 0px 0px 0px 0px;
+ border-color: #454545;
+ border-collapse : collapse;
+ border-style: none;
+ padding: 0px;
+}
+
+.pageLayout {
+ font-family : "Trebuchet MS", sans-serif;
+ color: #454545;
+ background-color : white;
+ width : 100%;
+ height : 100%;
+ min-height : 100%;
+ border-collapse : collapse;
+ margin: 0px;
+ padding: 0px;
+}
+
+.banner {
+ background-color: #454545;
+ color: white;
+ text-align : left;
+ border: none;
+ padding : 0px 6px 3px 6px;
+ margin : 0px;
+}
+
+.spacerPanel {
+ height : 10px;
+ background-color : #454545;
+ color: white;
+ text-align : center;
+ padding : 0px;
+ margin : 0px;
+}
+
.dataContent {
color: black;
background-color: white;
@@ -74,3 +203,44 @@
padding-right: 6px;
margin : 0px;
}
+
+.copyrightPanel {
+ font-family : "Trebuchet MS", sans-serif;
+ font-size: 8pt;
+ text-align : center;
+ color: white;
+ background-color: #454545;
+ padding : 3px 0px 2px 0px;
+ margin : 0px;
+ vertical-align : bottom;
+}
+
+/*
+ ------------------------------------------------------------
+ Sub content
+ ------------------------------------------------------------
+*/
+
+.copyrightPanel a {
+ font-family : "Trebuchet MS", sans-serif;
+ font-size: 8pt;
+ text-align : center;
+ color : white;
+ background-color : #454545;
+}
+
+.copyrightPanel a:link {
+ color : white;
+ background-color : #454545;
+}
+
+.copyrightPanel a:visited {
+ color : white;
+ background-color : #454545;
+}
+
+.copyrightPanel a:hover {
+ color : white;
+ background-color: #454545;
+ text-decoration : underline;
+}
Modified: branches/JBossProfiler2/src/main/www/index.xhtml
===================================================================
--- branches/JBossProfiler2/src/main/www/index.xhtml 2009-05-09 17:27:23 UTC (rev 531)
+++ branches/JBossProfiler2/src/main/www/index.xhtml 2009-05-10 15:12:39 UTC (rev 532)
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <ui:composition template="/template/template.xhtml">
+ <ui:define name="mainContent">
+
+ Welcome
+
+ </ui:define>
+ </ui:composition>
+</html>
Modified: branches/JBossProfiler2/src/main/www/template/head.xhtml
===================================================================
--- branches/JBossProfiler2/src/main/www/template/head.xhtml 2009-05-09 17:27:23 UTC (rev 531)
+++ branches/JBossProfiler2/src/main/www/template/head.xhtml 2009-05-10 15:12:39 UTC (rev 532)
@@ -9,18 +9,20 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></meta>
<title>JBoss Profiler 2</title>
</head>
- <body>
+
+ <f:view contentType="text/html">
- <style type="text/css">
- .wholecol {
- padding:10px;
- padding: 0px 30px 0px 0px;
- vertical-align: top;
- }
- </style>
+ <body>
-
- <f:view>
+ <style type="text/css">
+ .wholecol {
+ padding:10px;
+ padding: 0px 30px 0px 0px;
+ vertical-align: top;
+ }
+ </style>
+
+
<h:form>
<ui:include src="/addclasspanel.xhtml"></ui:include>
<ui:include src="/removeclasspanel.xhtml"></ui:include>
@@ -35,6 +37,7 @@
<ui:insert name="mainContent">
</ui:insert>
- </f:view>
- </body>
+ </body>
+
+ </f:view>
</html>
Added: branches/JBossProfiler2/src/main/www/template/template.xhtml
===================================================================
--- branches/JBossProfiler2/src/main/www/template/template.xhtml (rev 0)
+++ branches/JBossProfiler2/src/main/www/template/template.xhtml 2009-05-10 15:12:39 UTC (rev 532)
@@ -0,0 +1,77 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<head>
+ <title>JBoss Profiler 2</title>
+ <meta name="description" content=""/>
+ <meta name="keywords" content=""/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta http-equiv="Pragma" content="no-cache" />
+ <meta http-equiv="Expires" content="-1" />
+ <link rel="stylesheet" type="text/css" href="css/style.css" />
+</head>
+
+<f:view contentType="text/html">
+
+<body>
+
+<div class="layout">
+
+<table class="pageLayout">
+<tr>
+ <td colspan="2" class="banner">
+ <span style="font-size: 14pt;">JBoss Profiler 2</span>
+ </td>
+</tr>
+<!--
+<tr>
+ <td colspan="2" class="menuPanel">
+ </td>
+</tr>
+<tr>
+ <td colspan="2" class="spacerPanel"></td>
+</tr>
+-->
+
+<tr>
+<td class="leftPanel">
+ <table width="100%">
+ <tr>
+ </tr>
+ </table>
+</td>
+
+
+<td class="mainPanel">
+ <table width="100%">
+ <tr>
+ <td class="dataContent">
+ <f:subview id="content">
+ <ui:insert name="mainContent"/>
+ </f:subview>
+ </td>
+ </tr>
+ </table>
+</td>
+
+</tr>
+
+<tr>
+ <td colspan="2" class="copyrightPanel">
+ © 2009 <a href="http://www.jboss.org/jbossprofiler" target="_blank">Red Hat Middleware, LLC</a>. All rights reserved. JBoss is a registered trademark of Red Hat, Inc.
+ </td>
+</tr>
+</table>
+
+</div>
+
+</body>
+</f:view>
+</html>
More information about the jboss-cvs-commits
mailing list