Author: psteitz
Date: Sun Feb 7 13:52:06 2010
New Revision: 907421
URL: http://svn.apache.org/viewvc?rev=907421&view=rev
Log:
s/catalina/Apache Tomcat.
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/package.html
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java?rev=907421&r1=907420&r2=907421&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
Sun Feb 7 13:52:06 2010
@@ -76,7 +76,7 @@
*
* <p>
* The <a href="package-summary.html">package documentation</a> contains an
- * example using catalina and JNDI and it also contains a non-JNDI example.
+ * example using Apache Tomcat and JNDI and it also contains a non-JNDI
example.
* </p>
*
* @author John D. McNally
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/package.html
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/package.html?rev=907421&r1=907420&r2=907421&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/package.html
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/package.html
Sun Feb 7 13:52:06 2010
@@ -82,7 +82,7 @@
<p>
-Catalina deploys all objects configured similarly to above within the
+Apache Tomcat deploys all objects configured similarly to above within the
<strong>java:comp/env</strong> namespace. So the JNDI path given for
the dataSourceName parameter is valid for a
<code>ConnectionPoolDataSource</code> that is deployed as given in the