svn commit: r709767 - in /ibatis/trunk/java/ibatis-3: ./ ibatis-3-core/src/main/java/org/apache/ibatis/api/ ibatis-3-core/src/main/java/org/apache/ibatis/builder/ ibatis-3-core/src/test/java/org/apache/ibatis/builder/

Sat, 01 Nov 2008 13:02:01 -0700 

Author: cbegin
Date: Sat Nov  1 13:01:37 2008
New Revision: 709767

URL: http://svn.apache.org/viewvc?rev=709767&view=rev
Log:
merged monarch API into core.

Added:
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/MapperFactory.java
      - copied, changed from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/MapperFactory.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java
      - copied, changed from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/BaseParser.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BuilderException.java
      - copied, changed from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/BuilderException.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/InlineSqlSource.java
      - copied, changed from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/InlineSqlSource.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java
      - copied, changed from r708037, 
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-core/src/main/java/org/apache/ibatis/builder/MapperEntityResolver.java
      - copied, changed from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperEntityResolver.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperFactoryBuilder.java
      - copied, changed from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperFactoryBuilder.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperParser.java
      - copied, changed from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperParser.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MonarchConfiguration.java
      - copied, changed from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MonarchConfiguration.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
      - copied, changed from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/SqlSourceParser.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/monarch-configuration.dtd
      - copied unchanged from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/monarch-configuration.dtd
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/monarch-mapper.dtd
      - copied unchanged from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/monarch-mapper.dtd
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/BlogMapper.xml
      - copied unchanged from r708040, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/BlogMapper.xml
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java
      - copied, changed from r708040, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/TestObjectFactory.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java
      - copied, changed from r708040, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/TestPlugin.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java
      - copied, changed from r708040, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/TestTypeHandler.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfig.xml
      - copied, changed from r708040, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/MapperConfig.xml
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java
      - copied, changed from r708047, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/MapperConfigParserTest.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/mapper.properties
      - copied unchanged from r708040, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/mapper.properties
Modified:
    ibatis/trunk/java/ibatis-3/pom.xml

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/MapperFactory.java
 (from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/MapperFactory.java)
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/MapperFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/MapperFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/MapperFactory.java&r1=708037&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/MapperFactory.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/MapperFactory.java
 Sat Nov  1 13:01:37 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch;
