You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2008/10/07 03:55:38 UTC
svn commit: r702324 - in /ibatis/trunk/java/ibatis-3: ibatis-3-core/src/main/java/org/apache/ibatis/datasource/ ibatis-3-core/src/main/java/org/apache/ibatis/transaction/ ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/ ibatis-3-monarc...

Author: cbegin
Date: Mon Oct  6 18:55:38 2008
New Revision: 702324

URL: http://svn.apache.org/viewvc?rev=702324&view=rev
Log:
moved datasource and transaction factories to core

Added:
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java
      - copied, changed from r701597, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/DataSourceFactory.java
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/JndiDataSourceFactory.java
      - copied, changed from r701597, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/JndiDataSourceFactory.java
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/PooledDataSourceFactory.java
      - copied, changed from r701597, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/PooledDataSourceFactory.java
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/UnpooledDataSourceFactory.java
      - copied, changed from r702322, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/UnpooledDataSourceFactory.java
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/Transaction.java
      - copied, changed from r702322, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/transaction/Transaction.java
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManager.java
      - copied, changed from r702322, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/transaction/TransactionManager.java
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManagerFactory.java
      - copied, changed from r701597, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/transaction/TransactionManagerFactory.java
Modified:
    ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperConfigParser.java
    ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/Environment.java

Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java (from r701597, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/DataSourceFactory.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/DataSourceFactory.java&r1=701597&r2=702324&rev=702324&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/DataSourceFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java Mon Oct  6 18:55:38 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.environment.datasource;
+package org.apache.ibatis.datasource;
 
 import javax.sql.DataSource;
 import java.util.Properties;

Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/JndiDataSourceFactory.java (from r701597, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/JndiDataSourceFactory.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/JndiDataSourceFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/JndiDataSourceFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/JndiDataSourceFactory.java&r1=701597&r2=702324&rev=702324&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/JndiDataSourceFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/JndiDataSourceFactory.java Mon Oct  6 18:55:38 2008
@@ -1,6 +1,5 @@
-package org.apache.ibatis.monarch.environment.datasource;
+package org.apache.ibatis.datasource;
 
-import org.apache.ibatis.jdbc.DataSourceException;
 import org.apache.ibatis.monarch.environment.EnvironmentException;
 
 import javax.naming.*;

Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/PooledDataSourceFactory.java (from r701597, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/PooledDataSourceFactory.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/PooledDataSourceFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/PooledDataSourceFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/PooledDataSourceFactory.java&r1=701597&r2=702324&rev=702324&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/PooledDataSourceFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/PooledDataSourceFactory.java Mon Oct  6 18:55:38 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.environment.datasource;
+package org.apache.ibatis.datasource;
 
 import org.apache.ibatis.jdbc.PooledDataSource;
 

Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/UnpooledDataSourceFactory.java (from r702322, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/UnpooledDataSourceFactory.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/UnpooledDataSourceFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/UnpooledDataSourceFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/UnpooledDataSourceFactory.java&r1=702322&r2=702324&rev=702324&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/datasource/UnpooledDataSourceFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/UnpooledDataSourceFactory.java Mon Oct  6 18:55:38 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.environment.datasource;
+package org.apache.ibatis.datasource;
 
 import org.apache.ibatis.jdbc.UnpooledDataSource;
 import org.apache.ibatis.reflection.MetaObject;

Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/Transaction.java (from r702322, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/transaction/Transaction.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/Transaction.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/Transaction.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/transaction/Transaction.java&r1=702322&r2=702324&rev=702324&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/transaction/Transaction.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/Transaction.java Mon Oct  6 18:55:38 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.environment.transaction;
+package org.apache.ibatis.transaction;
 
 import java.sql.Connection;
 import java.sql.SQLException;

Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManager.java (from r702322, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/transaction/TransactionManager.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManager.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManager.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/transaction/TransactionManager.java&r1=702322&r2=702324&rev=702324&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/transaction/TransactionManager.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManager.java Mon Oct  6 18:55:38 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.environment.transaction;
+package org.apache.ibatis.transaction;
 
 import java.sql.Connection;
 

Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManagerFactory.java (from r701597, ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/transaction/TransactionManagerFactory.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManagerFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManagerFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/transaction/TransactionManagerFactory.java&r1=701597&r2=702324&rev=702324&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/transaction/TransactionManagerFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManagerFactory.java Mon Oct  6 18:55:38 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.environment.transaction;
+package org.apache.ibatis.transaction;
 
 import java.util.Properties;
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperConfigParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperConfigParser.java?rev=702324&r1=702323&r2=702324&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperConfigParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperConfigParser.java Mon Oct  6 18:55:38 2008
@@ -7,8 +7,8 @@
 import org.apache.ibatis.reflection.*;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.monarch.environment.Environment;
-import org.apache.ibatis.monarch.environment.transaction.TransactionManagerFactory;
-import org.apache.ibatis.monarch.environment.datasource.DataSourceFactory;
+import org.apache.ibatis.transaction.TransactionManagerFactory;
+import org.apache.ibatis.datasource.DataSourceFactory;
 
 import java.io.Reader;
 import java.util.*;

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/Environment.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/Environment.java?rev=702324&r1=702323&r2=702324&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/Environment.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/environment/Environment.java Mon Oct  6 18:55:38 2008
@@ -1,6 +1,6 @@
 package org.apache.ibatis.monarch.environment;
 
-import org.apache.ibatis.monarch.environment.transaction.TransactionManager;
+import org.apache.ibatis.transaction.TransactionManager;
 
 import javax.sql.DataSource;