Name of the column, in the "user roles" table, which contains a role name assigned to the corresponding user.

To ensure correct operation, there is a reasonable degree of synchronization in this Realm.

This Realm does not require modification to the underlying Realms or the associated user storage mechanisms. It achieves this by recording all failed logins, including those for users that do not exist. To prevent a DOS by @@ -866,7 +866,7 @@ <Realm> elements may be nested inside it.

Other Realm Implementations

@@ -336,7 +336,7 @@ true, the default of this setting will be true, else the default value will be false.
- +
If this is true Tomcat will allow '=' @@ -406,12 +406,12 @@ -
An alternative name for the single sign on session cookie. Defaults to JSESSIONIDSSO.
- +
If this is true, every request that is associated with a session will cause the session's last accessed time to be updated @@ -420,7 +420,7 @@ true, the default of this setting will be true, else the default value will be false.
- +
If this is true, Tomcat will track the number of active @@ -454,9 +454,9 @@
If no logging configuration file is specified and no logging configuration class is specified using the java.util.logging.config.class and java.util.logging.config.file - properties the default logging framework org.apache.juli will use the default - java.util.logging.SimpleFormatter for all console output. - To simply override the console output formatter, one can use the described property. Example: + properties the default logging framework org.apache.juli will use the default + java.util.logging.SimpleFormatter for all console output. + To simply override the console output formatter, one can use the described property. Example: -Dorg.apache.juli.formatter=org.apache.juli.OneLineFormatter
@@ -473,7 +473,7 @@ -
The max number of log records that the async logger will keep in memory. When this limit is reached and a new record is being logged by the +
The max number of log records that the async logger will keep in memory. When this limit is reached and a new record is being logged by the JULI framework the system will take an action based on the org.apache.juli.AsyncOverflowDropType setting.

The default value is 10000 records. This number represents the global number of records, not on a per handler basis. @@ -571,13 +571,13 @@
If true, use a shared selector for servlet write/read.

If not specified, the default value of true will be used.
- +
If true, the server will exit if an exception happens during the server initialization phase.

If not specified, the default value of false will be used.
- + Modified: tomcat/trunk/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/valve.xml (original) +++ tomcat/trunk/webapps/docs/config/valve.xml Sat Oct 22 21:26:20 2011 @@ -69,7 +69,7 @@
Some requests may be handled by Tomcat before they are passed to a container. These include redirects from /foo to /foo/ and the rejection of invalid requests. Where Tomcat can identify the Context that - would have handled the request, the request/response will be logged in the + would have handled the request, the request/response will be logged in the AccessLog(s) associated Context, Host and Engine. Where Tomcat cannot identify the Context that would have handled the request, e.g. in cases @@ -141,7 +141,7 @@ attributes (typically set by the RemoteIpValve and similar) that should be used to override the values returned by the request for remote address, remote host, server port and protocol. If the attributes are - not set, or this attribute is set to false then the values + not set, or this attribute is set to false then the values from the request will be used. If not set, the default value of false will be used.
@@ -208,7 +208,7 @@
Flag to determine if logging will be buffered. - If set to false, then access logging will be written after each + If set to false, then access logging will be written after each request. Default value: true
@@ -353,7 +353,7 @@ attributes (typically set by the RemoteIpValve and similar) that should be used to override the values returned by the request for remote address, remote host, server port and protocol. If the attributes are - not set, or this attribute is set to false then the values + not set, or this attribute is set to false then the values from the request will be used. If not set, the default value of false will be used.
@@ -417,7 +417,7 @@
Flag to determine if logging will be buffered. - If set to false, then access logging will be written after each + If set to false, then access logging will be written after each request. Default value: true
@@ -650,19 +650,19 @@ -
Default false. Flag to determine whether each request needs to be +
Default false. Flag to determine whether each request needs to be reauthenticated to the security Realm. If "true", this Valve uses cached security credentials (username and password) to - reauthenticate to the Realm each request associated - with an SSO session. If "false", the Valve can itself authenticate - requests based on the presence of a valid SSO cookie, without + reauthenticate to the Realm each request associated + with an SSO session. If "false", the Valve can itself authenticate + requests based on the presence of a valid SSO cookie, without rechecking with the Realm.
- +
Sets the host domain to be used for sso cookies.
- + @@ -944,7 +944,7 @@ from the request. If not set, the encoding of the request body will be used.
- +
Java class name of the implementation to use. This MUST be set to org.apache.catalina.authenticator.FormAuthenticator.
@@ -959,7 +959,7 @@ workaround for browser caching issues. If not set, the default value of true will be used.
- +
Controls the behavior of the FORM authentication process if the process is misused, for example by directly requesting the login page @@ -1219,7 +1219,7 @@

- +
Tomcat port of mod_remoteip, this valve replaces the apparent client remote IP address and hostname for @@ -1227,14 +1227,14 @@ via a request headers (e.g. "X-Forwarded-For").

Another feature of this valve is to replace the apparent scheme - (http/https), server port and request.secure with the scheme presented - by a proxy or a load balancer via a request header + (http/https), server port and request.secure with the scheme presented + by a proxy or a load balancer via a request header (e.g. "X-Forwarded-Proto").
- +
This Valve may be used at the Engine, Host or Context level as required. Normally, this Valve would be used at the Engine level.
- +
If used in conjunction with Remote Address/Host valves then this valve should be defined first to ensure that the correct client IP address is presented to the Remote Address/Host valves.
@@ -1312,19 +1312,19 @@ -
Value returned by ServletRequest.getServerPort() - when the protocolHeader indicates http +
Value returned by ServletRequest.getServerPort() + when the protocolHeader indicates http protocol and no portHeader is present. If not specified, the default of 80 is used.
-
Value returned by ServletRequest.getServerPort() - when the protocolHeader indicates https +
Value returned by ServletRequest.getServerPort() + when the protocolHeader indicates https protocol and no portHeader is present. If not specified, the default of 443 is used.
- +
If true, the value returned by ServletRequest.getLocalPort() and @@ -1342,17 +1342,17 @@

