svn commit: r705836 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis: datasource/ datasource/jndi/ datasource/pooled/ datasource/unpooled/ transaction/external/ transaction/jdbc/ transaction/jta/

[cbegin]

Author: cbegin
Date: Fri Oct 17 20:45:24 2008
New Revision: 705836

URL: http://svn.apache.org/viewvc?rev=705836&view=rev
Log:
reorganized datasource and transaction classes

Added:
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java
      - copied, changed from r703567, 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/JndiDataSourceFactory.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSourceFactory.java
      - copied, changed from r703567, 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/PooledDataSourceFactory.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java
      - copied, changed from r703567, 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/UnpooledDataSourceFactory.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/external/
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/external/ExternalTransaction.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jta/
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jta/JtaTransaction.java
Removed:
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/JndiDataSourceFactory.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/PooledDataSourceFactory.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/UnpooledDataSourceFactory.java

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java
 (from r703567, 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/JndiDataSourceFactory.java)
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/JndiDataSourceFactory.java&r1=703567&r2=705836&rev=705836&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/JndiDataSourceFactory.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java
 Fri Oct 17 20:45:24 2008
@@ -1,4 +1,7 @@
-package org.apache.ibatis.datasource;
+package org.apache.ibatis.datasource.jndi;
+
+import org.apache.ibatis.datasource.DataSourceFactory;
+import org.apache.ibatis.datasource.DataSourceException;
 
 import javax.naming.*;
 import javax.sql.DataSource;

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSourceFactory.java
 (from r703567, 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/PooledDataSourceFactory.java)
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSourceFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSourceFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/PooledDataSourceFactory.java&r1=703567&r2=705836&rev=705836&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/PooledDataSourceFactory.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSourceFactory.java
 Fri Oct 17 20:45:24 2008
@@ -1,6 +1,7 @@
-package org.apache.ibatis.datasource;
+package org.apache.ibatis.datasource.pooled;
 
 import org.apache.ibatis.jdbc.PooledDataSource;
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory;
 
 public class PooledDataSourceFactory extends UnpooledDataSourceFactory {
 

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java
 (from r703567, 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/UnpooledDataSourceFactory.java)
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/UnpooledDataSourceFactory.java&r1=703567&r2=705836&rev=705836&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/UnpooledDataSourceFactory.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java
 Fri Oct 17 20:45:24 2008
@@ -1,7 +1,9 @@
-package org.apache.ibatis.datasource;
+package org.apache.ibatis.datasource.unpooled;
 
 import org.apache.ibatis.jdbc.UnpooledDataSource;
 import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.datasource.DataSourceFactory;
+import org.apache.ibatis.datasource.DataSourceException;
 
 import javax.sql.DataSource;
 import java.util.Properties;

Added: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/external/ExternalTransaction.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/external/ExternalTransaction.java?rev=705836&view=auto
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/external/ExternalTransaction.java
 (added)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/external/ExternalTransaction.java
 Fri Oct 17 20:45:24 2008
@@ -0,0 +1,27 @@
+package org.apache.ibatis.transaction.external;
+
+import org.apache.ibatis.transaction.Transaction;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+public class ExternalTransaction implements Transaction {
+
+  private Connection connection;
+
+  public ExternalTransaction(Connection connection) {
+    this.connection = connection;
+  }
+
+  public Connection getConnection() {
+    return connection;
+  }
+
+  public void commit() throws SQLException {
+    // Does nothing
+  }
+
+  public void rollback() throws SQLException {
+    // Does nothing
+  }
+}

Added: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java?rev=705836&view=auto
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java
 (added)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java
 Fri Oct 17 20:45:24 2008
@@ -0,0 +1,27 @@
+package org.apache.ibatis.transaction.jdbc;
+
+import org.apache.ibatis.transaction.Transaction;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+public class JdbcTransaction implements Transaction {
+
+  private Connection connection;
+
+  public JdbcTransaction(Connection connection) {
+    this.connection = connection;
+  }
+
+  public Connection getConnection() {
+    return connection;
+  }
+
+  public void commit() throws SQLException {
+    connection.commit();
+  }
+
+  public void rollback() throws SQLException {
+    connection.rollback();
+  }
+}

Added: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jta/JtaTransaction.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jta/JtaTransaction.java?rev=705836&view=auto
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jta/JtaTransaction.java
 (added)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jta/JtaTransaction.java
 Fri Oct 17 20:45:24 2008
@@ -0,0 +1,4 @@
+package org.apache.ibatis.transaction.jta;
+
+public class JtaTransaction {
+}