Author: markt
Date: Mon Aug 2 16:13:22 2010
New Revision: 981579
URL: http://svn.apache.org/viewvc?rev=981579&view=rev
Log:
Tab police
Modified:
tomcat/trunk/webapps/ROOT/tomcat.svg
tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
tomcat/trunk/webapps/manager/status.xsd
tomcat/trunk/webapps/manager/xform.xsl
Modified: tomcat/trunk/webapps/ROOT/tomcat.svg
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/tomcat.svg?rev=981579&r1=981578&r2=981579&view=diff
==============================================================================
--- tomcat/trunk/webapps/ROOT/tomcat.svg (original)
+++ tomcat/trunk/webapps/ROOT/tomcat.svg Mon Aug 2 16:13:22 2010
@@ -17,34 +17,34 @@
-->
<!-- Generator: Adobe Illustrator 11 Build 196, SVG Export Plug-In . SVG
Version: 6.0.0 Build 78) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"; [
- <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/";>
- <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/";>
- <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/";>
- <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/";>
- <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/";>
- <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/";>
- <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/";>
- <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/";>
- <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/";>
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/";>
+ <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/";>
+ <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/";>
+ <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/";>
+ <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/";>
+ <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/";>
+ <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/";>
+ <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/";>
+ <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/";>
+ <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
+ <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
]>
<svg
- xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
i:viewOrigin="176.7139 486.707" i:rulerOrigin="-156 -296" i:pageBounds="156 496
456 296"
- xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;"
xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/";
- width="260.162" height="184.413" viewBox="0 0 260.162 184.413"
overflow="visible" enable-background="new 0 0 260.162 184.413"
- xml:space="preserve">
- <metadata>
- <variableSets xmlns="&ns_vars;">
- <variableSet varSetName="binding1" locked="none">
- <variables></variables>
- <v:sampleDataSets xmlns="&ns_custom;"
xmlns:v="&ns_vars;"></v:sampleDataSets>
- </variableSet>
- </variableSets>
- <sfw xmlns="&ns_sfw;">
- <slices></slices>
- <sliceSourceBounds y="302.294" x="176.714"
width="260.162" height="184.413" bottomLeftOrigin="true"></sliceSourceBounds>
- </sfw>
+ xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
i:viewOrigin="176.7139 486.707" i:rulerOrigin="-156 -296" i:pageBounds="156 496
456 296"
+ xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;"
xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/";
+ width="260.162" height="184.413" viewBox="0 0 260.162 184.413"
overflow="visible" enable-background="new 0 0 260.162 184.413"
+ xml:space="preserve">
+ <metadata>
+ <variableSets xmlns="&ns_vars;">
+ <variableSet varSetName="binding1" locked="none">
+ <variables></variables>
+ <v:sampleDataSets xmlns="&ns_custom;"
xmlns:v="&ns_vars;"></v:sampleDataSets>
+ </variableSet>
+ </variableSets>
+ <sfw xmlns="&ns_sfw;">
+ <slices></slices>
+ <sliceSourceBounds y="302.294" x="176.714" width="260.162"
height="184.413" bottomLeftOrigin="true"></sliceSourceBounds>
+ </sfw>
<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?><x:xmpmeta
xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 3.0-29, framework 1.6'>
<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
xmlns:iX='http://ns.adobe.com/iX/1.0/'>
@@ -82,84 +82,84 @@
</rdf:RDF>
</x:xmpmeta>
<?xpacket end='w'?>
- </metadata>
- <switch>
- <foreignObject requiredExtensions="&ns_ai;" x="0" y="0"
width="1" height="1">
- <i:pgfRef xlink:href="#adobe_illustrator_pgf">
- </i:pgfRef>
- </foreignObject>
- <g i:extraneous="self">
- <g id="colors" i:layer="yes"
i:dimmedPercent="3" i:rgbTrio="#4F00FFFF4F00">
- <path i:knockout="Off" fill="#F8DC75"
d="M237.682,33.617c-0.019-5.071,0.402-24.5-2.5-30.4
-
c-7.869,2.99-19.189,11.68-22.431,21.588c-15.532-2.32-35.042-2.045-50.381,0.608C159.808,14.753,147.946,7.596,138.243,3
-
c-4.093,6.907-3.906,19.92-3.445,31.279c-0.018,0.013-0.037,0.024-0.054,0.037c1.8,47.7,22.2,74.399,52.799,92.399
-
c31.481-17.988,50.972-49.057,50.101-93.12C237.656,33.603,237.67,33.609,237.682,33.617z
M216.485,25.421
-
c0.114,0.021,0.229,0.042,0.344,0.064C216.715,25.463,216.601,25.441,216.485,25.421z
M214.527,25.083
-
c0.275,0.044,0.554,0.094,0.83,0.141C215.081,25.177,214.805,25.129,214.527,25.083z"/>
- <path i:knockout="Off" fill="#D2A41F"
d="M91.013,133.328c46.474,4.115,90.927,22.883,141.085,49.085h25.598l0.361,0.191
-
c0.516-2.575-1.888-6.025-4.752-9.229c-4.941-5.528-11.623-6.145-19.707-5.951c-5.738-6.83-41.004-43.861-41.004-43.861
-
l-4.808,3.395c-38.75-21.75-49.155-62.513-49.155-62.513c-33.792,8.148-69.78,28.334-90.391,49.761l-3.118,3.292
-
c-1.489,1.597-2.928,3.174-4.312,4.723C18.967,146.661,3,170.87,3,175.213v2.25h23.816l-0.505-0.668
-
c-2.449-12.943,4.443-23.341,10.279-30.385c4.179-5.044,11.1-9.801,21.968-12.457L91.013,133.328z"/>
- </g>
- <g id="tomcat" i:layer="yes"
i:dimmedPercent="3" i:rgbTrio="#4F00FFFF4F00">
- <path i:knockout="Off"
d="M240.682,32.617c-0.019-5.071-1.598-26.5-4.5-32.4c-7.869,2.99-22.189,12.68-25.431,22.588
-
c-15.532-2.32-33.042-2.045-48.381,0.608C159.808,12.753,146.946,4.596,137.243,0c-4.093,6.907-5.906,22.92-5.445,34.279
-
c-0.018,0.013-0.037,0.024-0.054,0.037c1.8,47.7,25.2,77.399,55.799,95.399c31.481-17.988,53.972-53.057,53.101-97.12
-
C240.656,32.603,240.67,32.609,240.682,32.617z
M214.485,23.421c0.114,0.021,0.229,0.042,0.344,0.064
-
C214.715,23.463,214.601,23.441,214.485,23.421z
M212.527,23.083c0.275,0.044,0.554,0.094,0.83,0.141
-
C213.081,23.177,212.805,23.129,212.527,23.083z
M235.784,36.059c0.81,39.69-19.44,71.279-47.79,87.48
-
c-48.118-23.977-57.183-84.71-48.977-117.289c2.283,12.454,6.424,20.266,15.394,24.098c19.533-5.591,46.423-6.033,66.231-0.57
-
c8.255-6.001,11.456-15.169,13.204-23.18C236.029,15.921,235.777,36.055,235.784,36.059z"/>
- <g>
- <rect x="133.209" y="90.51"
i:knockout="Off" width="26.245" height="3.239"/>
- <rect x="133.209" y="82.732"
i:knockout="Off" width="26.245" height="3.24"/>
- <rect x="213.35" y="90.51"
i:knockout="Off" width="26.244" height="3.239"/>
- <rect x="213.35" y="82.732"
i:knockout="Off" width="26.244" height="3.24"/>
- <g>
- <path i:knockout="Off"
d="M204.1,63.524h-27.188h-3.021h-12.561v-2.917h13.31c1.639-7.018,1.963-13.725-0.014-17.125
-
c-0.844-1.446-2.01-2.121-3.674-2.121c-7.609,0-10.753,8.046-10.884,8.389l0.002-0.003l-2.73-1.024
-
c0.156-0.42,3.965-10.278,13.612-10.278c2.692,0,4.834,1.235,6.191,3.57c2.41,4.141,2.127,11.305,0.494,18.592l23.354,0
-
c3.103-9.116,9.581-13.414,20.405-13.414v2.916c-11.732,0-15.019,4.973-17.366,10.498l12.743,0l-0.029,2.901L204.1,63.524z"
- />
- <path i:knockout="Off"
d="M206.017,77.925l0.019-0.003c-3.459-5.101-4.555-9.456-3.108-14.413l-2.971,0.015
-
c-1.035,3.3-0.62,8.273,1.929,12.54H172.21c1.806-3.616,3.479-8.025,4.702-12.54h-3.021
-
c-1.348,4.786-3.241,9.524-5.372,13.277l-0.689,1.213l16.652,10.482l-9.375,6.178l1.605,2.436l10.479-6.908l11.312,7.382
-
l1.554-2.468l-10.488-6.488c0,0,15.682-10.187,16.461-10.684C206.024,77.937,206.021,77.931,206.017,77.925z
M187.156,86.733
-
l-12.317-7.755l24.071,0.006L187.156,86.733z"/>
- </g>
- </g>
- <polygon i:knockout="Off"
points="114.745,73.635 122.087,95.391 99.788,80.434 "/>
- <polygon i:knockout="Off"
points="93.261,83.153 101.147,96.75 84.559,88.32 "/>
- <polygon i:knockout="Off"
points="75.313,93.759 79.12,107.356 67.699,99.47 "/>
- <polygon i:knockout="Off"
points="196.871,130.199 189.801,141.077 202.31,135.366 "/>
- <polygon i:knockout="Off"
points="208.021,142.709 196.6,151.411 212.372,147.332 "/>
- <polygon i:knockout="Off"
points="180.282,24.686 188.713,43.178 194.151,24.414 "/>
- <polygon i:knockout="Off"
points="137.588,51.608 150.913,58.678 138.947,59.494 "/>
- <polygon i:knockout="Off"
points="140.851,66.021 149.009,69.284 142.211,71.188 "/>
- <polygon i:knockout="Off"
points="236.031,56.775 225.153,61.398 234.127,62.757 "/>
- <polygon i:knockout="Off"
points="231.68,70.1 223.25,72.548 230.048,74.995 "/>
- <path i:knockout="Off"
d="M256.305,173.375c-4.941-5.528-14.623-8.145-22.707-7.951c-5.738-6.83-39.004-41.861-39.004-41.861
-
l-2.306,2.903l40.162,43.238l1.743-0.149c10.912-0.935,17.115,4.983,18.757,6.819c1.204,1.347,1.931,2.575,2.326,3.539h-22.075
-
c-50.624-26.416-95.078-45.044-142.297-49.112c0.104-6.571,1.273-14.01,3.518-22.299l-4.343-1.177
-
c-2.308,8.521-3.523,16.236-3.661,23.133c-4.92-0.326-9.872-0.495-14.868-0.495c-4.237,0-8.095,0.394-11.614,1.077
-
c-4.59-4.587-8.5-8.959-11.823-13.108c21.936-22.85,58.15-43.498,89.533-51.092l-1.015-4.396
-
c-33.792,8.148-70.78,30.334-91.391,51.761c-9.565-12.91-13.36-23.504-14.487-31.532c-1.424-10.14,0.997-19.441,6.999-26.899
-
C47.15,44.099,60.502,43.277,74.23,45.586c-0.268,2.167,0.017,4.24,0.885,5.522c3.631,5.363,23.144,7.246,34.791,2.049
-
c-8.595-12.045-26.006-17.926-30.83-15.569c-1.598,0.781-2.804,2.214-3.63,3.886c-4.745-0.849-9.458-1.48-12.903-1.455
-
c-12.107,0.088-21.363,4.319-28.296,12.932c-6.802,8.451-9.551,18.944-7.95,30.347c1.516,10.8,6.863,22.286,15.825,34.198
-
c-1.489,1.597-2.928,3.174-4.312,4.723C15.967,146.661,0,172.87,0,177.213v2.25h28.816l-0.505-2.668
-
c-1.627-8.601,1.623-19.351,8.279-27.385c4.179-5.044,11.1-10.801,21.968-13.457c9.663,9.431,21.975,19.446,35.679,29.109
-
h21.414v-2.25c0-2.539-1.259-4.762-3.545-6.257c-3.383-2.212-8.605-2.517-13.402-0.881c-4.573-5.093-7.137-11.896-7.691-20.347
-
c46.474,4.115,90.927,22.883,141.085,49.085h27.598l0.361-1.809C260.572,180.029,259.169,176.579,256.305,173.375z
-
M33.125,146.539c-6.816,8.227-10.429,19.094-9.601,28.424H5.372c3.647-7.894,18.176-30.712,39.644-53.76
-
c2.958,3.656,6.253,7.35,9.872,11.073C44.347,135.444,37.437,141.336,33.125,146.539z"/>
- </g>
- </g>
- </switch>
- <i:pgf id="adobe_illustrator_pgf">
- <![CDATA[
-
eJzdffle8sqy6H0B3gFUFGQwEyEBB2YHUEFwwJlJRJlkWGuv88d59lvVSUgICWmQ75x1716/7aed
+ </metadata>
+ <switch>
+ <foreignObject requiredExtensions="&ns_ai;" x="0" y="0" width="1"
height="1">
+ <i:pgfRef xlink:href="#adobe_illustrator_pgf">
+ </i:pgfRef>
+ </foreignObject>
+ <g i:extraneous="self">
+ <g id="colors" i:layer="yes" i:dimmedPercent="3"
i:rgbTrio="#4F00FFFF4F00">
+ <path i:knockout="Off" fill="#F8DC75"
d="M237.682,33.617c-0.019-5.071,0.402-24.5-2.5-30.4
+
c-7.869,2.99-19.189,11.68-22.431,21.588c-15.532-2.32-35.042-2.045-50.381,0.608C159.808,14.753,147.946,7.596,138.243,3
+
c-4.093,6.907-3.906,19.92-3.445,31.279c-0.018,0.013-0.037,0.024-0.054,0.037c1.8,47.7,22.2,74.399,52.799,92.399
+
c31.481-17.988,50.972-49.057,50.101-93.12C237.656,33.603,237.67,33.609,237.682,33.617z
M216.485,25.421
+
c0.114,0.021,0.229,0.042,0.344,0.064C216.715,25.463,216.601,25.441,216.485,25.421z
M214.527,25.083
+
c0.275,0.044,0.554,0.094,0.83,0.141C215.081,25.177,214.805,25.129,214.527,25.083z"/>
+ <path i:knockout="Off" fill="#D2A41F"
d="M91.013,133.328c46.474,4.115,90.927,22.883,141.085,49.085h25.598l0.361,0.191
+
c0.516-2.575-1.888-6.025-4.752-9.229c-4.941-5.528-11.623-6.145-19.707-5.951c-5.738-6.83-41.004-43.861-41.004-43.861
+
l-4.808,3.395c-38.75-21.75-49.155-62.513-49.155-62.513c-33.792,8.148-69.78,28.334-90.391,49.761l-3.118,3.292
+
c-1.489,1.597-2.928,3.174-4.312,4.723C18.967,146.661,3,170.87,3,175.213v2.25h23.816l-0.505-0.668
+
c-2.449-12.943,4.443-23.341,10.279-30.385c4.179-5.044,11.1-9.801,21.968-12.457L91.013,133.328z"/>
+ </g>
+ <g id="tomcat" i:layer="yes" i:dimmedPercent="3"
i:rgbTrio="#4F00FFFF4F00">
+ <path i:knockout="Off"
d="M240.682,32.617c-0.019-5.071-1.598-26.5-4.5-32.4c-7.869,2.99-22.189,12.68-25.431,22.588
+
c-15.532-2.32-33.042-2.045-48.381,0.608C159.808,12.753,146.946,4.596,137.243,0c-4.093,6.907-5.906,22.92-5.445,34.279
+
c-0.018,0.013-0.037,0.024-0.054,0.037c1.8,47.7,25.2,77.399,55.799,95.399c31.481-17.988,53.972-53.057,53.101-97.12
+ C240.656,32.603,240.67,32.609,240.682,32.617z
M214.485,23.421c0.114,0.021,0.229,0.042,0.344,0.064
+ C214.715,23.463,214.601,23.441,214.485,23.421z
M212.527,23.083c0.275,0.044,0.554,0.094,0.83,0.141
+ C213.081,23.177,212.805,23.129,212.527,23.083z
M235.784,36.059c0.81,39.69-19.44,71.279-47.79,87.48
+
c-48.118-23.977-57.183-84.71-48.977-117.289c2.283,12.454,6.424,20.266,15.394,24.098c19.533-5.591,46.423-6.033,66.231-0.57
+
c8.255-6.001,11.456-15.169,13.204-23.18C236.029,15.921,235.777,36.055,235.784,36.059z"/>
+ <g>
+ <rect x="133.209" y="90.51" i:knockout="Off"
width="26.245" height="3.239"/>
+ <rect x="133.209" y="82.732" i:knockout="Off"
width="26.245" height="3.24"/>
+ <rect x="213.35" y="90.51" i:knockout="Off"
width="26.244" height="3.239"/>
+ <rect x="213.35" y="82.732" i:knockout="Off"
width="26.244" height="3.24"/>
+ <g>
+ <path i:knockout="Off"
d="M204.1,63.524h-27.188h-3.021h-12.561v-2.917h13.31c1.639-7.018,1.963-13.725-0.014-17.125
+
c-0.844-1.446-2.01-2.121-3.674-2.121c-7.609,0-10.753,8.046-10.884,8.389l0.002-0.003l-2.73-1.024
+
c0.156-0.42,3.965-10.278,13.612-10.278c2.692,0,4.834,1.235,6.191,3.57c2.41,4.141,2.127,11.305,0.494,18.592l23.354,0
+
c3.103-9.116,9.581-13.414,20.405-13.414v2.916c-11.732,0-15.019,4.973-17.366,10.498l12.743,0l-0.029,2.901L204.1,63.524z"
+ />
+ <path i:knockout="Off"
d="M206.017,77.925l0.019-0.003c-3.459-5.101-4.555-9.456-3.108-14.413l-2.971,0.015
+
c-1.035,3.3-0.62,8.273,1.929,12.54H172.21c1.806-3.616,3.479-8.025,4.702-12.54h-3.021
+
c-1.348,4.786-3.241,9.524-5.372,13.277l-0.689,1.213l16.652,10.482l-9.375,6.178l1.605,2.436l10.479-6.908l11.312,7.382
+
l1.554-2.468l-10.488-6.488c0,0,15.682-10.187,16.461-10.684C206.024,77.937,206.021,77.931,206.017,77.925z
M187.156,86.733
+ l-12.317-7.755l24.071,0.006L187.156,86.733z"/>
+ </g>
+ </g>
+ <polygon i:knockout="Off" points="114.745,73.635
122.087,95.391 99.788,80.434 "/>
+ <polygon i:knockout="Off" points="93.261,83.153
101.147,96.75 84.559,88.32 "/>
+ <polygon i:knockout="Off" points="75.313,93.759
79.12,107.356 67.699,99.47 "/>
+ <polygon i:knockout="Off" points="196.871,130.199
189.801,141.077 202.31,135.366 "/>
+ <polygon i:knockout="Off" points="208.021,142.709
196.6,151.411 212.372,147.332 "/>
+ <polygon i:knockout="Off" points="180.282,24.686
188.713,43.178 194.151,24.414 "/>
+ <polygon i:knockout="Off" points="137.588,51.608
150.913,58.678 138.947,59.494 "/>
+ <polygon i:knockout="Off" points="140.851,66.021
149.009,69.284 142.211,71.188 "/>
+ <polygon i:knockout="Off" points="236.031,56.775
225.153,61.398 234.127,62.757 "/>
+ <polygon i:knockout="Off" points="231.68,70.1
223.25,72.548 230.048,74.995 "/>
+ <path i:knockout="Off"
d="M256.305,173.375c-4.941-5.528-14.623-8.145-22.707-7.951c-5.738-6.83-39.004-41.861-39.004-41.861
+
l-2.306,2.903l40.162,43.238l1.743-0.149c10.912-0.935,17.115,4.983,18.757,6.819c1.204,1.347,1.931,2.575,2.326,3.539h-22.075
+
c-50.624-26.416-95.078-45.044-142.297-49.112c0.104-6.571,1.273-14.01,3.518-22.299l-4.343-1.177
+
c-2.308,8.521-3.523,16.236-3.661,23.133c-4.92-0.326-9.872-0.495-14.868-0.495c-4.237,0-8.095,0.394-11.614,1.077
+
c-4.59-4.587-8.5-8.959-11.823-13.108c21.936-22.85,58.15-43.498,89.533-51.092l-1.015-4.396
+
c-33.792,8.148-70.78,30.334-91.391,51.761c-9.565-12.91-13.36-23.504-14.487-31.532c-1.424-10.14,0.997-19.441,6.999-26.899
+
C47.15,44.099,60.502,43.277,74.23,45.586c-0.268,2.167,0.017,4.24,0.885,5.522c3.631,5.363,23.144,7.246,34.791,2.049
+
c-8.595-12.045-26.006-17.926-30.83-15.569c-1.598,0.781-2.804,2.214-3.63,3.886c-4.745-0.849-9.458-1.48-12.903-1.455
+
c-12.107,0.088-21.363,4.319-28.296,12.932c-6.802,8.451-9.551,18.944-7.95,30.347c1.516,10.8,6.863,22.286,15.825,34.198
+
c-1.489,1.597-2.928,3.174-4.312,4.723C15.967,146.661,0,172.87,0,177.213v2.25h28.816l-0.505-2.668
+
c-1.627-8.601,1.623-19.351,8.279-27.385c4.179-5.044,11.1-10.801,21.968-13.457c9.663,9.431,21.975,19.446,35.679,29.109
+
h21.414v-2.25c0-2.539-1.259-4.762-3.545-6.257c-3.383-2.212-8.605-2.517-13.402-0.881c-4.573-5.093-7.137-11.896-7.691-20.347
+
c46.474,4.115,90.927,22.883,141.085,49.085h27.598l0.361-1.809C260.572,180.029,259.169,176.579,256.305,173.375z
+
M33.125,146.539c-6.816,8.227-10.429,19.094-9.601,28.424H5.372c3.647-7.894,18.176-30.712,39.644-53.76
+
c2.958,3.656,6.253,7.35,9.872,11.073C44.347,135.444,37.437,141.336,33.125,146.539z"/>
+ </g>
+ </g>
+ </switch>
+ <i:pgf id="adobe_illustrator_pgf">
+ <![CDATA[
+
eJzdffle8sqy6H0B3gFUFGQwEyEBB2YHUEFwwJlJRJlkWGuv88d59lvVSUgICWmQ75x1716/7aed
Tnd1dXXN1fF6iuVQsjmot0J8mHG7vN70qFWbDEYxN2l1n3e70/FkhE2+G7+bZcMMdEqeS29qx7vW
aNwZ9GPkEXmYw7d951e565vTrN/t80NbpTPptqB1Mug1apPw+K+2X5sLXs7UJvAwciAfMKKbZWJ8
1J28hOepwbTf7PTbqcF/YPyo6OYZzi3AU0GKwuOzzk1rbO4TjrK8jB3DnAy/CLwYluBNQYInDL6V
@@ -231,9 +231,9 @@ Tq9gNWkg3o0d20wa+dw/eUxcW08qVKtMTmaugMas
wizatDXmNPh+Zz3pKZPca/miVUv0TraDJ+qk1ZDPhN6TK+Ho2aWcVTb7/J2bW+vjIVOIhlic9HBh
0rPWQLyphTiYlAmZV1p4eqyZJiWzqGuNfjdzr3aTZpjL/RfZetLzn1jia3R1YzlpOb7Hw6m0Xqu4
nW+VecZm0qcQU37zb1lPmj9rXT09+n36pC6vYdq7vX7bdtLyZ+m9bjfpKXOXHx5aTw==
- ]]>
- <![CDATA[
-
WuC9Lu9tLnF4ZLnWu+HFlu2kd2+nWxO7Sa+Z+5N8Rp8U1mKY9vI4+/ZaenmxnPTl+vvcdtKvaqSZ
+ ]]>
+ <![CDATA[
+
WuC9Lu9tLnF4ZLnWu+HFlu2kd2+nWxO7Sa+Z+5N8Rp8U1mKY9vI4+/ZaenmxnPTl+vvcdtKvaqSZ
s5n0Gbgl8zLuhqzXevU17F3LEm856dt5qG876chbDnj0SVGKGc/qLZPt9C4sJ5WuQluexEsoC5Py
YfOhmb5F39RJ67zfdGhcXv9jobZPpuX2jn1n82stMO/7sSROemyaFIb9+tGYvnhgnnQ82D1SJ52c
BGBf5tfqea49+ZVJU1X2fJ4VBkfj22MPTppY5EnnIW2lh6xpUsBY/GxLVKY9YfMhEysMDoUrRdLw
@@ -305,9 +305,9 @@ Ob0WOSR1jio9nDqMUue3qHMUKUq3csSvZ3Xq1Ptg
Z3nNCH3NqWNRhjqUGk2gKpSkUist9TbLvL5Tytt6qEs5qXXL+XNgX1tsWcA4x5NpzIu5fVmUPr/e
F+dLgFbdFzqVdaV9obsJaJVqZXPYCj0kv7mcCauVnSuZXKsdQ0rl1YzK2W3zVoeG7k4gClSqOgwi
0zH6uCoq9Zqm5TWJKxvmk+MfKzGo172aBeH6hvnk2CwG7Whsptpb00H7bCWTY3anyg==
- ]]>
- <![CDATA[
-
wu6fUTK4oKJdvHOv77ZHU8OYhfm8tvE8OTGL+bUxRjK1N4IxOtaj62N2xDDGU7kop5dYjvYgrWwj
+ ]]>
+ <![CDATA[
+
wu6fUTK4oKJdvHOv77ZHU8OYhfm8tvE8OTGL+bUxRjK1N4IxOtaj62N2xDDGU7kop5dYjvYgrWwj
2wK1GBCkAsngUZwBRcVXKEDSbbblZ3/ewrYJUGKQaSFlxto/ZrKwna65GX7YX3PzMm6bkxhcXmcj
fEkRNOU2uSjLZH/MVudKwJki71/ny1NNV1U/YTxUc2jvhXOq3+JeJj77GxbsfUpLarRXYS5OudZY
tLyOB8jCulF48vlyBrH6ck1aiOXtQBZycUnJMoU8cy0e8SUIdDjitgi01GDPraozV0TgnO7h8qrV
@@ -379,9 +379,9 @@ cd4Sf1jBEaKOaIs7kxuEourZWUxi/brz2aepYLfw
lpU0fzpduDCfgeuiuNOg+mu34sI9ilY5Sb9wK1Yt8y3Xvn2YlK7TS2S6z50fUKvXWi2PjdiyTC1a
48KF+bNfpfHzr2JN6kIL8y0LQthebL2M2w7Xg6nLWPZdiHnr9TZ2YDsfRcTcdr7ZjTqqxxHxWKhk
6weNXrLfCA2Ske700iQDyFSpbktkEoff18+5/d1rjbk0kruZj6GfTebvHwuzfQYrSQ==
- ]]>
- <![CDATA[
-
r7xXT5G5+/uV3l3vrNRqqTgpXKe6kodNX92XWrnD7HMY1nfvy/lLXDLxk3r1YWWKYg7MWk8aORyx
+ ]]>
+ <![CDATA[
+
r7xXT5G5+/uV3l3vrNRqqTgpXKe6kodNX92XWrnD7HMY1nfvy/lLXDLxk3r1YWWKYg7MWk8aORyx
mIhXSlOsjz6TQp7dafY+de+ZP1zFTCNWa2Yb79niaMSNk5799qh0EPLGdvn7y0gyIgbGn+cHg2nN
5d07a0ny/snTzuOW53zi9yRzNwdb1VcxtlO+3854v/vlwl7rcxgSy4Wft+h3s9BOfL9ffeZbZVm+
ej77uSuzw/xH+bPU6d6eHlxO795O/b63t3TA/1WNfF33ioH4h8s7DDwmJiNv2bc3GvE7nq1Ba3Dg
@@ -453,9 +453,9 @@ u7e3JscnCQShlcTEo5pDNzhGk8urhE8OQ/et1Hfh
Lr62f8haovf8Yc04PYnHPo2F1PfeaU4z631eY6ArffyilmvNXmPzVZT775feLkasRMXi67xe9IHG
RiLG6bbk72QW0ObnZzHTBw8cvvxohp2JEj0ddRp+DdZ7KfHA+MPan7tg7+d8ecaLzulLOHK1XYUY
mrvBfG6fO+a0bXyU0Oru5N738i9wAo+2SWQE3ZgZA0sBGkqA/f3QS1Yus3l9c1xezQ==
- ]]>
- <![CDATA[
-
/+uVsVMcWj1fydIVaJkY6tHRMYsgyXgOCkrwCO24+QfFRLx3nDYEfV74bBdsZOKA04JCxEFV1UJG
+ ]]>
+ <![CDATA[
+
/+uVsVMcWj1fydIVaJkY6tHRMYsgyXgOCkrwCO24+QfFRLx3nDYEfV74bBdsZOKA04JCxEFV1UJG
4ihRTudvQA/xn5MoHjpBJQw4PGldUl9JqfH4kDl4KEWVcNosGAXblPlIxJ+TF4Qnm4GKYrToKNmv
196V84K35xzujVvtrG/rrp3JeT8u5gNKF+J9zz9IDobDekqYpkqmiJTCYT5zJ+Pnu8Dx9uE2vnMG
mA/siNssc39wWf5GHfVkB/Sj/SfVEfJ+fgyc6mRsiFx2vZWSIZQzH4QBi6/16v8A7SqHmTPbEvqg
@@ -527,9 +527,9 @@ wsusSN7jw1wEloC4EWVWgLXwAGaUcwOCw7LMwS+4
QIYgSWRT+EhUIDsHC5ZwC8jOMazSxghKJwkXjNsr46YubHja9QETQn+YXMGxBLvWI22wgIjSJsJa
sUXgcBBsEQSlJSLwSgP8z91wKZ0krRMfdSsDCbOBRPfidA0AggGiBsTBS6zyROQEAgduiCiSpoiE
hAQtUVmQlRYetxGIjYmyCiCw3wIBZLEXjiSpI0UlZaS56RCO/Vvrw0pOoXb4wiyMzA==
- ]]>
- <![CDATA[
-
IPBw1sNSVMLjx8Ay4fBxoFlGOaQlwDEflWRcBeCdY4AKeUEGJCBa4HiJER7pmwHqwpPCSHBSgKp5
+ ]]>
+ <![CDATA[
+
IPBw1sNSVMLjx8Ay4fBxoFlGOaQlwDEflWRcBeCdY4AKeUEGJCBa4HiJER7pmwHqwpPCSHBSgKp5
IBegdDwgAg/HgQFUzdoKpC0aZZR+oN5ESFtEwSTPiGExipvEc2FJ4pAykT/g8YWJGFw/0iXP424J
XAQQF4XXWJhbJCQjKQTCs3Bco4h3eJ8nYEELJ/HaYQfCBrA4EagPVyHKYZ6JwuBwklgBtrvqQtqO
EMKOIow8TAa/8BKLrUDRPJwVNxx2RAgH/Tl8EoFfkUphRs7NCZEwnGGBkIyMZMVxeKwFmCfKAb9D
@@ -584,6 +584,6 @@ wnlZIFSIZlhPDdDwircRaE5ws6CskOOD+8FEyYFC
ukDeRCUHcSZE8HDAoMSYAP01wiiEg5FscoCA3eHZQk4gS0TWgcxB1zOHngMGhS0GDnji58eRMPSA
yFdpGTkB8E0SH4oi3zGv1zHaaRX58RZr7VZlVOt0WyNXe1z7q+Wu9fuDSW3SGsITd3vUGk8Go5Z7
/Dn4G1vgFa2715u9zrn+L1T7Dxc=
- ]]>
- </i:pgf>
- </svg>
+ ]]>
+ </i:pgf>
+ </svg>
Modified: tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/WEB-INF/web.xml?rev=981579&r1=981578&r2=981579&view=diff
==============================================================================
--- tomcat/trunk/webapps/host-manager/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/host-manager/WEB-INF/web.xml Mon Aug 2 16:13:22 2010
@@ -26,7 +26,7 @@
<display-name>Tomcat Host Manager Application</display-name>
<description>
A scriptable host management web application for the Tomcat Web Server;
- Manager lets you view, create and remove virtual hosts.
+ Manager lets you view, create and remove virtual hosts.
</description>
<servlet>
Modified: tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp?rev=981579&r1=981578&r2=981579&view=diff
==============================================================================
--- tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp (original)
+++ tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp Mon Aug 2
16:13:22 2010
@@ -135,14 +135,14 @@
<input type="hidden" name="action"
value="removeSessionAttribute" />
<input type="hidden" name="sessionId" value="<%=
currentSessionId %>" />
<input type="hidden" name="attributeName" value="<%=
attributeName %>" />
- <%
- if
("Primary".equals(request.getAttribute("sessionType"))) {
- %>
+ <%
+ if
("Primary".equals(request.getAttribute("sessionType"))) {
+ %>
<input type="submit" value="Remove" />
<%
- } else {
- out.print("Primary sessions
only");
- }
+ } else {
+ out.print("Primary sessions only");
+ }
%>
</div>
</form>
Modified: tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp?rev=981579&r1=981578&r2=981579&view=diff
==============================================================================
--- tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp (original)
+++ tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp Mon Aug 2
16:13:22 2010
@@ -34,114 +34,114 @@
%>
<head>
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
- <meta http-equiv="pragma" content="no-cache"/><!-- HTTP 1.0 -->
- <meta http-equiv="cache-control"
content="no-cache,must-revalidate"/><!-- HTTP 1.1 -->
- <meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and
should be treated as 'now' -->
- <meta http-equiv="content-language" content="en"/>
- <meta name="author" content="Cedrik LIME"/>
- <meta name="copyright" content="copyright 2005-2010 the Apache Software
Foundation"/>
- <meta name="robots" content="noindex,nofollow,noarchive"/>
- <title>Sessions Administration for <%= path %></title>
+ <meta http-equiv="pragma" content="no-cache"/><!-- HTTP 1.0 -->
+ <meta http-equiv="cache-control" content="no-cache,must-revalidate"/><!--
HTTP 1.1 -->
+ <meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and
should be treated as 'now' -->
+ <meta http-equiv="content-language" content="en"/>
+ <meta name="author" content="Cedrik LIME"/>
+ <meta name="copyright" content="copyright 2005-2010 the Apache Software
Foundation"/>
+ <meta name="robots" content="noindex,nofollow,noarchive"/>
+ <title>Sessions Administration for <%= path %></title>
</head>
<body>
<h1>Sessions Administration for <%= path %></h1>
<p>Tips:</p>
<ul>
- <li>Click on a column to sort.</li>
- <li>To view a session details and/or remove a session attributes, click
on its id.</li>
+ <li>Click on a column to sort.</li>
+ <li>To view a session details and/or remove a session attributes, click on
its id.</li>
</ul>
<div class="error"><%= JspHelper.escapeXml(request.getAttribute("error"))
%></div>
<div class="message"><%= JspHelper.escapeXml(request.getAttribute("message"))
%></div>
<form action="<%= submitUrl %>" method="post" id="sessionsForm">
- <fieldset><legend>Active HttpSessions informations</legend>
- <input type="hidden" name="action" id="sessionsFormAction"
value="injectSessions"/>
- <input type="hidden" name="sort" id="sessionsFormSort"
value="<%= (String) request.getAttribute("sort") %>"/>
- <% String order = (String) request.getAttribute("order");
- if (order == null || "".equals(order)) {
- order = "ASC";
- }
- %>
- <input type="hidden" name="order" id="sessionsFormSortOrder"
value="<%= order %>"/>
- <input type="submit" name="refresh" id="refreshButton"
value="Refresh Sessions list"
onclick="document.getElementById('sessionsFormAction').value='refreshSessions';
return true;"/>
- <%= JspHelper.formatNumber(activeSessions.size()) %> active
Sessions<br/>
- <table border="1" cellpadding="2" cellspacing="2" width="100%">
- <thead>
- <tr>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='id';
document.getElementById('refreshButton').click(); return true;">Session
Id</a></th>
+ <fieldset><legend>Active HttpSessions informations</legend>
+ <input type="hidden" name="action" id="sessionsFormAction"
value="injectSessions"/>
+ <input type="hidden" name="sort" id="sessionsFormSort" value="<%=
(String) request.getAttribute("sort") %>"/>
+ <% String order = (String) request.getAttribute("order");
+ if (order == null || "".equals(order)) {
+ order = "ASC";
+ }
+ %>
+ <input type="hidden" name="order" id="sessionsFormSortOrder"
value="<%= order %>"/>
+ <input type="submit" name="refresh" id="refreshButton" value="Refresh
Sessions list"
onclick="document.getElementById('sessionsFormAction').value='refreshSessions';
return true;"/>
+ <%= JspHelper.formatNumber(activeSessions.size()) %> active
Sessions<br/>
+ <table border="1" cellpadding="2" cellspacing="2" width="100%">
+ <thead>
+ <tr>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='id';
document.getElementById('refreshButton').click(); return true;">Session
Id</a></th>
<th><a
onclick="document.getElementById('sessionsFormSort').value='id';
document.getElementById('refreshButton').click(); return true;">Type</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='locale';
document.getElementById('refreshButton').click(); return true;">Guessed
Locale</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='user';
document.getElementById('refreshButton').click(); return true;">Guessed User
name</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='CreationTime';
document.getElementById('refreshButton').click(); return true;">Creation
Time</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='LastAccessedTime';
document.getElementById('refreshButton').click(); return true;">Last Accessed
Time</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='UsedTime';
document.getElementById('refreshButton').click(); return true;">Used
Time</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='InactiveTime';
document.getElementById('refreshButton').click(); return true;">Inactive
Time</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='TTL';
document.getElementById('refreshButton').click(); return true;"><span
title="Time To Live">TTL</span></a></th>
- </tr>
- </thead>
- <% if (activeSessions.size() > 10) { %>
- <tfoot><%-- <tfoot> is the same as <thead> --%>
- <tr>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='id';
document.getElementById('refreshButton').click(); return true;">Session
Id</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='locale';
document.getElementById('refreshButton').click(); return true;">Guessed
Locale</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='user';
document.getElementById('refreshButton').click(); return true;">Guessed User
name</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='CreationTime';
document.getElementById('refreshButton').click(); return true;">Creation
Time</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='LastAccessedTime';
document.getElementById('refreshButton').click(); return true;">Last Accessed
Time</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='UsedTime';
document.getElementById('refreshButton').click(); return true;">Used
Time</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='InactiveTime';
document.getElementById('refreshButton').click(); return true;">Inactive
Time</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='TTL';
document.getElementById('refreshButton').click(); return true;"><span
title="Time To Live">TTL</span></a></th>
+ </tr>
+ </thead>
+ <% if (activeSessions.size() > 10) { %>
+ <tfoot><%-- <tfoot> is the same as <thead> --%>
+ <tr>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='id';
document.getElementById('refreshButton').click(); return true;">Session
Id</a></th>
<th><a
onclick="document.getElementById('sessionsFormSort').value='id';
document.getElementById('refreshButton').click(); return true;">Type</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='locale';
document.getElementById('refreshButton').click(); return true;">Guessed
Locale</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='user';
document.getElementById('refreshButton').click(); return true;">Guessed User
name</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='CreationTime';
document.getElementById('refreshButton').click(); return true;">Creation
Time</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='LastAccessedTime';
document.getElementById('refreshButton').click(); return true;">Last Accessed
Time</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='UsedTime';
document.getElementById('refreshButton').click(); return true;">Used
Time</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='InactiveTime';
document.getElementById('refreshButton').click(); return true;">Inactive
Time</a></th>
- <th><a
onclick="document.getElementById('sessionsFormSort').value='TTL';
document.getElementById('refreshButton').click(); return true;"><span
title="Time To Live">TTL</span></a></th>
- </tr>
- </tfoot>
- <% } // end if %>
- <tbody>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='locale';
document.getElementById('refreshButton').click(); return true;">Guessed
Locale</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='user';
document.getElementById('refreshButton').click(); return true;">Guessed User
name</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='CreationTime';
document.getElementById('refreshButton').click(); return true;">Creation
Time</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='LastAccessedTime';
document.getElementById('refreshButton').click(); return true;">Last Accessed
Time</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='UsedTime';
document.getElementById('refreshButton').click(); return true;">Used
Time</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='InactiveTime';
document.getElementById('refreshButton').click(); return true;">Inactive
Time</a></th>
+ <th><a
onclick="document.getElementById('sessionsFormSort').value='TTL';
document.getElementById('refreshButton').click(); return true;"><span
title="Time To Live">TTL</span></a></th>
+ </tr>
+ </tfoot>
+ <% } // end if %>
+ <tbody>
<% Iterator iter = activeSessions.iterator();
while (iter.hasNext()) {
- Session currentSession = (Session) iter.next();
- String currentSessionId = currentSession.getId();
- String type;
- if (currentSession instanceof DeltaSession) {
- if (((DeltaSession) currentSession).isPrimarySession()) {
- type = "Primary";
- } else {
- type = "Backup";
- }
- } else if (currentSession instanceof DummyProxySession) {
- type = "Proxy";
- } else {
- type = "Primary";
- }
+ Session currentSession = (Session) iter.next();
+ String currentSessionId = currentSession.getId();
+ String type;
+ if (currentSession instanceof DeltaSession) {
+ if (((DeltaSession) currentSession).isPrimarySession()) {
+ type = "Primary";
+ } else {
+ type = "Backup";
+ }
+ } else if (currentSession instanceof DummyProxySession) {
+ type = "Proxy";
+ } else {
+ type = "Primary";
+ }
%>
- <tr>
- <td><input type="checkbox"
name="sessionIds" value="<%= currentSessionId %>" />
- <%
- if ("Proxy".equals(type)) {
- out.print(currentSessionId);
- } else {
- %>
- <a href="<%= submitUrl
%>&action=sessionDetail&sessionId=<%= currentSessionId
%>&sessionType=<%= type %>"><%= JspHelper.escapeXml(currentSessionId) %></a>
- <%
- }
- %>
- </td>
+ <tr>
+ <td><input type="checkbox" name="sessionIds" value="<%=
currentSessionId %>" />
+ <%
+ if ("Proxy".equals(type)) {
+ out.print(currentSessionId);
+ } else {
+ %>
+ <a href="<%= submitUrl
%>&action=sessionDetail&sessionId=<%= currentSessionId
%>&sessionType=<%= type %>"><%= JspHelper.escapeXml(currentSessionId) %></a>
+ <%
+ }
+ %>
+ </td>
<td style="text-align: center;"><%= type %></td>
- <td style="text-align: center;"><%=
JspHelper.guessDisplayLocaleFromSession(currentSession) %></td>
- <td style="text-align: center;"><%=
JspHelper.guessDisplayUserFromSession(currentSession) %></td>
- <td style="text-align: center;"><%=
JspHelper.getDisplayCreationTimeForSession(currentSession) %></td>
- <td style="text-align: center;"><%=
JspHelper.getDisplayLastAccessedTimeForSession(currentSession) %></td>
- <td style="text-align: center;"><%=
JspHelper.getDisplayUsedTimeForSession(currentSession) %></td>
- <td style="text-align: center;"><%=
JspHelper.getDisplayInactiveTimeForSession(currentSession) %></td>
- <td style="text-align: center;"><%=
JspHelper.getDisplayTTLForSession(currentSession) %></td>
- </tr>
+ <td style="text-align: center;"><%=
JspHelper.guessDisplayLocaleFromSession(currentSession) %></td>
+ <td style="text-align: center;"><%=
JspHelper.guessDisplayUserFromSession(currentSession) %></td>
+ <td style="text-align: center;"><%=
JspHelper.getDisplayCreationTimeForSession(currentSession) %></td>
+ <td style="text-align: center;"><%=
JspHelper.getDisplayLastAccessedTimeForSession(currentSession) %></td>
+ <td style="text-align: center;"><%=
JspHelper.getDisplayUsedTimeForSession(currentSession) %></td>
+ <td style="text-align: center;"><%=
JspHelper.getDisplayInactiveTimeForSession(currentSession) %></td>
+ <td style="text-align: center;"><%=
JspHelper.getDisplayTTLForSession(currentSession) %></td>
+ </tr>
<% } // end while %>
- </tbody>
- </table>
- <p style="text-align: center;">
- <input type="submit" name="invalidate"
value="Invalidate selected Sessions"
onclick="document.getElementById('sessionsFormAction').value='invalidateSessions';
return true;"/>
- </p>
- </fieldset>
+ </tbody>
+ </table>
+ <p style="text-align: center;">
+ <input type="submit" name="invalidate" value="Invalidate selected
Sessions"
onclick="document.getElementById('sessionsFormAction').value='invalidateSessions';
return true;"/>
+ </p>
+ </fieldset>
</form>
<form method="get" action="<%=request.getContextPath()%>/html">
@@ -152,15 +152,15 @@
<%--div style="display: none;">
<p>
- <a href="http://validator.w3.org/check?uri=referer";><img
- src="http://www.w3.org/Icons/valid-html401";
- alt="Valid HTML 4.01!" height="31" width="88"></a>
- <a href="http://validator.w3.org/check?uri=referer";><img
- src="http://www.w3.org/Icons/valid-xhtml10";
- alt="Valid XHTML 1.0!" height="31" width="88" /></a>
- <a href="http://validator.w3.org/check?uri=referer";><img
- src="http://www.w3.org/Icons/valid-xhtml11";
- alt="Valid XHTML 1.1!" height="31" width="88" /></a>
+ <a href="http://validator.w3.org/check?uri=referer";><img
+ src="http://www.w3.org/Icons/valid-html401";
+ alt="Valid HTML 4.01!" height="31" width="88"></a>
+ <a href="http://validator.w3.org/check?uri=referer";><img
+ src="http://www.w3.org/Icons/valid-xhtml10";
+ alt="Valid XHTML 1.0!" height="31" width="88" /></a>
+ <a href="http://validator.w3.org/check?uri=referer";><img
+ src="http://www.w3.org/Icons/valid-xhtml11";
+ alt="Valid XHTML 1.1!" height="31" width="88" /></a>
</p>
</div--%>
Modified: tomcat/trunk/webapps/manager/status.xsd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/status.xsd?rev=981579&r1=981578&r2=981579&view=diff
==============================================================================
--- tomcat/trunk/webapps/manager/status.xsd (original)
+++ tomcat/trunk/webapps/manager/status.xsd Mon Aug 2 16:13:22 2010
@@ -18,61 +18,61 @@
<!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by peter lin
(consultant) -->
<!--W3C Schema generated by XMLSPY v5 rel. 4 U (http://www.xmlspy.com)-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
- <xs:complexType name="connector">
- <xs:sequence>
- <xs:element name="threadInfo" type="threadInfo"/>
- <xs:element name="requestInfo" type="requestInfo"/>
- <xs:element name="workers" type="workers"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:complexType>
- <xs:complexType name="jvm">
- <xs:sequence>
- <xs:element name="memory" type="memory"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="memory">
- <xs:attribute name="free" type="xs:long" use="required"/>
- <xs:attribute name="total" type="xs:long" use="required"/>
- <xs:attribute name="max" type="xs:long" use="required"/>
- </xs:complexType>
- <xs:complexType name="requestInfo">
- <xs:attribute name="maxTime" type="xs:long" use="required"/>
- <xs:attribute name="processingTime" type="xs:int"
use="required"/>
- <xs:attribute name="requestCount" type="xs:long"
use="required"/>
- <xs:attribute name="errorCount" type="xs:long" use="required"/>
- <xs:attribute name="bytesReceived" type="xs:long"
use="required"/>
- <xs:attribute name="bytesSent" type="xs:long" use="required"/>
- </xs:complexType>
- <xs:element name="status">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="jvm" type="jvm"/>
- <xs:element name="connector" type="connector"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="threadInfo">
- <xs:attribute name="maxThreads" type="xs:int" use="required"/>
- <xs:attribute name="minSpareThreads" type="xs:int"
use="required"/>
- <xs:attribute name="currentThreadCount" type="xs:int"
use="required"/>
- <xs:attribute name="currentThreadsBusy" type="xs:int"
use="required"/>
- </xs:complexType>
- <xs:complexType name="worker">
- <xs:attribute name="stage" type="xs:string" use="required"/>
- <xs:attribute name="requestProcessingTime" type="xs:int"
use="required"/>
- <xs:attribute name="requestBytesSent" type="xs:long"
use="required"/>
- <xs:attribute name="requestBytesRecieved" type="xs:long"
use="required"/>
- <xs:attribute name="remoteAddr" type="xs:string"
use="required"/>
- <xs:attribute name="virtualHost" type="xs:string"
use="required"/>
- <xs:attribute name="method" type="xs:string" use="required"/>
- <xs:attribute name="currentUri" type="xs:string"
use="required"/>
- <xs:attribute name="currentQueryString" type="xs:string"
use="required"/>
- <xs:attribute name="protocol" type="xs:string" use="required"/>
- </xs:complexType>
- <xs:complexType name="workers">
- <xs:sequence>
- <xs:element name="worker" type="worker"/>
- </xs:sequence>
- </xs:complexType>
+ <xs:complexType name="connector">
+ <xs:sequence>
+ <xs:element name="threadInfo" type="threadInfo"/>
+ <xs:element name="requestInfo" type="requestInfo"/>
+ <xs:element name="workers" type="workers"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
+ <xs:complexType name="jvm">
+ <xs:sequence>
+ <xs:element name="memory" type="memory"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="memory">
+ <xs:attribute name="free" type="xs:long" use="required"/>
+ <xs:attribute name="total" type="xs:long" use="required"/>
+ <xs:attribute name="max" type="xs:long" use="required"/>
+ </xs:complexType>
+ <xs:complexType name="requestInfo">
+ <xs:attribute name="maxTime" type="xs:long" use="required"/>
+ <xs:attribute name="processingTime" type="xs:int" use="required"/>
+ <xs:attribute name="requestCount" type="xs:long" use="required"/>
+ <xs:attribute name="errorCount" type="xs:long" use="required"/>
+ <xs:attribute name="bytesReceived" type="xs:long" use="required"/>
+ <xs:attribute name="bytesSent" type="xs:long" use="required"/>
+ </xs:complexType>
+ <xs:element name="status">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="jvm" type="jvm"/>
+ <xs:element name="connector" type="connector"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:complexType name="threadInfo">
+ <xs:attribute name="maxThreads" type="xs:int" use="required"/>
+ <xs:attribute name="minSpareThreads" type="xs:int" use="required"/>
+ <xs:attribute name="currentThreadCount" type="xs:int" use="required"/>
+ <xs:attribute name="currentThreadsBusy" type="xs:int" use="required"/>
+ </xs:complexType>
+ <xs:complexType name="worker">
+ <xs:attribute name="stage" type="xs:string" use="required"/>
+ <xs:attribute name="requestProcessingTime" type="xs:int"
use="required"/>
+ <xs:attribute name="requestBytesSent" type="xs:long" use="required"/>
+ <xs:attribute name="requestBytesRecieved" type="xs:long"
use="required"/>
+ <xs:attribute name="remoteAddr" type="xs:string" use="required"/>
+ <xs:attribute name="virtualHost" type="xs:string" use="required"/>
+ <xs:attribute name="method" type="xs:string" use="required"/>
+ <xs:attribute name="currentUri" type="xs:string" use="required"/>
+ <xs:attribute name="currentQueryString" type="xs:string"
use="required"/>
+ <xs:attribute name="protocol" type="xs:string" use="required"/>
+ </xs:complexType>
+ <xs:complexType name="workers">
+ <xs:sequence>
+ <xs:element name="worker" type="worker"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
Modified: tomcat/trunk/webapps/manager/xform.xsl
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/xform.xsl?rev=981579&r1=981578&r2=981579&view=diff
==============================================================================
--- tomcat/trunk/webapps/manager/xform.xsl (original)
+++ tomcat/trunk/webapps/manager/xform.xsl Mon Aug 2 16:13:22 2010
@@ -26,12 +26,12 @@
<xsl:template match="status">
<html>
<head>
- <TITLE>Tomcat Status</TITLE>
- <STYLE type="text/css">
- body, table, tr, td, a, div, span {
- vertical-align : top;
- }
- </STYLE>
+ <TITLE>Tomcat Status</TITLE>
+ <STYLE type="text/css">
+ body, table, tr, td, a, div, span {
+ vertical-align : top;
+ }
+ </STYLE>
</head>
<body>
<div style='font-size:20px;'>Tomcat Status</div>
@@ -48,50 +48,50 @@
<xsl:template match="memory">
<table><tr>
- <td><b>JVM:</b></td>
- <td><b>free:</b> <xsl:value-of select="@free"/></td>
- <td><b>total:</b> <xsl:value-of select="@total"/></td>
- <td><b>max:</b> <xsl:value-of select="@max"/></td>
- </tr>
+ <td><b>JVM:</b></td>
+ <td><b>free:</b> <xsl:value-of select="@free"/></td>
+ <td><b>total:</b> <xsl:value-of select="@total"/></td>
+ <td><b>max:</b> <xsl:value-of select="@max"/></td>
+ </tr>
</table><hr />
</xsl:template>
<xsl:template match="connector">
- <b>Connector -- </b> <xsl:value-of select="@name"/><br />
+ <b>Connector -- </b> <xsl:value-of select="@name"/><br />
- <xsl:apply-templates select="threadInfo"/>
- <xsl:apply-templates select="requestInfo"/>
- <xsl:apply-templates select="workers"/>
+ <xsl:apply-templates select="threadInfo"/>
+ <xsl:apply-templates select="requestInfo"/>
+ <xsl:apply-templates select="workers"/>
</xsl:template>
<xsl:template match="threadInfo">
<table><tr>
- <td><b>threadInfo </b></td>
- <td><b>maxThreads:</b> <xsl:value-of
select="@maxThreads"/></td>
- <td><b>minSpareThreads:</b> <xsl:value-of
select="@minSpareThreads"/></td>
- <td><b>currentThreadCount:</b> <xsl:value-of
select="@currentThreadCount"/></td>
- <td><b>currentThreadsBusy:</b> <xsl:value-of
select="@currentThreadsBusy"/></td>
- </tr>
+ <td><b>threadInfo </b></td>
+ <td><b>maxThreads:</b> <xsl:value-of select="@maxThreads"/></td>
+ <td><b>minSpareThreads:</b> <xsl:value-of
select="@minSpareThreads"/></td>
+ <td><b>currentThreadCount:</b> <xsl:value-of
select="@currentThreadCount"/></td>
+ <td><b>currentThreadsBusy:</b> <xsl:value-of
select="@currentThreadsBusy"/></td>
+ </tr>
</table><hr />
</xsl:template>
<xsl:template match="requestInfo">
<table><tr>
- <td><b>requestInfo </b></td>
- <td><b>maxTime:</b> <xsl:value-of select="@maxTime"/></td>
- <td><b>processingTime:</b> <xsl:value-of
select="@processingTime"/></td>
- <td><b>requestCount:</b> <xsl:value-of
select="@requestCount"/></td>
- <td><b>errorCount:</b> <xsl:value-of
select="@errorCount"/></td>
- <td><b>bytesReceived:</b> <xsl:value-of
select="@bytesReceived"/></td>
- <td><b>bytesSent:</b> <xsl:value-of select="@bytesSent"/></td>
- </tr>
+ <td><b>requestInfo </b></td>
+ <td><b>maxTime:</b> <xsl:value-of select="@maxTime"/></td>
+ <td><b>processingTime:</b> <xsl:value-of
select="@processingTime"/></td>
+ <td><b>requestCount:</b> <xsl:value-of
select="@requestCount"/></td>
+ <td><b>errorCount:</b> <xsl:value-of select="@errorCount"/></td>
+ <td><b>bytesReceived:</b> <xsl:value-of
select="@bytesReceived"/></td>
+ <td><b>bytesSent:</b> <xsl:value-of select="@bytesSent"/></td>
+ </tr>
</table><hr />
</xsl:template>
<xsl:template match="workers">
<table>
<tr><th>Stage</th><th>Time</th><th>B Sent</th><th>B
Recv</th><th>Client</th><th>VHost</th><th>Request</th></tr>
- <xsl:apply-templates select="worker"/>
+ <xsl:apply-templates select="worker"/>
</table><hr />
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