- +
Web crawlers can trigger the creation of many thousands of sessions as they crawl a site which may result in significant memory consumption. This Valve ensures that crawlers are associated with a single session - just like normal users - regardless of whether or not they provide a session token with their requests.
- +
This Valve may be used at the Engine, Host or Context level as required. Normally, this Valve would be used at the Engine level.
- +
If used in conjunction with Remote IP valve then the Remote IP valve should be defined before this valve to ensure that the correct client IP address is presented to this valve.
@@ -1397,13 +1397,13 @@
- -
This valve allows to detect requests that take a long time to process, which might + +
This valve allows to detect requests that take a long time to process, which might indicate that the thread that is processing it is stuck.
-
When such a request is detected, the current stack trace of its thread is written +
When such a request is detected, the current stack trace of its thread is written to tomcat log with a WARN level.
-
The IDs of the stuck threads are available through JMX in the - stuckThreadIds attribute. The JVM Thread MBean can then be used to +
The IDs of the stuck threads are available through JMX in the + stuckThreadIds attribute. The JVM Thread MBean can then be used to retrieve other information about each stuck thread (name, stack trace...).
@@ -1422,10 +1422,10 @@ -
Minimum duration in seconds after which a thread is considered stuck. +
Minimum duration in seconds after which a thread is considered stuck. Default is 600 seconds. If set to 0, the detection is disabled.

Note: since the detection is done in the background thread of the Container - (Engine, Host or Context) declaring this Valve, the threshold should be higher + (Engine, Host or Context) declaring this Valve, the threshold should be higher than the backgroundProcessorDelay of this Container.
Modified: tomcat/trunk/webapps/docs/connectors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/connectors.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/connectors.xml (original) +++ tomcat/trunk/webapps/docs/connectors.xml Sat Oct 22 21:26:20 2011 @@ -48,26 +48,26 @@ connector features the lowest latency an
For clustering, a HTTP load balancer with support for web sessions stickiness must be installed to direct the traffic to the Tomcat servers. Tomcat supports mod_proxy -(on Apache HTTP Server 2.x, and included by default in Apache HTTP Server 2.2) as the load balancer. -It should be noted that the performance of HTTP proxying is usually lower than the +(on Apache HTTP Server 2.x, and included by default in Apache HTTP Server 2.2) as the load balancer. +It should be noted that the performance of HTTP proxying is usually lower than the performance of AJP, so AJP clustering is often preferable.

-
When using a single server, the performance when using a native webserver in +
When using a single server, the performance when using a native webserver in front of the Tomcat instance is most of the time significantly worse than a standalone Tomcat with its default HTTP connector, even if a large part of the web -application is made of static files. If integration with the native webserver is -needed for any reason, an AJP connector will provide faster performance than -proxied HTTP. AJP clustering is the most efficient from the Tomcat perspective. +application is made of static files. If integration with the native webserver is +needed for any reason, an AJP connector will provide faster performance than +proxied HTTP. AJP clustering is the most efficient from the Tomcat perspective. It is otherwise functionally equivalent to HTTP clustering.

The native connectors supported with this Tomcat release are:

JK 1.2.x with any of the supported servers
-
mod_proxy on Apache HTTP Server 2.x (included by default in Apache HTTP Server 2.2), +
mod_proxy on Apache HTTP Server 2.x (included by default in Apache HTTP Server 2.2), with AJP enabled

Modified: tomcat/trunk/webapps/docs/default-servlet.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/default-servlet.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/default-servlet.xml (original) +++ tomcat/trunk/webapps/docs/default-servlet.xml Sat Oct 22 21:26:20 2011 @@ -175,8 +175,8 @@ The DefaultServlet allows the following sendfileSize - If the connector used supports sendfile, this represents the minimal - file size in KB for which sendfile will be used. Use a negative value + If the connector used supports sendfile, this represents the minimal + file size in KB for which sendfile will be used. Use a negative value to always disable sendfile. [48] Modified: tomcat/trunk/webapps/docs/deployer-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/deployer-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/deployer-howto.xml (original) +++ tomcat/trunk/webapps/docs/deployer-howto.xml Sat Oct 22 21:26:20 2011 @@ -36,8 +36,8 @@

Deployment is the term used for the process of installing a web - application (either a 3rd party WAR or your own custom web application) - into the Tomcat server. + application (either a 3rd party WAR or your own custom web application) + into the Tomcat server.

Web application deployment may be accomplished in a number of ways @@ -45,7 +45,7 @@

Statically; the web application is setup before Tomcat is started

- Dynamically; in conjunction with the Tomcat Manager web application or + Dynamically; in conjunction with the Tomcat Manager web application or manipulating already deployed web applications

@@ -58,20 +58,20 @@ web application resource (WAR) files.

- +

There is no installation required for static deployment of web applications as this is provided out of the box by Tomcat. Nor is any - installation required for deployment functions with the Tomcat Manager, - although some configuration is required as detailed in the + installation required for deployment functions with the Tomcat Manager, + although some configuration is required as detailed in the Tomcat Manager manual. An installation is however required if you wish - to use the Tomcat Client Deployer (TCD). -
+ to use the Tomcat Client Deployer (TCD). +

- The TCD is not packaged with the Tomcat core - distribution, and must therefore be downloaded separately from - the Downloads area. The download is usually labelled + The TCD is not packaged with the Tomcat core + distribution, and must therefore be downloaded separately from + the Downloads area. The download is usually labelled apache-tomcat-7.0.x-deployer.

@@ -92,25 +92,25 @@ Tomcat Client Deployer
- +

In talking about deployment of web applications, the concept of a - Context is required to be understood. A Context is what Tomcat + Context is required to be understood. A Context is what Tomcat calls a web application.

In order to configure a Context within Tomcat a Context Descriptor is required. A Context Descriptor is simply an XML file that contains - Tomcat related configuration for a Context, e.g naming resources or + Tomcat related configuration for a Context, e.g naming resources or session manager configuration. In earlier versions of Tomcat the content of a Context Descriptor configuration was often stored within Tomcat's primary configuration file server.xml but this is now discouraged (although it currently still works).
-
- Context Descriptors not only help Tomcat to know how to configure - Contexts but other tools such as the Tomcat Manager and TCD often use +
+ Context Descriptors not only help Tomcat to know how to configure + Contexts but other tools such as the Tomcat Manager and TCD often use these Context Descriptors to perform their roles properly.

@@ -123,16 +123,16 @@
Files in (1) are named [webappname].xml but files in (2) are named context.xml. If a Context Descriptor is not provided for a Context, - Tomcat configures the Context using default values. + Tomcat configures the Context using default values.

- +

