Author: kkolinko Date: Thu Nov 27 12:03:54 2014 New Revision: 1642123 URL: http://svn.apache.org/r1642123 Log: CTR: whitespace Tabs -> spaces. A part of r981579.
Modified: tomcat/tc6.0.x/trunk/webapps/manager/status.xsd tomcat/tc6.0.x/trunk/webapps/manager/xform.xsl Modified: tomcat/tc6.0.x/trunk/webapps/manager/status.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/status.xsd?rev=1642123&r1=1642122&r2=1642123&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/manager/status.xsd (original) +++ tomcat/tc6.0.x/trunk/webapps/manager/status.xsd Thu Nov 27 12:03:54 2014 @@ -18,62 +18,62 @@ <!-- 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="maxSpareThreads" 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="maxSpareThreads" 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/tc6.0.x/trunk/webapps/manager/xform.xsl URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/xform.xsl?rev=1642123&r1=1642122&r2=1642123&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/manager/xform.xsl (original) +++ tomcat/tc6.0.x/trunk/webapps/manager/xform.xsl Thu Nov 27 12:03:54 2014 @@ -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,51 +48,51 @@ <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>maxSpareThreads:</b> <xsl:value-of select="@maxSpareThreads"/></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>maxSpareThreads:</b> <xsl:value-of select="@maxSpareThreads"/></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