svn commit: r1342511 - in /tomcat/tc7.0.x/trunk: ./ modules/ webapps/docs/changelog.xml webapps/docs/config/context.xml webapps/docs/jndi-resources-howto.xml

[kkolinko]

Author: kkolinko
Date: Fri May 25 06:28:10 2012
New Revision: 1342511

URL: http://svn.apache.org/viewvc?rev=1342511&view=rev
Log:
Merged revisions r1342498 r1342503 from tomcat/trunk, updated jdbc-pool 
external to r1342500:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53289
Clarified ResourceLink example that uses getConnection(username, password)
Improved JDBC pool documentation on jdbcInterceptors and 
alternateUsernameAllowed attributes.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/modules/   (props changed)
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
    tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
    tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1342498,1342503

Propchange: tomcat/tc7.0.x/trunk/modules/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri May 25 06:28:10 2012
@@ -1 +1 @@
-^/tomcat/trunk/modules/jdbc-pool@1340861 jdbc-pool
+^/tomcat/trunk/modules/jdbc-pool@1342500 jdbc-pool

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1342511&r1=1342510&r2=1342511&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri May 25 06:28:10 2012
@@ -186,6 +186,11 @@
         of <code>connectionTimeout</code> attribute for AJP protocol
         connectors. (kkolinko)
       </fix>
+      <update>
+        <bug>53289</bug>: Clarify <code>ResourceLink</code> example that
+        uses DataSource.getConnection(username, password) method. Not all
+        data source implementations support it. (kkolinko)
+      </update>
       <fix>
         Fix several trivial HTML markup errors in sample servlets. (kkolinko)
       </fix>

Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml?rev=1342511&r1=1342510&r2=1342511&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml Fri May 25 06:28:10 
2012
@@ -1196,16 +1196,26 @@
       </attribute>
 
     </attributes>
-    <p>Shared Data Source Example</p>
+    <p>Shared Data Source Example:</p>
+    <p><strong>Warning:</strong> This feature works only if the global 
DataSource
+supports <code>getConnection(username, password)</code> method.
+<a href="http://commons.apache.org/dbcp/";>Apache Commons DBCP</a> pool that
+Tomcat uses by default does not support it. See its Javadoc for
+<code>BasicDataSource</code> class.
+<a href="../jdbc-pool.html">Apache Tomcat JDBC pool</a> does support it,
+but by default this support is disabled and can be enabled by
+<code>alternateUsernameAllowed</code> attribute. See its documentation
+for details.</p>
 <source>
 &lt;GlobalNamingResources&gt;
   ...
   &lt;Resource name=&quot;sharedDataSource&quot;
             global=&quot;sharedDataSource&quot;
             type=&quot;javax.sql.DataSource&quot;
+            factory=&quot;org.apache.tomcat.jdbc.pool.DataSourceFactory&quot;
+            alternateUsernameAllowed=&quot;true&quot;
             username=&quot;bar&quot;
             password=&quot;barpass&quot;
-
             ...
   ...
 &lt;/GlobalNamingResources&gt;

Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml?rev=1342511&r1=1342510&r2=1342511&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml Fri May 25 
06:28:10 2012
@@ -110,7 +110,7 @@ element:</p>
 <li><a href="config/context.html#Resource Links">&lt;ResourceLink&gt;</a> -
     Add a link to a resource defined in the global JNDI context. Use resource
     links to give a web application access to a resource defined in
-    the<a href="config/globalresources.html">&lt;GlobalNamingResources&gt;</a>
+    the <a href="config/globalresources.html">&lt;GlobalNamingResources&gt;</a>
     child element of the <a href="config/server.html">&lt;Server&gt;</a>
     element.</li>
 <li><a href="config/context.html#Transaction">&lt;Transaction&gt;</a> -



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org