Modified: tomcat/trunk/webapps/docs/config/globalresources.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/globalresources.xml?rev=1519668&r1=1519667&r2=1519668&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/globalresources.xml (original) +++ tomcat/trunk/webapps/docs/config/globalresources.xml Tue Sep 3 12:41:42 2013 @@ -45,7 +45,7 @@ the <a href="../jndi-resources-howto.html">JNDI Resources HOW-TO</a>. The resources defined in this element are <strong>not</strong> visible in the per-web-application contexts unless you explicitly link them with - <a href="context.html#Resource Links"><ResourceLink></a> elements. + <a href="context.html#Resource_Links"><ResourceLink></a> elements. </p> </section> @@ -70,25 +70,21 @@ web applications as environment entry resources by nesting <code><Environment></code> entries inside this element. For example, you can create an environment entry like this:</p> -<source> -<GlobalNamingResources ...> +<source><![CDATA[<GlobalNamingResources ...> ... - <Environment name="maxExemptions" value="10" - type="java.lang.Integer" override="false"/> + <Environment name="maxExemptions" value="10" + type="java.lang.Integer" override="false"/> ... -</GlobalNamingResources> -</source> +</GlobalNamingResources>]]></source> <p>This is equivalent to the inclusion of the following element in the web application deployment descriptor (<code>/WEB-INF/web.xml</code>): </p> -<source> -<env-entry> - <env-entry-name>maxExemptions</env-entry-name> - <env-entry-value>10</env-entry-value> - <env-entry-type>java.lang.Integer</env-entry-type> -</env-entry> -</source> +<source><![CDATA[<env-entry> + <env-entry-name>maxExemptions</env-entry-name> + <env-entry-value>10</env-entry-value> + <env-entry-type>java.lang.Integer</env-entry-type> +</env-entry>]]></source> <p>but does <em>not</em> require modification of the deployment descriptor to customize this value.</p> @@ -137,7 +133,7 @@ to be returned for JNDI lookups of <code><resource-ref></code> and <code><resource-env-ref></code> elements in the web application deployment descriptor by defining them in this element and then linking - them with <a href="context.html#Resource Links"><ResourceLink></a> + them with <a href="context.html#_Links"><ResourceLink></a> elements in the <code><strong><Context></strong></code> element. @@ -147,26 +143,22 @@ the properties used to configure that object factory.</p> <p>For example, you can create a resource definition like this:</p> -<source> -<GlobalNamingResources ...> +<source><![CDATA[<GlobalNamingResources ...> ... - <Resource name="jdbc/EmployeeDB" auth="Container" + <Resource name="jdbc/EmployeeDB" auth="Container" type="javax.sql.DataSource" - description="Employees Database for HR Applications"/> + description="Employees Database for HR Applications"/> ... -</GlobalNamingResources> -</source> +</GlobalNamingResources>]]></source> <p>This is equivalent to the inclusion of the following element in the web application deployment descriptor (<code>/WEB-INF/web.xml</code>):</p> -<source> -<resource-ref> - <description>Employees Database for HR Applications</description> - <res-ref-name>jdbc/EmployeeDB</res-ref-name> - <res-ref-type>javax.sql.DataSource</res-ref-type> - <res-auth>Container</res-auth> -</resource-ref> -</source> +<source><![CDATA[<resource-ref> + <description>Employees Database for HR Applications</description> + <res-ref-name>jdbc/EmployeeDB</res-ref-name> + <res-ref-type>javax.sql.DataSource</res-ref-type> + <res-auth>Container</res-auth> +</resource-ref>]]></source> <p>but does <em>not</em> require modification of the deployment descriptor to customize this value.</p> @@ -239,25 +231,21 @@ </subsection> <subsection name="Resource Links"> - <p>Use <a href="context.html#Resource Links"><ResourceLink></a> + <p>Use <a href="context.html#Resource_Links"><code><ResourceLink></code></a> elements to link resources from the global context into per-web-application contexts. Here is an example of making a custom factory available to an application, based on the example definition in the - <a href="../jndi-resources-howto.html#Generic JavaBean Resources"> + <a href="../jndi-resources-howto.html#Generic_JavaBean_Resources"> JNDI Resource HOW-TO</a>: </p> - <source> - <![CDATA[ - <Context> - <ResourceLink - name="bean/MyBeanFactory" - global="bean/MyBeanFactory" - type="com.mycompany.MyBean" - /> - </Context> - ]]> - </source> + <source><![CDATA[<Context> + <ResourceLink + name="bean/MyBeanFactory" + global="bean/MyBeanFactory" + type="com.mycompany.MyBean" + /> +</Context>]]></source> </subsection>
Modified: tomcat/trunk/webapps/docs/config/host.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/host.xml?rev=1519668&r1=1519667&r2=1519668&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/host.xml (original) +++ tomcat/trunk/webapps/docs/config/host.xml Tue Sep 3 12:41:42 2013 @@ -48,7 +48,7 @@ <p>In many cases, System Administrators wish to associate more than one network name (such as <code>www.mycompany.com</code> and <code>company.com</code>) with the same virtual host and applications. - This can be accomplished using the <a href="#Host Name Aliases">Host + This can be accomplished using the <a href="#Host_Name_Aliases">Host Name Aliases</a> feature discussed below.</p> <p>One or more <strong>Host</strong> elements are nested inside an @@ -67,13 +67,11 @@ not match the name of a <strong>Host</strong> element will be routed to the default host.</p> - <blockquote><em> - <p>The description below uses the variable name $CATALINA_BASE to refer the + <p><em>The description below uses the variable name $CATALINA_BASE to refer the base directory against which most relative paths are resolved. If you have not configured Tomcat for multiple instances by setting a CATALINA_BASE directory, then $CATALINA_BASE will be set to the value of $CATALINA_HOME, - the directory into which you have installed Tomcat.</p> - </em></blockquote> + the directory into which you have installed Tomcat.</em></p> </section> @@ -183,7 +181,7 @@ specify the host name, Tomcat will convert it to lower case internally. One of the Hosts nested within an <a href="engine.html">Engine</a> MUST have a name that matches the <code>defaultHost</code> setting for that - Engine. See <a href="#Host Name Aliases">Host Name Aliases</a> for + Engine. See <a href="#Host_Name_Aliases">Host Name Aliases</a> for information on how to assign more than one network name to the same virtual host.</p> </attribute> @@ -337,17 +335,15 @@ <a href="host.html">Host</a>, or <a href="context.html">Context</a> by nesting a <a href="valve.html">Valve</a> element like this:</p> -<source> -<Host name="localhost" ...> +<source><![CDATA[<Host name="localhost" ...> ... - <Valve className="org.apache.catalina.valves.AccessLogValve" + <Valve className="org.apache.catalina.valves.AccessLogValve" prefix="localhost_access_log." suffix=".txt" - pattern="common"/> + pattern="common"/> ... -</Host> -</source> +</Host>]]></source> - <p>See <a href="valve.html#Access Log Valve">Access Log Valve</a> + <p>See <a href="valve.html#Access_Log_Valve">Access Log Valve</a> for more information on the configuration attributes that are supported.</p> @@ -394,7 +390,7 @@ for context.xml and/or WAR files.</li> </ol> - <p>When <code>autoDeploy</code> is <true>true</true>, the automatic + <p>When <code>autoDeploy</code> is <code>true</code>, the automatic deployment process will monitor the deployed web applications for changes. Depending on exactly what changes, the web application will either be re-deployed or reloaded. Re-deployment involves the creation of a new web @@ -451,13 +447,11 @@ <p>This is accomplished by utilizing one or more <strong>Alias</strong> elements nested inside your <strong>Host</strong> element. For example:</p> -<source> -<Host name="www.mycompany.com" ...> +<source><![CDATA[<Host name="www.mycompany.com" ...> ... - <Alias>mycompany.com</Alias> + <Alias>mycompany.com</Alias> ... -</Host> -</source> +</Host>]]></source> <p>In order for this strategy to be effective, all of the network names involved must be registered in your DNS server to resolve to the @@ -476,13 +470,11 @@ it will be notified about the occurrence of the corresponding lifecycle events. Configuration of such a listener looks like this:</p> -<source> -<Host name="localhost" ...> +<source><![CDATA[<Host name="localhost" ...> ... - <Listener className="com.mycompany.mypackage.MyListener" ... > + <Listener className="com.mycompany.mypackage.MyListener" ... > ... -</Host> -</source> +</Host>]]></source> <p>Note that a Listener can have any number of additional properties that may be configured from this element. Attribute names are matched @@ -504,19 +496,17 @@ not accepted will be rejected with an HTTP "Forbidden" error. Example filter declarations:</p> -<source> -<Host name="localhost" ...> +<source><![CDATA[<Host name="localhost" ...> ... - <Valve className="org.apache.catalina.valves.RemoteHostValve" - allow=".*\.mycompany\.com|www\.yourcompany\.com"/> - <Valve className="org.apache.catalina.valves.RemoteAddrValve" - deny="192\.168\.1\.\d+"/> + <Valve className="org.apache.catalina.valves.RemoteHostValve" + allow=".*\.mycompany\.com|www\.yourcompany\.com"/> + <Valve className="org.apache.catalina.valves.RemoteAddrValve" + deny="192\.168\.1\.\d+"/> ... -</Host> -</source> +</Host>]]></source> - <p>See <a href="valve.html#Remote Address Filter">Remote Address Filter</a> - and <a href="valve.html#Remote Host Filter">Remote Host Filter</a> for + <p>See <a href="valve.html#Remote_Address_Filter">Remote Address Filter</a> + and <a href="valve.html#Remote_Host_Filter">Remote Host Filter</a> for more information about the configuration options that are supported.</p> </subsection> @@ -530,13 +520,11 @@ host. This can be accomplished by nesting an element like this inside the Host element for this virtual host:</p> -<source> -<Host name="localhost" ...> +<source><![CDATA[<Host name="localhost" ...> ... - <Valve className="org.apache.catalina.authenticator.SingleSignOn"/> + <Valve className="org.apache.catalina.authenticator.SingleSignOn"/> ... -</Host> -</source> +</Host>]]></source> <p>The Single Sign On facility operates according to the following rules: </p> @@ -582,39 +570,33 @@ <strong>Listener</strong> element like this (on a Unix system that uses the <code>/etc/passwd</code> file to identify valid users):</p> -<source> -<Host name="localhost" ...> +<source><![CDATA[<Host name="localhost" ...> ... - <Listener className="org.apache.catalina.startup.UserConfig" + <Listener className="org.apache.catalina.startup.UserConfig" directoryName="public_html" - userClass="org.apache.catalina.startup.PasswdUserDatabase"/> + userClass="org.apache.catalina.startup.PasswdUserDatabase"/> ... -</Host> -</source> +</Host>]]></source> <p>On a server where <code>/etc/passwd</code> is not in use, you can request Catalina to consider all directories found in a specified base directory (such as <code>c:\Homes</code> in this example) to be considered "user home" directories for the purposes of this directive:</p> -<source> -<Host name="localhost" ...> +<source><![CDATA[<Host name="localhost" ...> ... - <Listener className="org.apache.catalina.startup.UserConfig" + <Listener className="org.apache.catalina.startup.UserConfig" directoryName="public_html" homeBase=c:\Homes" - userClass="org.apache.catalina.startup.HomesUserDatabase"/> + userClass="org.apache.catalina.startup.HomesUserDatabase"/> ... -</Host> -</source> +</Host>]]></source> <p>If a user home directory has been set up for a user named <code>craigmcc</code>, then its contents will be visible from a client browser by making a request to a URL like:</p> -<source> -http://www.mycompany.com:8080/~craigmcc -</source> +<source>http://www.mycompany.com:8080/~craigmcc</source> <p>Successful use of this feature requires recognition of the following considerations:</p> Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1519668&r1=1519667&r2=1519668&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Tue Sep 3 12:41:42 2013 @@ -174,7 +174,7 @@ <code>org.apache.coyote.http11.Http11AprProtocol</code> - the APR/native connector.<br/> Custom implementations may also be used.<br/> - Take a look at our <a href="#Connector Comparison">Connector + Take a look at our <a href="#Connector_Comparison">Connector Comparison</a> chart. The configuration for both Java connectors is identical, for http and https.<br/> For more information on the APR connector and APR specific SSL settings @@ -186,7 +186,7 @@ <p>If this <strong>Connector</strong> is being used in a proxy configuration, configure this attribute to specify the server name to be returned for calls to <code>request.getServerName()</code>. - See <a href="#Proxy Support">Proxy Support</a> for more + See <a href="#Proxy_Support">Proxy Support</a> for more information.</p> </attribute> @@ -194,7 +194,7 @@ <p>If this <strong>Connector</strong> is being used in a proxy configuration, configure this attribute to specify the server port to be returned for calls to <code>request.getServerPort()</code>. - See <a href="#Proxy Support">Proxy Support</a> for more + See <a href="#Proxy_Support">Proxy Support</a> for more information.</p> </attribute> @@ -489,7 +489,7 @@ <code>scheme</code> and the <code>secure</code> attributes as well to pass the correct <code>request.getScheme()</code> and <code>request.isSecure()</code> values to the servlets - See <a href="#SSL Support">SSL Support</a> for more information. + See <a href="#SSL_Support">SSL Support</a> for more information. </p> </attribute> @@ -565,19 +565,19 @@ </attribute> <attribute name="socket.performanceConnectionTime" required="false"> <p>(int)The first value for the performance settings. See - <a href="http://docs.oracle.com/javase/6/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int)">Socket Performance Options</a> + <a href="http://docs.oracle.com/javase/7/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int)">Socket Performance Options</a> All three performance attributes must be set else the JVM defaults will be used for all three.</p> </attribute> <attribute name="socket.performanceLatency" required="false"> <p>(int)The second value for the performance settings. See - <a href="http://docs.oracle.com/javase/6/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int)">Socket Performance Options</a> + <a href="http://docs.oracle.com/javase/7/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int)">Socket Performance Options</a> All three performance attributes must be set else the JVM defaults will be used for all three.</p> </attribute> <attribute name="socket.performanceBandwidth" required="false"> <p>(int)The third value for the performance settings. See - <a href="http://docs.oracle.com/javase/6/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int)">Socket Performance Options</a> + <a href="http://docs.oracle.com/javase/7/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int)">Socket Performance Options</a> All three performance attributes must be set else the JVM defaults will be used for all three.</p> </attribute> @@ -1029,8 +1029,6 @@ the JVM default is used. The permitted values may be obtained from the JVM documentation for the allowed values for <code>SSLSocket.setEnabledProtocols()</code> e.g. - <a href="http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#jssenames";> - Oracle Java 6</a> and <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#jssenames";> Oracle Java 7</a>. Note: There is overlap between this attribute and <code>sslProtocol</code>.</p> @@ -1049,8 +1047,6 @@ default is <code>TLS</code>. The permitted values may be obtained from the JVM documentation for the allowed values for algorithm when creating an <code>SSLContext</code> instance e.g. - <a href="http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#SSLContext";> - Oracle Java 6</a> and <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#SSLContext";> Oracle Java 7</a>. Note: There is overlap between this attribute and <code>sslEnabledProtocols</code>.</p> @@ -1249,23 +1245,81 @@ <subsection name="Connector Comparison"> <p>Below is a small chart that shows how the connectors differentiate.</p> - <source> - Java Blocking Connector Java Non Blocking Connector APR/native Connector - BIO NIO APR - Classname Http11Protocol Http11NioProtocol Http11AprProtocol - Tomcat Version 3.x onwards 6.x onwards 5.5.x onwards - Support Polling NO YES YES - Polling Size N/A maxConnections maxConnections - Read HTTP Request Blocking Non Blocking Blocking - Read HTTP Body Blocking Sim Blocking Blocking - Write HTTP Response Blocking Sim Blocking Blocking - Wait for next Request Blocking Non Blocking Non Blocking - SSL Support Java SSL Java SSL OpenSSL - SSL Handshake Blocking Non blocking Blocking - Max Connections maxConnections maxConnections maxConnections - - </source> + <table class="defaultTable" style="text-align: center;"> + <tr> + <th /> + <th>Java Blocking Connector<br />BIO</th> + <th>Java Nio Blocking Connector<br />NIO</th> + <th>APR/native Connector<br />APR</th> + </tr> + <tr> + <th style="text-align: left;">Classname</th> + <td><code class="noHighlight">Http11Protocol</code></td> + <td><code class="noHighlight">Http11NioProtocol</code></td> + <td><code class="noHighlight">Http11AprProtocol</code></td> + </tr> + <tr> + <th style="text-align: left;">Tomcat Version</th> + <td>3.x onwards</td> + <td>6.x onwards</td> + <td>5.5.x onwards</td> + </tr> + <tr> + <th style="text-align: left;">Support Polling</th> + <td>NO</td> + <td>YES</td> + <td>YES</td> + </tr> + <tr> + <th style="text-align: left;">Polling Size</th> + <td>N/A</td> + <td><code class="noHighlight">maxConnections</code></td> + <td><code class="noHighlight">maxConnections</code></td> + </tr> + <tr> + <th style="text-align: left;">Read HTTP Request</th> + <td>Blocking</td> + <td>Non Blocking</td> + <td>Blocking</td> + </tr> + <tr> + <th style="text-align: left;">Read HTTP Body</th> + <td>Blocking</td> + <td>Sim Blocking</td> + <td>Blocking</td> + </tr> + <tr> + <th style="text-align: left;">Write HTTP Response</th> + <td>Blocking</td> + <td>Sim Blocking</td> + <td>Blocking</td> + </tr> + <tr> + <th style="text-align: left;">Wait for next Request</th> + <td>Blocking</td> + <td>Non Blocking</td> + <td>Non Blocking</td> + </tr> + <tr> + <th style="text-align: left;">SSL Support</th> + <td>Java SSL</td> + <td>Java SSL</td> + <td>OpenSSL</td> + </tr> + <tr> + <th style="text-align: left;">SSL Handshake</th> + <td>Blocking</td> + <td>Non blocking</td> + <td>Blocking</td> + </tr> + <tr> + <th style="text-align: left;">Max Connections</th> + <td><code class="noHighlight">maxConnections</code></td> + <td><code class="noHighlight">maxConnections</code></td> + <td><code class="noHighlight">maxConnections</code></td> + </tr> + </table> </subsection> </section> Modified: tomcat/trunk/webapps/docs/config/listeners.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1519668&r1=1519667&r2=1519668&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/listeners.xml (original) +++ tomcat/trunk/webapps/docs/config/listeners.xml Tue Sep 3 12:41:42 2013 @@ -451,47 +451,35 @@ <h3>Using file-based Authentication and Authorisation</h3> - <p>If this listener was configured in server.xml as: - <source> - <Listener className="org.apache.catalina.mbeans.JmxRemoteLifecycleListener" - rmiRegistryPortPlatform="10001" rmiServerPortPlatform="10002" /> - </source> - with the following system properties set (e.g. in setenv.sh): - <source> - -Dcom.sun.management.jmxremote.password.file=$CATALINA_BASE/conf/jmxremote.password + <p>If this listener was configured in server.xml as:</p> + <source><![CDATA[ <Listener className="org.apache.catalina.mbeans.JmxRemoteLifecycleListener" + rmiRegistryPortPlatform="10001" rmiServerPortPlatform="10002" />]]></source> + <p>with the following system properties set (e.g. in setenv.sh):</p> + <source> -Dcom.sun.management.jmxremote.password.file=$CATALINA_BASE/conf/jmxremote.password -Dcom.sun.management.jmxremote.access.file=$CATALINA_BASE/conf/jmxremote.access - -Dcom.sun.management.jmxremote.ssl=false - </source> - $CATALINA_BASE/conf/jmxremote.password containing: - <source> - admin letmein - </source> - $CATALINA_BASE/conf/jmxremote.access containing: - <source> - admin readwrite - </source> - then opening ports 10001 (RMI Registry) and 10002 (JMX/RMI Server) in your + -Dcom.sun.management.jmxremote.ssl=false</source> + <p>$CATALINA_BASE/conf/jmxremote.password containing:</p> + <source>admin letmein</source> + <p>$CATALINA_BASE/conf/jmxremote.access containing:</p> + <source>admin readwrite</source> + <p>then opening ports 10001 (RMI Registry) and 10002 (JMX/RMI Server) in your firewall would enable jconsole to connect to a Tomcat instance running - behind a firewall using a connection string of the form: - <source> - service:jmx:rmi://<hostname>:10002/jndi/rmi://<hostname>:10001/jmxrmi - </source> + behind a firewall using a connection string of the form:</p> + <source>service:jmx:rmi://<hostname>:10002/jndi/rmi://<hostname>:10001/jmxrmi</source> + <p> with a user name of <code>admin</code> and a password of <code>letmein</code>. </p> <h3>Using JAAS</h3> - <p>If we use the following system properties instead: - <source> - -Dcom.sun.management.jmxremote.login.config=Tomcat + <p>If we use the following system properties instead:</p> + <source> -Dcom.sun.management.jmxremote.login.config=Tomcat -Djava.security.auth.login.config=$CATALINA_BASE/conf/login.config -Dcom.sun.management.jmxremote.access.file=$CATALINA_BASE/conf/jmxremote.access - -Dcom.sun.management.jmxremote.ssl=false - </source> - $CATALINA_BASE/conf/login.config containing your choice of JAAS LoginModule implementation, for example: - <source> - Tomcat { /* should match to the com.sun.management.jmxremote.login.config property */ + -Dcom.sun.management.jmxremote.ssl=false</source> + <p>$CATALINA_BASE/conf/login.config containing your choice of JAAS LoginModule implementation, for example:</p> + <source> Tomcat { /* should match to the com.sun.management.jmxremote.login.config property */ /* for illustration purposes only */ com.sun.security.auth.module.LdapLoginModule REQUIRED @@ -499,12 +487,10 @@ userFilter="(&(uid={USERNAME})(objectClass=inetOrgPerson))" authzIdentity="admin" debug=true; - }; - </source> - $CATALINA_BASE/conf/jmxremote.access containing: - <source> - admin readwrite - </source> + };</source> + <p>$CATALINA_BASE/conf/jmxremote.access containing:</p> + <source>admin readwrite</source> + <p> then we would need to provide LDAP credentials instead. </p> Modified: tomcat/trunk/webapps/docs/config/loader.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/loader.xml?rev=1519668&r1=1519667&r2=1519668&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/loader.xml (original) +++ tomcat/trunk/webapps/docs/config/loader.xml Tue Sep 3 12:41:42 2013 @@ -56,13 +56,11 @@ <p>For a more in-depth description of the class loader hierarchy that is implemented by Catalina, see <a href="../class-loader-howto.html">the ClassLoader HowTo</a>.</p> - <blockquote><em> - <p>The description below uses the variable name $CATALINA_BASE to refer the + <p><em>The description below uses the variable name $CATALINA_BASE to refer the base directory against which most relative paths are resolved. If you have not configured Tomcat for multiple instances by setting a CATALINA_BASE directory, then $CATALINA_BASE will be set to the value of $CATALINA_HOME, - the directory into which you have installed Tomcat.</p> - </em></blockquote> + the directory into which you have installed Tomcat.</em></p> </section> Modified: tomcat/trunk/webapps/docs/config/manager.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/manager.xml?rev=1519668&r1=1519667&r2=1519668&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/manager.xml (original) +++ tomcat/trunk/webapps/docs/config/manager.xml Tue Sep 3 12:41:42 2013 @@ -195,14 +195,14 @@ element - this is required for use of <code>PersistentManager</code>.</p> <p>This implementation of Manager supports the following attributes in - addition to the <a href="#Common Attributes">Common Attributes</a> + addition to the <a href="#Common_Attributes">Common Attributes</a> described earlier.</p> <attributes> <attribute name="className" required="true"> <p>It has the same meaning as described in the - <a href="#Common Attributes">Common Attributes</a> above. + <a href="#Common_Attributes">Common Attributes</a> above. You <strong>must</strong> specify <code>org.apache.catalina.session.PersistentManager</code> to use this manager implementation.</p> @@ -432,8 +432,7 @@ Detailed SQL commands vary depending on the database you are using, but a script like this will generally be required:</p> -<source> -create table tomcat_sessions ( +<source>create table tomcat_sessions ( session_id varchar(100) not null primary key, valid_session char(1) not null, max_inactive int not null, @@ -441,8 +440,7 @@ create table tomcat_sessions ( app_name varchar(255), session_data mediumblob, KEY kapp_name(app_name) -); -</source> +);</source> <p>In order for the JDBC Based Store to successfully connect to your database, the JDBC driver you configure must be visible to Tomcat's @@ -481,7 +479,7 @@ create table tomcat_sessions ( a <a href="context.html">Context</a> configuration file for your web application and add the following element there:</p> - <source><Manager pathname="" /></source> + <source><![CDATA[<Manager pathname="" />]]></source> </subsection> </section> Modified: tomcat/trunk/webapps/docs/config/realm.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=1519668&r1=1519667&r2=1519668&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/realm.xml (original) +++ tomcat/trunk/webapps/docs/config/realm.xml Tue Sep 3 12:41:42 2013 @@ -55,13 +55,11 @@ <a href="../realm-howto.html">Container-Managed Security Guide</a>. </p> - <blockquote><em> - <p>The description below uses the variable name $CATALINA_BASE to refer the + <p><em>The description below uses the variable name $CATALINA_BASE to refer the base directory against which most relative paths are resolved. If you have not configured Tomcat for multiple instances by setting a CATALINA_BASE directory, then $CATALINA_BASE will be set to the value of $CATALINA_HOME, - the directory into which you have installed Tomcat.</p> - </em></blockquote> + the directory into which you have installed Tomcat.</em></p> </section> Modified: tomcat/trunk/webapps/docs/config/systemprops.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1519668&r1=1519667&r2=1519668&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/systemprops.xml (original) +++ tomcat/trunk/webapps/docs/config/systemprops.xml Tue Sep 3 12:41:42 2013 @@ -278,7 +278,7 @@ <property name="org.apache.catalina. STRICT_SERVLET_COMPLIANCE"> <p>The default value of this system property is <code>false</code>.</p> - <p>If this is <code>true</code> the default values will be changed for: + <p>If this is <code>true</code> the default values will be changed for:</p> <ul> <li><code>org.apache.catalina.core.<br/>ApplicationContext.GET_RESOURCE_REQUIRE_SLASH</code></li> <li><code>org.apache.catalina.core.<br/>ApplicationDispatcher.WRAP_SAME_OBJECT</code></li> @@ -298,7 +298,7 @@ <li>The <code>xmlValidation</code> attribute of any <a href="context.html">Context</a> element.</li> </ul> - </p> + <p>Note that changing a number of the above defaults is likely to break the majority of systems as some browsers are unable to correctly handle the cookie headers that result from a strict adherence to the @@ -342,12 +342,12 @@ <property name="org.apache.tomcat.websocket. STRICT_SPEC_COMPLIANCE"> <p>The default value of this system property is <code>false</code>.</p> - <p>If this is <code>true</code> the default values will be changed for: + <p>If this is <code>true</code> the default values will be changed for:</p> <ul> <li><code>org.apache.tomcat.websocket.server#isEnforceNoAddAfterHandshake</code> (default changes from <code>false</code> to <code>true</code>)</li> </ul> - </p> + </property> <property @@ -510,7 +510,7 @@ <code>org.apache.juli.logging.UserDataHelper.SUPPRESSION_TIME</code>. </p> <p>The default value is <code>INFO_THEN_DEBUG</code>.</p> - <p>The errors currently logged using this system are: + <p>The errors currently logged using this system are:</p> <ul> <li>invalid cookies;</li> <li>invalid parameters;</li> @@ -518,7 +518,7 @@ <code>maxHeaderCount</code> or <code>maxParameterCount</code> limits of a <a href="http.html">connector</a>).</li> </ul> - Other errors triggered by invalid input data may be added to this + <p>Other errors triggered by invalid input data may be added to this system in later versions.</p> </property> Modified: tomcat/trunk/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1519668&r1=1519667&r2=1519668&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/valve.xml (original) +++ tomcat/trunk/webapps/docs/config/valve.xml Tue Sep 3 12:41:42 2013 @@ -42,13 +42,11 @@ Individual Valves have distinct processing capabilities, and are described individually below.</p> - <blockquote><em> - <p>The description below uses the variable name $CATALINA_BASE to refer the + <p><em>The description below uses the variable name $CATALINA_BASE to refer the base directory against which most relative paths are resolved. If you have not configured Tomcat for multiple instances by setting a CATALINA_BASE directory, then $CATALINA_BASE will be set to the value of $CATALINA_HOME, - the directory into which you have installed Tomcat.</p> - </em></blockquote> + the directory into which you have installed Tomcat.</em></p> </section> @@ -297,6 +295,7 @@ It is modeled after the <a href="http://httpd.apache.org/";>Apache HTTP Server</a> log configuration syntax: + </p> <ul> <li><b><code>%{xxx}i</code></b> for incoming headers</li> <li><b><code>%{xxx}o</code></b> for outgoing response headers</li> @@ -305,7 +304,6 @@ <li><b><code>%{xxx}s</code></b> xxx is an attribute in the HttpSession</li> <li><b><code>%{xxx}t</code></b> xxx is an enhanced SimpleDateFormat pattern</li> </ul> - </p> <p>All formats supported by SimpleDateFormat are allowed in <code>%{xxx}t</code>. In addition the following extensions have been added:</p> @@ -518,10 +516,8 @@ <subsection name="Example"> <p>To allow access only for the clients connecting from localhost:</p> -<pre> - <Valve className="org.apache.catalina.valves.RemoteAddrValve" - allow="127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1"/> -</pre> + <source><![CDATA[<Valve className="org.apache.catalina.valves.RemoteAddrValve" + allow="127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1"/>]]></source> </subsection> </section> @@ -605,7 +601,7 @@ your virtual host, and then have their identity recognized by all other web applications on the same virtual host.</p> - <p>See the <a href="host.html#Single Sign On">Single Sign On</a> special + <p>See the <a href="host.html#Single_Sign_On">Single Sign On</a> special feature on the <strong>Host</strong> element for more information.</p> </subsection> Modified: tomcat/trunk/webapps/docs/images/docs-stylesheet.css URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/images/docs-stylesheet.css?rev=1519668&r1=1519667&r2=1519668&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/images/docs-stylesheet.css (original) +++ tomcat/trunk/webapps/docs/images/docs-stylesheet.css Tue Sep 3 12:41:42 2013 @@ -38,6 +38,11 @@ img { table { border-collapse: collapse; + text-align: left; +} +table *:not(table) { + /* Prevent border-collapsing for table child elements like <div> */ + border-collapse: separate; } main { @@ -213,34 +218,25 @@ div.codeBox pre.wrap { } -table.defaultTable tr { +table.defaultTable tr, table.detail-table tr { border: 1px solid #CCC; } -table.defaultTable tr:nth-child(even) { +table.defaultTable tr:nth-child(even), table.detail-table tr:nth-child(even) { background-color: #FAFBFF; } -table.defaultTable tr:nth-child(odd) { +table.defaultTable tr:nth-child(odd), table.detail-table tr:nth-child(odd) { background-color: #EEEFFF; } -table.defaultTable th { +table.defaultTable th, table.detail-table th { background-color: #88b; color: #fff; } -table.detail-table th { - background-color: #039acc; - color: #fff; -} -table.detail-table td { - background-color: #DAF2FA; -} - table.defaultTable th, table.defaultTable td, table.detail-table th, table.detail-table td { padding: 5px 8px; - text-align: left; } Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=1519668&r1=1519667&r2=1519668&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Tue Sep 3 12:41:42 2013 @@ -307,6 +307,8 @@ <div class="subsection"> <!-- Subsection heading --> + <!-- TODO: When a <subsection> is nested in another <subsection>, + the output should be <h5>, not <h4>. Same with <h6>. --> <h4 id="{$name}"> <xsl:value-of select="@name"/> </h4> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
