commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1572236 - in /commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2: ./ cpdsadapter/ datasources/
Date Wed, 26 Feb 2014 20:29:25 GMT
Author: markt
Date: Wed Feb 26 20:29:24 2014
New Revision: 1572236

URL: http://svn.apache.org/r1572236
Log:
Remove @since markers

Modified:
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
Wed Feb 26 20:29:24 2014
@@ -531,8 +531,6 @@ public class BasicDataSource implements 
     /**
      * The initial number of connections that are created when the pool
      * is started.
-     *
-     * @since 1.2
      */
     private int initialSize = 0;
 
@@ -879,7 +877,6 @@ public class BasicDataSource implements 
      * @param softMinEvictableIdleTimeMillis minimum amount of time a
      * connection may sit idle in the pool before it is eligible for eviction,
      * assuming there are minIdle idle connections in the pool.
-     * @since 1.4.1
      * @see #getSoftMinEvictableIdleTimeMillis
      */
     public synchronized void setSoftMinEvictableIdleTimeMillis(long softMinEvictableIdleTimeMillis)
{
@@ -907,7 +904,6 @@ public class BasicDataSource implements 
      * @return minimum amount of time a connection may sit idle in the pool before
      * it is eligible for eviction, assuming there are minIdle idle connections
      * in the pool
-     * @since 1.4.1
      */
     @Override
     public synchronized long getSoftMinEvictableIdleTimeMillis() {
@@ -919,8 +915,6 @@ public class BasicDataSource implements 
 
     /**
      * Gets the EvictionPolicy implementation in use with this connection pool.
-     *
-     * @since 2.0
      */
     public synchronized String getEvictionPolicyClassName() {
         return evictionPolicyClassName;
@@ -931,8 +925,6 @@ public class BasicDataSource implements 
      *
      * @param evictionPolicyClassName   The fully qualified class name of the
      *                                  EvictionPolicy implementation
-     *
-     * @since 2.0
      */
     public synchronized void setEvictionPolicyClassName(
             String evictionPolicyClassName) {
@@ -1136,8 +1128,6 @@ public class BasicDataSource implements 
 
     /**
      * Timeout in seconds before connection validation queries fail.
-     *
-     * @since 1.3
      */
     private volatile int validationQueryTimeout = -1;
 
@@ -1145,7 +1135,6 @@ public class BasicDataSource implements 
      * Returns the validation query timeout.
      *
      * @return the timeout in seconds before connection validation queries fail.
-     * @since 1.3
      */
     @Override
     public int getValidationQueryTimeout() {
@@ -1164,7 +1153,6 @@ public class BasicDataSource implements 
      * setLoginTimeout, getLoginTimeout, getLogWriter.</code></p>
      *
      * @param timeout new validation query timeout value in seconds
-     * @since 1.3
      */
     public void setValidationQueryTimeout(int timeout) {
         this.validationQueryTimeout = timeout;
@@ -1177,8 +1165,6 @@ public class BasicDataSource implements 
      * NLS_SORT=XCYECH in an Oracle Database only once after connection
      * creation.
      * </p>
-     *
-     * @since 1.3
      */
     private volatile List<String> connectionInitSqls;
 
@@ -1188,7 +1174,6 @@ public class BasicDataSource implements 
      * statements configured.
      *
      * @return initialization SQL statements
-     * @since 1.3
      */
     public List<String> getConnectionInitSqls() {
         List<String> result = connectionInitSqls;

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
Wed Feb 26 20:29:24 2014
@@ -82,7 +82,6 @@ public class BasicDataSourceFactory impl
     /**
      * The property name for connectionInitSqls.
      * The associated value String must be of the form [query;]*
-     * @since 1.3
      */
     private final static String PROP_CONNECTIONINITSQLS = "connectionInitSqls";
     private final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = "accessToUnderlyingConnectionAllowed";

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
Wed Feb 26 20:29:24 2014
@@ -95,8 +95,6 @@ public class DelegatingConnection<C exte
     /**
      * Returns a string representation of the metadata associated with
      * the innnermost delegate connection.
-     *
-     * @since 1.2.2
      */
     @Override
     public String toString() {
@@ -152,7 +150,6 @@ public class DelegatingConnection<C exte
      *
      * @param c connection to compare innermost delegate with
      * @return true if innermost delegate equals <code>c</code>
-     * @since 1.2.2
      */
     public boolean innermostDelegateEquals(Connection c) {
         Connection innerCon = getInnermostDelegateInternal();

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
Wed Feb 26 20:29:24 2014
@@ -248,7 +248,6 @@ public class DelegatingPreparedStatement
      * Returns a String representation of this object.
      *
      * @return String
-     * @since 1.2.2
      */
     @Override
     public String toString() {

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
Wed Feb 26 20:29:24 2014
@@ -348,7 +348,6 @@ public class DelegatingStatement extends
      * Returns a String representation of this object.
      *
      * @return String
-     * @since 1.2.2
      */
     @Override
     public String toString() {

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
Wed Feb 26 20:29:24 2014
@@ -33,7 +33,6 @@ import org.apache.commons.pool2.KeyedObj
  *
  * @see PoolingConnection
  * @version $Revision$ $Date$
- * @since 1.3
  */
 public class PoolableCallableStatement extends DelegatingCallableStatement {
 

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
Wed Feb 26 20:29:24 2014
@@ -80,7 +80,6 @@ public class PoolableConnectionFactory
      * no timeout.
      *
      * @param timeout new validation query timeout value in seconds
-     * @since 1.3
      */
     public void setValidationQueryTimeout(int timeout) {
         _validationQueryTimeout = timeout;
@@ -90,7 +89,6 @@ public class PoolableConnectionFactory
      * Sets the SQL statements I use to initialize newly created {@link Connection}s.
      * Using <tt>null</tt> turns off connection initialization.
      * @param connectionInitSqls SQL statement to initialize {@link Connection}s.
-     * @since 1.3
      */
     public void setConnectionInitSql(Collection<String> connectionInitSqls) {
         _connectionInitSqls = connectionInitSqls;

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
Wed Feb 26 20:29:24 2014
@@ -164,7 +164,6 @@ public class PoolingConnection extends D
      * @param sql the sql string used to define the CallableStatement
      * @return a {@link PoolableCallableStatement}
      * @throws SQLException
-     * @since 1.3
      */
     @Override
     public CallableStatement prepareCall(String sql) throws SQLException {
@@ -186,7 +185,6 @@ public class PoolingConnection extends D
      * @param resultSetConcurrency result set concurrency
      * @return a {@link PoolableCallableStatement}
      * @throws SQLException
-     * @since 1.3
      */
     @Override
     public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency)
throws SQLException {

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java Wed
Feb 26 20:29:24 2014
@@ -155,7 +155,6 @@ public class PoolingDriver implements Dr
      * @throws SQLException if the connection is not a
      * <code>PoolGuardConnectionWrapper</code> or an error occurs invalidating
      * the connection
-     * @since 1.2.2
      */
     public void invalidateConnection(Connection conn) throws SQLException {
         if (conn instanceof PoolGuardConnectionWrapper) { // normal case

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
Wed Feb 26 20:29:24 2014
@@ -366,7 +366,6 @@ public class DriverAdapterCPDS
      * Get the connection properties passed to the JDBC driver.
      *
      * @return the JDBC connection properties used when creating connections.
-     * @since 1.3
      */
     public Properties getConnectionProperties() {
         return connectionProperties;
@@ -385,7 +384,6 @@ public class DriverAdapterCPDS
      * of these properties if <code>connectionProperties</code> is not null.</p>
      *
      * @param props Connection properties to use when creating new connections.
-     * @since 1.3
      * @throws IllegalStateException if {@link #getPooledConnection()} has been called
      */
     public void setConnectionProperties(Properties props) {
@@ -689,7 +687,6 @@ public class DriverAdapterCPDS
      * Returns the maximun number of prepared statements.
      *
      * @return maxPrepartedStatements value
-     * @since 1.2.2
      */
     public int getMaxPreparedStatements()
     {
@@ -700,8 +697,6 @@ public class DriverAdapterCPDS
      * Sets the maximum number of prepared statements.
      * @param maxPreparedStatements the new maximum number of prepared
      * statements
-     *
-     * @since 1.2.2
      */
     public void setMaxPreparedStatements(int maxPreparedStatements)
     {

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
Wed Feb 26 20:29:24 2014
@@ -833,7 +833,6 @@ public abstract class InstanceKeyDataSou
      *
      * @return true if a rollback will be issued after executing the
      * validation query
-     * @since 1.2.2
      */
     public boolean isRollbackAfterValidation() {
         return this.rollbackAfterValidation;
@@ -847,7 +846,6 @@ public abstract class InstanceKeyDataSou
      * if a validation query is set
      *
      * @param rollbackAfterValidation new property value
-     * @since 1.2.2
      */
     public void setRollbackAfterValidation(boolean rollbackAfterValidation) {
         assertInitializationAllowed();

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
Wed Feb 26 20:29:24 2014
@@ -985,8 +985,6 @@ public class PerUserPoolDataSource exten
 
     /**
      * Returns a <code>PerUserPoolDataSource</code> {@link Reference}.
-     *
-     * @since 1.2.2
      */
     @Override
     public Reference getReference() throws NamingException {

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java
Wed Feb 26 20:29:24 2014
@@ -23,7 +23,6 @@ import javax.sql.PooledConnection;
 /**
  * Methods to manage PoolableConnections and the connection pools that source them.
  * 
- * @since 1.3
  * @version $Revision$ $Date$
  */
 interface PooledConnectionManager {

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java?rev=1572236&r1=1572235&r2=1572236&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
Wed Feb 26 20:29:24 2014
@@ -152,8 +152,6 @@ public class SharedPoolDataSource extend
 
     /**
      * Returns a <code>SharedPoolDataSource</code> {@link Reference}.
-     *
-     * @since 1.2.2
      */
     @Override
     public Reference getReference() throws NamingException {



Mime
View raw message