svn commit: r1358368 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne: conn/PoolManager.java dba/oracle/OracleSQLTemplateAction.java

[aadamchik]

Author: aadamchik
Date: Fri Jul  6 19:38:47 2012
New Revision: 1358368

URL: http://svn.apache.org/viewvc?rev=1358368&view=rev
Log:
CAY-1718 Remove everything deprecated in 3.1

in progress

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PoolManager.java
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PoolManager.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PoolManager.java?rev=1358368&r1=1358367&r2=1358368&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PoolManager.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PoolManager.java
 Fri Jul  6 19:38:47 2012
@@ -19,15 +19,6 @@
 
 package org.apache.cayenne.conn;
 
-import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.di.ScopeEventListener;
-import org.apache.cayenne.log.JdbcEventLogger;
-
-import javax.sql.ConnectionEvent;
-import javax.sql.ConnectionEventListener;
-import javax.sql.ConnectionPoolDataSource;
-import javax.sql.DataSource;
-import javax.sql.PooledConnection;
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -37,6 +28,16 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.logging.Logger;
 
+import javax.sql.ConnectionEvent;
+import javax.sql.ConnectionEventListener;
+import javax.sql.ConnectionPoolDataSource;
+import javax.sql.DataSource;
+import javax.sql.PooledConnection;
+
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.di.ScopeEventListener;
+import org.apache.cayenne.log.JdbcEventLogger;
+
 /**
  * PoolManager is a Cayenne implementation of a pooling DataSource.
  */
@@ -174,17 +175,6 @@ public class PoolManager implements Scop
     }
 
     /**
-     * Closes all existing connections, removes them from the pool.
-     * 
-     * @deprecated since 3.1 replaced with {@link #shutdown()} method for 
naming
-     *             consistency.
-     */
-    @Deprecated
-    public void dispose() throws SQLException {
-        shutdown();
-    }
-
-    /**
      * Closes all existing connections, drains the pool and stops the 
maintenance thread.
      * 
      * @since 3.1

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java?rev=1358368&r1=1358367&r2=1358368&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java
 Fri Jul  6 19:38:47 2012
@@ -169,7 +169,7 @@ class OracleSQLTemplateAction extends SQ
         }
 
         /**
-         * @deprecated
+         * @deprecated to mirror deprecation in the ResultSet interface
          */
         @Deprecated
         public BigDecimal getBigDecimal(int columnIndex, int scale) throws 
SQLException {
@@ -181,7 +181,7 @@ class OracleSQLTemplateAction extends SQ
         }
 
         /**
-         * @deprecated
+         * @deprecated to mirror deprecation in the ResultSet interface
          */
         @Deprecated
         public BigDecimal getBigDecimal(String columnName, int scale) throws 
SQLException {
@@ -1106,18 +1106,14 @@ class OracleSQLTemplateAction extends SQ
         }
 
         /**
-         * @since 3.1
-         *
-         * JDBC 4.1 compatibility under Java 1.5
+         * @since 3.1 JDBC 4.1 compatibility under Java 1.5
          */
         public <T> T getObject(int columnIndex, Class<T> type) throws 
SQLException {
             throw new UnsupportedOperationException();
         }
 
         /**
-         * @since 3.1
-         *
-         * JDBC 4.1 compatibility under Java 1.5
+         * @since 3.1 JDBC 4.1 compatibility under Java 1.5
          */
         public <T> T getObject(String columnLabel, Class<T> type) throws 
SQLException {
             throw new UnsupportedOperationException();