{0}

\n" + " \n" + "

\n" + "\n"; Modified: trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 2008-03-= 03 21:29:40 UTC (rev 458) +++ trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 2008-03-= 03 22:27:07 UTC (rev 459) @@ -299,23 +299,15 @@ PrintWriter writer =3D response.getWriter(); = // HTML Header Section - if (request.getPathInfo() =3D=3D null) { - writer.print(Constants.HTML_HEADER_SECTION); - } else { - writer.print(Constants.HTML_HEADER_SECTION.replace("images/", = "../images/")); - } + Object[] args =3D new Object[1]; + args[0] =3D request.getContextPath(); + writer.print(MessageFormat.format(Constants.HTML_HEADER_SECTION, a= rgs)); = // Body Header Section - Object[] args =3D new Object[2]; + args =3D new Object[2]; args[0] =3D request.getContextPath(); args[1] =3D sm.getString("htmlManagerServlet.title"); - if (request.getPathInfo() =3D=3D null) { - writer.print(MessageFormat.format - (Constants.BODY_HEADER_SECTION, args)); - } else { - writer.print(MessageFormat.format - (Constants.BODY_HEADER_SECTION.replace("images/", "../= images/"), args)); - } + writer.print(MessageFormat.format(Constants.BODY_HEADER_SECTION, a= rgs)); = // Manager Section args =3D new Object[9]; Modified: trunk/java/org/apache/catalina/manager/StatusManagerServlet.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/java/org/apache/catalina/manager/StatusManagerServlet.java 2008-0= 3-03 21:29:40 UTC (rev 458) +++ trunk/java/org/apache/catalina/manager/StatusManagerServlet.java 2008-0= 3-03 22:27:07 UTC (rev 459) @@ -212,10 +212,12 @@ completeStatus =3D true; } // use StatusTransformer to output status - StatusTransformer.writeHeader(writer, mode, (request.getPathInfo()= !=3D null)); + Object[] args =3D new Object[1]; + args[0] =3D request.getContextPath(); + StatusTransformer.writeHeader(writer, args, mode); = // Body Header Section - Object[] args =3D new Object[2]; + args =3D new Object[2]; args[0] =3D request.getContextPath(); if (completeStatus) { args[1] =3D sm.getString("statusServlet.complete"); @@ -223,7 +225,7 @@ args[1] =3D sm.getString("statusServlet.title"); } // use StatusTransformer to output status - StatusTransformer.writeBody(writer,args,mode, (request.getPathInfo= () !=3D null)); + StatusTransformer.writeBody(writer,args,mode); = // Manager Section args =3D new Object[9]; Modified: trunk/java/org/apache/catalina/manager/StatusTransformer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/java/org/apache/catalina/manager/StatusTransformer.java 2008-03-0= 3 21:29:40 UTC (rev 458) +++ trunk/java/org/apache/catalina/manager/StatusTransformer.java 2008-03-0= 3 22:27:07 UTC (rev 459) @@ -70,14 +70,11 @@ * @exception IOException if an input/output error occurs * @exception ServletException if a servlet-specified error occurs */ - public static void writeHeader(PrintWriter writer, int mode, boolean p= athInfo) { + public static void writeHeader(PrintWriter writer, Object[] args, int = mode) { if (mode =3D=3D 0){ // HTML Header Section - if (pathInfo) { - writer.print(Constants.HTML_HEADER_SECTION.replace("images= /", "../images/")); - } else { - writer.print(Constants.HTML_HEADER_SECTION); - } + writer.print(MessageFormat.format + (Constants.HTML_HEADER_SECTION, args)); } else if (mode =3D=3D 1){ writer.write(Constants.XML_DECLARATION); writer.write @@ -95,15 +92,10 @@ * @param args What to write * @param mode 0 means write = */ - public static void writeBody(PrintWriter writer, Object[] args, int mo= de, boolean pathInfo) { + public static void writeBody(PrintWriter writer, Object[] args, int mo= de) { if (mode =3D=3D 0){ - if (pathInfo) { - writer.print(MessageFormat.format - (Constants.BODY_HEADER_SECTION.replace("images/",= "../images/"), args)); - } else { - writer.print(MessageFormat.format - (Constants.BODY_HEADER_SECTION, args)); - } + writer.print(MessageFormat.format + (Constants.BODY_HEADER_SECTION, args)); } } = Modified: trunk/java/org/apache/catalina/manager/host/Constants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/java/org/apache/catalina/manager/host/Constants.java 2008-03-03 2= 1:29:40 UTC (rev 458) +++ trunk/java/org/apache/catalina/manager/host/Constants.java 2008-03-03 2= 2:27:07 UTC (rev 459) @@ -26,88 +26,18 @@ public static final String HTML_HEADER_SECTION =3D "\n" + "\n" + - "\n"; + "\n"; = public static final String BODY_HEADER_SECTION =3D - "{0}\n" + + "{1}\n" + "\n" + "\n" + "\n" + "\n" + "

