Added: tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml?rev=420006&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml Fri Jul  7 
15:40:04 2006
@@ -0,0 +1,352 @@
+<?xml version="1.0"?>
+<!DOCTYPE document [
+  <!ENTITY project SYSTEM "project.xml">
+]>
+<document url="windows-service-howto.html">
+
+    &project;
+
+    <properties>
+      <author email="[EMAIL PROTECTED]">Mladen Turk</author>
+      <title>Windows service HOW-TO</title>
+    </properties>
+
+<body>
+ 
+<section name="NOTICE">
+<p>
+    <b>This section of the documentation applies to procrun 1.0, and is now 
obsolete.</b>
+</p>
+</section>
+<section name="Tomcat5 service application">
+<p>
+    <b>Tomcat5</b> is a service application for running Tomcat5 as NT service.
+</p>
+</section>
+<section name="Tomcat5w monitor application">
+<p>
+    <b>Tomcat5w</b> is a GUI application for monitoring and configuring Tomcat
+    services.
+</p>    
+    <p>The available command line options are:</p>
+<p> 
+    <table>
+    <tr><th>//ES//</th>
+        <td>Edit service configuration</td>
+        <td>This is the default operation. It is called if the no option is
+            provided but the executable is renamed to 
<b>servicenameW.exe</b></td>
+    </tr>
+    <tr><th>//MS//</th>
+        <td>Monitor service</td>
+        <td>Put the icon in the system try</td>
+    </tr>
+    </table>
+</p>
+</section>
+<section name="Command line arguments">
+<p>
+    Each command line directive is in the form of <b>//XX//ServiceName</b>
+</p>
+    <p>The available command line options are:</p>
+<p> 
+    <table>
+    <tr><th>//TS//</th>
+        <td>Run the service as console application</td>
+        <td>This is the default operation. It is called if the no option is
+            provided. The ServiceName is the name of the executable without
+            exe sufix, meaning Tomcat5</td>
+    </tr>
+    <tr><th>//RS//</th>
+        <td>Run the service</td>
+        <td>Called only from ServiceManager</td>
+    </tr>
+    <tr><th>//SS//</th>
+        <td>Stop the service</td>
+        <td></td>
+    </tr>
+    <tr><th>//US//</th>
+        <td>Update service parameters</td>
+        <td></td>
+    </tr>
+    <tr><th>//IS//</th>
+        <td>Install service</td>
+        <td></td>
+    </tr>
+    <tr><th>//DS//</th>
+        <td>Delete service</td>
+        <td>Stops the service if running</td>
+    </tr>        
+    </table>
+</p> 
+</section>
+<section name="Command line parameters">
+<p>
+    Each command parameter is prefixed with <b>--</b>.
+    If the command line is prefixed with <b>++</b> then it's value will
+    be appended to the existing option.
+    If the environment variable with the same name as command line parameter 
but
+    prefixed with <code>PR_</code> exists it will take precedence.
+    For example:
+<source>set PR_CLASSPATH=xx.jar</source>
+</p>    
+<p>is equivalent to providing
+<source>--Classpath=xx.jar</source>
+</p>
+<p> as command line parameter.</p>
+<p> 
+    <table>
+    <tr>
+    <th>ParameterName</th>
+       <th>Default</th>
+       <th>Description</th>
+       </tr> 
+    <tr>
+    <td>--Description</td>
+    <td></td>
+    <td>Service name description (maximum 1024 characters)</td>
+    </tr>
+    <tr>
+    <td>--DisplayName</td>
+    <td>ServiceName</td>
+    <td>Service display name</td>
+    </tr>
+    <tr>
+    <td>--Install</td>
+    <td>procrun.exe //RS//ServiceName</td>
+    <td>Install image</td>
+    </tr>
+    <tr>
+    <td>--Startup</td>
+    <td>manual</td>
+    <td>Service startup mode can be either <b>auto</b> or <b>manual</b></td>
+    </tr>
+    <tr>
+    <td>--DependsOn</td>
+    <td></td>
+    <td>List of services that this service depend on. Dependent services
+        are separated using either <b>#</b> or <b>;</b> characters</td>
+    </tr>
+    <tr>
+    <td>--Environment</td>
+    <td></td>
+    <td>List of environment variables that will be provided to the service
+        in the form <b>key=value</b>. They are separated using either
+        <b>#</b> or <b>;</b> characters</td>
+    </tr>
+    <tr>
+    <td>--User</td>
+    <td></td>
+    <td>User account used for running executable. It is used only for
+       StartMode <b>java</b> or <b>exe</b> and enables running applications
+       as service under account without LogonAsService privilege.</td>
+    </tr>
+    <tr>
+    <td>--Password</td>
+    <td></td>
+    <td>Password for user account set by --User parameter</td>
+    </tr>
+    <tr>
+    <td>--JavaHome</td>
+    <td>JAVA_HOME</td>
+    <td>Set a different JAVA_HOME then defined by JAVA_HOME environment
+        variable</td>
+    </tr>
+    <tr>
+    <td>--Jvm</td>
+    <td>auto</td>
+    <td>Use either <b>auto</b> or specify the full path to the <b>jvm.dll</b>.
+        You can use the environment variable expansion here.</td>
+    </tr>
+    <tr>
+    <td>--JvmOptions</td>
+    <td>-Xrs</td>
+    <td>List of options in the form of <b>-D</b> or <b>-X</b> that will be
+        passed to the JVM. The options are separated using either
+        <b>#</b> or <b>;</b> characters.</td>
+    </tr>
+    <tr>
+    <td>--Classpath</td>
+    <td></td>
+    <td>Set the Java classpath</td>
+    </tr>
+    <tr>
+    <td>--JvmMs</td>
+    <td></td>
+    <td>Initial memory pool size in MB</td>
+    </tr>
+    <tr>
+    <td>--JvmMx</td>
+    <td></td>
+    <td>Maximum memory pool size in MB</td>
+    </tr>
+    <tr>
+    <td>--JvmSs</td>
+    <td></td>
+    <td>Thread stack size in KB</td>
+    </tr>
+    <tr>
+    <tr>
+    <td>--StartImage</td>
+    <td></td>
+    <td>Executable that will be run.</td>
+    </tr>
+    <tr>
+    <td>--StartPath</td>
+    <td></td>
+    <td>Working path for the start image executable.</td>
+    </tr>
+    <tr>
+    <td>--StartClass</td>
+    <td></td>
+    <td>Class that will be used for startup.</td>
+    </tr>
+    <tr>
+    <td>--StartParams</td>
+    <td></td>
+    <td>List of parameters that will be passed to either StartImage or
+        StartClass. Parameters are separated using either <b>#</b> or
+        <b>;</b> character.</td>
+    </tr>
+    <tr>
+    <td>--StartMethod</td>
+    <td>Main</td>
+    <td>Method name if differs then main</td>
+    </tr>
+    <tr>
+    <td>--StartMode</td>
+    <td>executable</td>
+    <td>Can one of <b>jvm</b> <b>java</b> or <b>exe</b></td>
+    </tr>
+    <td>--StopImage</td>
+    <td></td>
+    <td>Executable that will be run on Stop service signal.</td>
+    </tr>
+    <tr>
+    <td>--StopPath</td>
+    <td></td>
+    <td>Working path for the stop image executable.</td>
+    </tr>
+    <tr>
+    <td>--StopClass</td>
+    <td></td>
+    <td>Class that will be used on Stop service signal.</td>
+    </tr>
+    <tr>
+    <td>--StopParams</td>
+    <td></td>
+    <td>List of parameters that will be passed to either StopImage or
+        StopClass. Parameters are separated using either <b>#</b> or
+        <b>;</b> character.</td>
+    </tr>
+    <tr>
+    <td>--StopMethod</td>
+    <td>Main</td>
+    <td>Method name if differs then main</td>
+    </tr>
+    <tr>
+    <td>--StopMode</td>
+    <td>executable</td>
+    <td>Can one of <b>jvm</b> <b>java</b> or <b>exe</b></td>
+    </tr>
+    <tr>
+    <td>--StopTimeout</td>
+    <td>No Timeout</td>
+    <td>Defines the timeout in seconds that procrun waits for service to
+        exit gracefully.</td>
+    </tr>
+    <tr>
+    <td>--LogPath</td>
+    <td>working path</td>
+    <td>Defines the path for logging</td>
+    </tr>
+    <tr>
+    <td>--LogPrefix</td>
+    <td>jakarta_service</td>
+    <td>Defines the service log filename</td>
+    </tr>
+    <tr>
+    <td>--LogLevel</td>
+    <td>INFO</td>
+    <td>Defines the logging level and can be either <b>error</b>,
+        <b>info</b>, <b>warn</b> or <b>debug</b></td>
+    </tr>
+    <tr>
+    <td>--StdOutput</td>
+    <td></td>
+    <td>Redirected stdout filename</td>
+    </tr>
+    <tr>
+    <td>--StdError</td>
+    <td></td>
+    <td>Redirected stderr filename</td>
+    </tr>    
+    </table>
+</p> 
+</section>
+<section name="Installing services">
+<p>
+The safest way to manually install the service is to use the provided 
<b>service.bat</b> script.
+</p>
+<p>
+<source>
+Install the service named 'Tomcat5'
+C:\> service.bat install
+</source>
+</p>
+<p>
+If using tomcat5.exe, you need to use the <b>//IS//</b> parameter.
+</p>
+<p>
+<source>
+Install the service named 'Tomcat5'
+C:\> tomcat5 //IS//Tomcat5 --DisplayName="Apache Tomcat 5" \
+C:\> --Install="C:\Program Files\Tomcat\bin\tomcat5.exe" --Jvm=auto \
+C:\> --StartMode=jvm --StopMode=jvm \
+C:\> --StartClass=org.apache.catalina.startup.Bootstrap --StartParams=start \
+C:\> --StopClass=org.apache.catalina.startup.Bootstrap --StopParams=stop
+</source>
+</p>
+</section>
+<section name="Updating services">
+<p>
+To update the service parameters, you need to use the <b>//US//</b> parameter.
+</p>
+<p>
+<source>
+Update the service named 'Tomcat5
+C:\> tomcat5 //US//Tomcat5 --Description="Apache Tomcat Server - 
http://jakarta.apache.org/tomcat " \
+C:\> --Startup=auto 
--Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar
+</source>
+</p>
+</section>
+<section name="Removing services">
+<p>
+To remove the service, you need to use the <b>//DS//</b> parameter.<br/>
+If the service is running it will be stopped and then deleted.
+</p>
+<p>
+<source>
+Remove the service named 'Tomcat5'
+C:\> tomcat5 //DS//Tomcat5
+</source>
+</p>
+</section>
+<section name="Debugging services">
+<p>
+To run the service in console mode, you need to use the <b>//TS//</b> 
parameter.
+The service shutdown can be initiated by pressing <b>CTRL+C</b> or
+<b>CTRL+BREAK</b>.
+If you rename the tomcat5.exe to testservice.exe then you can just execute the
+testservice.exe and this command mode will be executed by default.
+</p>
+<p>
+<source>
+Run the service named 'Tomcat5' in console mode
+C:\> tomcat5 //TS//Tomcat5 [additional arguments]
+Or simply execute:
+C:\> tomcat5
+</source>
+</p>
+</section>
+</body>
+</document> 