- If you are not interested in using the Tomcat Manager, or TCD, - then you'll need to deploy your web applications + If you are not interested in using the Tomcat Manager, or TCD, + then you'll need to deploy your web applications statically to Tomcat, followed by a Tomcat startup. The location you - deploy web applications to for this type of deployment is called the + deploy web applications to for this type of deployment is called the appBase which is specified per Host. You either copy a so-called exploded web application, i.e non-compressed, to this location, or a compressed web application resource .WAR file. @@ -140,7 +140,7 @@
The web applications present in the location specified by the Host's (default Host is "localhost") appBase attribute (default - appBase is "$CATALINA_BASE/webapps") will be deployed on Tomcat startup + appBase is "$CATALINA_BASE/webapps") will be deployed on Tomcat startup only if the Host's deployOnStartup attribute is "true".

@@ -151,31 +151,31 @@
Any Context Descriptors will be deployed first.

Exploded web applications not referenced by any Context - Descriptor will then be deployed. If they have an associated - .WAR file in the appBase and it is newer than the exploded web application, - the exploded directory will be removed and the webapp will be + Descriptor will then be deployed. If they have an associated + .WAR file in the appBase and it is newer than the exploded web application, + the exploded directory will be removed and the webapp will be redeployed from the .WAR

.WAR files will be deployed

- Note again that for each deployed web application, a + Note again that for each deployed web application, a Context Descriptor will be created unless one exists already.

- +

It is possible to deploy web applications to a running Tomcat server.

- If the Host autoDeploy attribute is "true", the Host will + If the Host autoDeploy attribute is "true", the Host will attempt to deploy and update web applications dynamically, as needed, - for example if a new .WAR is dropped into the appBase. - For this to work, the Host needs to have background processing + for example if a new .WAR is dropped into the appBase. + For this to work, the Host needs to have background processing enabled which is the default configuration.
- +
autoDeploy set to "true" and a running Tomcat allows for:
@@ -187,11 +187,11 @@
Re-deployment of a web application which has already been deployed from - a .WAR when the new .WAR is provided. In this case the exploded - web application is removed, and the .WAR is expanded again. - Note that the explosion will not occur if the Host is configured + a .WAR when the new .WAR is provided. In this case the exploded + web application is removed, and the .WAR is expanded again. + Note that the explosion will not occur if the Host is configured so that .WARs are not exploded with a unpackWARs - attribute set to "false", in which case the web application + attribute set to "false", in which case the web application will be simply redeployed as a compressed archive.

@@ -205,14 +205,14 @@
Re-deployment of a web application if a Context Descriptor file (with a filename corresponding to the Context path of the previously deployed - web application) is added to the + web application) is added to the $CATALINA_BASE/conf/[enginename]/[hostname]/ directory.

Undeployment of a web application if its document base (docBase) - is deleted. Note that on Windows, this assumes that anti-locking - features (see Context configuration) are enabled, otherwise it is not + is deleted. Note that on Windows, this assumes that anti-locking + features (see Context configuration) are enabled, otherwise it is not possible to delete the resources of a running web application.
@@ -221,23 +221,23 @@ case loaded classes will be tracked for changes.

- +

- The Tomcat Manager is covered in its own manual page. + The Tomcat Manager is covered in its own manual page.

- +

- Finally, deployment of web application may be achieved using the - Tomcat Client Deployer. This is a package which can be used to - validate, compile, compress to .WAR, and deploy web applications to - production or development Tomcat servers. It should be noted that this feature + Finally, deployment of web application may be achieved using the + Tomcat Client Deployer. This is a package which can be used to + validate, compile, compress to .WAR, and deploy web applications to + production or development Tomcat servers. It should be noted that this feature uses the Tomcat Manager and as such the target Tomcat server should be running.
- +
It is assumed the user will be familiar with Apache Ant for using the TCD. Apache Ant is a scripted build tool. The TCD comes pre-packaged with a @@ -246,37 +246,37 @@ with using the operating system command shell and configuring environment variables).
- +
- The TCD includes Ant tasks, the Jasper page compiler for JSP compilation + The TCD includes Ant tasks, the Jasper page compiler for JSP compilation before deployment, as well as a task which validates the web application Context Descriptor. The validator task (class org.apache.catalina.ant.ValidatorTask) allows only one parameter: the base path of an exploded web application.
- +
The TCD uses an exploded web application as input (see the list of the - properties used below). A web application that is programmatically - deployed with the deployer may include a Context Descriptor in + properties used below). A web application that is programmatically + deployed with the deployer may include a Context Descriptor in /META-INF/context.xml.
- +
The TCD includes a ready-to-use Ant script, with the following targets:

- compile (default): Compile and validate the web + compile (default): Compile and validate the web application. This can be used standalone, and does not need a running Tomcat server. The compiled application will only run on the associated Tomcat 7.0.x server release, and is not guaranteed to work on another Tomcat release, as the code generated by Jasper depends on its runtime component. It should also be noted that this target will also compile - automatically any Java source file located in the + automatically any Java source file located in the /WEB-INF/classes folder of the web application.

- deploy: Deploy a web application (compiled or not) to + deploy: Deploy a web application (compiled or not) to a Tomcat server.

undeploy: Undeploy a web application
@@ -284,42 +284,42 @@
reload: Reload web application

stop: Stop web application

- +
In order for the deployment to be configured, create a file called deployer.properties in the TCD installation directory root. In this file, add the following name=value pairs per line:
- +
- Additionally, you will need to ensure that a user has been + Additionally, you will need to ensure that a user has been setup for the target Tomcat Manager (which TCD uses) otherwise the TCD will not authenticate with the Tomcat Manager and the deployment will - fail. To do this, see the Tomcat Manager page. + fail. To do this, see the Tomcat Manager page.
- +

- build: The build folder used will be, by default, + build: The build folder used will be, by default, ${build}/webapp/${path}. After the end of the execution of the compile target, the web application .WAR will be located at ${build}/webapp/${path}.war.

- webapp: The directory containing the exploded web application + webapp: The directory containing the exploded web application which will be compiled and validated. By default, the folder is myapp.

- path: Deployed context path of the web application, + path: Deployed context path of the web application, by default /myapp.

- url: Absolute URL to the Tomcat Manager web application of a + url: Absolute URL to the Tomcat Manager web application of a running Tomcat server, which will be used to deploy and undeploy the - web application. By default, the deployer will attempt to access - a Tomcat instance running on localhost, at + web application. By default, the deployer will attempt to access + a Tomcat instance running on localhost, at http://localhost:8080/manager/text.

