incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1335460 - in /incubator/lcf/branches/CONNECTORS-96: connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/
Date Tue, 08 May 2012 12:24:12 GMT
Author: kwright
Date: Tue May  8 12:24:12 2012
New Revision: 1335460

URL: http://svn.apache.org/viewvc?rev=1335460&view=rev
Log:
Move jdbcpool classes to core.

Added:
    incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/
    incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java
      - copied, changed from r1335409, incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ConnectionPool.java
    incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPoolManager.java
      - copied, changed from r1335409, incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ConnectionPoolManager.java
    incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/WrappedConnection.java
      - copied, changed from r1335409, incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/WrappedConnection.java
Removed:
    incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ConnectionPool.java
    incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ConnectionPoolManager.java
    incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/WrappedConnection.java
Modified:
    incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnection.java
    incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnectionFactory.java

Modified: incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnection.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnection.java?rev=1335460&r1=1335459&r2=1335460&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnection.java
(original)
+++ incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnection.java
Tue May  8 12:24:12 2012
@@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.core.database.*;
+import org.apache.manifoldcf.core.jdbcpool.*;
 import org.apache.manifoldcf.agents.interfaces.*;
 
 import java.sql.*;
@@ -29,8 +30,6 @@ import javax.sql.*;
 import java.io.*;
 import java.util.*;
 
-import com.bitmechanic.sql.*;
-
 /** This object describes a connection to a particular JDBC instance.
 */
 public class JDBCConnection

Modified: incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnectionFactory.java?rev=1335460&r1=1335459&r2=1335460&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnectionFactory.java
(original)
+++ incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnectionFactory.java
Tue May  8 12:24:12 2012
@@ -19,6 +19,7 @@
 package org.apache.manifoldcf.crawler.connectors.jdbc;
 
 import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.core.jdbcpool.*;
 import org.apache.manifoldcf.agents.interfaces.*;
 import org.apache.manifoldcf.crawler.system.Logging;
 import org.apache.manifoldcf.crawler.system.ManifoldCF;

Copied: incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java
(from r1335409, incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ConnectionPool.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java?p2=incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java&p1=incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ConnectionPool.java&r1=1335409&r2=1335460&rev=1335460&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ConnectionPool.java
(original)
+++ incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java
Tue May  8 12:24:12 2012
@@ -16,13 +16,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.crawler.connectors.jdbc;
+package org.apache.manifoldcf.core.jdbcpool;
 
 import java.sql.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.util.*;
-import org.apache.manifoldcf.crawler.system.Logging;
+import org.apache.manifoldcf.core.system.Logging;
 
 /** The class that defines a connection pool.
 */
@@ -107,7 +107,7 @@ public class ConnectionPool
       }
       catch (SQLException e)
       {
-        Logging.connectors.warn("Error closing pooled connection: "+e.getMessage(),e);
+        Logging.db.warn("Error closing pooled connection: "+e.getMessage(),e);
       }
       freeConnections[i] = null;
     }

Copied: incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPoolManager.java
(from r1335409, incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ConnectionPoolManager.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPoolManager.java?p2=incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPoolManager.java&p1=incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ConnectionPoolManager.java&r1=1335409&r2=1335460&rev=1335460&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ConnectionPoolManager.java
(original)
+++ incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPoolManager.java
Tue May  8 12:24:12 2012
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.crawler.connectors.jdbc;
+package org.apache.manifoldcf.core.jdbcpool;
 
 import javax.naming.*;
 import javax.sql.*;

Copied: incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/WrappedConnection.java
(from r1335409, incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/WrappedConnection.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/WrappedConnection.java?p2=incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/WrappedConnection.java&p1=incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/WrappedConnection.java&r1=1335409&r2=1335460&rev=1335460&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-96/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/WrappedConnection.java
(original)
+++ incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/WrappedConnection.java
Tue May  8 12:24:12 2012
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.manifoldcf.crawler.connectors.jdbc;
+package org.apache.manifoldcf.core.jdbcpool;
 
 import java.sql.*;
 



Mime
View raw message