Author: cbegin
Date: Sat May 9 18:00:23 2009
New Revision: 773255
URL: http://svn.apache.org/viewvc?rev=773255&view=rev
Log:
Renamed xml package to parsing package
Renamed parser package to builder package
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/
- copied from r773252,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/
- copied from r773252,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/
- copied from r773252,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/
- copied from r773252,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/xml/
Removed:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/xml/
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/xml/
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SqlSourceFactory.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlStatementParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.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/ParserException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SequentialMapperBuilder.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/builder/StaticSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperEntityResolver.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ChooseSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/IfSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/MixedSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/PrefixSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SetSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/WhereSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.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/main/java/org/apache/ibatis/parsing/GenericTokenParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/Nodelet.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletContext.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletWrapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/PropertyParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.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/xml/dynamic/DynamicSqlSourceTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/NodeletParserTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java?rev=773255&r1=773254&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java
Sat May 9 18:00:23 2009
@@ -7,7 +7,7 @@
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.mapping.SqlSource;
-import org.apache.ibatis.xml.NodeletContext;
+import org.apache.ibatis.parsing.NodeletContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java?rev=773255&r1=773254&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java
Sat May 9 18:00:23 2009
@@ -7,7 +7,7 @@
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.mapping.SqlSource;
-import org.apache.ibatis.xml.NodeletContext;
+import org.apache.ibatis.parsing.NodeletContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SqlSourceFactory.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SqlSourceFactory.java?rev=773255&r1=773254&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SqlSourceFactory.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SqlSourceFactory.java
Sat May 9 18:00:23 2009
@@ -3,7 +3,7 @@
import com.ibatis.sqlmap.engine.mapping.sql.dynamic.elements.SqlTagHandler;
import
com.ibatis.sqlmap.engine.mapping.sql.dynamic.elements.SqlTagHandlerFactory;
import org.apache.ibatis.mapping.SqlSource;
-import org.apache.ibatis.xml.NodeletContext;
+import org.apache.ibatis.parsing.NodeletContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java?rev=773255&r1=773254&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java
Sat May 9 18:00:23 2009
@@ -11,9 +11,9 @@
import org.apache.ibatis.reflection.ObjectFactory;
import org.apache.ibatis.type.JdbcType;
import org.apache.ibatis.type.TypeHandler;
-import org.apache.ibatis.xml.Nodelet;
-import org.apache.ibatis.xml.NodeletContext;
-import org.apache.ibatis.xml.NodeletParser;
+import org.apache.ibatis.parsing.Nodelet;
+import org.apache.ibatis.parsing.NodeletContext;
+import org.apache.ibatis.parsing.NodeletParser;
import java.io.Reader;
import java.util.HashMap;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapParser.java?rev=773255&r1=773254&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapParser.java
Sat May 9 18:00:23 2009
@@ -8,9 +8,9 @@
import org.apache.ibatis.reflection.MetaClass;
import org.apache.ibatis.type.JdbcType;
import org.apache.ibatis.type.TypeHandler;
-import org.apache.ibatis.xml.Nodelet;
-import org.apache.ibatis.xml.NodeletContext;
-import org.apache.ibatis.xml.NodeletParser;
+import org.apache.ibatis.parsing.Nodelet;
+import org.apache.ibatis.parsing.NodeletContext;
+import org.apache.ibatis.parsing.NodeletParser;
import java.io.Reader;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlStatementParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlStatementParser.java?rev=773255&r1=773254&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlStatementParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlStatementParser.java
Sat May 9 18:00:23 2009
@@ -6,7 +6,7 @@
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.mapping.*;
import org.apache.ibatis.type.TypeHandler;
-import org.apache.ibatis.xml.NodeletContext;
+import org.apache.ibatis.parsing.NodeletContext;
import org.w3c.dom.CharacterData;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java?rev=773255&r1=773254&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java
Sat May 9 18:00:23 2009
@@ -1,7 +1,7 @@
package org.apache.ibatis.binding;
import org.apache.ibatis.mapping.Configuration;
-import org.apache.ibatis.parser.annotation.MapperAnnotationParser;
+import org.apache.ibatis.builder.annotation.MapperAnnotationParser;
import org.apache.ibatis.session.SqlSession;
import java.util.*;
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=773255&r1=773252&r2=773255&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 May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser;
+package org.apache.ibatis.builder;
import org.apache.ibatis.mapping.*;
import org.apache.ibatis.type.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser;
+package org.apache.ibatis.builder;
import org.apache.ibatis.mapping.SqlMapperException;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SequentialMapperBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SequentialMapperBuilder.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SequentialMapperBuilder.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SequentialMapperBuilder.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser;
+package org.apache.ibatis.builder;
import org.apache.ibatis.cache.Cache;
import org.apache.ibatis.cache.decorators.LruCache;
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=773255&r1=773252&r2=773255&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 May 9 18:00:23 2009
@@ -1,8 +1,8 @@
-package org.apache.ibatis.parser;
+package org.apache.ibatis.builder;
import org.apache.ibatis.mapping.*;
import org.apache.ibatis.type.TypeHandler;
-import org.apache.ibatis.xml.GenericTokenParser;
+import org.apache.ibatis.parsing.GenericTokenParser;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/StaticSqlSource.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/StaticSqlSource.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/StaticSqlSource.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/StaticSqlSource.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser;
+package org.apache.ibatis.builder;
import org.apache.ibatis.mapping.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
Sat May 9 18:00:23 2009
@@ -1,11 +1,11 @@
-package org.apache.ibatis.parser.annotation;
+package org.apache.ibatis.builder.annotation;
import static org.apache.ibatis.annotations.Annotations.*;
import org.apache.ibatis.binding.BindingException;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.parser.*;
-import org.apache.ibatis.parser.xml.XMLMapperParser;
+import org.apache.ibatis.builder.*;
+import org.apache.ibatis.builder.xml.XMLMapperParser;
import org.apache.ibatis.reflection.MetaClass;
import org.apache.ibatis.type.JdbcType;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
Sat May 9 18:00:23 2009
@@ -1,7 +1,7 @@
-package org.apache.ibatis.parser.annotation;
+package org.apache.ibatis.builder.annotation;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.parser.SqlSourceParser;
+import org.apache.ibatis.builder.SqlSourceParser;
import java.lang.reflect.Method;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java
Sat May 9 18:00:23 2009
@@ -1,15 +1,15 @@
-package org.apache.ibatis.parser.xml;
+package org.apache.ibatis.builder.xml;
import org.apache.ibatis.datasource.DataSourceFactory;
import org.apache.ibatis.executor.ErrorContext;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.parser.*;
+import org.apache.ibatis.builder.*;
import org.apache.ibatis.plugin.Interceptor;
import org.apache.ibatis.reflection.*;
import org.apache.ibatis.transaction.TransactionFactory;
import org.apache.ibatis.type.TypeHandler;
-import org.apache.ibatis.xml.*;
+import org.apache.ibatis.parsing.*;
import java.io.Reader;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperEntityResolver.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperEntityResolver.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperEntityResolver.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperEntityResolver.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser.xml;
+package org.apache.ibatis.builder.xml;
import org.apache.ibatis.io.Resources;
import org.xml.sax.*;
@@ -11,8 +11,8 @@
*/
public class XMLMapperEntityResolver implements EntityResolver {
- private static final String MAPPER_CONFIG_DTD_RESOURCE =
"org/apache/ibatis/parser/xml/ibatis-3-config.dtd";
- private static final String MAPPER_DTD_RESOURCE =
"org/apache/ibatis/parser/xml/ibatis-3-mapper.dtd";
+ private static final String MAPPER_CONFIG_DTD_RESOURCE =
"org/apache/ibatis/builder/xml/ibatis-3-config.dtd";
+ private static final String MAPPER_DTD_RESOURCE =
"org/apache/ibatis/builder/xml/ibatis-3-mapper.dtd";
private static final Map<String, String> doctypeMap = new HashMap<String,
String>();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java
Sat May 9 18:00:23 2009
@@ -1,9 +1,9 @@
-package org.apache.ibatis.parser.xml;
+package org.apache.ibatis.builder.xml;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.parser.*;
+import org.apache.ibatis.builder.*;
import org.apache.ibatis.type.JdbcType;
-import org.apache.ibatis.xml.*;
+import org.apache.ibatis.parsing.*;
import java.io.Reader;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java
Sat May 9 18:00:23 2009
@@ -1,15 +1,15 @@
-package org.apache.ibatis.parser.xml;
+package org.apache.ibatis.builder.xml;
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.mapping.ResultSetType;
import org.apache.ibatis.mapping.SqlSource;
import org.apache.ibatis.mapping.StatementType;
-import org.apache.ibatis.parser.BaseParser;
-import org.apache.ibatis.parser.ParserException;
-import org.apache.ibatis.parser.SequentialMapperBuilder;
-import org.apache.ibatis.parser.SqlSourceParser;
-import org.apache.ibatis.parser.xml.dynamic.*;
-import org.apache.ibatis.xml.NodeletContext;
+import org.apache.ibatis.builder.BaseParser;
+import org.apache.ibatis.builder.ParserException;
+import org.apache.ibatis.builder.SequentialMapperBuilder;
+import org.apache.ibatis.builder.SqlSourceParser;
+import org.apache.ibatis.builder.xml.dynamic.*;
+import org.apache.ibatis.parsing.NodeletContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ChooseSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ChooseSqlNode.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ChooseSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ChooseSqlNode.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser.xml.dynamic;
+package org.apache.ibatis.builder.xml.dynamic;
import java.util.List;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser.xml.dynamic;
+package org.apache.ibatis.builder.xml.dynamic;
import org.apache.ibatis.reflection.MetaObject;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java
Sat May 9 18:00:23 2009
@@ -1,7 +1,7 @@
-package org.apache.ibatis.parser.xml.dynamic;
+package org.apache.ibatis.builder.xml.dynamic;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.parser.SqlSourceParser;
+import org.apache.ibatis.builder.SqlSourceParser;
public class DynamicSqlSource implements SqlSource {
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java
Sat May 9 18:00:23 2009
@@ -1,7 +1,7 @@
-package org.apache.ibatis.parser.xml.dynamic;
+package org.apache.ibatis.builder.xml.dynamic;
import org.apache.ibatis.ognl.*;
-import org.apache.ibatis.parser.ParserException;
+import org.apache.ibatis.builder.ParserException;
import java.math.BigDecimal;
import java.util.Arrays;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser.xml.dynamic;
+package org.apache.ibatis.builder.xml.dynamic;
public class ForEachSqlNode implements SqlNode {
private ExpressionEvaluator evaluator;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/IfSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/IfSqlNode.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/IfSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/IfSqlNode.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser.xml.dynamic;
+package org.apache.ibatis.builder.xml.dynamic;
public class IfSqlNode implements SqlNode {
private ExpressionEvaluator evaluator;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/MixedSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/MixedSqlNode.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/MixedSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/MixedSqlNode.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser.xml.dynamic;
+package org.apache.ibatis.builder.xml.dynamic;
import java.util.List;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/PrefixSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/PrefixSqlNode.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/PrefixSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/PrefixSqlNode.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser.xml.dynamic;
+package org.apache.ibatis.builder.xml.dynamic;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SetSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SetSqlNode.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SetSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SetSqlNode.java
Sat May 9 18:00:23 2009
@@ -1,6 +1,4 @@
-package org.apache.ibatis.parser.xml.dynamic;
-
-import java.util.*;
+package org.apache.ibatis.builder.xml.dynamic;
public class SetSqlNode extends PrefixSqlNode {
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SqlNode.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SqlNode.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser.xml.dynamic;
+package org.apache.ibatis.builder.xml.dynamic;
public interface SqlNode {
boolean apply(DynamicContext context);
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
Sat May 9 18:00:23 2009
@@ -1,6 +1,6 @@
-package org.apache.ibatis.parser.xml.dynamic;
+package org.apache.ibatis.builder.xml.dynamic;
-import org.apache.ibatis.xml.GenericTokenParser;
+import org.apache.ibatis.parsing.GenericTokenParser;
public class TextSqlNode implements SqlNode {
private String text;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/WhereSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/WhereSqlNode.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/WhereSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/WhereSqlNode.java
Sat May 9 18:00:23 2009
@@ -1,6 +1,4 @@
-package org.apache.ibatis.parser.xml.dynamic;
-
-import java.util.*;
+package org.apache.ibatis.builder.xml.dynamic;
public class WhereSqlNode extends PrefixSqlNode{
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java?rev=773255&r1=773254&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java
Sat May 9 18:00:23 2009
@@ -1,6 +1,6 @@
package org.apache.ibatis.migration;
-import org.apache.ibatis.xml.PropertyParser;
+import org.apache.ibatis.parsing.PropertyParser;
import java.io.*;
import java.util.Properties;
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=773255&r1=773254&r2=773255&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 May 9 18:00:23 2009
@@ -4,7 +4,7 @@
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.jdbc.*;
import org.apache.ibatis.migration.*;
-import org.apache.ibatis.xml.PropertyParser;
+import org.apache.ibatis.parsing.PropertyParser;
import java.io.*;
import java.math.BigDecimal;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.xml;
+package org.apache.ibatis.parsing;
public class GenericTokenParser {
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/Nodelet.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/Nodelet.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/Nodelet.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/Nodelet.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.xml;
+package org.apache.ibatis.parsing;
import java.lang.annotation.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletContext.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletContext.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletContext.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletContext.java
Sat May 9 18:00:23 2009
@@ -1,7 +1,7 @@
-package org.apache.ibatis.xml;
+package org.apache.ibatis.parsing;
import org.w3c.dom.*;
-import org.apache.ibatis.xml.PropertyParser;
+import org.apache.ibatis.parsing.PropertyParser;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletException.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletException.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.xml;
+package org.apache.ibatis.parsing;
public class NodeletException extends RuntimeException {
public NodeletException() {
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletParser.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletParser.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.xml;
+package org.apache.ibatis.parsing;
import org.w3c.dom.*;
import org.xml.sax.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletWrapper.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletWrapper.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletWrapper.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletWrapper.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.xml;
+package org.apache.ibatis.parsing;
import java.lang.reflect.Method;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/PropertyParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/PropertyParser.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/PropertyParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/PropertyParser.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.xml;
+package org.apache.ibatis.parsing;
import java.util.Properties;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XNode.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XNode.java
Sat May 9 18:00:23 2009
@@ -1,7 +1,7 @@
-package org.apache.ibatis.xml;
+package org.apache.ibatis.parsing;
import org.w3c.dom.*;
-import org.apache.ibatis.xml.PropertyParser;
+import org.apache.ibatis.parsing.PropertyParser;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java
Sat May 9 18:00:23 2009
@@ -1,10 +1,10 @@
-package org.apache.ibatis.xml;
+package org.apache.ibatis.parsing;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.*;
-import org.apache.ibatis.xml.PropertyParser;
+import org.apache.ibatis.parsing.PropertyParser;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathFactory;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java?rev=773255&r1=773254&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java
Sat May 9 18:00:23 2009
@@ -2,7 +2,7 @@
import org.apache.ibatis.exceptions.ExceptionFactory;
import org.apache.ibatis.mapping.Configuration;
-import org.apache.ibatis.parser.xml.XMLMapperConfigParser;
+import org.apache.ibatis.builder.xml.XMLMapperConfigParser;
import org.apache.ibatis.session.defaults.DefaultSqlSessionFactory;
import java.io.Reader;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser;
+package org.apache.ibatis.builder;
import org.apache.ibatis.reflection.DefaultObjectFactory;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExamplePlugin.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser;
+package org.apache.ibatis.builder;
import org.apache.ibatis.plugin.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser;
+package org.apache.ibatis.builder;
import org.apache.ibatis.type.*;
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=773255&r1=773252&r2=773255&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 May 9 18:00:23 2009
@@ -6,7 +6,7 @@
<configuration>
- <properties resource="org/apache/ibatis/parser/mapper.properties">
+ <properties resource="org/apache/ibatis/builder/mapper.properties">
<property name="driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
</properties>
@@ -31,15 +31,15 @@
</typeAliases>
<typeHandlers>
- <typeHandler javaType="String" jdbcType="VARCHAR"
handler="org.apache.ibatis.parser.ExampleTypeHandler"/>
+ <typeHandler javaType="String" jdbcType="VARCHAR"
handler="org.apache.ibatis.builder.ExampleTypeHandler"/>
</typeHandlers>
- <objectFactory type="org.apache.ibatis.parser.ExampleObjectFactory">
+ <objectFactory type="org.apache.ibatis.builder.ExampleObjectFactory">
<property name="objectFactoryProperty" value="100"/>
</objectFactory>
<plugins>
- <plugin interceptor="org.apache.ibatis.parser.ExamplePlugin">
+ <plugin interceptor="org.apache.ibatis.builder.ExamplePlugin">
<property name="pluginProperty" value="100"/>
</plugin>
</plugins>
@@ -60,9 +60,9 @@
<mappers>
<!-- mapperXML vs. mapperClass-->
- <mapper resource="org/apache/ibatis/parser/AuthorMapper.xml"/>
- <mapper resource="org/apache/ibatis/parser/BlogMapper.xml"/>
- <mapper resource="org/apache/ibatis/parser/CachedAuthorMapper.xml"/>
+ <mapper resource="org/apache/ibatis/builder/AuthorMapper.xml"/>
+ <mapper resource="org/apache/ibatis/builder/BlogMapper.xml"/>
+ <mapper resource="org/apache/ibatis/builder/CachedAuthorMapper.xml"/>
</mappers>
</configuration>
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser.xml.dynamic;
+package org.apache.ibatis.builder.xml.dynamic;
import static org.junit.Assert.*;
import org.junit.Test;
@@ -205,7 +205,7 @@
private DynamicSqlSource createDynamicSqlSource(SqlNode... contents) throws
IOException, SQLException {
createBlogDataSource();
- final String resource = "org/apache/ibatis/parser/MapperConfig.xml";
+ final String resource = "org/apache/ibatis/builder/MapperConfig.xml";
final Reader reader = Resources.getResourceAsReader(resource);
SqlSessionFactory sqlMapper = new SqlSessionFactoryBuilder().build(reader);
Configuration configuration = sqlMapper.getConfiguration();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parser.xml.dynamic;
+package org.apache.ibatis.builder.xml.dynamic;
import static org.junit.Assert.*;
import org.junit.Test;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java?rev=773255&r1=773254&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java
Sat May 9 18:00:23 2009
@@ -7,13 +7,13 @@
import org.apache.ibatis.logging.LogException;
import org.apache.ibatis.mapping.SqlMapperException;
import org.apache.ibatis.migration.MigrationException;
-import org.apache.ibatis.parser.ParserException;
+import org.apache.ibatis.builder.ParserException;
import org.apache.ibatis.plugin.PluginException;
import org.apache.ibatis.reflection.ReflectionException;
import org.apache.ibatis.session.SessionException;
import org.apache.ibatis.transaction.TransactionException;
import org.apache.ibatis.type.TypeException;
-import org.apache.ibatis.xml.NodeletException;
+import org.apache.ibatis.parsing.NodeletException;
import static org.junit.Assert.*;
import org.junit.Test;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java?rev=773255&r1=773254&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java
Sat May 9 18:00:23 2009
@@ -5,7 +5,7 @@
import org.apache.ibatis.cache.decorators.*;
import org.apache.ibatis.cache.impl.PerpetualCache;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.parser.StaticSqlSource;
+import org.apache.ibatis.builder.StaticSqlSource;
import org.apache.ibatis.type.*;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
Sat May 9 18:00:23 2009
@@ -1,8 +1,8 @@
-package org.apache.ibatis.xml;
+package org.apache.ibatis.parsing;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.apache.ibatis.xml.GenericTokenParser;
+import org.apache.ibatis.parsing.GenericTokenParser;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/NodeletParserTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/NodeletParserTest.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/NodeletParserTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/NodeletParserTest.java
Sat May 9 18:00:23 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.xml;
+package org.apache.ibatis.parsing;
import domain.misc.Employee;
import org.apache.ibatis.io.Resources;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java?rev=773255&r1=773252&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
Sat May 9 18:00:23 2009
@@ -1,9 +1,9 @@
-package org.apache.ibatis.xml;
+package org.apache.ibatis.parsing;
import static org.junit.Assert.*;
import org.junit.Test;
import org.apache.ibatis.io.Resources;
-import org.apache.ibatis.xml.XPathParser;
+import org.apache.ibatis.parsing.XPathParser;
import java.io.Reader;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java?rev=773255&r1=773254&r2=773255&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java
Sat May 9 18:00:23 2009
@@ -17,7 +17,7 @@
@BeforeClass
public static void setup() throws Exception {
createBlogDataSource();
- final String resource = "org/apache/ibatis/parser/MapperConfig.xml";
+ final String resource = "org/apache/ibatis/builder/MapperConfig.xml";
final Reader reader = Resources.getResourceAsReader(resource);
sqlMapper = new SqlSessionFactoryBuilder().build(reader);
}