Modified: tomcat/trunk/webapps/docs/developers.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/developers.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/developers.xml (original) +++ tomcat/trunk/webapps/docs/developers.xml Sat Oct 22 21:26:20 2011 @@ -34,12 +34,12 @@
The list indicates the developers' main areas of interest. Feel free to - add to the list :) The developers email addresses are - [login]@apache.org. Please do not contact - developers directly for any support issues (please post to the - tomcat-users mailing list instead, or one of the other support - resources; some organizations and individual consultants also offer - for pay Tomcat support, as listed on the + add to the list :) The developers email addresses are + [login]@apache.org. Please do not contact + developers directly for any support issues (please post to the + tomcat-users mailing list instead, or one of the other support + resources; some organizations and individual consultants also offer + for pay Tomcat support, as listed on the support and training page on the Tomcat Wiki).
Modified: tomcat/trunk/webapps/docs/elapi/index.html URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/elapi/index.html?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/elapi/index.html (original) +++ tomcat/trunk/webapps/docs/elapi/index.html Sat Oct 22 21:26:20 2011 @@ -23,10 +23,10 @@ -The EL Javadoc is not installed by default. Download and install +The EL Javadoc is not installed by default. Download and install the "fulldocs" package to get it. -You can also access the javadoc online in the Tomcat +You can also access the javadoc online in the Tomcat documentation bundle. Modified: tomcat/trunk/webapps/docs/extras.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/extras.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/extras.xml (original) +++ tomcat/trunk/webapps/docs/extras.xml Sat Oct 22 21:26:20 2011 @@ -36,7 +36,7 @@

A number of additional components may be used with Apache Tomcat. These - components may be built by users should they need them or they can be + components may be built by users should they need them or they can be downloaded from one of the mirrors.
@@ -46,10 +46,10 @@
To download the extras components open the Tomcat download page and select "browse" from the Quick Navigation Links. The extras components can be - found in bin/extras. + found in bin/extras.

- +

@@ -57,9 +57,9 @@ of the standard Tomcat Ant script which is present in the source bundle of Tomcat.
- +
The build process is the following:
- +

