cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2005-06-29 Thread remm 
remm2005/06/29 10:31:57

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Update for new API.
  
  Revision  ChangesPath
  1.27  +5 -5  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- StatusTransformer.java18 Apr 2005 22:50:24 -  1.26
  +++ StatusTransformer.java29 Jun 2005 17:31:56 -  1.27
  @@ -147,7 +147,7 @@
* Mode 1 will generate XML.
*/
   public static void writeOSState(PrintWriter writer, int mode) {
  -long[] result = new long[14];
  +long[] result = new long[16];
   boolean ok = false;
   try {
   String methodName = info;
  @@ -177,12 +177,12 @@
   writer.print( Free page file: );
   writer.print(formatSize(new Long(result[3]), true));
   writer.print( Memory load: );
  -writer.print(new Long(result[4]));
  +writer.print(new Long(result[6]));
   writer.print(br);
   writer.print( Process kernel time: );
  -writer.print(formatTime(new Long(result[9] / 1000), true));
  +writer.print(formatTime(new Long(result[11] / 1000), true));
   writer.print( Process user time: );
  -writer.print(formatTime(new Long(result[10] / 1000), true));
  +writer.print(formatTime(new Long(result[12] / 1000), true));
   writer.print(/p);
   } else if (mode == 1){
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2005-04-14 Thread remm 
remm2005/04/14 16:32:55

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
   http11/src/java/org/apache/coyote/http11
Http11AprProtocol.java
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Code cleanup.
  - Number of keepalive connections seems a valuable statistics, as they won't 
show up in the scoreboard.
  - Fix thread names.
  
  Revision  ChangesPath
  1.2   +35 -62
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AprEndpoint.java  14 Apr 2005 18:52:28 -  1.1
  +++ AprEndpoint.java  14 Apr 2005 23:32:54 -  1.2
  @@ -261,6 +261,14 @@
   
   
   /**
  + * Number of keepalive sockets.
  + */
  +protected int keepAliveCount = 0;
  +public int getKeepAliveCount() { return keepAliveCount; }
  +public void setKeepAliveCount(int keepAliveCount) { this.keepAliveCount 
= keepAliveCount; }
  +
  +
  +/**
* Dummy maxSpareThreads property.
*/
   public int getMaxSpareThreads() { return 0; }
  @@ -378,8 +386,22 @@
   if (!running) {
   running = true;
   paused = false;
  -// Start acceptor and poller threads
  -threadStart();
  +
  +// Start acceptor thread
  +acceptorThread = new Thread(new Acceptor(), getName() + 
-Acceptor);
  +acceptorThread.setPriority(getThreadPriority());
  +acceptorThread.setDaemon(true);
  +acceptorThread.start();
  +
  +// Start poller thread
  +poller = new Poller(pollerSize);
  +pollerThread = new Thread(poller, getName() + -Poller);
  +pollerThread.setPriority(getThreadPriority());
  +pollerThread.setDaemon(true);
  +pollerThread.start();
  +
  +// Start sendfile thread
  +// FIXME: Implement sendfile support
   }
   }
   
  @@ -401,7 +423,9 @@
   if (running) {
   running = false;
   unlockAccept();
  -threadStop();
  +acceptorThread = null;
  +pollerThread = null;
  +sendfileThread = null;
   }
   }
   
  @@ -410,7 +434,7 @@
   stop();
   }
   // Close server socket
  -closeServerSocket();
  +Socket.close(serverSock);
   // Close all APR memory pools and resources
   Pool.destroy(rootPool);
   initialized = false ;
  @@ -429,26 +453,6 @@
   
   
   /**
  - * Close the server socket.
  - */
  -protected void closeServerSocket() {
  -if (!paused)
  -unlockAccept();
  -// FIXME: Close server socket
  -Socket.close(serverSock);
  -/*
  -try {
  -if( serverSocket!=null)
  -serverSocket.close();
  -} catch(Exception e) {
  -log.error(sm.getString(endpoint.err.close), e);
  -}
  -serverSocket = null;
  -*/
  -}
  -
  -
  -/**
* Unlock the server socket accept using a bugus connection.
*/
   protected void unlockAccept() {
  @@ -459,8 +463,8 @@
   s = new java.net.Socket(127.0.0.1, port);
   } else {
   s = new java.net.Socket(address, port);
  -// setting soLinger to a small value will help shutdown 
the
  -// connection quicker
  +// setting soLinger to a small value will help shutdown the
  +// connection quicker
   s.setSoLinger(true, 0);
   }
   } catch(Exception e) {
  @@ -590,32 +594,6 @@
   }
   
   
  -/**
  - * Start the background processing thread.
  - */
  -protected void threadStart() {
  -acceptorThread = new Thread(new Acceptor(), getName());
  -acceptorThread.setPriority(getThreadPriority());
  -acceptorThread.setDaemon(true);
  -acceptorThread.start();
  -
  -poller = new Poller(pollerSize);
  -pollerThread = new Thread(poller, getName() + -poller);
  -pollerThread.setPriority(getThreadPriority());
  -pollerThread.setDaemon(true);
  -pollerThread.start();
  -}
  -
  -
  -/**
  - * Stop the background processing thread.
  - */
  -protected void threadStop() {
  -acceptorThread = null;
  -pollerThread = null;
  -}
  -
  -
   // --- Acceptor

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2004-10-06 Thread luehe 
luehe   2004/10/06 10:10:25

  Modified:webapps/docs changelog.xml
   catalina/src/share/org/apache/catalina/core
