svn commit: r1153076 - in /tomcat/tc6.0.x/trunk/webapps/docs: config/context.xml jndi-datasource-examples-howto.xml manager-howto.xml

Tue, 02 Aug 2011 02:23:11 -0700 

Author: kkolinko
Date: Tue Aug  2 09:22:35 2011
New Revision: 1153076

URL: http://svn.apache.org/viewvc?rev=1153076&view=rev
Log:
CTR: Docs
Remove path attribute from examples of <Context> where this attribute is not 
needed.

Modified:
    tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
    tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
    tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=1153076&r1=1153075&r2=1153076&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Tue Aug  2 09:22:35 
2011
@@ -538,7 +538,7 @@
     by nesting a <a href="valve.html">Valve</a> element like this:</p>
 
 <source>
-&lt;Context path="/examples" ...&gt;
+&lt;Context&gt;
   ...
   &lt;Valve className="org.apache.catalina.valves.AccessLogValve"
          prefix="localhost_access_log." suffix=".txt"
@@ -592,7 +592,7 @@
     <code>&lt;Parameter&gt;</code> elements inside this element.  For
     example, you can create an initialization parameter like this:</p>
 <source>
-&lt;Context ...&gt;
+&lt;Context&gt;
   ...
   &lt;Parameter name="companyName" value="My Company, Incorporated"
          override="false"/&gt;
@@ -651,7 +651,7 @@
     <code>&lt;Environment&gt;</code> entries inside this element.  For
     example, you can create an environment entry like this:</p>
 <source>
-&lt;Context ...&gt;
+&lt;Context&gt;
   ...
   &lt;Environment name="maxExemptions" value="10"
          type="java.lang.Integer" override="false"/&gt;
@@ -728,7 +728,7 @@
     lifecycle events.  Configuration of such a listener looks like this:</p>
 
 <source>
-&lt;Context path="/examples" ...&gt;
+&lt;Context&gt;
   ...
   &lt;Listener className="com.mycompany.mypackage.MyListener" ... &gt;
   ...
@@ -756,7 +756,7 @@
     Example filter declarations:</p>
 
 <source>
-&lt;Context path="/examples" ...&gt;
+&lt;Context&gt;
   ...
   &lt;Valve className="org.apache.catalina.valves.RemoteHostValve"
          allow=".*\.mycompany\.com|www\.yourcompany\.com"/&gt;
@@ -785,7 +785,7 @@
 
     <p>For example, you can create a resource definition like this:</p>
 <source>
-&lt;Context ...&gt;
+&lt;Context&gt;
   ...
   &lt;Resource name="jdbc/EmployeeDB" auth="Container"
             type="javax.sql.DataSource"
@@ -860,7 +860,7 @@
 
     <p>For example, you can create a resource link like this:</p>
 <source>
-&lt;Context ...&gt;
+&lt;Context&gt;
   ...
   &lt;ResourceLink name="linkToGlobalResource"
             global="simpleValue"
@@ -921,7 +921,7 @@
     </attributes>
     <p>Shared Data Source Example</p>
 <source>
-&lt;GlobalNamingResources ...&gt;
+&lt;GlobalNamingResources&gt;
   ...
   &lt;Resource name=&quot;sharedDataSource&quot;
             global=&quot;sharedDataSource&quot;

Modified: tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1153076&r1=1153075&r2=1153076&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml 
(original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Tue 
Aug  2 09:22:35 2011
@@ -206,8 +206,7 @@ resource to your <a href="config/context
 <p>For example:
 
 <source>
-&lt;Context path="/DBTest" docBase="DBTest"
-        reloadable="true" crossContext="true"&gt;
+&lt;Context&gt;
 
     &lt;!-- 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>
-&lt;Context path="/someApp" docBase="someApp"
-   crossContext="true" reloadable="true"&gt;
+&lt;Context&gt;
 
 &lt;Resource name="jdbc/postgres" auth="Container"
           type="javax.sql.DataSource" driverClassName="org.postgresql.Driver"

Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=1153076&r1=1153075&r2=1153076&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Tue Aug  2 09:22:35 2011
@@ -174,8 +174,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>
-&lt;Context path="/manager" privileged="true"
-         docBase="/usr/local/tomcat6/server/manager"&gt;
+&lt;Context privileged="true"&gt;
          &lt;Valve className="org.apache.catalina.valves.RemoteAddrValve"
                 allow="127\.0\.0\.1"/&gt;
 &lt;/Context&gt;



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to