Follow the build instructions to build a Tomcat binary from the source bundle (note: it will be used by the build Modified: tomcat/trunk/webapps/docs/html-manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/html-manager-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/html-manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/html-manager-howto.xml Sat Oct 22 21:26:20 2011 @@ -133,25 +133,25 @@ OK - Started application at context path error message. Possible causes for problems include:

Encountered exception -
+

An exception was encountered trying to start the web application. Check the Tomcat logs for the details.
-
+
Invalid context path was specified -
+

The context path must start with a slash character, unless you are referencing the ROOT web application -- in which case the context path must be a zero-length string.
-
+
No context exists for path /foo -
+

There is no deployed application on the context path - that you specified.
-
+ that you specified.
+
No context path was specified -
+
The path parameter is required. -
+
@@ -170,27 +170,27 @@ OK - Stopped application at context path
Otherwise, the Message will start with FAIL and include an error message. Possible causes for problems include:
-
+

Encountered exception -
+

An exception was encountered trying to stop the web application. Check the Tomcat logs for the details.
-
+
Invalid context path was specified -
+

The context path must start with a slash character, unless you are referencing the ROOT web application -- in which case the context path must be a zero-length string.
-
+
No context exists for path /foo -
+

There is no deployed application on the context path - that you specified.
-
+ that you specified.
+
No context path was specified -
+
The path parameter is required. -
+
@@ -219,35 +219,35 @@ OK - Reloaded application at context pat error message. Possible causes for problems include:

Encountered exception -
+

An exception was encountered trying to restart the web application. Check the Tomcat logs for the details.
-
+
Invalid context path was specified -
+

The context path must start with a slash character, unless you are referencing the ROOT web application -- in which case the context path must be a zero-length string.
-
+
No context exists for path /foo -
+

There is no deployed application on the context path - that you specified.
-
+ that you specified.
+
No context path was specified -
+
The path parameter is required. -
+
Reload not supported on WAR deployed at path /foo -
+
Currently, application reloading (to pick up changes to the classes or web.xml file) is not supported when a web application is - installed directly from a WAR file, which happens when the host is - configured to not unpack WAR files. As it only works when the web - application is installed from an unpacked directory, if you are using - a WAR file, you should undeploy and then deploy + installed directly from a WAR file, which happens when the host is + configured to not unpack WAR files. As it only works when the web + application is installed from an unpacked directory, if you are using + a WAR file, you should undeploy and then deploy the application again to pick up your changes. -
+
@@ -260,11 +260,11 @@ the appBase directory (typi . The web application temporary work directory is also deleted. If you simply want to take an application out of service, you should use the /stop command instead.
- +
Signal an existing application to gracefully shut itself down, and then remove it from Tomcat (which also makes this context path available for reuse later). This command is the logical opposite of the -/deploy Ant command, and the related deploy features available +/deploy Ant command, and the related deploy features available in the HTML manager.

If this command succeeds, you will see a Message like this:
@@ -274,27 +274,27 @@ OK - Undeployed application at context p
Otherwise, the Message will start with FAIL and include an error message. Possible causes for problems include:
-
+

Encountered exception -
+

An exception was encountered trying to undeploy the web application. Check the Tomcat logs for the details.
-
+
Invalid context path was specified -
+

The context path must start with a slash character, unless you are referencing the ROOT web application -- in which case the context path must be a zero-length string.
-
+
No context exists for path /foo -
+

There is no deployed application on the context path - that you specified.
-
+ that you specified.
+
No context path was specified -
+
The path parameter is required. -
+
@@ -423,8 +423,8 @@ extension is used as the context path na
Use the Browse button to select a WAR file to upload to the server from your local desktop system.
-
The .WAR file may include Tomcat specific deployment configuration, by -including a Context configuration XML file in +
The .WAR file may include Tomcat specific deployment configuration, by +including a Context configuration XML file in /META-INF/context.xml.

Upload of a WAR file could fail for the following reasons:
Modified: tomcat/trunk/webapps/docs/images/tomcat.svg URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/images/tomcat.svg?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/images/tomcat.svg (original) +++ tomcat/trunk/webapps/docs/images/tomcat.svg Sat Oct 22 21:26:20 2011 @@ -441,28 +441,28 @@ AJx+aX3n/OK/576ldpcalLBdTgKguLi/MzqoNQAz i:knockout="Off" width="26.245" height="3.239" - id="rect22" /> + id="rect22" /> + id="rect24" /> + id="rect26" /> + id="rect28" /> - + eJzdffle8sqy6H0B3gFUFGQwEyEBB2YHUEFwwJlJRJlkWGuv88d59lvVSUgICWmQ75x1716/7aed Tnd1dXXN1fF6iuVQsjmot0J8mHG7vN70qFWbDEYxN2l1n3e70/FkhE2+G7+bZcMMdEqeS29qx7vW aNwZ9GPkEXmYw7d951e565vTrN/t80NbpTPptqB1Mug1apPw+K+2X5sLXs7UJvAwciAfMKKbZWJ8 @@ -597,8 +597,8 @@ Tq9gNWkg3o0d20wa+dw/eUxcW08qVKtMTmaugMas wizatDXmNPh+Zz3pKZPca/miVUv0TraDJ+qk1ZDPhN6TK+Ho2aWcVTb7/J2bW+vjIVOIhlic9HBh 0rPWQLyphTiYlAmZV1p4eqyZJiWzqGuNfjdzr3aTZpjL/RfZetLzn1jia3R1YzlpOb7Hw6m0Xqu4 nW+VecZm0qcQU37zb1lPmj9rXT09+n36pC6vYdq7vX7bdtLyZ+m9bjfpKXOXHx5aTw== - - + + WuC9Lu9tLnF4ZLnWu+HFlu2kd2+nWxO7Sa+Z+5N8Rp8U1mKY9vI4+/ZaenmxnPTl+vvcdtKvaqSZ s5n0Gbgl8zLuhqzXevU17F3LEm856dt5qG876chbDnj0SVGKGc/qLZPt9C4sJ5WuQluexEsoC5Py YfOhmb5F39RJ67zfdGhcXv9jobZPpuX2jn1n82stMO/7sSROemyaFIb9+tGYvnhgnnQ82D1SJ52c @@ -671,8 +671,8 @@ Ob0WOSR1jio9nDqMUue3qHMUKUq3csSvZ3Xq1Ptg Z3nNCH3NqWNRhjqUGk2gKpSkUist9TbLvL5Tytt6qEs5qXXL+XNgX1tsWcA4x5NpzIu5fVmUPr/e F+dLgFbdFzqVdaV9obsJaJVqZXPYCj0kv7mcCauVnSuZXKsdQ0rl1YzK2W3zVoeG7k4gClSqOgwi 0zH6uCoq9Zqm5TWJKxvmk+MfKzGo172aBeH6hvnk2CwG7Whsptpb00H7bCWTY3anyg== - - + + wu6fUTK4oKJdvHOv77ZHU8OYhfm8tvE8OTGL+bUxRjK1N4IxOtaj62N2xDDGU7kop5dYjvYgrWwj 2wK1GBCkAsngUZwBRcVXKEDSbbblZ3/ewrYJUGKQaSFlxto/ZrKwna65GX7YX3PzMm6bkxhcXmcj fEkRNOU2uSjLZH/MVudKwJki71/ny1NNV1U/YTxUc2jvhXOq3+JeJj77GxbsfUpLarRXYS5OudZY @@ -745,8 +745,8 @@ cd4Sf1jBEaKOaIs7kxuEourZWUxi/brz2aepYLfw lpU0fzpduDCfgeuiuNOg+mu34sI9ilY5Sb9wK1Yt8y3Xvn2YlK7TS2S6z50fUKvXWi2PjdiyTC1a 48KF+bNfpfHzr2JN6kIL8y0LQthebL2M2w7Xg6nLWPZdiHnr9TZ2YDsfRcTcdr7ZjTqqxxHxWKhk 6weNXrLfCA2Ske700iQDyFSpbktkEoff18+5/d1rjbk0kruZj6GfTebvHwuzfQYrSQ== - - + + r7xXT5G5+/uV3l3vrNRqqTgpXKe6kodNX92XWrnD7HMY1nfvy/lLXDLxk3r1YWWKYg7MWk8aORyx mIhXSlOsjz6TQp7dafY+de+ZP1zFTCNWa2Yb79niaMSNk5799qh0EPLGdvn7y0gyIgbGn+cHg2nN 5d07a0ny/snTzuOW53zi9yRzNwdb1VcxtlO+3854v/vlwl7rcxgSy4Wft+h3s9BOfL9ffeZbZVm+ @@ -819,8 +819,8 @@ u7e3JscnCQShlcTEo5pDNzhGk8urhE8OQ/et1Hfh Lr62f8haovf8Yc04PYnHPo2F1PfeaU4z631eY6ArffyilmvNXmPzVZT775feLkasRMXi67xe9IHG RiLG6bbk72QW0ObnZzHTBw8cvvxohp2JEj0ddRp+DdZ7KfHA+MPan7tg7+d8ecaLzulLOHK1XYUY mrvBfG6fO+a0bXyU0Oru5N738i9wAo+2SWQE3ZgZA0sBGkqA/f3QS1Yus3l9c1xezQ== - - + + /+uVsVMcWj1fydIVaJkY6tHRMYsgyXgOCkrwCO24+QfFRLx3nDYEfV74bBdsZOKA04JCxEFV1UJG 4ihRTudvQA/xn5MoHjpBJQw4PGldUl9JqfH4kDl4KEWVcNosGAXblPlIxJ+TF4Qnm4GKYrToKNmv 196V84K35xzujVvtrG/rrp3JeT8u5gNKF+J9zz9IDobDekqYpkqmiJTCYT5zJ+Pnu8Dx9uE2vnMG @@ -893,8 +893,8 @@ wsusSN7jw1wEloC4EWVWgLXwAGaUcwOCw7LMwS+4 QIYgSWRT+EhUIDsHC5ZwC8jOMazSxghKJwkXjNsr46YubHja9QETQn+YXMGxBLvWI22wgIjSJsJa sUXgcBBsEQSlJSLwSgP8z91wKZ0krRMfdSsDCbOBRPfidA0AggGiBsTBS6zyROQEAgduiCiSpoiE hAQtUVmQlRYetxGIjYmyCiCw3wIBZLEXjiSpI0UlZaS56RCO/Vvrw0pOoXb4wiyMzA== - - + + IPBw1sNSVMLjx8Ay4fBxoFlGOaQlwDEflWRcBeCdY4AKeUEGJCBa4HiJER7pmwHqwpPCSHBSgKp5 IBegdDwgAg/HgQFUzdoKpC0aZZR+oN5ESFtEwSTPiGExipvEc2FJ4pAykT/g8YWJGFw/0iXP424J XAQQF4XXWJhbJCQjKQTCs3Bco4h3eJ8nYEELJ/HaYQfCBrA4EagPVyHKYZ6JwuBwklgBtrvqQtqO @@ -950,7 +950,7 @@ wnlZIFSIZlhPDdDwircRaE5ws6CskOOD+8FEyYFC ukDeRCUHcSZE8HDAoMSYAP01wiiEg5FscoCA3eHZQk4gS0TWgcxB1zOHngMGhS0GDnji58eRMPSA yFdpGTkB8E0SH4oi3zGv1zHaaRX58RZr7VZlVOt0WyNXe1z7q+Wu9fuDSW3SGsITd3vUGk8Go5Z7 /Dn4G1vgFa2715u9zrn+L1T7Dxc= - + -
Servlet 3.0 +
Servlet 3.0 Specification and Modified: tomcat/trunk/webapps/docs/jasper-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/jasper-howto.xml (original) +++ tomcat/trunk/webapps/docs/jasper-howto.xml Sat Oct 22 21:26:20 2011 @@ -97,7 +97,7 @@ classpath is created dynamically based o
compiler - Which compiler Ant should use to compile JSP pages. See the Ant documentation for more information. If the value is not set, -then the default Eclipse JDT Java compiler will be used instead of using Ant. +then the default Eclipse JDT Java compiler will be used instead of using Ant. No default value.

compilerSourceVM - What JDK version are the source files @@ -153,7 +153,7 @@ java source files. Default UTF8true or false, default true.
-
mappedfile - Should we generate static content with one +
mappedfile - Should we generate static content with one print statement per input line, to ease debugging? true or false, default true.
@@ -185,7 +185,7 @@ application.
suppressSmap - Should the generation of SMAP info for JSR45 debugging be suppressed? true or false, default false.
- +
trimSpaces - Should white spaces in template text between actions or directives be trimmed ?, default false.
@@ -239,7 +239,7 @@ the following changes from the default c

development - To disable on access checks for JSP pages compilation set this to false.
-
genStringAsCharArray - To generate slightly more efficient +
genStringAsCharArray - To generate slightly more efficient char arrays, set this to true.

modificationTestInterval - If development has to be set to true for any reason (such as dynamic generation of JSPs), setting @@ -254,27 +254,27 @@ set this to true.

Using Ant is the preferred way to compile web applications using JSPC. Note -that when pre-compiling JSPs, SMAP information will only be included in the +that when pre-compiling JSPs, SMAP information will only be included in the final classes if suppressSmap is false and compile is true. -Use the script given below (a similar script is included in the "deployer" +Use the script given below (a similar script is included in the "deployer" download) to precompile a webapp:

-<project name="Webapp Precompilation" default="all" basedir="."> +<project name="Webapp Precompilation" default="all" basedir="."> <import file="${tomcat.home}/bin/catalina-tasks.xml"/> - - <target name="jspc"> - <jasper - validateXml="false" - uriroot="${webapp.path}" - webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml" - outputDir="${webapp.path}/WEB-INF/src" /> + <target name="jspc"> + + <jasper + validateXml="false" + uriroot="${webapp.path}" + webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml" + outputDir="${webapp.path}/WEB-INF/src" /> - </target> + </target> <target name="compile"> @@ -284,7 +284,7 @@ download) to precompile a webapp: <javac destdir="${webapp.path}/WEB-INF/classes" optimize="off" debug="on" failonerror="false" - srcdir="${webapp.path}/WEB-INF/src" + srcdir="${webapp.path}/WEB-INF/src" excludes="**/*.smap"> <classpath> <pathelement location="${webapp.path}/WEB-INF/classes"/> @@ -295,9 +295,9 @@ download) to precompile a webapp: <fileset dir="${tomcat.home}/lib"> <include name="*.jar"/> </fileset> - <fileset dir="${tomcat.home}/bin"> - <include name="*.jar"/> - </fileset> + <fileset dir="${tomcat.home}/bin"> + <include name="*.jar"/> + </fileset> </classpath> <include name="**" /> <exclude name="tags/**" /> @@ -321,7 +321,7 @@ download) to precompile a webapp:
The following command line can be used to run the script -(replacing the tokens with the Tomcat base path and the path to the webapp +(replacing the tokens with the Tomcat base path and the path to the webapp which should be precompiled):
$ANT_HOME/bin/ant -Dtomcat.home=<$TOMCAT_HOME> -Dwebapp.path=<$WEBAPP_PATH> @@ -329,20 +329,20 @@ $ANT_HOME/bin/ant -Dtomcat.home=<$TOM

-Then, the declarations and mappings for the servlets which were generated +Then, the declarations and mappings for the servlets which were generated during the precompilation must be added to the web application deployment descriptor. Insert the ${webapp.path}/WEB-INF/generated_web.xml at the right place inside the ${webapp.path}/WEB-INF/web.xml file. -Restart the web application (using the manager) and test it to verify it is +Restart the web application (using the manager) and test it to verify it is running fine with precompiled servlets. An appropriate token placed in the web application deployment descriptor may also be used to automatically -insert the generated servlet declarations and mappings using Ant filtering -capabilities. This is actually how all the webapps distributed with Tomcat +insert the generated servlet declarations and mappings using Ant filtering +capabilities. This is actually how all the webapps distributed with Tomcat are automatically compiled as part of the build process.

-At the jasper2 task you can use the option addWebXmlMappings for +At the jasper2 task you can use the option addWebXmlMappings for automatic merge the ${webapp.path}/WEB-INF/generated_web.xml with the current web application deployment descriptor at ${webapp.path}/WEB-INF/web.xml. When you want to use Java 6 @@ -353,7 +353,7 @@ without debug info debug="off
-When you don't want to stop the jsp generation at first jsp syntax error, use +When you don't want to stop the jsp generation at first jsp syntax error, use failOnError="false"and with showSuccess="true" all successfull jsp to java generation are printed out. Sometimes it is very helpfull, when you cleanup the Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Sat Oct 22 21:26:20 2011 @@ -58,9 +58,9 @@ to make them work in Tomcat 7.x.x.-Also, please note that JNDI DataSource configuration in general, and this -tutorial in particular, assumes that you have read and understood the -Context and +Also, please note that JNDI DataSource configuration in general, and this +tutorial in particular, assumes that you have read and understood the +Context and Host configuration references, including the section about Automatic Application Deployment in the latter reference. @@ -120,7 +120,7 @@ The following libraries are used:
-These libraries are located in a single JAR at +These libraries are located in a single JAR at $CATALINA_HOME/lib/tomcat-dbcp.jar. However, only the classes needed for connection pooling have been included, and the packages have been renamed to avoid interfering with applications. @@ -218,13 +218,13 @@ Your MySQL user must ha will fail if you try to connect with an empty password. -mysql> GRANT ALL PRIVILEGES ON *.* TO javauser@localhost +mysql> GRANT ALL PRIVILEGES ON *.* TO javauser@localhost -> IDENTIFIED BY 'javadude' WITH GRANT OPTION; mysql> create database javatest; mysql> use javatest; mysql> create table testdata ( -> id int not null auto_increment primary key, - -> foo varchar(25), + -> foo varchar(25), -> bar int); @@ -277,7 +277,7 @@ resource to your type="javax.sql.DataSource" driverClassName="oracle.jdbc.OracleDriver" url="jdbc:oracle:thin:@127.0.0.1:1521:mysid" username="scott" password="tiger" maxActive="20" maxIdle="10" - maxWait="-1"/> + maxWait="-1"/> 2. web.xml configuration @@ -519,11 +519,11 @@ Oracle and DBCP solution above. In order to use OCI driver, you should have an Oracle client installed. You should have installed Oracle8i(8.1.7) client from cd, and download the suitable JDBC/OCI -driver(Oracle8i 8.1.7.1 JDBC/OCI Driver) from otn.oracle.com. +driver(Oracle8i 8.1.7.1 JDBC/OCI Driver) from otn.oracle.com. After renaming classes12.zip file to classes12.jar -for Tomcat, copy it into $CATALINA_HOME/lib. +for Tomcat, copy it into $CATALINA_HOME/lib. You may also have to remove the javax.sql.* classes from this file depending upon the version of Tomcat and JDK you are using. @@ -532,7 +532,7 @@ from this file depending upon the versio Ensure that you have the ocijdbc8.dll or .so in your $PATH or LD_LIBRARY_PATH - (possibly in $ORAHOME\bin) and also confirm that the native library can be loaded by a simple test program + (possibly in $ORAHOME\bin) and also confirm that the native library can be loaded by a simple test program using System.loadLibrary("ocijdbc8"); @@ -546,12 +546,12 @@ conn = DriverManager.getConnection("jdbc:oracle:oci8:@database","username","password"); -where database is of the form host:port:SID Now if you try to access the URL of your -test servlet/jsp and what you get is a +where database is of the form host:port:SID Now if you try to access the URL of your +test servlet/jsp and what you get is a ServletException with a root cause of java.lang.UnsatisfiedLinkError:get_env_handle. -First, the UnsatisfiedLinkError indicates that you have +First, the UnsatisfiedLinkError indicates that you have a mismatch between your JDBC classes file and your Oracle client version. The giveaway here is the message stating that a needed library file cannot be @@ -559,7 +559,7 @@ found. For example, you may be using a c Oracle client. The classeXXXs.zip file and Oracle client software versions must match. A $PATH, LD_LIBRARY_PATH problem. -It has been reported that ignoring the driver you have downloded from otn and using + It has been reported that ignoring the driver you have downloded from otn and using the classes12.zip file from the directory $ORAHOME\jdbc\lib will also work. @@ -680,7 +680,7 @@ obtained from a connection pool: Please note that although the above instructions place the JNDI declarations in a Context - element, it is possible and sometimes desirable to place these declarations in the + element, it is possible and sometimes desirable to place these declarations in the GlobalNamingResources section of the server configuration file. A resource placed in the GlobalNamingResources section will be shared among the Contexts of the server. @@ -693,7 +693,7 @@ obtained from a connection pool: defined in the <GlobalNamingResources> or <Context> section, not a datasource as renamed using <ResourceLink>. - +
Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-resources-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/jndi-resources-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-resources-howto.xml Sat Oct 22 21:26:20 2011 @@ -37,9 +37,9 @@ Tomcat provides a JNDI InitialContext implementation -instance for each web application running under it, in a manner that is -compatible with those provided by a -Java Enterprise Edition application +instance for each web application running under it, in a manner that is +compatible with those provided by a +Java Enterprise Edition application server. The Java EE standard provides a standard set of elements in the /WEB-INF/web.xml file to reference/define resources. @@ -108,13 +108,13 @@ element: <resource-ref> element in the web application deployment descriptor).

