Author: fhanik
Date: Thu Mar 4 17:21:41 2010
New Revision: 919076
URL: http://svn.apache.org/viewvc?rev=919076&view=rev
Log:
Add in and document more XA support
Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default
tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=919076&r1=919075&r2=919076&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Thu Mar 4 17:21:41
2010
@@ -27,8 +27,8 @@
# ----- Vesion Control Flags -----
version.major=1
version.minor=0
-version.build=8
-version.patch=5
+version.build=9
+version.patch=0
version.suffix=
# ----- Default Base Path for Dependent Packages -----
Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=919076&r1=919075&r2=919076&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Thu Mar 4 17:21:41 2010
@@ -88,7 +88,7 @@
<li>Get JMX notifications and log entries when connections are suspected
for being abandoned. This is similar to
the <code>removeAbandonedTimeout</code> but it doesn't take any
action, only reports the information.
This is achieved using the <code>suspectTimeout</code>
attribute.</li>
- <li>Connections can be retrieved from a <code>java.sql.Driver</code> or
a <code>javax.sql.DataSource</code>
+ <li>Connections can be retrieved from a <code>java.sql.Driver</code>,
<code>javax.sql.DataSource</code> or <code>javax.sql.XADataSource</code>
This is achieved using the <code>dataSource</code> and
<code>dataSourceJNDI</code> attributes.</li>
<li>XA connection support</li>
</ol>
@@ -149,7 +149,8 @@
<p>factory is required, and the value should be
<code>org.apache.tomcat.jdbc.pool.DataSourceFactory</code></p>
</attribute>
<attribute name="type" required="true">
- <p>Type should always be <code>javax.sql.DataSource</code></p>
+ <p>Type should always be <code>javax.sql.DataSource</code> or
<code>javax.sql.XADataSource</code></p>
+ <p>Depending on the type a
<code>org.apache.tomcat.jdbc.pool.DataSource</code> or a
<code>org.apache.tomcat.jdbc.pool.XADataSource</code> will be created.</p>
</attribute>
</attributes>
</subsection>
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=919076&r1=919075&r2=919076&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Thu Mar 4 17:21:41 2010
@@ -749,6 +749,7 @@
boolean result = timer && (isRemoveAbandoned() &&
getRemoveAbandonedTimeout()>0);
result = result || (timer && getSuspectTimeout()>0);
result = result || (timer && isTestWhileIdle() &&
getValidationQuery()!=null);
+ result = result || (timer && getMinEvictableIdleTimeMillis()>0);
return result;
}
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java?rev=919076&r1=919075&r2=919076&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
Thu Mar 4 17:21:41 2010
@@ -68,13 +68,19 @@
}
public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return (iface.isInstance(connection.getConnection()));
+ if (iface == XAConnection.class && connection.getXAConnection()!=null)
{
+ return true;
+ } else {
+ return (iface.isInstance(connection.getConnection()));
+ }
}
public Object unwrap(Class<?> iface) throws SQLException {
if (iface == PooledConnection.class) {
return connection;
+ }else if (iface == XAConnection.class) {
+ return connection.getXAConnection();
} else if (isWrapperFor(iface)) {
return connection.getConnection();
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