StandardWrapper.java
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  Register JSP monitoring mbean for each servlet that declares a jsp-file in web.xml
  
  Revision  ChangesPath
  1.141 +4 -1  jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- changelog.xml 6 Oct 2004 13:34:06 -   1.140
  +++ changelog.xml 6 Oct 2004 17:10:24 -   1.141
  @@ -173,6 +173,9 @@
 fix
   bug31549/bug: Add name to WebappClassLoader's stopped message. (yoavs)
 /fix
  +  fix
  +Add name to WebappClassLoader's stopped message. (yoavs)
  +  /fix
   /changelog
 /subsection
   
  @@ -205,7 +208,7 @@
   Catalina Connector class. (remm)
 /update
 fix
  -Fix handling of the timeout attribute of the HTTP protocol handler. (remm)
  +Register JSP monitoring mbean for each servlet that declares a jsp-file in 
web.xml. (luehe)
 /fix
   /changelog
 /subsection
  
  
  
  1.50  +6 -9  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
  
  Index: StandardWrapper.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- StandardWrapper.java  6 Oct 2004 00:54:46 -   1.49
  +++ StandardWrapper.java  6 Oct 2004 17:10:24 -   1.50
  @@ -335,13 +335,10 @@
*/
   public void setJspFile(String jspFile) {
   
  -//if ((jspFile != null)  !jspFile.startsWith(/))
  -//throw new IllegalArgumentException
  -//(sm.getString(standardWrapper.jspFile.format, jspFile));
  -
   String oldJspFile = this.jspFile;
   this.jspFile = jspFile;
   support.firePropertyChange(jspFile, oldJspFile, this.jspFile);
  +isJspServlet = true;
   
   }
   
  @@ -1619,9 +1616,10 @@
   
   if (isJspServlet) {
   // Register JSP monitoring mbean
  -onameStr = domain + :type=JspMonitor,WebModule= + webMod +
  -   ,J2EEApplication= + ctx.getJ2EEApplication() +
  -   ,J2EEServer= + ctx.getJ2EEServer();
  +onameStr = domain + :type=JspMonitor,name= + getName()
  +   + ,WebModule= + webMod
  +   + ,J2EEApplication= + ctx.getJ2EEApplication()
  +   + ,J2EEServer= + ctx.getJ2EEServer();
   try {
   jspMonitorON = new ObjectName(onameStr);
   Registry.getRegistry(null, null)
  @@ -1631,7 +1629,6 @@
instance);
   }
   }
  -
   }
   
   
  
  
  
  1.24  +19 -12
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- StatusTransformer.java29 Sep 2004 21:11:56 -  1.23
  +++ StatusTransformer.java6 Oct 2004 17:10:25 -   1.24
  @@ -590,12 +590,7 @@
   ObjectName queryJspMonitor = new ObjectName
   (objectName.getDomain() + :type=JspMonitor,WebModule= +
webModuleName + ,*);
  -Set jspMonitorsON = mBeanServer.queryNames(queryJspMonitor, null);
  -ObjectName jspMonitorON = null;
  -iterator2 = jspMonitorsON.iterator();
  -while (iterator2.hasNext()) {
  -jspMonitorON = (ObjectName) iterator2.next();
  -}
  +Set jspMonitorONs = mBeanServer.queryNames(queryJspMonitor, null);
   
   // Special case for the root context
   if (contextName.equals(/)) {
  @@ -621,8 +616,8 @@
   if (managerON != null) {
   writeManager(writer, managerON, mBeanServer, mode);
   }
  -if (jspMonitorON != null) {
  -writeJspMonitor(writer, jspMonitorON, mBeanServer, mode);
  +if (jspMonitorONs != null) {
  +writeJspMonitor(writer,

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2004-09-29 Thread luehe 
luehe   2004/09/29 14:11:56

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  Expose context start time in status page
  
  Revision  ChangesPath
  1.23  +6 -1  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- StatusTransformer.java20 Sep 2004 16:31:17 -  1.22
  +++ StatusTransformer.java29 Sep 2004 21:11:56 -  1.23
  @@ -19,6 +19,7 @@
   
   import java.io.PrintWriter;
   import java.text.MessageFormat;
  +import java.util.Date;
   import java.util.Enumeration;
   import java.util.Iterator;
   import java.util.Set;
  @@ -607,6 +608,10 @@
   writer.print(/a);
   
   writer.print(p);
  +Object startTime = mBeanServer.getAttribute(objectName,
  +startTime);
  +writer.print( Start time:  +
  + new Date(((Long) startTime).longValue()));
   writer.print( Startup time: );
   writer.print(formatTime(mBeanServer.getAttribute
   (objectName, startupTime), false));
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2004-09-20 Thread yoavs 
yoavs   2004/09/20 09:31:17

  Modified:webapps/docs changelog.xml
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  Bugzilla 31058: XML-escape query string for Manager's StatusTransformer.
  
  Revision  ChangesPath
  1.109 +3 -0  jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- changelog.xml 20 Sep 2004 15:57:55 -  1.108
  +++ changelog.xml 20 Sep 2004 16:31:17 -  1.109
  @@ -61,6 +61,9 @@
 fix
   bug29485/bug: I broke the HTML manager when adding JavaScript 
confirmation, fixed now ;) (yoavs)
 /fix
  +  fix
  +bug31058/bug: Ensure StatusTransformer escapes query string for XML. 
(yoavs)
  +  /fix
   /changelog
 /subsection
   /section
  
  
  
  1.22  +4 -3  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- StatusTransformer.java7 Sep 2004 20:57:35 -   1.21
  +++ StatusTransformer.java20 Sep 2004 16:31:17 -  1.22
  @@ -25,6 +25,7 @@
   import java.util.Vector;
   
   import javax.servlet.http.HttpServletResponse;
  +import org.apache.catalina.util.RequestUtil;
   import org.apache.tomcat.util.compat.JdkCompat;
   
   import javax.management.MBeanServer;
  @@ -404,7 +405,7 @@
   (pName, currentQueryString);
   if ((queryString != null)  (!queryString.equals())) {
   writer.write(?);
  -writer.print(queryString);
  +writer.print(RequestUtil.filter(queryString));
   }
   writer.write( );
   writer.write(filter(mBeanServer.getAttribute
  @@ -459,7 +460,7 @@
   (pName, currentQueryString);
   if ((queryString != null)  (!queryString.equals())) {
   writer.write( currentQueryString=\ 
  - + queryString + \);
  + + RequestUtil.filter(queryString) + \);
   } else {
   writer.write( currentQueryString=\#63;\);
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2004-09-20 Thread yoavs 
yoavs   2004/09/20 09:39:28

  Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
Tag: TOMCAT_5_0 StatusTransformer.java
  Log:
  Bugzilla 31058: xml-escape query string in manager's StatusTransformer.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.70.2.36 +3 -0  jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.70.2.35
  retrieving revision 1.70.2.36
  diff -u -r1.70.2.35 -r1.70.2.36
  --- changelog.xml 20 Sep 2004 16:11:47 -  1.70.2.35
  +++ changelog.xml 20 Sep 2004 16:39:28 -  1.70.2.36
  @@ -89,6 +89,9 @@
 fix
   bug29485/bug: Added JavaScript confirmation prompts to HTML Manager 
actions. (yoavs)
 /fix
  +  fix
  +bug31058/bug: Ensure StatusTransformer escapes query string for XML. 
(yoavs)
  +  /fix
   /changelog
 /subsection
 subsection name=Jasper
  
  
  
  No   revision
  No   revision
  1.18.2.1  +4 -3  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.18
  retrieving revision 1.18.2.1
  diff -u -r1.18 -r1.18.2.1
  --- StatusTransformer.java26 May 2004 16:41:54 -  1.18
  +++ StatusTransformer.java20 Sep 2004 16:39:28 -  1.18.2.1
  @@ -25,6 +25,7 @@
   import java.util.Vector;
   
   import javax.servlet.http.HttpServletResponse;
  +import org.apache.catalina.util.RequestUtil;
   import org.apache.tomcat.util.compat.JdkCompat;
   
   import javax.management.MBeanServer;
  @@ -404,7 +405,7 @@
   (pName, currentQueryString);
   if ((queryString != null)  (!queryString.equals())) {
   writer.write(?);
  -writer.print(queryString);
  +writer.print(RequestUtil.filter(queryString));
   }
   writer.write( );
   writer.write(filter(mBeanServer.getAttribute
  @@ -459,7 +460,7 @@
   (pName, currentQueryString);
   if ((queryString != null)  (!queryString.equals())) {
   writer.write( currentQueryString=\ 
  - + queryString + \);
  + + RequestUtil.filter(queryString) + \);
   } else {
   writer.write( currentQueryString=\#63;\);
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2004-09-07 Thread luehe 
luehe   2004/09/07 13:57:35

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  Added average time an expired session had been alive to set of monitorable session 
manager attributes
  
  Revision  ChangesPath
  1.21  +5 -1  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- StatusTransformer.java3 Sep 2004 00:54:44 -   1.20
  +++ StatusTransformer.java7 Sep 2004 20:57:35 -   1.21
  @@ -664,6 +664,10 @@
   writer.print(formatSeconds(mBeanServer.getAttribute(
   objectName,
   sessionMaxAliveTime)));
  +writer.print( Average session alive time: );
  +writer.print(formatSeconds(mBeanServer.getAttribute(
  +objectName,
  +sessionAverageAliveTime)));
   writer.print( Processing time: );
   writer.print(formatTime(mBeanServer.getAttribute
   (objectName, processingTime), false));
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2004-09-02 Thread luehe 
luehe   2004/09/02 17:54:44

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  Added longest time an expired session had been alive to set of monitorable session 
manager attributes
  
  Revision  ChangesPath
  1.20  +26 -1 
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- StatusTransformer.java23 Jul 2004 22:46:08 -  1.19
  +++ StatusTransformer.java3 Sep 2004 00:54:44 -   1.20
  @@ -660,6 +660,10 @@
   writer.print( Expired sessions: );
   writer.print(mBeanServer.getAttribute
(objectName, expiredSessions));
  +writer.print( Longest session alive time: );
  +writer.print(formatSeconds(mBeanServer.getAttribute(
  +objectName,
  +sessionMaxAliveTime)));
   writer.print( Processing time: );
   writer.print(formatTime(mBeanServer.getAttribute
   (objectName, processingTime), false));
  @@ -829,6 +833,27 @@
   } else {
   return (time +  ms);
   }
  +}
  +
  +
  +/**
  + * Formats the given time (given in seconds) as a string.
  + *
  + * @param obj Time object to be formatted as string
  + *
  + * @return String formatted time
  + */
  +public static String formatSeconds(Object obj) {
  +
  +long time = -1L;
  +
  +if (obj instanceof Long) {
  +time = ((Long) obj).longValue();
  +} else if (obj instanceof Integer) {
  +time = ((Integer) obj).intValue();
  +}
  +
  +return (time +  s);
   }
   
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2004-05-26 Thread yoavs 
yoavs   2004/05/26 09:41:54

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  Minor JavaDoc fixes (Bugzilla 28335)
  
  Revision  ChangesPath
  1.18  +8 -8  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- StatusTransformer.java16 Apr 2004 23:08:55 -  1.17
  +++ StatusTransformer.java26 May 2004 16:41:54 -  1.18
  @@ -82,9 +82,9 @@
* Write the header body. XML output doesn't bother
* to output this stuff, since it's just title.
* 
  - * @param PrintWriter writer
  - * @param Object[] args
  - * @param int mode
  + * @param writer The output writer
  + * @param args What to write
  + * @param mode 0 means write 
*/
   public static void writeBody(PrintWriter writer, Object[] args, int mode) {
   if (mode == 0){
  @@ -97,9 +97,9 @@
   /**
* Write the manager webapp information.
* 
  - * @param PrintWriter writer
  - * @param Object[] args
  - * @param int mode
  + * @param writer The output writer
  + * @param args What to write
  + * @param mode 0 means write
*/
   public static void writeManager(PrintWriter writer, Object[] args, 
   int mode) {
  @@ -748,7 +748,7 @@
* in HTML.  This avoids potential attacks caused by including JavaScript
* codes in the request URL that is often reported in error messages.
*
  - * @param message The message string to be filtered
  + * @param obj The message string to be filtered
*/
   public static String filter(Object obj) {
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2004-04-16 Thread luehe 
luehe   2004/04/16 16:08:55

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  Added number of JSPs that have been *re*loaded to set of monitorable attributes
  
  Revision  ChangesPath
  1.17  +3 -1  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- StatusTransformer.java20 Mar 2004 01:36:18 -  1.16
  +++ StatusTransformer.java16 Apr 2004 23:08:55 -  1.17
  @@ -683,6 +683,8 @@
   writer.print(br);
   writer.print( JSPs loaded: );
   writer.print(mBeanServer.getAttribute(objectName, jspCount));
  +writer.print( JSPs reloaded: );
  +writer.print(mBeanServer.getAttribute(objectName, jspReloadCount));
   } else if (mode == 1) {
   // for now we don't write out anything
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2004-03-19 Thread luehe 
luehe   2004/03/19 17:36:18

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  Changed oname format of JSP monitoring mbean. The new format is:
  
  
domain:type=JspMonitor,WebModule=webmod,J2EEApplication=j2ee-app,J2EEServer=j2ee-server
  
  Revision  ChangesPath
  1.16  +4 -5  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- StatusTransformer.java9 Mar 2004 18:39:25 -   1.15
  +++ StatusTransformer.java20 Mar 2004 01:36:18 -  1.16
  @@ -586,8 +586,8 @@
   }
   
   ObjectName queryJspMonitor = new ObjectName
  -(objectName.getDomain() + :type=JspMonitor,path= + contextName 
  - + ,host= + hostName + ,*);
  +(objectName.getDomain() + :type=JspMonitor,WebModule= +
  + webModuleName + ,*);
   Set jspMonitorsON = mBeanServer.queryNames(queryJspMonitor, null);
   ObjectName jspMonitorON = null;
   iterator2 = jspMonitorsON.iterator();
  @@ -682,8 +682,7 @@
   if (mode == 0) {
   writer.print(br);
   writer.print( JSPs loaded: );
  -writer.print(mBeanServer.getAttribute
  - (objectName, jspCount));
  +writer.print(mBeanServer.getAttribute(objectName, jspCount));
   } else if (mode == 1) {
   // for now we don't write out anything
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2004-03-09 Thread remm 
remm2004/03/09 10:39:25

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Replace '?' with 0 which is easier to process using data binding tools.
  - Submitted by Peter Lin.
  
  Revision  ChangesPath
  1.15  +6 -6  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- StatusTransformer.java8 Mar 2004 16:53:30 -   1.14
  +++ StatusTransformer.java9 Mar 2004 18:39:25 -   1.15
  @@ -429,7 +429,7 @@
   writer.write( + mBeanServer.getAttribute
(pName, requestBytesSent));
   } else {
  -writer.write(#63;);
  +writer.write(0);
   }
   writer.write(\);
   writer.write( requestBytesReceived=\);
  @@ -437,7 +437,7 @@
   writer.write( + mBeanServer.getAttribute
(pName, requestBytesReceived));
   } else {
  -writer.write(#63;);
  +writer.write(0);
   }
   writer.write(\);
   writer.write( remoteAddr=\ 
  @@ -473,9 +473,9 @@
   writer.write( protocol=\#63;\);
   }
   } else {
  -writer.write( requestProcessingTime=\#63;\);
  -writer.write( requestBytesSent=\#63;\);
  -writer.write( requestBytesRecieved=\#63;\);
  +writer.write( requestProcessingTime=\0\);
  +writer.write( requestBytesSent=\0\);
  +writer.write( requestBytesRecieved=\0\);
   writer.write( remoteAddr=\#63;\);
   writer.write( virtualHost=\#63;\);
   writer.write( method=\#63;\);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2004-03-08 Thread luehe 
luehe   2004/03/08 08:53:30

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  Added JSP monitoring facility.
  Initially, the number of JSPs that have been loaded into a webapp is exposed
  as a monitorable attribute. Additional attributes (e.g., number of JSPs whose
  compilation failed, etc.) may follow.
  
  Revision  ChangesPath
  1.14  +34 -1 
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- StatusTransformer.java2 Mar 2004 16:24:52 -   1.13
  +++ StatusTransformer.java8 Mar 2004 16:53:30 -   1.14
  @@ -585,6 +585,16 @@
   managerON = (ObjectName) iterator2.next();
   }
   
  +ObjectName queryJspMonitor = new ObjectName
  +(objectName.getDomain() + :type=JspMonitor,path= + contextName 
  + + ,host= + hostName + ,*);
  +Set jspMonitorsON = mBeanServer.queryNames(queryJspMonitor, null);
  +ObjectName jspMonitorON = null;
  +iterator2 = jspMonitorsON.iterator();
  +while (iterator2.hasNext()) {
  +jspMonitorON = (ObjectName) iterator2.next();
  +}
  +
   // Special case for the root context
   if (contextName.equals(/)) {
   contextName = ;
  @@ -605,6 +615,9 @@
   if (managerON != null) {
   writeManager(writer, managerON, mBeanServer, mode);
   }
  +if (jspMonitorON != null) {
  +writeJspMonitor(writer, jspMonitorON, mBeanServer, mode);
  +}
   writer.print(/p);
   
   String onStr = objectName.getDomain() 
  @@ -654,6 +667,26 @@
   // for now we don't write out the wrapper details
   }
   
  +}
  +
  +
  +/**
  + * Write JSP monitoring information.
  + */
  +public static void writeJspMonitor(PrintWriter writer,
  +   ObjectName objectName,
  +   MBeanServer mBeanServer,
  +   int mode)
  +throws Exception {
  +
  +if (mode == 0) {
  +writer.print(br);
  +writer.print( JSPs loaded: );
  +writer.print(mBeanServer.getAttribute
  + (objectName, jspCount));
  +} else if (mode == 1) {
  +// for now we don't write out anything
  +}
   }
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2004-03-02 Thread remm 
remm2004/03/02 08:24:52

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Escape '?' in generated XML.
  - Submitted by Peter Lin.
  
  Revision  ChangesPath
  1.13  +17 -17
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- StatusTransformer.java27 Feb 2004 14:59:07 -  1.12
  +++ StatusTransformer.java2 Mar 2004 16:24:52 -   1.13
  @@ -429,7 +429,7 @@
   writer.write( + mBeanServer.getAttribute
(pName, requestBytesSent));
   } else {
  -writer.write(?);
  +writer.write(#63;);
   }
   writer.write(\);
   writer.write( requestBytesReceived=\);
  @@ -437,7 +437,7 @@
   writer.write( + mBeanServer.getAttribute
(pName, requestBytesReceived));
   } else {
  -writer.write(?);
  +writer.write(#63;);
   }
   writer.write(\);
   writer.write( remoteAddr=\ 
  @@ -461,27 +461,27 @@
   writer.write( currentQueryString=\ 
+ queryString + \);
   } else {
  -writer.write( currentQueryString=\?\);
  +writer.write( currentQueryString=\#63;\);
   }
   writer.write( protocol=\ 
+ filter(mBeanServer.getAttribute
 (pName, protocol)) + \);
   } else {
  -writer.write( method=\?\);
  -writer.write( currentUri=\?\);
  -writer.write( currentQueryString=\?\);
  -writer.write( protocol=\?\);
  +writer.write( method=\#63;\);
  +writer.write( currentUri=\#63;\);
  +writer.write( currentQueryString=\#63;\);
  +writer.write( protocol=\#63;\);
   }
   } else {
  -writer.write( requestProcessingTime=\?\);
  -writer.write( requestBytesSent=\?\);
  -writer.write( requestBytesRecieved=\?\);
  -writer.write( remoteAddr=\?\);
  -writer.write( virtualHost=\?\);
  -writer.write( method=\?\);
  -writer.write( currentUri=\?\);
  -writer.write( currentQueryString=\?\);
  -writer.write( protocol=\?\);
  +writer.write( requestProcessingTime=\#63;\);
  +writer.write( requestBytesSent=\#63;\);
  +writer.write( requestBytesRecieved=\#63;\);
  +writer.write( remoteAddr=\#63;\);
  +writer.write( virtualHost=\#63;\);
  +writer.write( method=\#63;\);
  +writer.write( currentUri=\#63;\);
  +writer.write( currentQueryString=\#63;\);
  +writer.write( protocol=\#63;\);
   }
   writer.write( /);
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2003-12-23 Thread remm 
remm2003/12/23 10:50:07

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - I don't understand how this was compiling successfully ;-)
  - Apparently, the compiler was ok because the status servlet was in the
same package.
  
  Revision  ChangesPath
  1.9   +13 -13
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- StatusTransformer.java11 Dec 2003 01:25:28 -  1.8
  +++ StatusTransformer.java23 Dec 2003 18:50:07 -  1.9
  @@ -190,7 +190,7 @@
* Write the VM state. Mode 0 will generate HTML.
* Mode 1 will generate XML.
*/
  -protected static void writeVMState(PrintWriter writer, int mode)
  +public static void writeVMState(PrintWriter writer, int mode)
   throws Exception {
   
   if (mode == 0){
  @@ -225,12 +225,12 @@
   /**
* Write connector state.
*/
  -protected static void writeConnectorState(PrintWriter writer, 
  -  ObjectName tpName, String name,
  -  MBeanServer mBeanServer,
  -  Vector globalRequestProcessors,
  -  Vector requestProcessors,
  -  int mode)
  +public static void writeConnectorState(PrintWriter writer, 
  +   ObjectName tpName, String name,
  +   MBeanServer mBeanServer,
  +   Vector globalRequestProcessors,
  +   Vector requestProcessors,
  +   int mode)
   throws Exception {
   
   if (mode == 0) {
  @@ -539,8 +539,8 @@
   /**
* Write applications state.
*/
  -protected static void writeDetailedState(PrintWriter writer,
  - MBeanServer mBeanServer, int mode)
  +public static void writeDetailedState(PrintWriter writer,
  +  MBeanServer mBeanServer, int mode)
   throws Exception {
   
   if (mode == 0){
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2003-12-23 Thread remm 
remm2003/12/23 11:10:05

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Filter out bad web module names.
  
  Revision  ChangesPath
  1.10  +8 -4  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- StatusTransformer.java23 Dec 2003 18:50:07 -  1.9
  +++ StatusTransformer.java23 Dec 2003 19:10:04 -  1.10
  @@ -561,6 +561,10 @@
   if (webModuleName.startsWith(//)) {
   webModuleName = webModuleName.substring(2);
   }
  +int slash = webModuleName.indexOf(/);
  +if (slash == -1) {
  +continue;
  +}
   
   writer.print(a href=\# + (count++) + .0\);
   writer.print(webModuleName);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2003-12-23 Thread remm 
remm2003/12/23 11:23:10

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - When filterering out bad web module names, count must still be incremented.
  
  Revision  ChangesPath
  1.11  +5 -4  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- StatusTransformer.java23 Dec 2003 19:10:04 -  1.10
  +++ StatusTransformer.java23 Dec 2003 19:23:10 -  1.11
  @@ -563,6 +563,7 @@
   }
   int slash = webModuleName.indexOf(/);
   if (slash == -1) {
  +count++;
   continue;
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2003-12-10 Thread remm 
remm2003/12/10 16:59:07

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Add manager statistics for each context, as well as navigation links so that this
is actually useful. Somehow, the links don't work with Mozilla: it must be
because my HTML is very bad. IE works, though.
  
  Revision  ChangesPath
  1.6   +87 -9 
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StatusTransformer.java20 Oct 2003 01:44:54 -  1.5
  +++ StatusTransformer.java11 Dec 2003 00:59:07 -  1.6
  @@ -233,7 +233,7 @@
 int mode)
   throws Exception {
   
  -if (mode == 0){
  +if (mode == 0) {
   writer.print(h1);
   writer.print(name);
   writer.print(/h1);
  @@ -250,7 +250,7 @@
   writer.print( Current thread busy: );
   writer.print(mBeanServer.getAttribute(tpName, currentThreadsBusy));
   
  -writer.print(br/);
  +writer.print(br);
   
   ObjectName grpName = null;
   
  @@ -546,11 +546,39 @@
   if (mode == 0){
   ObjectName queryHosts = new ObjectName(*:j2eeType=WebModule,*);
   Set hostsON = mBeanServer.queryNames(queryHosts, null);
  +
  +// Navigation menu
  +writer.print(h1);
  +writer.print(Application list);
  +writer.print(/h1);
  +
  +writer.print(p);
  +int count = 0;
   Iterator iterator = hostsON.iterator();
   while (iterator.hasNext()) {
   ObjectName contextON = (ObjectName) iterator.next();
  +String webModuleName = contextON.getKeyProperty(name);
  +
  +writer.print(a href=\# + (count++) + .0\);
  +writer.print(webModuleName);
  +writer.print(/a);
  +if (iterator.hasNext()) {
  +writer.print(br);
  +}
  +
  +}
  +writer.print(/p);
  +
  +// Webapp list
  +count = 0;
  +iterator = hostsON.iterator();
  +while (iterator.hasNext()) {
  +ObjectName contextON = (ObjectName) iterator.next();
  +writer.print(a class=\A.name\ name=\# 
  + + (count++) + .0\);
   writeContext(writer, contextON, mBeanServer, mode);
   }
  +
   } else if (mode == 1){
   // for now we don't write out the Detailed state in XML
   }
  @@ -585,6 +613,17 @@
   } else {
   return;
   }
  +
  +ObjectName queryManager = new ObjectName
  +(objectName.getDomain() + :type=Manager,path= + contextName 
  + + ,host= + hostName + ,*);
  +Set managersON = mBeanServer.queryNames(queryManager, null);
  +ObjectName managerON = null;
  +Iterator iterator2 = managersON.iterator();
  +while (iterator2.hasNext()) {
  +managerON = (ObjectName) iterator2.next();
  +}
  +
   // Special case for the root context
   if (contextName.equals(/)) {
   contextName = ;
  @@ -593,6 +632,7 @@
   writer.print(h1);
   writer.print(name);
   writer.print(/h1);
  +writer.print(/a);
   
   writer.print(p);
   writer.print( Startup time: );
  @@ -601,9 +641,13 @@
   writer.print( TLD scan time: );
   writer.print(formatTime(mBeanServer.getAttribute
   (objectName, tldScanTime), false));
  +if (managerON != null) {
  +writeManager(writer, managerON, mBeanServer, mode);
  +}
   writer.print(/p);
  -
  -String onStr = *:j2eeType=Servlet,WebModule= + webModuleName + ,*;
  +
  +String onStr = objectName.getDomain() 
  ++ :j2eeType=Servlet,WebModule= + webModuleName + ,*;
   ObjectName servletObjectName = new ObjectName(onStr);
   Set set = mBeanServer.queryMBeans(servletObjectName, null);
   Iterator iterator = set.iterator();
  @@ -611,6 +655,7 @@
   ObjectInstance oi = (ObjectInstance) iterator.next();
   writeWrapper(writer, oi.getObjectName(), mBeanServer, mode);

Re: cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2003-12-10 Thread Kyle VanderBeek 
On Thu, Dec 11, 2003 at 12:59:07AM -, [EMAIL PROTECTED] wrote:
 remm2003/12/10 16:59:07
 
   Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
 StatusTransformer.java
   Log:
   - Add manager statistics for each context, as well as navigation links so that this
 is actually useful. Somehow, the links don't work with Mozilla: it must be
 because my HTML is very bad. IE works, though.
[...]
   -writer.print(br/);
   +writer.print(br);

The old way is actually better, it lets you move toward XHTML.  
However, the way the cool kids do it is to leave a space before the 
/ in body-less entities.

br /
hr /
img src=foo.gif /

This is the known gentle way to not freak out old browsers.  Maybe 
I'll have to take a look at this class tonight and make it generate 
more proper HTML.

-- 
[EMAIL PROTECTED]
  Some people have a way with words, while others... erm... thingy.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2003-12-10 Thread remm 
remm2003/12/10 17:06:02

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Remove leading slashes.
  
  Revision  ChangesPath
  1.7   +7 -4  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- StatusTransformer.java11 Dec 2003 00:59:07 -  1.6
  +++ StatusTransformer.java11 Dec 2003 01:06:02 -  1.7
  @@ -558,6 +558,9 @@
   while (iterator.hasNext()) {
   ObjectName contextON = (ObjectName) iterator.next();
   String webModuleName = contextON.getKeyProperty(name);
  +if (webModuleName.startsWith(//)) {
  +webModuleName = webModuleName.substring(2);
  +}
   
   writer.print(a href=\# + (count++) + .0\);
   writer.print(webModuleName);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2003-12-10 Thread Tim Funk 
The name attribute of A should be #less.

  +writer.print(a class=\A.name\ name=\#
  + + (count++) + .0\);
A page example which uses anchors:
http://jakarta.apache.org/tomcat/faq/tomcatuser.html
-Tim

[EMAIL PROTECTED] wrote:
remm2003/12/10 16:59:07

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Add manager statistics for each context, as well as navigation links so that this
is actually useful. Somehow, the links don't work with Mozilla: it must be
because my HTML is very bad. IE works, though.
  


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2003-12-10 Thread remm 
remm2003/12/10 17:25:28

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Name fix thanks to Tim.
  
  Revision  ChangesPath
  1.8   +5 -5  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StatusTransformer.java11 Dec 2003 01:06:02 -  1.7
  +++ StatusTransformer.java11 Dec 2003 01:25:28 -  1.8
  @@ -577,7 +577,7 @@
   iterator = hostsON.iterator();
   while (iterator.hasNext()) {
   ObjectName contextON = (ObjectName) iterator.next();
  -writer.print(a class=\A.name\ name=\# 
  +writer.print(a class=\A.name\ name=\ 
+ (count++) + .0\);
   writeContext(writer, contextON, mBeanServer, mode);
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2003-10-19 Thread billbarker 
billbarker2003/10/19 18:44:54

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  Restoring JDK 1.3.1 support.
  
  Revision  ChangesPath
  1.5   +5 -5  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StatusTransformer.java16 Sep 2003 15:36:07 -  1.4
  +++ StatusTransformer.java20 Oct 2003 01:44:54 -  1.5
  @@ -214,7 +214,7 @@
   writer.write(memory);
   writer.write( free=' + Runtime.getRuntime().freeMemory() + ');
   writer.write( total=' + Runtime.getRuntime().totalMemory() + ');
  -writer.write( max=' + Runtime.getRuntime().maxMemory() + '/);
  +writer.write( max=' + JdkCompat.getJdkCompat().getMaxMemory() + 
'/);
   
   writer.write(/jvm);
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java Constants.java StatusManagerServlet.java

2003-09-04 Thread remm 
remm2003/09/04 07:22:18

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
Constants.java StatusManagerServlet.java
  Added:   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Refactor the status servlet, allowing for XML output in addition to the user
friendly HTML.
  - Submitted by Peter Lin, inspired by the code from John Turner which was
originally rejected.
  
  Revision  ChangesPath
  1.6   +9 -3  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java
  
  Index: Constants.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Constants.java30 Jul 2003 18:43:01 -  1.5
  +++ Constants.java4 Sep 2003 14:22:18 -   1.6
  @@ -238,5 +238,11 @@
   /body\n +
   /html;
   
  + public static final String XML_DECLARATION =
  + ?xml version=\1.0\?;
  + 
  + public static final String XML_STYLE =
  + ?xml-stylesheet type=\text/xsl\ href=\xform.xsl\ ?;
  +
   }
   
  
  
  
  1.11  +33 -446   
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
  
  Index: StatusManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- StatusManagerServlet.java 17 Aug 2003 14:50:24 -  1.10
  +++ StatusManagerServlet.java 4 Sep 2003 14:22:18 -   1.11
  @@ -67,7 +67,6 @@
   
   import java.io.IOException;
   import java.io.PrintWriter;
  -import java.text.MessageFormat;
   import java.util.Enumeration;
   import java.util.Iterator;
   import java.util.Set;
  @@ -81,15 +80,12 @@
   import javax.management.ObjectName;
   
   import javax.servlet.ServletException;
  -import javax.servlet.UnavailableException;
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   
   import org.apache.commons.modeler.Registry;
   
  -import org.apache.tomcat.util.compat.JdkCompat;
  -
   import org.apache.catalina.util.ServerInfo;
   import org.apache.catalina.util.StringManager;
   
  @@ -247,7 +243,14 @@
 HttpServletResponse response)
   throws IOException, ServletException {
   
  -response.setContentType(text/html);
  +// mode is flag for HTML or XML output
  +int mode = 0;
  +// if ?XML=true, set the mode to XML
  +if (request.getParameter(XML) != null 
  + request.getParameter(XML).equals(true)) {
  +mode = 1;
  +}
  +StatusTransformer.setContentType(response, mode);
   
   PrintWriter writer = response.getWriter();
   
  @@ -256,9 +259,8 @@
(request.getPathInfo().equals(/all))) {
   completeStatus = true;
   }
  -
  -// HTML Header Section
  -writer.print(Constants.HTML_HEADER_SECTION);
  + // use StatusTransformer to output status
  +StatusTransformer.writeHeader(writer,mode);
   
   // Body Header Section
   Object[] args = new Object[2];
  @@ -268,8 +270,8 @@
   } else {
   args[1] = sm.getString(statusServlet.title);
   }
  -writer.print(MessageFormat.format
  - (Constants.BODY_HEADER_SECTION, args));
  + // use StatusTransformer to output status
  +StatusTransformer.writeBody(writer,args,mode);
   
   // Manager Section
   args = new Object[9];
  @@ -293,10 +295,11 @@
   (request.getContextPath() + /status/all);
   args[8] = sm.getString(statusServlet.complete);
   }
  -writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
  + // use StatusTransformer to output status
  +StatusTransformer.writeManager(writer,args,mode);
   
   // Server Header Section
  -args = new Object[7];
  + args = new Object[7];
   args[0] = sm.getString(htmlManagerServlet.serverTitle);
   args[1] = sm.getString(htmlManagerServlet.serverVersion);
   args[2] = sm.getString(htmlManagerServlet.serverJVMVersion);
  @@ -304,8 +307,8 @@
   args[4] = sm.getString(htmlManagerServlet.serverOSName);
   args[5] = sm.getString(htmlManagerServlet.serverOSVersion);
   args[6] = sm.getString(htmlManagerServlet.serverOSArch);
  -

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

2003-09-04 Thread remm 
remm2003/09/04 10:59:39

  Modified:webapps/manager xform.xsl
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Implement the XML processor state.
  
  Revision  ChangesPath
  1.3   +7 -7  jakarta-tomcat-catalina/webapps/manager/xform.xsl
  
  Index: xform.xsl
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/xform.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xform.xsl 25 Mar 2003 15:40:26 -  1.2
  +++ xform.xsl 4 Sep 2003 17:59:39 -   1.3
  @@ -83,13 +83,13 @@
   
 xsl:template match=worker
  tr
  -tdxsl:apply-templates select=stage//td
  -tdxsl:apply-templates select=requestProcessingTime//td
  -tdxsl:apply-templates select=requestBytesSent//td
  -tdxsl:apply-templates select=requestBytesReceived//td
  -tdxsl:apply-templates select=remoteAddr//td
  -tdxsl:apply-templates select=virtualHost//td
  -tdxsl:apply-templates select=method/ xsl:apply-templates 
select=currentUri/?xsl:apply-templates select=currentQueryString//td
  +tdxsl:value-of select=@stage//td
  +tdxsl:value-of select=@requestProcessingTime//td
  +tdxsl:value-of select=@requestBytesSent//td
  +tdxsl:value-of select=@requestBytesReceived//td
  +tdxsl:value-of select=@remoteAddr//td
  +tdxsl:value-of select=@virtualHost//td
  +tdxsl:value-of select=@method/ xsl:value-of 
select=@currentUri/?xsl:value-of select=@currentQueryString/ xsl:value-of 
select=@protocol//td
  /tr
 /xsl:template
   
  
  
  
  1.2   +118 -52   
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StatusTransformer.java4 Sep 2003 14:22:18 -   1.1
  +++ StatusTransformer.java4 Sep 2003 17:59:39 -   1.2
  @@ -338,9 +338,7 @@
   while (enum.hasMoreElements()) {
   ObjectName objectName = (ObjectName) enum.nextElement();
   if (name.equals(objectName.getKeyProperty(worker))) {
  -writer.write(worker);
   writeProcessorState(writer, objectName, mBeanServer, mode);
  -writer.write(/worker);
   }
   }
   writer.write(/workers);
  @@ -361,53 +359,55 @@
 int mode)
   throws Exception {
   
  -if (mode == 0) {
  -Integer stageValue = 
  -(Integer) mBeanServer.getAttribute(pName, stage);
  -int stage = stageValue.intValue();
  -boolean fullStatus = true;
  -boolean showRequest = true;
  -
  -writer.write(tdstrong);
  -
  -switch (stage) {
  +Integer stageValue = 
  +(Integer) mBeanServer.getAttribute(pName, stage);
  +int stage = stageValue.intValue();
  +boolean fullStatus = true;
  +boolean showRequest = true;
  +String stageStr = null;
  +
  +switch (stage) {
  +
  +case (1/*org.apache.coyote.Constants.STAGE_PARSE*/):
  +stageStr = P;
  +fullStatus = false;
  +break;
  +case (2/*org.apache.coyote.Constants.STAGE_PREPARE*/):
  +stageStr = P;
  +fullStatus = false;
  +break;
  +case (3/*org.apache.coyote.Constants.STAGE_SERVICE*/):
  +stageStr = S;
  +break;
  +case (4/*org.apache.coyote.Constants.STAGE_ENDINPUT*/):
  +stageStr = F;
  +break;
  +case (5/*org.apache.coyote.Constants.STAGE_ENDOUTPUT*/):
  +stageStr = F;
  +break;
  +case (7/*org.apache.coyote.Constants.STAGE_ENDED*/):
  +stageStr = R;
  +fullStatus = false;
  +break;
  +case (6/*org.apache.coyote.Constants.STAGE_KEEPALIVE*/):
  +stageStr = K;
  +fullStatus = true;
  +showRequest = false;
  +break;
  +case (0/*org.apache.coyote.Constants.STAGE_NEW*/):
  +stageStr = R;
  +fullStatus = false;
  +break;
  +default:
  +// Unknown stage
  +stageStr = ?;
  +fullStatus = false;
   
  -case (1/*org.apache.coyote.Constants.STAGE_PARSE*/):
  -writer.write(P);
  -fullStatus = false;
  -break;
  -case