svn commit: r757299 - in /ibatis/trunk/java/ibatis-3: ./ ibatis-3-core/src/main/java/org/apache/ibatis/binding/ ibatis-3-core/src/main/java/org/apache/ibatis/parser/ ibatis-3-core/src/main/java/org/apache/ibatis/session/

[cb...@apache.org]

Author: cbegin
Date: Mon Mar 23 02:10:50 2009
New Revision: 757299

URL: http://svn.apache.org/viewvc?rev=757299&view=rev
Log:
Gave the XML parsers more clear names

Added:
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperConfigParser.java
      - copied, changed from r753101, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigParser.java
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperEntityResolver.java
      - copied, changed from r753101, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperEntityResolver.java
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperParser.java
      - copied, changed from r757131, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java
Removed:
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigParser.java
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperEntityResolver.java
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java
Modified:
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperAnnotationParser.java
    ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java
    ibatis/trunk/java/ibatis-3/version.properties

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperAnnotationParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperAnnotationParser.java?rev=757299&r1=757298&r2=757299&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperAnnotationParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperAnnotationParser.java Mon Mar 23 02:10:50 2009
@@ -4,7 +4,7 @@
 import org.apache.ibatis.mapping.*;
 import org.apache.ibatis.parser.MapperConfigurator;
 import org.apache.ibatis.parser.SqlSourceParser;
-import org.apache.ibatis.parser.MapperParser;
+import org.apache.ibatis.parser.XMLMapperParser;
 import org.apache.ibatis.reflection.MetaClass;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.io.Resources;