+package org.apache.ibatis.api;
 
 public class MapperFactory {
 }

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java
 (from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/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?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/BaseParser.java&r1=708037&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/BaseParser.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java
 Sat Nov  1 13:01:37 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 import org.apache.ibatis.type.*;
 import org.apache.ibatis.mapping.*;

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BuilderException.java
 (from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/BuilderException.java)
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BuilderException.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BuilderException.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/BuilderException.java&r1=708037&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/BuilderException.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BuilderException.java
 Sat Nov  1 13:01:37 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 import org.apache.ibatis.mapping.SqlMapperException;
 

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/InlineSqlSource.java
 (from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/InlineSqlSource.java)
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/InlineSqlSource.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/InlineSqlSource.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/InlineSqlSource.java&r1=708037&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/InlineSqlSource.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/InlineSqlSource.java
 Sat Nov  1 13:01:37 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 import org.apache.ibatis.mapping.*;
 

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java
 (from r708037, 
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-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperConfigParser.java&r1=708037&r2=709767&rev=709767&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-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java
 Sat Nov  1 13:01:37 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 import org.apache.ibatis.xml.*;
 import org.apache.ibatis.mapping.*;

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperEntityResolver.java
 (from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperEntityResolver.java)
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperEntityResolver.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperEntityResolver.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperEntityResolver.java&r1=708037&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperEntityResolver.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperEntityResolver.java
 Sat Nov  1 13:01:37 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 import org.xml.sax.*;
 import org.apache.ibatis.io.Resources;

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperFactoryBuilder.java
 (from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperFactoryBuilder.java)
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperFactoryBuilder.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperFactoryBuilder.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperFactoryBuilder.java&r1=708037&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperFactoryBuilder.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperFactoryBuilder.java
 Sat Nov  1 13:01:37 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 public class MapperFactoryBuilder {
 

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperParser.java
 (from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/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?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperParser.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperParser.java&r1=708037&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MapperParser.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperParser.java
 Sat Nov  1 13:01:37 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 import org.apache.ibatis.mapping.*;
 import org.apache.ibatis.reflection.MetaClass;

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MonarchConfiguration.java
 (from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MonarchConfiguration.java)
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MonarchConfiguration.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MonarchConfiguration.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MonarchConfiguration.java&r1=708037&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/MonarchConfiguration.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MonarchConfiguration.java
 Sat Nov  1 13:01:37 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 import org.apache.ibatis.mapping.Configuration;
 import org.apache.ibatis.mapping.Environment;

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
 (from r708037, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/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?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/SqlSourceParser.java&r1=708037&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/SqlSourceParser.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
 Sat Nov  1 13:01:37 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 import org.apache.ibatis.mapping.*;
 import org.apache.ibatis.xml.*;

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java
 (from r708040, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/TestObjectFactory.java)
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/TestObjectFactory.java&r1=708040&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/TestObjectFactory.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java
 Sat Nov  1 13:01:37 2008
@@ -1,11 +1,11 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 import org.apache.ibatis.reflection.DefaultObjectFactory;
 
 import java.util.List;
 import java.util.Properties;
 
-public class TestObjectFactory extends DefaultObjectFactory {
+public class ExampleObjectFactory extends DefaultObjectFactory {
 
   public Object create(Class type) {
     return super.create(type);

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java
 (from r708040, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/TestPlugin.java)
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/TestPlugin.java&r1=708040&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/TestPlugin.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java
 Sat Nov  1 13:01:37 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.plugin.Invocation;
@@ -6,7 +6,7 @@
 
 import java.util.Properties;
 
-public class TestPlugin implements Interceptor {
+public class ExamplePlugin implements Interceptor {
 
   public Object intercept(Invocation invocation) throws Throwable {
     return invocation.proceed();

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java
 (from r708040, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/TestTypeHandler.java)
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/TestTypeHandler.java&r1=708040&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/TestTypeHandler.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java
 Sat Nov  1 13:01:37 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 import org.apache.ibatis.type.TypeHandler;
 import org.apache.ibatis.type.JdbcType;
@@ -8,7 +8,7 @@
 import java.sql.ResultSet;
 import java.sql.CallableStatement;
 
-public class TestTypeHandler implements TypeHandler {
+public class ExampleTypeHandler implements TypeHandler {
 
   public void setParameter(PreparedStatement ps, int i, Object parameter, 
JdbcType jdbcType) throws SQLException {
     ps.setString(i,(String)parameter);

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfig.xml
 (from r708040, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/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?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfig.xml&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/MapperConfig.xml&r1=708040&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/MapperConfig.xml
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfig.xml
 Sat Nov  1 13:01:37 2008
@@ -25,15 +25,15 @@
   </typeAliases>
 
   <typeHandlers>
-    <typeHandler javaType="String" jdbcType="VARCHAR" 
handler="org.apache.ibatis.monarch.builder.TestTypeHandler"/>
+    <typeHandler javaType="String" jdbcType="VARCHAR" 
handler="org.apache.ibatis.builder.ExampleTypeHandler"/>
   </typeHandlers>
 
-  <objectFactory type="org.apache.ibatis.monarch.builder.TestObjectFactory">
+  <objectFactory type="org.apache.ibatis.builder.ExampleObjectFactory">
     <property name="objectFactoryProperty" value="100"/>
   </objectFactory>
 
   <plugins>
-    <plugin interceptor="org.apache.ibatis.monarch.builder.TestPlugin">
+    <plugin interceptor="org.apache.ibatis.builder.ExamplePlugin">
       <property name="pluginProperty" value="100"/>
     </plugin>
   </plugins>

Copied: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java
 (from r708047, 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/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?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/MapperConfigParserTest.java&r1=708047&r2=709767&rev=709767&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/builder/MapperConfigParserTest.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/MapperConfigParserTest.java
 Sat Nov  1 13:01:37 2008
@@ -1,13 +1,16 @@
-package org.apache.ibatis.monarch.builder;
+package org.apache.ibatis.builder;
 
 import org.junit.Test;
 import org.apache.ibatis.BaseDataTest;
 
+import javax.sql.DataSource;
+
 public class MapperConfigParserTest extends BaseDataTest {
 
   @Test
   public void shouldBuildBlogMappers() throws Exception {
-    
+    DataSource ds = createBlogDataSource();
+
   }
 
 }

Modified: ibatis/trunk/java/ibatis-3/pom.xml
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/pom.xml?rev=709767&r1=709766&r2=709767&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/pom.xml (original)
+++ ibatis/trunk/java/ibatis-3/pom.xml Sat Nov  1 13:01:37 2008
@@ -8,6 +8,5 @@
   <modules>
     <module>ibatis-3-core</module>
     <module>ibatis-3-compat</module>
-    <module>ibatis-3-monarch</module>
   </modules>
-</project>
\ No newline at end of file
+</project>

Reply via email to