\n" + " \n" + "

\n" + "\n"; Modified: trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServle= t.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java= 2008-03-03 21:29:40 UTC (rev 458) +++ trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java= 2008-03-03 22:27:07 UTC (rev 459) @@ -185,23 +185,15 @@ PrintWriter writer =3D response.getWriter(); = // HTML Header Section - if (request.getPathInfo() =3D=3D null) { - writer.print(Constants.HTML_HEADER_SECTION); - } else { - writer.print(Constants.HTML_HEADER_SECTION.replace("images/", = "../images/")); - } + Object[] args =3D new Object[1]; + args[0] =3D request.getContextPath(); + writer.print(MessageFormat.format(Constants.HTML_HEADER_SECTION, a= rgs)); = // Body Header Section - Object[] args =3D new Object[2]; + args =3D new Object[2]; args[0] =3D request.getContextPath(); args[1] =3D sm.getString("htmlHostManagerServlet.title"); - if (request.getPathInfo() =3D=3D null) { - writer.print(MessageFormat.format - (Constants.BODY_HEADER_SECTION, args)); - } else { - writer.print(MessageFormat.format - (Constants.BODY_HEADER_SECTION.replace("images/", "../= images/"), args)); - } + writer.print(MessageFormat.format(Constants.BODY_HEADER_SECTION, a= rgs)); = // Manager Section args =3D new Object[9]; Added: trunk/webapps/host-manager/jbossweb.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/webapps/host-manager/jbossweb.css (rev 0) +++ trunk/webapps/host-manager/jbossweb.css 2008-03-03 22:27:07 UTC (rev 45= 9) @@ -0,0 +1,238 @@ + +/* ------- Common Elements ---------- */ + +html { + margin:0; + padding:0; +} + +body { + margin:20px; + padding: 0px; + font-family:Verdana, Arial, Helvetica, sans-serif; + background-color:#a3a9ad; + color:#424242; + font-size: 12px; +} + +p { } + +a { + color:#527fa8; +} + +hr { + border-top: 1px solid #a4b2b9; + border-right: 0px solid #a4b2b9; + border-left: 0px solid #a4b2b9; + border-bottom: 0px solid #a4b2b9; + margin-bottom: 3px; +} +img { border:0px; } + +h1 { + font-size:14px; + color:#4a5d75; + margin-top:0px; + padding-top: 6px; = +} +h2 { + font-size:13px; + color:#32444d; +} + +h3 { } +h4 { } +h5 { } +h6 { } + +table { + width: 100%; +} + +td.page-title { + text-align: center; + vertical-align: top; + font-family:sans-serif,Tahoma,Arial; + font-weight: bold; + background: white; + color: black; +} + = +td.title { + text-align: left; + vertical-align: top; + font-family:sans-serif,Tahoma,Arial; + font-style:italic; + font-weight: bold; + background: #4a5d75; +} + = +td.header-left { + text-align: left; + vertical-align: top; + font-family:sans-serif,Tahoma,Arial; + font-weight: bold; + background: #656565; +} + = +td.header-center { + text-align: center; + vertical-align: top; + font-family:sans-serif,Tahoma,Arial; + font-weight: bold; + background: #656565; +} + = +td.row-left { + text-align: left; + vertical-align: middle; + font-family:sans-serif,Tahoma,Arial; + color: black; +} + = +td.row-center { + text-align: center; + vertical-align: middle; + font-family:sans-serif,Tahoma,Arial; + color: black; +} + = +td.row-right { + text-align: right; + vertical-align: middle; + font-family:sans-serif,Tahoma,Arial; + color: black; +} + = +TH { + text-align: center; + vertical-align: top; + font-family:sans-serif,Tahoma,Arial; + font-weight: bold; + background: #656565; +} + = +TD { + text-align: center; + vertical-align: middle; + font-family:sans-serif,Tahoma,Arial; + color: black; +} + +.wrapper { = + min-width: 900px; + background-image:url(images/bkg_shadow.png); + background-position:right; + background-repeat:repeat-y; + padding-right:7px; +} + +.container { + = + margin: 0px; + padding:0px; + background-color: white; + overflow:hidden; +} + = +.leftcol { + float:left; + width:300px; + background-color:#eaeff2; + border-right: 1px solid #c1c4ca; +} + = +.maincol { + margin: 0px 20px 0px 325px; + padding-top: 30px; + +} + +/* -------- This equalizes the two column heights in the layout ----------= ------- */ + +.leftcol, .maincol { + padding-bottom: 30005px; + margin-bottom: -30000px; + } + +/* ---------- */ + +.header { + background-image: url(images/hdr_bkg.gif); + background-position:bottom; + background-repeat: repeat-x; + background-color:#35485d; + height: 50px; +} + +.footer { = + background-color:#35485d; + color:#dbe7ee; + line-height:2em; + font-size:9px; + text-align: center; + clear:both; +} + +.footer a { = + color:#dbe7ee; + line-height:2em; + font-size:9px; + text-align: center; + clear:both; +} + +.floatright { + float:right; +} +.floatleft { + float:left; +} + +/* ------------------------------------------------- Left Navigation ----= --------------------------------------------------------------------- */ + +.leftcol dl { margin-left: 30px; } + +.leftcol dt { + color:#4a5d75; = + font-weight: bold; + margin-left: 0px; + margin-right: 20px; + padding: 10px 0px 0px 0px; + border-bottom: 1px solid #424242; +} + +.leftcol dd { + margin-left: 4px; + padding:2px 0px; +} + +/* ------------------------------------------------- Breadcrumb navigatio= n ------------------------------------------------------------------ */ + +#bread { + color: #656565; + padding-right: 3px; + margin-bottom: 10px; + } + +#bread ul { + margin-left: 0; + padding-left: 0; + display: inline; + border: none; + } = + +#bread ul li { + margin-left: 0; + padding-left: 2px; + font-size:10px; + border: none; + list-style: none; + display: inline; + } + +#bread a { + color:#656565; + text-decoration: underline; +} Added: trunk/webapps/manager/jbossweb.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/webapps/manager/jbossweb.css (rev 0) +++ trunk/webapps/manager/jbossweb.css 2008-03-03 22:27:07 UTC (rev 459) @@ -0,0 +1,238 @@ + +/* ------- Common Elements ---------- */ + +html { + margin:0; + padding:0; +} + +body { + margin:20px; + padding: 0px; + font-family:Verdana, Arial, Helvetica, sans-serif; + background-color:#a3a9ad; + color:#424242; + font-size: 12px; +} + +p { } + +a { + color:#527fa8; +} + +hr { + border-top: 1px solid #a4b2b9; + border-right: 0px solid #a4b2b9; + border-left: 0px solid #a4b2b9; + border-bottom: 0px solid #a4b2b9; + margin-bottom: 3px; +} +img { border:0px; } + +h1 { + font-size:14px; + color:#4a5d75; + margin-top:0px; + padding-top: 6px; = +} +h2 { + font-size:13px; + color:#32444d; +} + +h3 { } +h4 { } +h5 { } +h6 { } + +table { + width: 100%; +} + +td.page-title { + text-align: center; + vertical-align: top; + font-family:sans-serif,Tahoma,Arial; + font-weight: bold; + background: white; + color: black; +} + = +td.title { + text-align: left; + vertical-align: top; + font-family:sans-serif,Tahoma,Arial; + font-style:italic; + font-weight: bold; + background: #4a5d75; +} + = +td.header-left { + text-align: left; + vertical-align: top; + font-family:sans-serif,Tahoma,Arial; + font-weight: bold; + background: #656565; +} + = +td.header-center { + text-align: center; + vertical-align: top; + font-family:sans-serif,Tahoma,Arial; + font-weight: bold; + background: #656565; +} + = +td.row-left { + text-align: left; + vertical-align: middle; + font-family:sans-serif,Tahoma,Arial; + color: black; +} + = +td.row-center { + text-align: center; + vertical-align: middle; + font-family:sans-serif,Tahoma,Arial; + color: black; +} + = +td.row-right { + text-align: right; + vertical-align: middle; + font-family:sans-serif,Tahoma,Arial; + color: black; +} + = +TH { + text-align: center; + vertical-align: top; + font-family:sans-serif,Tahoma,Arial; + font-weight: bold; + background: #656565; +} + = +TD { + text-align: center; + vertical-align: middle; + font-family:sans-serif,Tahoma,Arial; + color: black; +} + +.wrapper { = + min-width: 900px; + background-image:url(images/bkg_shadow.png); + background-position:right; + background-repeat:repeat-y; + padding-right:7px; +} + +.container { + = + margin: 0px; + padding:0px; + background-color: white; + overflow:hidden; +} + = +.leftcol { + float:left; + width:300px; + background-color:#eaeff2; + border-right: 1px solid #c1c4ca; +} + = +.maincol { + margin: 0px 20px 0px 325px; + padding-top: 30px; + +} + +/* -------- This equalizes the two column heights in the layout ----------= ------- */ + +.leftcol, .maincol { + padding-bottom: 30005px; + margin-bottom: -30000px; + } + +/* ---------- */ + +.header { + background-image: url(images/hdr_bkg.gif); + background-position:bottom; + background-repeat: repeat-x; + background-color:#35485d; + height: 50px; +} + +.footer { = + background-color:#35485d; + color:#dbe7ee; + line-height:2em; + font-size:9px; + text-align: center; + clear:both; +} + +.footer a { = + color:#dbe7ee; + line-height:2em; + font-size:9px; + text-align: center; + clear:both; +} + +.floatright { + float:right; +} +.floatleft { + float:left; +} + +/* ------------------------------------------------- Left Navigation ----= --------------------------------------------------------------------- */ + +.leftcol dl { margin-left: 30px; } + +.leftcol dt { + color:#4a5d75; = + font-weight: bold; + margin-left: 0px; + margin-right: 20px; + padding: 10px 0px 0px 0px; + border-bottom: 1px solid #424242; +} + +.leftcol dd { + margin-left: 4px; + padding:2px 0px; +} + +/* ------------------------------------------------- Breadcrumb navigatio= n ------------------------------------------------------------------ */ + +#bread { + color: #656565; + padding-right: 3px; + margin-bottom: 10px; + } + +#bread ul { + margin-left: 0; + padding-left: 0; + display: inline; + border: none; + } = + +#bread ul li { + margin-left: 0; + padding-left: 2px; + font-size:10px; + border: none; + list-style: none; + display: inline; + } + +#bread a { + color:#656565; + text-decoration: underline; +} --===============1710828054627266395==--