Author: violetagg
Date: Tue Mar 18 10:16:25 2014
New Revision: 1578811
URL: http://svn.apache.org/r1578811
Log:
Merged revision 1578810 from tomcat/trunk:
Corrected link to Tomcat 7.0 documentation. Issue is reported via comments at
apache.org
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1578810
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1578811&r1=1578810&r2=1578811&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Mar 18
10:16:25 2014
@@ -130,7 +130,7 @@
</subsection>
<subsection name="Inside the Apache Tomcat Container">
<p>
- The Tomcat Connection pool is configured as a resource described in <a
href="http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html";
target="_blank">The Tomcat JDBC documentation</a>
+ The Tomcat Connection pool is configured as a resource described in <a
href="http://tomcat.apache.org/tomcat-7.0-doc/jndi-datasource-examples-howto.html";
target="_blank">The Tomcat JDBC documentation</a>
With the only difference being that you have to specify the
<code>factory</code> attribute and set the value to
<code>org.apache.tomcat.jdbc.pool.DataSourceFactory</code>
</p>
@@ -699,7 +699,7 @@
</section>
<section name="Code Example">
- <p>Other examples of Tomcat configuration for JDBC usage can be found <a
href="http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html";>in
the Tomcat documentation</a>. </p>
+ <p>Other examples of Tomcat configuration for JDBC usage can be found <a
href="http://tomcat.apache.org/tomcat-7.0-doc/jndi-datasource-examples-howto.html";>in
the Tomcat documentation</a>. </p>
<subsection name="Plain Ol' Java">
<p>Here is a simple example of how to create and use a data source.</p>
<source>
@@ -916,7 +916,7 @@
<section name="Building">
<p>We build the JDBC pool code with 1.6, but it is backwards compatible down
to 1.5 for runtime environment. For unit test, we use 1.6 and higher</p>
- <p>Other examples of Tomcat configuration for JDBC usage can be found <a
href="http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html";>in
the Tomcat documentation</a>. </p>
+ <p>Other examples of Tomcat configuration for JDBC usage can be found <a
href="http://tomcat.apache.org/tomcat-7.0-doc/jndi-datasource-examples-howto.html";>in
the Tomcat documentation</a>. </p>
<subsection name="Building from source">
<p>Building is pretty simple. The pool has a dependency on
<code>tomcat-juli.jar</code> and in case you want the
<code>SlowQueryReportJmx</code></p>
<source>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
