Author: kkolinko
Date: Tue Aug 2 09:13:39 2011
New Revision: 1153074
URL: http://svn.apache.org/viewvc?rev=1153074&view=rev
Log:
Remove path attribute from examples of <Context> where this attribute is not
needed.
Modified:
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/trunk/webapps/docs/manager-howto.xml
Modified: tomcat/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1153074&r1=1153073&r2=1153074&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Tue Aug 2 09:13:39 2011
@@ -767,7 +767,7 @@
by nesting a <a href="valve.html">Valve</a> element like this:</p>
<source>
-<Context path="/examples" ...>
+<Context>
...
<Valve className="org.apache.catalina.valves.AccessLogValve"
prefix="localhost_access_log." suffix=".txt"
@@ -821,7 +821,7 @@
<code><Parameter></code> elements inside this element. For
example, you can create an initialization parameter like this:</p>
<source>
-<Context ...>
+<Context>
...
<Parameter name="companyName" value="My Company, Incorporated"
override="false"/>
@@ -880,7 +880,7 @@
<code><Environment></code> entries inside this element. For
example, you can create an environment entry like this:</p>
<source>
-<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:</p>
<source>
-<Context path="/examples" ...>
+<Context>
...
<Listener className="com.mycompany.mypackage.MyListener" ... >
...
@@ -985,7 +985,7 @@
Example filter declarations:</p>
<source>
-<Context path="/examples" ...>
+<Context>
...
<Valve className="org.apache.catalina.valves.RemoteHostValve"
allow=".*\.mycompany\.com|www\.yourcompany\.com"/>
@@ -1014,7 +1014,7 @@
<p>For example, you can create a resource definition like this:</p>
<source>
-<Context ...>
+<Context>
...
<Resource name="jdbc/EmployeeDB" auth="Container"
type="javax.sql.DataSource"
@@ -1111,7 +1111,7 @@
<p>For example, you can create a resource link like this:</p>
<source>
-<Context ...>
+<Context>
...
<ResourceLink name="linkToGlobalResource"
global="simpleValue"
@@ -1172,7 +1172,7 @@
</attributes>
<p>Shared Data Source Example</p>
<source>
-<GlobalNamingResources ...>
+<GlobalNamingResources>
...
<Resource name="sharedDataSource"
global="sharedDataSource"
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=1153074&r1=1153073&r2=1153074&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Tue Aug 2
09:13:39 2011
@@ -206,8 +206,7 @@ resource to your <a href="config/context
<p>For example:
<source>
-<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 somethin
</p>
<source>
-<Context path="/someApp" docBase="someApp"
- crossContext="true" reloadable="true">
+<Context>
<Resource name="jdbc/postgres" auth="Container"
type="javax.sql.DataSource" driverClassName="org.postgresql.Driver"
Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1153074&r1=1153073&r2=1153074&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Aug 2 09:13:39 2011
@@ -71,7 +71,7 @@ Manager web application <code>Context</c
<code>$CATALINA_BASE/conf/[enginename]/[hostname]</code> folder. Here is an
example:</p>
<pre>
-<Context path="/manager" privileged="true"
+<Context privileged="true"
docBase="/usr/local/kinetic/tomcat7/server/webapps/manager">
</Context>
</pre>
@@ -162,8 +162,7 @@ could be restricted by the remote IP add
<code>RemoteAddrValve</code> or <code>RemoteHostValve</code>. Here is
an example of restricting access to the localhost by IP address:</p>
<pre>
-<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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]