From 01ce46d3e524c40ff650a356bda0dab23e28e730 Mon Sep 17 00:00:00 2001 From: kkolinko Date: Tue, 2 Aug 2011 09:13:39 +0000 Subject: [PATCH] Remove path attribute from examples of where this attribute is not needed. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153074 13f79535-47bb-0310-9956-ffa450edef68 --- webapps/docs/config/context.xml | 16 ++++++++-------- webapps/docs/jndi-datasource-examples-howto.xml | 6 ++---- webapps/docs/manager-howto.xml | 5 ++--- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 30a52f985..4be9ac2a1 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -767,7 +767,7 @@ by nesting a Valve element like this:

-<Context path="/examples" ...> +<Context> ... <Valve className="org.apache.catalina.valves.AccessLogValve" prefix="localhost_access_log." suffix=".txt" @@ -821,7 +821,7 @@ <Parameter> elements inside this element. For example, you can create an initialization parameter like this:

-<Context ...> +<Context> ... <Parameter name="companyName" value="My Company, Incorporated" override="false"/> @@ -880,7 +880,7 @@ <Environment> entries inside this element. For example, you can create an environment entry like this:

-<Context ...> +<Context> ... <Environment name="maxExemptions" value="10" type="java.lang.Integer" override="false"/> @@ -957,7 +957,7 @@ lifecycle events. Configuration of such a listener looks like this:

-<Context path="/examples" ...> +<Context> ... <Listener className="com.mycompany.mypackage.MyListener" ... > ... @@ -985,7 +985,7 @@ Example filter declarations:

-<Context path="/examples" ...> +<Context> ... <Valve className="org.apache.catalina.valves.RemoteHostValve" allow=".*\.mycompany\.com|www\.yourcompany\.com"/> @@ -1014,7 +1014,7 @@

For example, you can create a resource definition like this:

-<Context ...> +<Context> ... <Resource name="jdbc/EmployeeDB" auth="Container" type="javax.sql.DataSource" @@ -1111,7 +1111,7 @@

For example, you can create a resource link like this:

-<Context ...> +<Context> ... <ResourceLink name="linkToGlobalResource" global="simpleValue" @@ -1172,7 +1172,7 @@

Shared Data Source Example

-<GlobalNamingResources ...> +<GlobalNamingResources> ... <Resource name="sharedDataSource" global="sharedDataSource" diff --git a/webapps/docs/jndi-datasource-examples-howto.xml b/webapps/docs/jndi-datasource-examples-howto.xml index b7165d52f..e005c0db1 100644 --- a/webapps/docs/jndi-datasource-examples-howto.xml +++ b/webapps/docs/jndi-datasource-examples-howto.xml @@ -206,8 +206,7 @@ resource to your Context.

For example: -<Context path="/DBTest" docBase="DBTest" - reloadable="true" crossContext="true"> +<Context> <!-- maxActive: Maximum number of dB connections in pool. Make sure you configure your mysqld max_connections large enough to handle @@ -411,8 +410,7 @@ The Context element should look something like the following.

-<Context path="/someApp" docBase="someApp" - crossContext="true" reloadable="true"> +<Context> <Resource name="jdbc/postgres" auth="Container" type="javax.sql.DataSource" driverClassName="org.postgresql.Driver" diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml index 571b8ba5b..81ae2b016 100644 --- a/webapps/docs/manager-howto.xml +++ b/webapps/docs/manager-howto.xml @@ -71,7 +71,7 @@ Manager web application Context to a new host install the $CATALINA_BASE/conf/[enginename]/[hostname] folder. Here is an example:

-<Context path="/manager" privileged="true"
+<Context privileged="true"
          docBase="/usr/local/kinetic/tomcat7/server/webapps/manager">
 </Context>
@@ -162,8 +162,7 @@ could be restricted by the remote IP address or host by adding a RemoteAddrValve or RemoteHostValve. Here is an example of restricting access to the localhost by IP address:

-<Context path="/manager" privileged="true"
-         docBase="/usr/local/kinetic/tomcat7/server/webapps/manager">
+<Context privileged="true">
          <Valve className="org.apache.catalina.valves.RemoteAddrValve"
                 allow="127\.0\.0\.1"/>
 </Context>
-- 
2.11.0