<ResourceLink> - - Add a link to a resource defined in the global JNDI context. Use resource - links to give a web application access to a resource defined in + Add a link to a resource defined in the global JNDI context. Use resource + links to give a web application access to a resource defined in the<GlobalNamingResources> child element of the <Server> element. <Transaction> - - Add a resource factory for instantiating the UserTransaction object + Add a resource factory for instantiating the UserTransaction object instance that is available at java:comp/UserTransaction.

@@ -143,16 +143,16 @@ attribute to "true"). -Tomcat maintains a separate namespace of global resources for the -entire server. These are configured in the + Tomcat maintains a separate namespace of global resources for the +entire server. These are configured in the -<GlobalNamingResources> element of -$CATALINA_BASE/conf/server.xml. You may expose these resources to -web applications by using a +<GlobalNamingResources> element of +$CATALINA_BASE/conf/server.xml. You may expose these resources to +web applications by using a <ResourceLink> to include it in the per-web-application context. -If a resource has been defined using a + If a resource has been defined using a <ResourceLink>, it is not necessary for that resource to be defined in /WEB-INF/web.xml. However, it is recommended to keep the entry in /WEB-INF/web.xml @@ -376,7 +376,7 @@ writer.println("foo = " + bean.getFoo() The pathname attribute can be absolute or relative. If relative, it is relative to $CATALINA_BASE. - + The readonly attribute is optional and defaults to true if not supplied. If the XML is writeable then it will be written to when Tomcat starts. WARNING: When the file is @@ -513,7 +513,7 @@ Transport.send(message); 5. Restart Tomcat - + For the additional JAR to be visible to Tomcat, it is necessary for the Tomcat instance to be restarted. Modified: tomcat/trunk/webapps/docs/jspapi/index.html URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jspapi/index.html?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/jspapi/index.html (original) +++ tomcat/trunk/webapps/docs/jspapi/index.html Sat Oct 22 21:26:20 2011 @@ -23,10 +23,10 @@ -The JSP Javadoc is not installed by default. Download and install +The JSP Javadoc is not installed by default. Download and install the "fulldocs" package to get it. -You can also access the javadoc online in the Tomcat +You can also access the javadoc online in the Tomcat documentation bundle. Modified: tomcat/trunk/webapps/docs/logging.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/logging.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/logging.xml (original) +++ tomcat/trunk/webapps/docs/logging.xml Sat Oct 22 21:26:20 2011 @@ -343,7 +343,7 @@ org.apache.catalina.core.ContainerBase.[ #org.apache.catalina.util.LifecycleBase.level = FINE - + Example logging.properties for the servlet-examples web application to be placed in WEB-INF/classes inside the web application: @@ -420,7 +420,7 @@ java.util.logging.ConsoleHandler.formatt - Create a file called log4j.properties with the + Create a file called log4j.properties with the following content and save it into $CATALINA_BASE/lib @@ -473,7 +473,7 @@ log4j.logger.org.apache.catalina.core.Co INFO, HOST-MANAGER - Download Log4J + Download Log4J (v1.2 or later). Download or build tomcat-juli.jar and @@ -529,10 +529,10 @@ log4j.logger.org.apache.catalina.core.Co - You can (and should) be more picky about which packages to include + You can (and should) be more picky about which packages to include in the logging. Tomcat defines loggers by Engine and Host names. For example, for a more detailed Catalina localhost log, add this to the - end of the log4j.properties above. Note that there are known issues with + end of the log4j.properties above. Note that there are known issues with using this naming convention (with square brackets) in log4j XML based configuration files, so we recommend you use a properties file as described until a future version of log4j allows this convention. @@ -550,12 +550,12 @@ log4j.logger.org.apache.catalina.session - Your web applications should certainly use their own log4j configuration. + Your web applications should certainly use their own log4j configuration. This is valid with the above configuration. You would place a similar log4j.properties file in your web application's WEB-INF/classes directory, and log4jx.y.z.jar into WEB-INF/lib. Then specify your package level logging. This is a basic setup of log4j which does *not* require - Commons-Logging, and you should consult the + Commons-Logging, and you should consult the log4j documentation for more options. This page is intended only as a bootstrapping guide. Modified: tomcat/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/manager-howto.xml Sat Oct 22 21:26:20 2011 @@ -172,7 +172,7 @@ an example of restricting access to the The HTML interface is protected against CSRF but the text and JMX interfaces are not. To maintain the CSRF protection: - + users with the manager-gui role should not be granted either the manager-script or manager-jmx roles. @@ -258,8 +258,8 @@ name or the war file name without the .w application can later be undeployed (and the corresponding application directory removed) by use of the /undeploy command. -The .WAR file may include Tomcat specific deployment configuration, by -including a Context configuration XML file in + The .WAR file may include Tomcat specific deployment configuration, by +including a Context configuration XML file in /META-INF/context.xml. URL parameters include: @@ -759,13 +759,13 @@ error message. Possible causes for prob http://localhost:8080/manager/text/undeploy?path=/examples -WARNING - This command will delete any web -application artifacts that exist within appBase directory + WARNING - This command will delete any web +application artifacts that exist within appBase directory (typically "webapps") for this virtual host. -This will delete the the application .WAR, if present, -the application directory resulting either from a deploy in unpacked form +This will delete the the application .WAR, if present, +the application directory resulting either from a deploy in unpacked form or from .WAR expansion as well as the XML Context definition from -$CATALINA_BASE/conf/[enginename]/[hostname]/ directory. +$CATALINA_BASE/conf/[enginename]/[hostname]/ directory. If you simply want to take an application out of service, you should use the /stop command instead. @@ -845,29 +845,29 @@ has been reloaded several times, it may If the command does not succeed, the response will start with FAIL and include an error message. - + From this link , you can view information about the server. -First, you have the server and JVM version number, JVM provider, OS name + First, you have the server and JVM version number, JVM provider, OS name and number followed by the architecture type. -Second, there is several information about the memory usage of the JVM + Second, there is several information about the memory usage of the JVM (available, total and max memory). -Then, there is information about the Tomcat AJP and HTTP connectors. + Then, there is information about the Tomcat AJP and HTTP connectors. The same information is available for both of them : - Threads information : Max threads, min and max spare threads, + Threads information : Max threads, min and max spare threads, current thread count and current thread busy. - Request information : Max processing time and processing time, + Request information : Max processing time and processing time, request and error count, bytes received and sent. - A table showing Stage, Time, Bytes Sent, Bytes Receive, Client, - VHost and Request. All existing threads are listed in the table. + A table showing Stage, Time, Bytes Sent, Bytes Receive, Client, + VHost and Request. All existing threads are listed in the table. Here is the list of the possible thread stages : "Parse and Prepare Request" : The request headers are @@ -993,8 +993,8 @@ property, and specify it from the comman Using Ant version 1.6.2 or later, -the Catalina tasks offer the option to capture their output in -properties or external files. They support directly the following subset of the +the Catalina tasks offer the option to capture their output in +properties or external files. They support directly the following subset of the <redirector> type attributes: @@ -1091,10 +1091,10 @@ any wrong or missing command attribute w They also support the embedded <redirector> element in which you can specify -its full set of attributes, but input, inputstring and +its full set of attributes, but input, inputstring and inputencoding that, even if accepted, are not used because they have no meaning in this context. -Refer to ant manual for details on +Refer to ant manual for details on <redirector> element attributes. @@ -1125,17 +1125,17 @@ can be used: path="${mgr.context.path}" war="${mgr.war.file}"/> </target> - + <target name="context.status"> <property name="running" value="${mgr.context.path}:running"/> <property name="stopped" value="${mgr.context.path}:stopped"/> - + <list url="${mgr.url}" outputproperty="ctx.status" username="${mgr.username}" password="${mgr.password}"> </list> - + <condition property="context.running"> <contains string="${ctx.status}" substring="${running}"/> </condition> Modified: tomcat/trunk/webapps/docs/maven-jars.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/maven-jars.xml?rev=1187809&r1=1187808&r2=1187809&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/maven-jars.xml (original) +++ tomcat/trunk/webapps/docs/maven-jars.xml Sat Oct 22 21:26:20 2011 @@ -35,10 +35,10 @@ - Tomcat snapshots are located in the + Tomcat snapshots are located in the Apache Snapshot Repository. The official URL is http://people.apache.org/repo/m2-snapshot-repository/org/apache/tomcat/ - Snapshots are done periodically, not on a regular basis, but when changes happen and the Tomcat team deems a new snapshot might + Snapshots are done periodically, not on a regular basis, but when changes happen and the Tomcat team deems a new snapshot might useful. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org

Other Realm Implementations

2. web.xml configuration

5. Restart Tomcat