svn commit: r709806 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src: main/java/org/apache/ibatis/mapping/Configuration.java test/java/org/apache/ibatis/builder/MapperConfig.xml

[cbegin]

Author: cbegin
Date: Sat Nov  1 17:24:06 2008
New Revision: 709806

URL: http://svn.apache.org/viewvc?rev=709806&view=rev
Log:
Mapper parser config half done, breaks build for an obvious reason, outta time, 
switching computers.

Modified:
    
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/test/java/org/apache/ibatis/builder/MapperConfig.xml

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=709806&r1=709805&r2=709806&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:24:06 2008
@@ -10,7 +10,9 @@
 import org.apache.ibatis.reflection.*;
 import org.apache.ibatis.type.*;
 import org.apache.ibatis.transaction.jdbc.JdbcTransaction;
+import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.apache.ibatis.transaction.managed.ManagedTransaction;
+import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
 import org.apache.ibatis.datasource.jndi.JndiDataSourceFactory;
 import org.apache.ibatis.datasource.pooled.PooledDataSourceFactory;
 import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory;
@@ -43,8 +45,8 @@
   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("JDBC", 
JdbcTransactionFactory.class.getName());
+    typeAliasRegistry.registerAlias("MANAGED", 
ManagedTransactionFactory.class.getName());
     typeAliasRegistry.registerAlias("JNDI", 
JndiDataSourceFactory.class.getName());
     typeAliasRegistry.registerAlias("POOLED", 
PooledDataSourceFactory.class.getName());
     typeAliasRegistry.registerAlias("UNPOOLED", 
UnpooledDataSourceFactory.class.getName());    

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=709806&r1=709805&r2=709806&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:24:06 2008
@@ -53,7 +53,8 @@
   </environments>
 
   <mappers>
-    <mapper xml="org/apache/ibatis/builder/BlogMapper.xml"/>
+    <!-- mapperXML vs. mapperClass-->
+    <mapper resource="org/apache/ibatis/builder/BlogMapper.xml"/>
   </mappers>
 
 </configuration>