[jboss-cvs] JBossAS SVN: r80563 - in branches/JBPAPP_4_2_0_GA_CP/tomcat/src: webapps/ROOT.war and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 5 15:02:12 EST 2008
Author: fjuma
Date: 2008-11-05 15:02:12 -0500 (Wed, 05 Nov 2008)
New Revision: 80563
Added:
branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/css/
branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/css/jboss.css
branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/images/
branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/images/logo.gif
Removed:
branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/jboss.css
branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/logo.gif
Modified:
branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/tomcat/service/StatusServlet.java
branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/WEB-INF/web.xml
branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/index.html
Log:
JBPAPP-1146: Modified StatusServlet.java to point to the correct logo and css
stylesheet for web-console/status. Made changes to ROOT.war so that the
/status servlet works. This is the same behaviour that was implemented in
JBAS-6110.
Modified: branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/tomcat/service/StatusServlet.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/tomcat/service/StatusServlet.java 2008-11-05 19:50:39 UTC (rev 80562)
+++ branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/tomcat/service/StatusServlet.java 2008-11-05 20:02:12 UTC (rev 80563)
@@ -362,12 +362,12 @@
+ "<head>"
+ "<title>Tomcat Status</title>"
+ "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />"
- + "<link rel=\"StyleSheet\" href=\"jboss.css\" type=\"text/css\"/>"
+ + "<link rel=\"StyleSheet\" href=\"css/jboss.css\" type=\"text/css\"/>"
+ "</head>"
+ "<body>"
+ "<!-- header begin -->"
+ "<a href=\"http://www.jboss.org\">"
- + "<img src=\"logo.gif\" alt=\"JBoss\" id=\"logo\" width=\"226\" height=\"105\" />"
+ + "<img src=\"images/logo.gif\" alt=\"JBoss\" id=\"logo\" width=\"226\" height=\"105\" />"
+ "</a>"
+ "<div id=\"header\"> </div>"
+ "<div id=\"navigation_bar\">"
Modified: branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/WEB-INF/web.xml 2008-11-05 19:50:39 UTC (rev 80562)
+++ branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/WEB-INF/web.xml 2008-11-05 20:02:12 UTC (rev 80563)
@@ -9,4 +9,12 @@
<description>
Welcome to JBoss
</description>
+ <servlet>
+ <servlet-name>Status Servlet</servlet-name>
+ <servlet-class>org.jboss.web.tomcat.service.StatusServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Status Servlet</servlet-name>
+ <url-pattern>/status</url-pattern>
+ </servlet-mapping>
</web-app>
Added: branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/css/jboss.css
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/css/jboss.css (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/css/jboss.css 2008-11-05 20:02:12 UTC (rev 80563)
@@ -0,0 +1,143 @@
+body {
+ margin: 13px 0px 10px 0px;
+ background-color: #ffffff;
+ font-size: 10px;
+ font-family: verdana, arial, "sans-serif";
+ color: #606060;
+ }
+img {
+ border: 0px;
+ }
+#header {
+ background-color: #003D6E;
+ background-repeat: no-repeat;
+ width: 100%;
+ height: 80px;
+ }
+#header #banner {
+ float: right;
+ margin: 8px 5px 0px 0px;
+ }
+#logo {
+ position: absolute;
+ top: 2px;
+ left: 4px;
+ z-index: 200;
+}
+#navigation_bar {
+ background-color: #f0f0f0;
+ border-bottom: 1px dotted #999999;
+ height: 20px;
+ }
+#items {
+ font-size: 12px;
+ width: 600px;
+ margin: 5px 5px 5px 170px;
+ position: relative;
+ z-index: 300;
+ }
+#items .item {
+ margin-right: 10px;
+ }
+.side_block {
+ margin: 15px 5px 10px 5px;
+ background-color: #fbfbfb;
+ border: 1px solid #f0f0f0;
+ }
+.side_block h3 {
+ font-size: 11px;
+ font-weight: 100;
+ width: 100%;
+ margin: 0px 0px 5px 0px;
+ padding: 4px 4px 4px 10x;
+ background-color: #f0f0f0;
+ }
+.side_block h4 {
+ font-size: 11px;
+ color: #003D6E;
+ font-weight: bold;
+ margin: 10px 5px 4px 5px;
+ }
+.side_block p {
+ margin: 5px 5px 3px 5px;
+ }
+.side_block form {
+ margin: 0px 0px 0px 5px;
+ }
+.side_block #login {
+ font-size: 9px;
+ }
+.side_block p img {
+ text-align: center;
+ }
+#content {
+ width: 90%;
+ margin: 10px auto;
+ }
+#left {
+ float: left;
+ width: 14%;
+ }
+#right {
+ float: right;
+ width: 14%;
+ }
+.content_block {
+ text-align: justify;
+ border: 1px solid #999999;
+ margin: 5px;
+ width: 31%;
+ float: left;
+ }
+.content_block p {
+ margin: 0px 5px 3px 5px;
+ }
+.content_block h3 {
+ font-size: 11px;
+ font-weight: bold;
+ color: #000000;
+ margin: 0px 0px 5px 0px;
+ padding: 4px 4px 4px 4x;
+ text-align: center;
+ background-color: #f0f0f0;
+ border-bottom: 1px solid #999999
+ }
+.content_block h4 {
+ font-size: 11px;
+ color: #003D6E;
+ text-align: left;
+ font-weight: bold;
+ margin: 10px 5px 4px 5px;
+ }
+#footer {
+ clear: both;
+ border-top: 1px dotted #999999;
+ }
+#credits {
+ background-color: #f0f0f0;
+ padding: 5px;
+ text-align: center;
+ }
+#footer_bar {
+ height: 20px;
+ width: 100%;
+ background-color: #003D6E;
+ }
+.hide {
+ display: none;
+ }
+.spacer {
+ clear: both;
+ }
+.spacer hr {
+ display: none;
+ }
+.center {
+ text-align: center;
+ }
+#youcandoit {
+ background-image: url("youcandoit.jpg");
+ background-repeat: repeat-x;
+ height: 165px;
+ margin: 0px 30px 0px 30px;
+ }
Added: branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/images/logo.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/images/logo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/index.html
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/index.html 2008-11-05 19:50:39 UTC (rev 80562)
+++ branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/index.html 2008-11-05 20:02:12 UTC (rev 80563)
@@ -4,13 +4,13 @@
<head>
<title>Welcome to JBoss™</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <link rel="StyleSheet" href="jboss.css" type="text/css"/>
+ <link rel="StyleSheet" href="css/jboss.css" type="text/css"/>
</head>
<body>
<!-- header begin -->
<a href="http://www.jboss.org">
- <img src="logo.gif" alt="JBoss" id="logo" width="226" height="105" />
+ <img src="images/logo.gif" alt="JBoss" id="logo" width="226" height="105" />
</a>
<div id="header"> </div>
<div id="navigation_bar"></div>
@@ -26,9 +26,9 @@
<h3>JBoss Management</h3>
<ul>
- <li><a href="/web-console/status">Tomcat status</a>
- <a href="/web-console/status?full=true">(full)</a>
- <a href="/web-console/status?XML=true">(XML)</a></li>
+ <li><a href="/status">Tomcat status</a>
+ <a href="/status?full=true">(full)</a>
+ <a href="/status?XML=true">(XML)</a></li>
<li><a href="/jmx-console/">JMX Console</a></li>
<li><a href="/web-console/">JBoss Web Console</a></li>
</ul>
Deleted: branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/jboss.css
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/jboss.css 2008-11-05 19:50:39 UTC (rev 80562)
+++ branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/jboss.css 2008-11-05 20:02:12 UTC (rev 80563)
@@ -1,143 +0,0 @@
-body {
- margin: 13px 0px 10px 0px;
- background-color: #ffffff;
- font-size: 10px;
- font-family: verdana, arial, "sans-serif";
- color: #606060;
- }
-img {
- border: 0px;
- }
-#header {
- background-color: #003D6E;
- background-repeat: no-repeat;
- width: 100%;
- height: 80px;
- }
-#header #banner {
- float: right;
- margin: 8px 5px 0px 0px;
- }
-#logo {
- position: absolute;
- top: 2px;
- left: 4px;
- z-index: 200;
-}
-#navigation_bar {
- background-color: #f0f0f0;
- border-bottom: 1px dotted #999999;
- height: 20px;
- }
-#items {
- font-size: 12px;
- width: 600px;
- margin: 5px 5px 5px 170px;
- position: relative;
- z-index: 300;
- }
-#items .item {
- margin-right: 10px;
- }
-.side_block {
- margin: 15px 5px 10px 5px;
- background-color: #fbfbfb;
- border: 1px solid #f0f0f0;
- }
-.side_block h3 {
- font-size: 11px;
- font-weight: 100;
- width: 100%;
- margin: 0px 0px 5px 0px;
- padding: 4px 4px 4px 10x;
- background-color: #f0f0f0;
- }
-.side_block h4 {
- font-size: 11px;
- color: #003D6E;
- font-weight: bold;
- margin: 10px 5px 4px 5px;
- }
-.side_block p {
- margin: 5px 5px 3px 5px;
- }
-.side_block form {
- margin: 0px 0px 0px 5px;
- }
-.side_block #login {
- font-size: 9px;
- }
-.side_block p img {
- text-align: center;
- }
-#content {
- width: 90%;
- margin: 10px auto;
- }
-#left {
- float: left;
- width: 14%;
- }
-#right {
- float: right;
- width: 14%;
- }
-.content_block {
- text-align: justify;
- border: 1px solid #999999;
- margin: 5px;
- width: 31%;
- float: left;
- }
-.content_block p {
- margin: 0px 5px 3px 5px;
- }
-.content_block h3 {
- font-size: 11px;
- font-weight: bold;
- color: #000000;
- margin: 0px 0px 5px 0px;
- padding: 4px 4px 4px 4x;
- text-align: center;
- background-color: #f0f0f0;
- border-bottom: 1px solid #999999
- }
-.content_block h4 {
- font-size: 11px;
- color: #003D6E;
- text-align: left;
- font-weight: bold;
- margin: 10px 5px 4px 5px;
- }
-#footer {
- clear: both;
- border-top: 1px dotted #999999;
- }
-#credits {
- background-color: #f0f0f0;
- padding: 5px;
- text-align: center;
- }
-#footer_bar {
- height: 20px;
- width: 100%;
- background-color: #003D6E;
- }
-.hide {
- display: none;
- }
-.spacer {
- clear: both;
- }
-.spacer hr {
- display: none;
- }
-.center {
- text-align: center;
- }
-#youcandoit {
- background-image: url("youcandoit.jpg");
- background-repeat: repeat-x;
- height: 165px;
- margin: 0px 30px 0px 30px;
- }
Deleted: branches/JBPAPP_4_2_0_GA_CP/tomcat/src/webapps/ROOT.war/logo.gif
===================================================================
(Binary files differ)
More information about the jboss-cvs-commits
mailing list