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/11/02 01:11:51 UTC
svn commit: r709804 - in /ibatis/trunk/java/ibatis-3:
ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/
ibatis-3-core/src/main/java/org/apache/ibatis/builder/
ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/
ibatis-3-core/src/main/j...
Author: cbegin
Date: Sat Nov 1 17:11:50 2008
New Revision: 709804
URL: http://svn.apache.org/viewvc?rev=709804&view=rev
Log:
Refactored transaction, datasource, configuration and parsers
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java
- copied, changed from r708037, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/PoolState.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java
- copied, changed from r708037, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/PooledConnection.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java
- copied, changed from r708037, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/PooledDataSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/DataSourceException.java
- copied, changed from r708037, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/DataSourceException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java
- copied, changed from r708037, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/UnpooledDataSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionFactory.java
- copied, changed from r708037, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManager.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactory.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactory.java
Removed:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MonarchConfiguration.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/DataSourceException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/UnpooledDataSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManagerFactory.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/ScriptRunner.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/SimpleDataSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSourceFactory.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Environment.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfig.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/ScriptRunner.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/ScriptRunner.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/ScriptRunner.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/ScriptRunner.java Sat Nov 1 17:11:50 2008
@@ -1,6 +1,6 @@
package com.ibatis.common.jdbc;
-import org.apache.ibatis.jdbc.UnpooledDataSource;
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
import java.sql.*;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/SimpleDataSource.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/SimpleDataSource.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/SimpleDataSource.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/SimpleDataSource.java Sat Nov 1 17:11:50 2008
@@ -4,7 +4,7 @@
import java.util.*;
-import org.apache.ibatis.jdbc.PooledDataSource;
+import org.apache.ibatis.datasource.pooled.PooledDataSource;
public class SimpleDataSource extends PooledDataSource {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java Sat Nov 1 17:11:50 2008
@@ -2,9 +2,14 @@
import org.apache.ibatis.type.*;
import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.transaction.jdbc.JdbcTransaction;
+import org.apache.ibatis.transaction.managed.ManagedTransaction;
+import org.apache.ibatis.datasource.jndi.JndiDataSourceFactory;
+import org.apache.ibatis.datasource.pooled.PooledDataSourceFactory;
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory;
public class BaseParser {
- protected MonarchConfiguration configuration;
+ protected Configuration configuration;
protected TypeAliasRegistry typeAliasRegistry;
protected TypeHandlerRegistry typeHandlerRegistry;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java Sat Nov 1 17:11:50 2008
@@ -7,8 +7,8 @@
import org.apache.ibatis.reflection.*;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.mapping.Environment;
-import org.apache.ibatis.transaction.TransactionManagerFactory;
import org.apache.ibatis.datasource.DataSourceFactory;
+import org.apache.ibatis.transaction.TransactionFactory;
import java.io.Reader;
import java.util.*;
@@ -25,7 +25,7 @@
public MapperConfigParser(Reader reader, Properties props) {
this.reader = reader;
- this.configuration = new MonarchConfiguration();
+ this.configuration = new Configuration();
this.configuration.setVariables(props);
this.typeAliasRegistry = this.configuration.getTypeAliasRegistry();
this.typeHandlerRegistry = this.configuration.getTypeHandlerRegistry();
@@ -45,7 +45,7 @@
parser.parse(reader);
}
- public MonarchConfiguration getConfiguration() {
+ public Configuration getConfiguration() {
return configuration;
}
@@ -146,10 +146,10 @@
String type = context.getStringAttribute("type");
Properties props = context.getChildrenAsProperties();
- TransactionManagerFactory factory = (TransactionManagerFactory) resolveClass(type).newInstance();
+ TransactionFactory factory = (TransactionFactory) resolveClass(type).newInstance();
factory.setProperties(props);
- environmentBuilder.transactionManager(factory.getTransactionManager());
+ environmentBuilder.transactionFactory(factory);
}
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperParser.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperParser.java Sat Nov 1 17:11:50 2008
@@ -26,7 +26,7 @@
private Cache cache;
- public MapperParser(Reader reader, MonarchConfiguration configuration) {
+ public MapperParser(Reader reader, Configuration configuration) {
this.reader = reader;
this.configuration = configuration;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java Sat Nov 1 17:11:50 2008
@@ -8,7 +8,7 @@
public class SqlSourceParser extends BaseParser {
- public SqlSourceParser(MonarchConfiguration configuration) {
+ public SqlSourceParser(Configuration configuration) {
this.configuration = configuration;
this.typeAliasRegistry = configuration.getTypeAliasRegistry();
this.typeHandlerRegistry = configuration.getTypeHandlerRegistry();
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java (from r708037, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/PoolState.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/PoolState.java&r1=708037&r2=709804&rev=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/PoolState.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java Sat Nov 1 17:11:50 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.jdbc;
+package org.apache.ibatis.datasource.pooled;
import java.util.*;
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java (from r708037, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/PooledConnection.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/PooledConnection.java&r1=708037&r2=709804&rev=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/PooledConnection.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java Sat Nov 1 17:11:50 2008
@@ -1,10 +1,10 @@
-package org.apache.ibatis.jdbc;
+package org.apache.ibatis.datasource.pooled;
import org.apache.ibatis.reflection.ExceptionUtil;
+import org.apache.ibatis.datasource.unpooled.DataSourceException;
import java.lang.reflect.*;
import java.sql.*;
-import java.util.Map;
class PooledConnection implements InvocationHandler {
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java (from r708037, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/PooledDataSource.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/PooledDataSource.java&r1=708037&r2=709804&rev=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/PooledDataSource.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java Sat Nov 1 17:11:50 2008
@@ -1,6 +1,7 @@
-package org.apache.ibatis.jdbc;
+package org.apache.ibatis.datasource.pooled;
import org.apache.ibatis.logging.*;
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
import javax.sql.DataSource;
import java.io.PrintWriter;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/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?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSourceFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSourceFactory.java Sat Nov 1 17:11:50 2008
@@ -1,6 +1,6 @@
package org.apache.ibatis.datasource.pooled;
-import org.apache.ibatis.jdbc.PooledDataSource;
+import org.apache.ibatis.datasource.pooled.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/DataSourceException.java (from r708037, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/DataSourceException.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/DataSourceException.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/DataSourceException.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/DataSourceException.java&r1=708037&r2=709804&rev=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/DataSourceException.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/DataSourceException.java Sat Nov 1 17:11:50 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.jdbc;
+package org.apache.ibatis.datasource.unpooled;
public class DataSourceException extends RuntimeException {
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java (from r708037, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/UnpooledDataSource.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/UnpooledDataSource.java&r1=708037&r2=709804&rev=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/UnpooledDataSource.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java Sat Nov 1 17:11:50 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.jdbc;
+package org.apache.ibatis.datasource.unpooled;
import javax.sql.DataSource;
import java.io.PrintWriter;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/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?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java Sat Nov 1 17:11:50 2008
@@ -1,6 +1,6 @@
package org.apache.ibatis.datasource.unpooled;
-import org.apache.ibatis.jdbc.UnpooledDataSource;
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
import org.apache.ibatis.reflection.MetaObject;
import org.apache.ibatis.datasource.DataSourceFactory;
import org.apache.ibatis.datasource.DataSourceException;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java Sat Nov 1 17:11:50 2008
@@ -9,6 +9,11 @@
import org.apache.ibatis.plugin.*;
import org.apache.ibatis.reflection.*;
import org.apache.ibatis.type.*;
+import org.apache.ibatis.transaction.jdbc.JdbcTransaction;
+import org.apache.ibatis.transaction.managed.ManagedTransaction;
+import org.apache.ibatis.datasource.jndi.JndiDataSourceFactory;
+import org.apache.ibatis.datasource.pooled.PooledDataSourceFactory;
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory;
import java.sql.Connection;
import java.util.*;
@@ -37,6 +42,14 @@
private final Map<String, ResultMap> resultMaps = new HashMap<String, ResultMap>();
private final Map<String, ParameterMap> parameterMaps = new HashMap<String, ParameterMap>();
+ public Configuration() {
+ typeAliasRegistry.registerAlias("JDBC", JdbcTransaction.class.getName());
+ typeAliasRegistry.registerAlias("MANAGED", ManagedTransaction.class.getName());
+ typeAliasRegistry.registerAlias("JNDI", JndiDataSourceFactory.class.getName());
+ typeAliasRegistry.registerAlias("POOLED", PooledDataSourceFactory.class.getName());
+ typeAliasRegistry.registerAlias("UNPOOLED", UnpooledDataSourceFactory.class.getName());
+ }
+
public Environment getEnvironment() {
return environment;
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Environment.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Environment.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Environment.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Environment.java Sat Nov 1 17:11:50 2008
@@ -1,25 +1,25 @@
package org.apache.ibatis.mapping;
-import org.apache.ibatis.transaction.TransactionManager;
+import org.apache.ibatis.transaction.TransactionFactory;
import javax.sql.DataSource;
public class Environment {
private String id;
- private TransactionManager transactionManager;
+ private TransactionFactory transactionFactory;
private DataSource dataSource;
private Environment() {}
public static class Builder {
private Environment environment = new Environment();
- public Builder(String id, TransactionManager transactionManager, DataSource dataSource) {
+ public Builder(String id, TransactionFactory transactionManager, DataSource dataSource) {
environment.id = id;
- environment.transactionManager = transactionManager;
+ environment.transactionFactory = transactionManager;
environment.dataSource = dataSource;
}
- public Builder transactionManager(TransactionManager transactionManager) {
- environment.transactionManager = transactionManager;
+ public Builder transactionFactory(TransactionFactory transactionFactory) {
+ environment.transactionFactory = transactionFactory;
return this;
}
public Builder dataSource(DataSource dataSource) {
@@ -40,8 +40,8 @@
return id;
}
- public TransactionManager getTransactionManager() {
- return transactionManager;
+ public TransactionFactory getTransactionFactory() {
+ return transactionFactory;
}
public DataSource getDataSource() {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java Sat Nov 1 17:11:50 2008
@@ -3,7 +3,7 @@
import org.apache.ibatis.jdbc.SqlRunner;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.migration.*;
-import org.apache.ibatis.jdbc.UnpooledDataSource;
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
import org.apache.ibatis.jdbc.ScriptRunner;
import org.apache.ibatis.xml.PropertyParser;
Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionFactory.java (from r708037, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManager.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManager.java&r1=708037&r2=709804&rev=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionManager.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionFactory.java Sat Nov 1 17:11:50 2008
@@ -1,10 +1,12 @@
package org.apache.ibatis.transaction;
import java.sql.Connection;
+import java.util.Properties;
-public interface TransactionManager {
- //TODO: Create transaction class, wrap connection passed to executor
+public interface TransactionFactory {
+ void setProperties(Properties props);
+
Transaction newTransaction(Connection conn);
}
Added: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactory.java?rev=709804&view=auto
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactory.java (added)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactory.java Sat Nov 1 17:11:50 2008
@@ -0,0 +1,18 @@
+package org.apache.ibatis.transaction.jdbc;
+
+import org.apache.ibatis.transaction.TransactionFactory;
+import org.apache.ibatis.transaction.Transaction;
+
+import java.util.Properties;
+import java.sql.Connection;
+
+public class JdbcTransactionFactory implements TransactionFactory {
+
+ public void setProperties(Properties props) {
+ }
+
+ public Transaction newTransaction(Connection conn) {
+ return null;
+ }
+
+}
Added: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactory.java?rev=709804&view=auto
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactory.java (added)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactory.java Sat Nov 1 17:11:50 2008
@@ -0,0 +1,4 @@
+package org.apache.ibatis.transaction.managed;
+
+public class ManagedTransactionFactory {
+}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/BaseDataTest.java Sat Nov 1 17:11:50 2008
@@ -2,8 +2,8 @@
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.jdbc.ScriptRunner;
-import org.apache.ibatis.jdbc.UnpooledDataSource;
-import org.apache.ibatis.jdbc.PooledDataSource;
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
+import org.apache.ibatis.datasource.pooled.PooledDataSource;
import org.junit.Test;
import javax.sql.DataSource;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfig.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfig.xml?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfig.xml (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfig.xml Sat Nov 1 17:11:50 2008
@@ -1,6 +1,6 @@
<configuration>
- <properties resource="org/apache/ibatis/monarch/example/mapper.properties"> <!-- url="" -->
+ <properties resource="org/apache/ibatis/builder/mapper.properties"> <!-- url="" -->
<property name="driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
</properties>
@@ -53,7 +53,7 @@
</environments>
<mappers>
- <mapper xml="org/apache/ibatis/monarch/example/BlogMapper.xml"/>
+ <mapper xml="org/apache/ibatis/builder/BlogMapper.xml"/>
</mappers>
</configuration>
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java Sat Nov 1 17:11:50 2008
@@ -1,16 +1,27 @@
package org.apache.ibatis.builder;
import org.junit.Test;
+import org.junit.Assert;
import org.apache.ibatis.BaseDataTest;
+import org.apache.ibatis.mapping.Configuration;
+import org.apache.ibatis.io.Resources;
import javax.sql.DataSource;
+import java.io.Reader;
public class MapperConfigParserTest extends BaseDataTest {
@Test
public void shouldBuildBlogMappers() throws Exception {
DataSource ds = createBlogDataSource();
+ final String resource = "org/apache/ibatis/builder/MapperConfig.xml";
+ final Reader reader = Resources.getResourceAsReader(resource);
+ MapperConfigParser parser = new MapperConfigParser(reader,null);
+ parser.parse();
+ Configuration config = parser.getConfiguration();
+
+ Assert.assertEquals(1,config.getCaches().size());
}
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java Sat Nov 1 17:11:50 2008
@@ -2,12 +2,10 @@
import domain.blog.*;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.jdbc.PooledDataSource;
import org.apache.ibatis.mapping.*;
import org.junit.*;
import javax.sql.DataSource;
-import java.io.IOException;
import java.sql.*;
import java.util.*;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java Sat Nov 1 17:11:50 2008
@@ -1,6 +1,7 @@
package org.apache.ibatis.jdbc;
import org.apache.ibatis.BaseDataTest;
+import org.apache.ibatis.datasource.pooled.PooledDataSource;
import org.junit.*;
import java.sql.Connection;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java Sat Nov 1 17:11:50 2008
@@ -1,6 +1,8 @@
package org.apache.ibatis.jdbc;
import org.apache.ibatis.BaseDataTest;
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
+import org.apache.ibatis.datasource.pooled.PooledDataSource;
import org.apache.ibatis.jdbc.SqlRunner;
import org.apache.ibatis.io.Resources;
import org.junit.*;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java?rev=709804&r1=709803&r2=709804&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/jdbc/SqlRunnerTest.java Sat Nov 1 17:11:50 2008
@@ -1,7 +1,6 @@
package org.apache.ibatis.jdbc;
import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.jdbc.PooledDataSource;
import org.apache.ibatis.jdbc.Null;
import org.apache.ibatis.jdbc.SqlRunner;
import org.junit.*;