@@ -51,7 +51,7 @@
       // ignore, resource is not required
     }
     if (xmlReader != null) {
-      MapperParser xmlParser = new MapperParser(xmlReader, configurator.getConfiguration(), xmlResource, type.getName());
+      XMLMapperParser xmlParser = new XMLMapperParser(xmlReader, configurator.getConfiguration(), xmlResource, type.getName());
       xmlParser.parse();
     }
   }

Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperConfigParser.java (from r753101, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigParser.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperConfigParser.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperConfigParser.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigParser.java&r1=753101&r2=757299&rev=757299&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperConfigParser.java Mon Mar 23 02:10:50 2009
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.Properties;
 
-public class MapperConfigParser extends BaseParser {
+public class XMLMapperConfigParser extends BaseParser {
 
   private boolean parsed;
 
@@ -29,15 +29,15 @@
   private String environment;
   private Environment.Builder environmentBuilder;
 
-  public MapperConfigParser(Reader reader) {
+  public XMLMapperConfigParser(Reader reader) {
     this(reader, null, null);
   }
 
-  public MapperConfigParser(Reader reader, String environment) {
+  public XMLMapperConfigParser(Reader reader, String environment) {
     this(reader, environment, null);
   }
 
-  public MapperConfigParser(Reader reader, String environment, Properties props) {
+  public XMLMapperConfigParser(Reader reader, String environment, Properties props) {
     ErrorContext.instance().resource("SQL Mapper Configuration");
     this.parsed = false;
     this.reader = reader;
@@ -52,7 +52,7 @@
     this.parser.addNodeletHandler(this);
     this.parser.setValidation(true);
     this.parser.setVariables(props);
-    this.parser.setEntityResolver(new MapperEntityResolver());
+    this.parser.setEntityResolver(new XMLMapperEntityResolver());
   }
 
   public Configuration parse() {
@@ -223,12 +223,12 @@
     if (resource != null && url == null) {
       ErrorContext.instance().resource(resource);
       reader = Resources.getResourceAsReader(resource);
-      MapperParser mapperParser = new MapperParser(reader, configuration, resource);
+      XMLMapperParser mapperParser = new XMLMapperParser(reader, configuration, resource);
       mapperParser.parse();
     } else if (url != null && resource == null) {
       ErrorContext.instance().resource(url);
       reader = Resources.getUrlAsReader(url);
-      MapperParser mapperParser = new MapperParser(reader, configuration, url);
+      XMLMapperParser mapperParser = new XMLMapperParser(reader, configuration, url);
       mapperParser.parse();
     } else {
       throw new ParserException("A mapper element may only specify a url or resource, but not both.");

Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperEntityResolver.java (from r753101, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperEntityResolver.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperEntityResolver.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperEntityResolver.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperEntityResolver.java&r1=753101&r2=757299&rev=757299&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperEntityResolver.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperEntityResolver.java Mon Mar 23 02:10:50 2009
@@ -13,7 +13,7 @@
 /**
  * Offline entity resolver for the iBATIS DTDs
  */
-public class MapperEntityResolver implements EntityResolver {
+public class XMLMapperEntityResolver implements EntityResolver {
 
   private static final String MAPPER_CONFIG_DTD_RESOURCE = "org/apache/ibatis/parser/ibatis-config-3.dtd";
   private static final String MAPPER_DTD_RESOURCE = "org/apache/ibatis/parser/ibatis-mapper-3.dtd";

Copied: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperParser.java (from r757131, ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperParser.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperParser.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java&r1=757131&r2=757299&rev=757299&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/XMLMapperParser.java Mon Mar 23 02:10:50 2009
@@ -10,25 +10,25 @@
 import java.util.ArrayList;
 import java.util.Properties;
 
-public class MapperParser extends BaseParser {
+public class XMLMapperParser extends BaseParser {
 
   protected Reader reader;
   protected NodeletParser parser;
   protected MapperConfigurator mapperConfigurator;
 
-  public MapperParser(Reader reader, Configuration configuration, String resource, String namespace) {
+  public XMLMapperParser(Reader reader, Configuration configuration, String resource, String namespace) {
     this(reader, configuration, resource);
     this.mapperConfigurator.namespace(namespace);
   }
 
-  public MapperParser(Reader reader, Configuration configuration, String resource) {
+  public XMLMapperParser(Reader reader, Configuration configuration, String resource) {
     this.mapperConfigurator = new MapperConfigurator(configuration,resource);
     this.reader = reader;
     this.parser = new NodeletParser();
     this.parser.addNodeletHandler(this);
     this.parser.setValidation(true);
     this.parser.setVariables(configuration.getVariables());
-    this.parser.setEntityResolver(new MapperEntityResolver());
+    this.parser.setEntityResolver(new XMLMapperEntityResolver());
     this.typeAliasRegistry = configuration.getTypeAliasRegistry();
     this.typeHandlerRegistry = configuration.getTypeHandlerRegistry();
     this.configuration = configuration;

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=757299&r1=757298&r2=757299&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 Mon Mar 23 02:10:50 2009
@@ -3,7 +3,7 @@
 import org.apache.ibatis.session.defaults.DefaultSqlSessionFactory;
 import org.apache.ibatis.exceptions.ExceptionFactory;
 import org.apache.ibatis.mapping.Configuration;
-import org.apache.ibatis.parser.MapperConfigParser;
+import org.apache.ibatis.parser.XMLMapperConfigParser;
 
 import java.io.Reader;
 import java.util.Properties;
@@ -24,7 +24,7 @@
 
   public SqlSessionFactory build(Reader reader, String environment, Properties props) {
     try {
-      MapperConfigParser parser = new MapperConfigParser(reader, environment, props);
+      XMLMapperConfigParser parser = new XMLMapperConfigParser(reader, environment, props);
       Configuration config = parser.parse();
       return new DefaultSqlSessionFactory(config);
     } catch (Exception e) {

Modified: ibatis/trunk/java/ibatis-3/version.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/version.properties?rev=757299&r1=757298&r2=757299&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/version.properties (original)
+++ ibatis/trunk/java/ibatis-3/version.properties Mon Mar 23 02:10:50 2009
@@ -1,5 +1,5 @@
 #Build version info
-#Sat Mar 21 14:34:34 MDT 2009
+#Sun Mar 22 20:04:46 MDT 2009
 version=3.0.0
-buildDate=2009/03/21 14\:34
-buildNum=144
+buildDate=2009/03/22 20\:04
+buildNum=146