Propchange: tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml?rev=420006&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml Fri Jul  7 
15:40:04 2006
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd";>
+
+<web-app>
+
+  <display-name>Tomcat Manager Application</display-name>
+  <description>
+    A scriptable management web application for the Tomcat Web Server;
+       Manager lets you view, load/unload/etc particular web applications.
+  </description>
+
+  <!-- Define the Manager Servlet
+       Change servlet-class to: org.apache.catalina.servlets.HTMLManagerServlet
+       to get a Servlet with a more intuitive HTML interface, don't change if 
you
+       have software that is expected to parse the output from ManagerServlet
+       since they're not compatible.
+   -->
+  <servlet>
+    <servlet-name>HostManager</servlet-name>
+    
<servlet-class>org.apache.catalina.manager.host.HostManagerServlet</servlet-class>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>2</param-value>
+    </init-param>
+  </servlet>
+  <servlet>
+    <servlet-name>HTMLHostManager</servlet-name>
+    
<servlet-class>org.apache.catalina.manager.host.HTMLHostManagerServlet</servlet-class>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>2</param-value>
+    </init-param>
+  </servlet>
+
+  <!-- Define the Manager Servlet Mapping -->
+  <servlet-mapping>
+    <servlet-name>HostManager</servlet-name>
+    <url-pattern>/list</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>HostManager</servlet-name>
+    <url-pattern>/add</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>HostManager</servlet-name>
+    <url-pattern>/remove</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>HostManager</servlet-name>
+    <url-pattern>/start</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>HostManager</servlet-name>
+    <url-pattern>/stop</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>HTMLHostManager</servlet-name>
+    <url-pattern>/html/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- Define a Security Constraint on this Application -->
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>HTMLHostManager and HostManager 
commands</web-resource-name>
+      <url-pattern>/html/*</url-pattern>
+      <url-pattern>/list</url-pattern>
+      <url-pattern>/add</url-pattern>
+      <url-pattern>/remove</url-pattern>
+      <url-pattern>/start</url-pattern>
+      <url-pattern>/stop</url-pattern>
+    </web-resource-collection>
+    <auth-constraint>
+       <!-- NOTE:  This role is not present in the default users file -->
+       <role-name>admin</role-name>
+    </auth-constraint>
+  </security-constraint>
+
+  <!-- Define the Login Configuration for this Application -->
+  <login-config>
+    <auth-method>BASIC</auth-method>
+    <realm-name>Tomcat Host Manager Application</realm-name>
+  </login-config>
+
+  <!-- Security roles referenced by this web application -->
+  <security-role>
+    <description>
+      The role that is required to log in to the Manager Application
+    </description>
+    <role-name>admin</role-name>
+  </security-role>
+
+</web-app>

Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: tomcat/tc6.0.x/trunk/webapps/host-manager/host-manager.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/host-manager.xml?rev=420006&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/host-manager/host-manager.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/host-manager/host-manager.xml Fri Jul  7 
15:40:04 2006
@@ -0,0 +1,13 @@
+<!--
+
+    Context configuration file for the Tomcat Host Manager Web App
+
+    $Id: host-manager.xml 303743 2005-03-11 22:39:26Z remm $
+
+-->
+
+
+<Context docBase="${catalina.home}/server/webapps/host-manager"
+         privileged="true" antiResourceLocking="false" antiJARLocking="false">
+
+</Context>

Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/host-manager.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: tomcat/tc6.0.x/trunk/webapps/host-manager/images/add.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/images/add.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/images/add.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/host-manager/images/asf-logo.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/images/asf-logo.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/images/asf-logo.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/host-manager/images/code.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/images/code.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/images/code.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/host-manager/images/design.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/images/design.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/images/design.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/host-manager/images/docs.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/images/docs.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/images/docs.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/host-manager/images/fix.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/images/fix.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/images/fix.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/host-manager/images/tomcat.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/images/tomcat.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/images/tomcat.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/host-manager/images/update.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/images/update.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/images/update.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/host-manager/images/void.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/images/void.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/images/void.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/host-manager/manager.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/manager.xml?rev=420006&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/host-manager/manager.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/host-manager/manager.xml Fri Jul  7 15:40:04 
2006
@@ -0,0 +1,13 @@
+<!--
+
+    Context configuration file for the Tomcat Manager Web App
+
+    $Id: manager.xml 303743 2005-03-11 22:39:26Z remm $
+
+-->
+
+
+<Context docBase="${catalina.home}/server/webapps/manager"
+         privileged="true" antiResourceLocking="false" antiJARLocking="false">
+
+</Context>

Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/manager.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml?rev=420006&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml Fri Jul  7 15:40:04 
2006
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
+    version="2.4">
+
+  <display-name>Tomcat Manager Application</display-name>
+  <description>
+    A scriptable management web application for the Tomcat Web Server;
+       Manager lets you view, load/unload/etc particular web applications.
+  </description>
+
+  <!-- Define the Manager Servlet
+       Change servlet-class to: org.apache.catalina.servlets.HTMLManagerServlet
+       to get a Servlet with a more intuitive HTML interface, don't change if 
you
+       have software that is expected to parse the output from ManagerServlet
+       since they're not compatible.
+   -->
+  <servlet>
+    <servlet-name>Manager</servlet-name>
+    <servlet-class>org.apache.catalina.manager.ManagerServlet</servlet-class>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>2</param-value>
+    </init-param>
+  </servlet>
+  <servlet>
+    <servlet-name>HTMLManager</servlet-name>
+    
<servlet-class>org.apache.catalina.manager.HTMLManagerServlet</servlet-class>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>2</param-value>
+    </init-param>
+  </servlet>
+  <servlet>
+    <servlet-name>Status</servlet-name>
+    
<servlet-class>org.apache.catalina.manager.StatusManagerServlet</servlet-class>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>0</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <servlet-name>JMXProxy</servlet-name>
+    <servlet-class>org.apache.catalina.manager.JMXProxyServlet</servlet-class>
+  </servlet>
+
+  <!-- Define the Manager Servlet Mapping -->
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/list</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/sessions</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/start</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/stop</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/install</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/remove</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/deploy</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/undeploy</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/reload</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/save</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/serverinfo</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/roles</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Manager</servlet-name>
+      <url-pattern>/resources</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Status</servlet-name>
+    <url-pattern>/status/*</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>JMXProxy</servlet-name>
+      <url-pattern>/jmxproxy/*</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>HTMLManager</servlet-name>
+    <url-pattern>/html/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- Define reference to the user database for looking up roles -->
+  <resource-env-ref>
+    <description>
+      Link to the UserDatabase instance from which we request lists of
+      defined role names.  Typically, this will be connected to the global
+      user database with a ResourceLink element in server.xml or the context
+      configuration file for the Manager web application.
+    </description>
+    <resource-env-ref-name>users</resource-env-ref-name>
+    <resource-env-ref-type>
+      org.apache.catalina.UserDatabase
+    </resource-env-ref-type>
+  </resource-env-ref>
+
+  <!-- Define a Security Constraint on this Application -->
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>HTMLManger and Manager command</web-resource-name>
+      <url-pattern>/jmxproxy/*</url-pattern>
+      <url-pattern>/html/*</url-pattern>
+      <url-pattern>/list</url-pattern>
+      <url-pattern>/sessions</url-pattern>
+      <url-pattern>/start</url-pattern>
+      <url-pattern>/stop</url-pattern>
+      <url-pattern>/install</url-pattern>
+      <url-pattern>/remove</url-pattern>
+      <url-pattern>/deploy</url-pattern>
+      <url-pattern>/undeploy</url-pattern>
+      <url-pattern>/reload</url-pattern>
+      <url-pattern>/save</url-pattern>
+      <url-pattern>/serverinfo</url-pattern>
+      <url-pattern>/status/*</url-pattern>
+      <url-pattern>/roles</url-pattern>
+      <url-pattern>/resources</url-pattern>
+    </web-resource-collection>
+    <auth-constraint>
+       <!-- NOTE:  This role is not present in the default users file -->
+       <role-name>manager</role-name>
+    </auth-constraint>
+  </security-constraint>
+
+  <!-- Define the Login Configuration for this Application -->
+  <login-config>
+    <auth-method>BASIC</auth-method>
+    <realm-name>Tomcat Manager Application</realm-name>
+  </login-config>
+
+  <!-- Security roles referenced by this web application -->
+  <security-role>
+    <description>
+      The role that is required to log in to the Manager Application
+    </description>
+    <role-name>manager</role-name>
+  </security-role>
+
+</web-app>

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: tomcat/tc6.0.x/trunk/webapps/manager/images/add.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/images/add.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/images/add.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/manager/images/asf-logo.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/images/asf-logo.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/images/asf-logo.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/manager/images/code.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/images/code.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/images/code.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/manager/images/design.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/images/design.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/images/design.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/manager/images/docs.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/images/docs.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/images/docs.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/manager/images/fix.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/images/fix.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/images/fix.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/manager/images/tomcat.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/images/tomcat.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/images/tomcat.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/manager/images/update.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/images/update.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/images/update.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/manager/images/void.gif
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/images/void.gif?rev=420006&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/images/void.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tomcat/tc6.0.x/trunk/webapps/manager/manager.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/manager.xml?rev=420006&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/manager/manager.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/manager/manager.xml Fri Jul  7 15:40:04 2006
@@ -0,0 +1,17 @@
+<!--
+
+    Context configuration file for the Tomcat Manager Web App
+
+    $Id: manager.xml 303123 2004-08-26 17:03:35Z remm $
+
+-->
+
+
+<Context docBase="${catalina.home}/server/webapps/manager"
+         privileged="true" antiResourceLocking="false" antiJARLocking="false">
+
+  <!-- Link to the user database we will get roles from -->
+  <ResourceLink name="users" global="UserDatabase"
+                type="org.apache.catalina.UserDatabase"/>
+
+</Context>

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/manager.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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=420006&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/manager/status.xsd (added)
+++ tomcat/tc6.0.x/trunk/webapps/manager/status.xsd Fri Jul  7 15:40:04 2006
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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:schema>

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/status.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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=420006&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/manager/xform.xsl (added)
+++ tomcat/tc6.0.x/trunk/webapps/manager/xform.xsl Fri Jul  7 15:40:04 2006
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+  version="1.0">
+
+  <!-- Output method -->
+  <xsl:output encoding="iso-8859-1"
+              indent="no"/>
+
+  <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>
+    </head>
+    <body>
+      <div style='font-size:20px;'>Tomcat Status</div>
+
+      <xsl:apply-templates select="jvm"/>
+      <xsl:apply-templates select="connector"/>
+     </body>
+    </html>
+  </xsl:template>
+
+  <xsl:template match="jvm">
+   <xsl:apply-templates select="memory"/>
+  </xsl:template>
+
+  <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>
+    </table><hr />
+  </xsl:template>
+
+  <xsl:template match="connector">
+        <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: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>
+    </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>
+    </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"/>
+
+   </table><hr />
+  </xsl:template>
+
+  <xsl:template match="worker">
+   <tr>
+    <td><xsl:value-of select="@stage"/></td>
+    <td><xsl:value-of select="@requestProcessingTime"/></td>
+    <td><xsl:value-of select="@requestBytesSent"/></td>
+    <td><xsl:value-of select="@requestBytesReceived"/></td>
+    <td><xsl:value-of select="@remoteAddr"/></td>
+    <td><xsl:value-of select="@virtualHost"/></td>
+    <td><xsl:value-of select="@method"/> <xsl:value-of 
select="@currentUri"/>?<xsl:value-of select="@currentQueryString"/> 
<xsl:value-of select="@protocol"/></td>
+   </tr>
+  </xsl:template>
+
+</xsl:stylesheet>

Propchange: tomcat/tc6.0.x/trunk/webapps/manager/xform.xsl
------------------------------------------------------------------------------
    svn:eol-style = native



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

Reply via email to