You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ps...@apache.org on 2015/02/19 05:13:11 UTC
svn commit: r1660791 - in /commons/proper/dbcp/trunk/src:
main/java/org/apache/commons/dbcp2/managed/
test/java/org/apache/commons/dbcp2/
test/java/org/apache/commons/dbcp2/datasources/
Author: psteitz
Date: Thu Feb 19 04:13:10 2015
New Revision: 1660791
URL: http://svn.apache.org/r1660791
Log:
J8 javadoc fixes.
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterDriver.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java?rev=1660791&r1=1660790&r2=1660791&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java Thu Feb 19 04:13:10 2015
@@ -82,7 +82,7 @@ public class LocalXAConnectionFactory im
* the connection auto-commit is turned off. When the connection is committed or rolled back,
* the commit or rollback method is called on the connection and then the original auto-commit
* value is restored.
- * </p>
+ * <p>
* The LocalXAResource also respects the connection read-only setting. If the connection is
* read-only the commit method will not be called, and the prepare method returns the XA_RDONLY.
* </p>
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java?rev=1660791&r1=1660790&r2=1660791&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java Thu Feb 19 04:13:10 2015
@@ -33,10 +33,10 @@ import org.apache.commons.dbcp2.Delegati
/**
* TransactionRegistry tracks Connections and XAResources in a transacted environment for a single XAConnectionFactory.
- * </p>
+ * <p>
* The TransactionRegistry hides the details of transaction processing from the existing DBCP pooling code, and gives
* the ManagedConnection a way to enlist connections in a transaction, allowing for the maximal rescue of DBCP.
- *
+ * </p>
* @author Dain Sundstrom
* @version $Id$
* @since 2.0
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java?rev=1660791&r1=1660790&r2=1660791&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java Thu Feb 19 04:13:10 2015
@@ -46,10 +46,11 @@ public interface XAConnectionFactory ext
/**
* Create a new {@link java.sql.Connection} in an implementation specific fashion.
- * </p>
+ * <p>
* An implementation can assume that the caller of this will wrap the connection in
* a proxy that protects access to the setAutoCommit, commit and rollback when
* enrolled in a XA transaction.
+ * </p>
*
* @return a new {@link java.sql.Connection}
* @throws java.sql.SQLException if a database error occurs creating the connection
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java?rev=1660791&r1=1660790&r2=1660791&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java Thu Feb 19 04:13:10 2015
@@ -471,7 +471,7 @@ public abstract class TestConnectionPool
conn3.close();
}
- /** @see "http://issues.apache.org/bugzilla/show_bug.cgi?id=12400" */
+ /** "http://issues.apache.org/bugzilla/show_bug.cgi?id=12400" */
@Test
public void testConnectionsAreDistinct() throws Exception {
Connection[] conn = new Connection[getMaxTotal()];
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java?rev=1660791&r1=1660790&r2=1660791&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java Thu Feb 19 04:13:10 2015
@@ -118,7 +118,7 @@ public class TestPoolingDriver extends T
driver2.registerPool("example",connectionPool);
}
- /** @see "http://issues.apache.org/bugzilla/show_bug.cgi?id=28912" */
+ /** "http://issues.apache.org/bugzilla/show_bug.cgi?id=28912" */
@Test
public void testReportedBug28912() throws Exception {
Connection conn1 = getConnection();
@@ -139,7 +139,7 @@ public class TestPoolingDriver extends T
assertFalse(conn2.isClosed());
}
- /** @see "http://issues.apache.org/bugzilla/show_bug.cgi?id=12400" */
+ /** "http://issues.apache.org/bugzilla/show_bug.cgi?id=12400" */
@Test
public void testReportedBug12400() throws Exception {
GenericObjectPoolConfig config = new GenericObjectPoolConfig();
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterDriver.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterDriver.java?rev=1660791&r1=1660790&r2=1660791&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterDriver.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterDriver.java Thu Feb 19 04:13:10 2015
@@ -31,7 +31,7 @@ import java.util.logging.Logger;
* Returns <code>TestConnection</code>'s from getConnection methods.
* Valid username, password combinations are:
*
- * <table>
+ * <table summary="valid credentials">
* <tr><th>user</th><th>password</th></tr>
* <tr><td>foo</td><td>bar</td></tr>
* <tr><td>u1</td><td>p1</td></tr>
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java?rev=1660791&r1=1660790&r2=1660791&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java Thu Feb 19 04:13:10 2015
@@ -76,7 +76,7 @@ public class TestPerUserPoolDataSource e
}
/**
- * Switching 'u1 -> 'u2' and 'p1' -> 'p2' will
+ * Switching 'u1 to 'u2' and 'p1' to 'p2' will
* exhibit the bug detailed in
* http://issues.apache.org/bugzilla/show_bug.cgi?id=18905
*/
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java?rev=1660791&r1=1660790&r2=1660791&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java Thu Feb 19 04:13:10 2015
@@ -76,10 +76,6 @@ public class TestSharedPoolDataSource ex
/**
- * Switching 'u1 -> 'u2' and 'p1' -> 'p2' will
- * exhibit the bug detailed in
- * http://issues.apache.org/bugzilla/show_bug.cgi?id=18905
- *
* Starting with a successful connection, then incorrect password,
* then correct password for same user illustrates
* JIRA: DBCP-245