ibatis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgbut...@apache.org
Subject svn commit: r705122 [1/2] - in /ibatis/trunk/java/tools/ibator/core: build/ buildsupport/org/apache/ibatis/ibator/build/ doc/ htmldoc/ htmldoc/configreference/ htmldoc/reference/ src/org/apache/ibatis/ibator/api/ src/org/apache/ibatis/ibator/api/dom/ja...
Date Thu, 16 Oct 2008 02:51:26 GMT
Author: jgbutler
Date: Wed Oct 15 19:51:25 2008
New Revision: 705122

URL: http://svn.apache.org/viewvc?rev=705122&view=rev
Log:
[ibator] minor bug fixes, migration from Abator information, other documentation

Added:
    ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html
Modified:
    ibatis/trunk/java/tools/ibator/core/build/ant.bat
    ibatis/trunk/java/tools/ibator/core/build/version.properties
    ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java
    ibatis/trunk/java/tools/ibator/core/doc/MigrationNotes.txt
    ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/classPathEntry.html
    ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/daoGenerator.html
    ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html
    ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/javaModelGenerator.html
    ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/javaTypeResolver.html
    ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/sqlMapGenerator.html
    ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/xmlconfig.html
    ibatis/trunk/java/tools/ibator/core/htmldoc/menu.html
    ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html
    ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/JavaGenerator.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/XmlGenerator.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Impl.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DAOElementGeneratorBaseImpl.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithBLOBsMethodGenerator.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithoutBLOBsMethodGenerator.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RootClassInfo.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorObjectFactory.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/ActualTableName.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/ConnectionFactory.java
    ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java
    ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java2/ConditionalJava2Tests.java
    ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java2/UpdateByExampleTests.java
    ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/FlatJava2Tests.java
    ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/UpdateByExampleTests.java
    ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/hierarchical/java2/HierarchicalJava2Tests.java
    ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/hierarchical/java2/UpdateByExampleTests.java
    ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/MiscellaneousTests.java

Modified: ibatis/trunk/java/tools/ibator/core/build/ant.bat
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/ant.bat?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/build/ant.bat (original)
+++ ibatis/trunk/java/tools/ibator/core/build/ant.bat Wed Oct 15 19:51:25 2008
@@ -1,2 +1,2 @@
 
-%JAVA_HOME%\bin\java -classpath ..\devlib\ant-launcher-1.7.1.jar org.apache.tools.ant.launch.Launcher -buildfile build.xml %1
\ No newline at end of file
+"%JAVA_HOME%\bin\java" -classpath ..\devlib\ant-launcher-1.7.1.jar org.apache.tools.ant.launch.Launcher -buildfile build.xml %1
\ No newline at end of file

Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/version.properties?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Wed Oct 15 19:51:25 2008
@@ -1,4 +1,4 @@
 #ibator build version info
-#Fri Oct 10 15:00:01 CDT 2008
+#Wed Oct 15 21:47:23 CDT 2008
 version=1.2.0
-buildNum=612
+buildNum=636

Modified: ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java (original)
+++ ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java Wed Oct 15 19:51:25 2008
@@ -44,8 +44,8 @@
             File file = new File(fileName);
             
             //com.vladium.emma.rt.RT.dumpCoverageData(file, true, false);
-            Class clazz = Class.forName("com.vladium.emma.rt.RT"); //$NON-NLS-1$
-            Class[] parameters = new Class[3];
+            Class<?> clazz = Class.forName("com.vladium.emma.rt.RT"); //$NON-NLS-1$
+            Class<?>[] parameters = new Class<?>[3];
             parameters[0] = File.class;
             parameters[1] = boolean.class;
             parameters[2] = boolean.class;

Modified: ibatis/trunk/java/tools/ibator/core/doc/MigrationNotes.txt
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/MigrationNotes.txt?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/doc/MigrationNotes.txt (original)
+++ ibatis/trunk/java/tools/ibator/core/doc/MigrationNotes.txt Wed Oct 15 19:51:25 2008
@@ -1,10 +1,3 @@
-1. Attribute "generatorSet" removed from <ibatorContext>,
-   new attribute "targetJRE" with similar meaning
+Undocumented changes:
 
-2. introspectedTableImplementation removed from <ibatorContext>
 
-3. type attribute removed from <javaModelGenerator>, <sqlMapGenerator>
-
-4. type attribute changed meaning on <daoGenerator>
-
-5. JavaTypeResolver interface changed

Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/classPathEntry.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/classPathEntry.html?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/classPathEntry.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/classPathEntry.html Wed Oct 15 19:51:25 2008
@@ -19,17 +19,22 @@
 <p>The &lt;classPathEntry&gt; element is used to add classpath locations to the
 classpath of the ibator run.  The &lt;classPathEntry&gt; element is an option child
 element of the <a href="ibatorConfiguration.html">&lt;ibatorConfiguration&gt;</a> element.
-ibator loads classes in several instances:</p>
+ibator loads classes from these locations in these instances:</p>
 <ul>
   <li>When loading the JDBC driver for database introspection</li>
-  <li>When loading custom JavaModelGenerator, JavaTypeResolvers, etc.</li>
   <li>When loading root classes in the JavaModelGenerator to check for overridden
       methods</li>
 </ul>
 
-<p>This element is option and is not required if you setup the classpath externally to ibator
+<p>This element is optional and is not required if you setup the classpath externally to ibator
 (e.g. with the <code>-cp</code> argument of the <code>java</code> command</p>
 
+<p><b>Important Note:</b> these locations are NOT used when loading classes that
+extend one of ibator's classes or implement one of ibator's interfaces.  In those cases
+you must add your external classes to the runtime classpath in the same way you
+add ibator to the classpath (e,g, with the <code>-cp</code> argument of the
+<code>java</code> command).</p>
+
 <h2>Required Attributes</h2>
 <table border="1" cellspacing="0" cellpadding="5">
   <tr>

Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/daoGenerator.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/daoGenerator.html?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/daoGenerator.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/daoGenerator.html Wed Oct 15 19:51:25 2008
@@ -22,11 +22,6 @@
 introspected table. This element is a optional child element
 of the <a href="ibatorContext.html">&lt;ibatorContext&gt;</a> element.  If you do not
 specify this element, then ibator will not generate DAO interfaces and classes.</p>
-<p>If you don't specify a user defined type, ibator will select a default
-generator based on the value of the type attribute of this element and the
-<code>generatorSet</code> property of the
-<a href="ibatorContext.html">&lt;ibatorContext&gt;</a> element.  See the notes on that
-page for features of the different types of generators.</p>
 <h2>Required Attributes</h2>
 <table border="1" cellspacing="0" cellpadding="5">
   <tr>
@@ -35,17 +30,17 @@
   </tr>
   <tr>
     <td valign="top">type</td>
-    <td>This attribute is used to select one of the predefined DAO generators, or
-        to specify a user provided DAO generator.
-        Any user provided DAO generator must implement the interface
-        <code>org.apache.ibatis.ibator.api.DAOGenerator</code>,
-        and must have a public default constructor.
+    <td>This attribute is used to select one of the predefined DAO templates, or
+        to specify a user provided DAO template.
+        Any user provided DAO template must extend the class
+        <code>org.apache.ibatis.ibator.generator.ibatis2.dao.templates.AbstractDAOTemplate</code>
+        class, and must have a public default constructor.
         <p>The attribute accepts the following four values for selecting one of the
         predefined DAO generators:</p>
         <table cellpadding="5">
           <tr>
             <th nowrap="nowrap" valign="top">IBATIS</th>
-            <td>The generated DAO objects will conform to the iBATIS DAO framework.</td>
+            <td>The generated DAO objects will conform to the (now deprecated) iBATIS DAO framework.</td>
           </tr>
           <tr>
             <th nowrap="nowrap" valign="top">GENERIC-CI</th>

Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html Wed Oct 15 19:51:25 2008
@@ -77,16 +77,15 @@
     </td>
   </tr>
   <tr>
-    <td valign="top">generatorSet</td>
+    <td valign="top">targetJRE</td>
     <td>
-      This property is used to select different sets of code generators,
-      with different behaviors.
+      This property is used to specify the JRE under which the generated code will run.
       The property supports these values:
       <table>
         <tr>
           <th valign="top">Java2</th>
           <td><i>This is the default value</i>
-            <br/>This set of code generators generate objects that are compatible
+            <br/>With this value, ibator will generate objects that are compatible
             with iBATIS versions 2.2.0 and higher, and all levels of Java 2.
             The "by example" methods in these generated objects support virtually
             unlimited dynamic where clauses.  The objects generated with
@@ -96,8 +95,9 @@
         </tr>
         <tr>
           <th valign="top">Java5</th>
-          <td>This set of code generators generate objects that are compatible
-            with iBATIS versions 2.2.0 and higher, and JSE 5.0 and higher.
+          <td>With the value, ibator will generate objects that are compatible
+            with iBATIS versions 2.2.0 and higher, and JSE 5.0 and higher (e.g. the
+            Java model and DAO classes will use generic types).
             The "by example" methods in these generated objects support virtually
             unlimited dynamic where clauses.  Additionally, the Java objects
             generated with these generators support many JSE 5.0 features including
@@ -109,17 +109,6 @@
       </table>
     </td>
   </tr>
-  <tr>
-    <td valign="top">introspectedTableImplementation</td>
-    <td>This atribute can be used to configure a custom implementation of the
-        <code>org.apache.ibatis.ibator.api.IntrospectedTable</code> interface
-        for this context.  Implementations of this interface can provide
-        custom behavior for many of the core ibator functions.  The default
-        implementation of the interface is
-        <code>org.apache.ibatis.ibator.internal.db.IntrospectedTableDefaultImpl</code>
-        and that class is designed for extensibility.
-    </td>
-  </tr>
 </table>
 
 <h2>Child Elements</h2>
@@ -147,11 +136,11 @@
     <td valign="top">suppressTypeWarnings</td>
     <td>If true, then ibator will add an annotation to any method
       that uses a non-parameterized type to suppress compiler type warnings.
-      This is useful if you are using the Java2 generator set, but are
+      This is useful if you are using the Java2 targetJRE, but are
       compiling the generated objects with a JSE 5.0 compiler.  In that situation,
       the ibator generated code would generate many compiler warnings if the
       annotation is not allowed.  This property is not needed and will have
-      no effect when using the Java5 generator set.</p>
+      no effect when using the Java5 targetJRE.</p>
       <p><i>The default value is false.</i></p></td>
   </tr>
   <tr>

Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/javaModelGenerator.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/javaModelGenerator.html?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/javaModelGenerator.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/javaModelGenerator.html Wed Oct 15 19:51:25 2008
@@ -21,11 +21,6 @@
 Query by Example classes that match the introspected table. This element is a required
 child element
 of the <a href="ibatorContext.html">&lt;ibatorContext&gt;</a> element.</p>
-<p>If you don't specify a user defined type, ibator will select a default
-generator based on the value of the
-<code>generatorSet</code> property of the
-<a href="ibatorContext.html">&lt;ibatorContext&gt;</a> element.  See the notes on that
-page for features of the different types of generators.</p>
 <h2>Required Attributes</h2>
 <table border="1" cellspacing="0" cellpadding="5">
   <tr>
@@ -57,21 +52,7 @@
 </table>
 
 <h2>Optional Attributes</h2>
-<table border="1" cellspacing="0" cellpadding="5">
-  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td valign="top">type</td>
-    <td>This can be used to specify a user provided Java model generator.
-        The class must implement the interface
-        org.apache.ibatis.ibator.api.JavaModelGenerator,
-        and must have a public default constructor.  The attribute also accepts
-        the special value DEFAULT in which case the default implementation will
-        be used (this has the same effect as not specifying the type).</td>
-  </tr>
-</table>
+<p>None</p>
 
 <h2>Child Elements</h2>
 <ul>

Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/javaTypeResolver.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/javaTypeResolver.html?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/javaTypeResolver.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/javaTypeResolver.html Wed Oct 15 19:51:25 2008
@@ -37,7 +37,8 @@
   <tr>
     <td valign="top">type</td>
     <td>This can be used to specify a user provided Java Type Resolver.
-        The class must implement the interface org.apache.ibatis.ibator.api.JavaTypeResolver,
+        The class must implement the interface
+        <code>org.apache.ibatis.ibator.api.JavaTypeResolver</code>,
         and must have a public default constructor.  The attribute also accepts
         the special value DEFAULT in which case the default implementation will
         be used (this has the same effect as not specifying the type).</td>

Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/sqlMapGenerator.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/sqlMapGenerator.html?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/sqlMapGenerator.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/sqlMapGenerator.html Wed Oct 15 19:51:25 2008
@@ -20,11 +20,6 @@
 generator.  The SQL Map Generator builds an iBATIS formatted SQL map for each
 introspected table. This element is a required child element
 of the <a href="ibatorContext.html">&lt;ibatorContext&gt;</a> element.</p>
-<p>If you don't specify a user defined type, ibator will select a default
-generator based on the value of the
-<code>generatorSet</code> property of the
-<a href="ibatorContext.html">&lt;ibatorContext&gt;</a> element.  See the notes on that
-page for features of the different types of generators.</p>
 <h2>Required Attributes</h2>
 <table border="1" cellspacing="0" cellpadding="5">
   <tr>
@@ -56,21 +51,7 @@
 </table>
 
 <h2>Optional Attributes</h2>
-<table border="1" cellspacing="0" cellpadding="5">
-  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td valign="top">type</td>
-    <td>This can be used to specify a user provided Java model generator.
-        The class must implement the interface
-        org.apache.ibatis.ibator.api.SqlMapGenerator,
-        and must have a public default constructor.  The attribute also accepts
-        the special value DEFAULT in which case the default implementation will
-        be used (this has the same effect as not specifying the type).</td>
-  </tr>
-</table>
+<p>None</p>
 
 <h2>Child Elements</h2>
 <ul>

Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/xmlconfig.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/xmlconfig.html?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/xmlconfig.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/xmlconfig.html Wed Oct 15 19:51:25 2008
@@ -37,7 +37,7 @@
 &lt;ibatorConfiguration&gt;
   &lt;classPathEntry location="/Program Files/IBM/SQLLIB/java/db2java.zip" /&gt;
 
-  &lt;ibatorContext id="DB2Tables" generatorSet="Java2"&gt;
+  &lt;ibatorContext id="DB2Tables" targetJRE="Java2"&gt;
     &lt;jdbcConnection driverClass="COM.ibm.db2.jdbc.app.DB2Driver"
         connectionURL="jdbc:db2:TEST"
         userId="db2admin"
@@ -75,9 +75,8 @@
 </pre>
 <p>Important notes about this file follow:</p>
 <ul>
-  <li>ibator will use the <code>Java2</code> generator set to generate code.  This generator set
-      is more powerful then the original generator set shipped with early versions of
-      Abator.</li>
+  <li>ibator will generate code compatible with versions of Java before Java 5.0 (i.e. no generic
+      types).</li>
   <li>The file specifies that the legacy DB2 CLI driver will be used to connect to the database,
       and also specifies where the driver can be found.</li>
   <li>The Java Type Resolver should not force the use of BigDecimal fields - this means that

Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/menu.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/menu.html?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/menu.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/menu.html Wed Oct 15 19:51:25 2008
@@ -14,6 +14,7 @@
   <a href="quickstart.html" target="mainFrame">Quick Start Guide</a><br/>
   <a href="running.html" target="mainFrame">Running Ibator</a><br/>
   <a href="afterRunning.html" target="mainFrame">Tasks After Running ibator</a><br/>
+  <a href="migratingFromAbator.html" target="mainFrame">Migrating from Abator</a><br/>
 
   <a href="configreference/xmlconfig.html" target="mainFrame">XML Configuration File Reference</a><br/>
   &nbsp;&nbsp;<a href="configreference/classPathEntry.html" target="mainFrame">&lt;classPathEntry&gt;</a><br/>

Added: ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html?rev=705122&view=auto
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html (added)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html Wed Oct 15 19:51:25 2008
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>Migrating from Abator</title>
+  <link type="text/css" rel="stylesheet" href="ibator.css"/>
+</head>
+<body>
+
+<div class="menuNav">
+  <p>
+    <a href="index.html" target="_top">Show Menu</a>
+    <a href="migratingFromAbator.html" target="_top">Hide Menu</a>
+  </p>
+</div>
+
+<h1>Migrating from Abator</h1>
+<p>This page details changes to the XML configuration file between
+ibator and Abator.  For most users, the changes should be simple.
+If you extended any of Abator's classes to supply custom implementations
+of code generators or the Java type resolver, you will need to rework
+those custom classes.</p>
+<p>The following list details the required changes to the XML configuration
+files:</p>
+<ul>
+  <li>The DTD has changed.  The new DOCTYPE should be
+      <pre>
+
+&lt;!DOCTYPE ibatorConfiguration
+  PUBLIC &quot;-//Apache Software Foundation//DTD Apache iBATIS ibator Configuration 1.0//EN&quot;
+  &quot;http://ibatis.apache.org/dtd/ibator-config_1_0.dtd&quot;&gt;
+    </pre>
+  </li>
+  <li>All abator* elements are renamed to ibator*.  For example,
+    &lt;abatorConfiguration&gt; is renamed to &lt;ibatorConfiguration&gt;</li>
+  <li>The <code>generatorSet</code> attribute is removed from the
+    <code>&lt;ibatorContext&gt;</code> element and replaced with the
+    <code>targetJRE</code> attribute.  Valid values for this
+    attribute are <code>Java2</code> or <code>Java5</code>.
+    Ibator does not include the legacy generator set from
+    Abator - so iBATIS version 2.2.0 or higher is required for
+    the code generated by ibator.</li>
+  <li>The <code>type</code> attribute is removed from both the
+    <code>&lt;javaModelGenerator&gt;</code> and
+    <code>&lt;sqlMapGenerator&gt;</code> elements.  Ibator has an entirely
+    different method of supplying custom code generators than Abator.
+    See the <a href="reference/extending.html">Extending Ibator</a>
+    page for full details.</li>
+  <li>The <code>type</code> attribute on the
+    <code>&lt;daoGenerator&gt;</code> element has a different meaning from the
+    attribute in Abator.  The special value remain the same, the difference manifests
+    if you used this attribute the specify a custom DAO generator for Abator.  With Ibator,
+    the type specifies the type of a custom DAO template rather than an implementation of a
+    custom DAO generator.  Again, no changes are required unless you used this attribute
+    to specify a custom DAO generator in Abator.
+    Ibator has an entirely
+    different method of supplying custom code generators than Abator.
+    See the <a href="reference/extending.html">Extending Ibator</a>
+    page for full details.</li>
+  <li>The <code>JavaTypeResolver</code> interface has changed and is
+    simplified.  If you specified a custom implementation on the
+    &lt;javaTypeResolver&gt; element, you must rework your implementation
+    class.</li>
+</ul>
+</body>
+</html>
\ No newline at end of file

Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html Wed Oct 15 19:51:25 2008
@@ -24,7 +24,7 @@
 useful for generating simple to moderately complex Java and XML code.</p>
 
 <p>Using options in the ibator configuration file, you can provide your own implementations
-of any of ibator's key interfaces.  You can also subclass any of the provided implementations
+of many of ibator's key interfaces.  You can also subclass any of the provided implementations
 to provide customized behaviors.  This page will describe the public APIs available in
 ibator and provide pointers to the source code for further investigation.  If you have
 any difficulty understanding how to extend ibator, feel free to send a note to the
@@ -43,114 +43,14 @@
 would be a FreeMarker or Velocity template based implementation of ibator.  In almost every
 other instance, a plugin is the better way to go.</p>
 
-<h2>org.apache.ibatis.ibator.api.JavaModelGenerator</h2>
-<p>Ibator calls methods in this interface to generate the Java model POJOs.
-   You can provide your own implementation, and the supplied implementations have
-   been designed for extensibility.  The default implementation of the interface
-   is dependant on the value of the <code>generatorSet</code>
-   property of the <a href="../configreference/ibatorContext.html">&lt;ibatorContext&gt;</a>
-   configuration element.  The following table shows the different possibilities:</p>
-
-<table border="1" cellspacing="0" cellpadding="5">
-  <tr>
-    <th>generatorSet</th>
-    <th>Implementation Class</th>
-  </tr>
-  <tr>
-    <td>Java2 (the default value)</td>
-    <td><code>org.apache.ibatis.ibator.internal.java.model.JavaModelGeneratorJava2Impl</code></td>
-  </tr>
-  <tr>
-    <td>Java5</td>
-    <td><code>org.apache.ibatis.ibator.internal.java.model.JavaModelGeneratorJava5Impl</code></td>
-  </tr>
-</table>
+<h2>org.apache.ibatis.ibator.generator.ibatis2.dao.templates.AbstractDAOTemplate</h2>
+<p>TODO</p>
 
-<p>To provide your own implementation, specify the fully qualified class name
-   in the XML configuration like this:</p>
-<pre>
-    &lt;javaModelGenerator type="mypackage.MyImplementation"&gt;
-      ...
-    &lt;/javaModelGenerator&gt;
-</pre>
-
-<h2>org.apache.ibatis.ibator.api.SqlMapGenerator</h2>
-<p>Ibator calls methods in this interface to generate the SQL Maps.
-   The default implementation of this interface is
-   <code>org.apache.ibatis.ibator.internal.sqlmap.SqlMapGeneratorIterateImpl</code>
-   You can provide your own implementation, and the supplied implementation has
-   been designed for extensibility.</p>
-
-<p>To provide your own implementation, specify the fully qualified class name
-   in the XML configuration like this:</p>
-<pre>
-    &lt;sqlMapGenerator type="mypackage.MyImplementation"&gt;
-      ...
-    &lt;/sqlMapGenerator&gt;
-</pre>
+<h2>org.apache.ibatis.ibator.api.IntrospectedTable</h2>
+<p>TODO</p>
 
-<h2>org.apache.ibatis.ibator.api.DAOGenerator</h2>
-<p>Ibator calls methods in this interface to generate the DAOs for each introspected
-table.  Ibator supplies eight implementations of this
-interface to match the four different types of DAOs, and the two different sets
-of code generators.  The implementation is selected based on the value of the
-<a href="../configreference/ibatorContext.html">&lt;ibatorContext&gt;</a>
-configuration element and the value of the <code>type</code> attribute
-of the <a href="../configreference/daoGenerator.html">&lt;daoGenerator&gt;</a> element.
-The implementations are:</p>
-
-<table border="1" cellspacing="0" cellpadding="5">
-  <tr>
-    <th>generatorSet/type</th>
-    <th>Implementation Class</th>
-  </tr>
-  <tr>
-    <td nowrap="nowrap">Java2/IBATIS</td>
-    <td><code>org.apache.ibatis.ibator.internal.java.dao.IbatisJava2DAOGenerator</code></td>
-  </tr>
-  <tr>
-    <td nowrap="nowrap">Java2/GENERIC-CI</td>
-    <td><code>org.apache.ibatis.ibator.internal.java.dao.GenericCIJava2DAOGenerator</code></td>
-  </tr>
-  <tr>
-    <td nowrap="nowrap">Java2/GENERIC-SI</td>
-    <td><code>org.apache.ibatis.ibator.internal.java.dao.GenericSIJava2DAOGenerator</code></td>
-  </tr>
-  <tr>
-    <td nowrap="nowrap">Java2/SPRING</td>
-    <td><code>org.apache.ibatis.ibator.internal.java.dao.SpringJava2DAOGenerator</code></td>
-  </tr>
-  <tr>
-    <td nowrap="nowrap">Java5/IBATIS</td>
-    <td><code>org.apache.ibatis.ibator.internal.java.dao.IbatisJava5DAOGenerator</code></td>
-  </tr>
-  <tr>
-    <td nowrap="nowrap">Java5/GENERIC-CI</td>
-    <td><code>org.apache.ibatis.ibator.internal.java.dao.GenericCIJava5DAOGenerator</code></td>
-  </tr>
-  <tr>
-    <td nowrap="nowrap">Java5/GENERIC-SI</td>
-    <td><code>org.apache.ibatis.ibator.internal.java.dao.GenericSIJava5DAOGenerator</code></td>
-  </tr>
-  <tr>
-    <td nowrap="nowrap">Java5/SPRING</td>
-    <td><code>org.apache.ibatis.ibator.internal.java.dao.SpringJava5DAOGenerator</code></td>
-  </tr>
-</table>
-
-<p>The different DAO implementations are "configured" through the use of
-   a template described in
-   <code>org.apache.ibatis.ibator.internal.java.dao.AbstractDAOTemplate</code>.
-   It should be fairly simple to provide a new template for a different type
-   of DAO if needed.</p>
-<p>The DAO generators are also designed for extensibility.  To provide your own
-   implementation, specify the fully qualified class name in the XML
-   configuration like this:</p>
-<pre>
-    &lt;daoGenerator type="mypackage.MyImplementation"&gt;
-      ...
-    &lt;/daoGenerator&gt;
-</pre>
+<h2>org.apache.ibatis.ibator.api.IntrospectedColumn</h2>
+<p>TODO</p>
 
 <h2>org.apache.ibatis.ibator.api.JavaTypeResolver</h2>
 <p>Ibator calls methods in this interface to map JDBC types to Java types

Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html Wed Oct 15 19:51:25 2008
@@ -20,7 +20,9 @@
 <h3>Announcements</h3>
 <ul>
   <li>With version 1.2, Abator is renamed to Apache iBATIS ibator.  Several changes
-      have been made to the XML configuration as well as the Java API.</li>
+      have been made to the XML configuration as well as the Java API.  See the
+      <a href="migratingFromAbator.html">Migrating from Abator</a> page for detailed
+      information about changes needed to existing Abator configuration files.</li>
 </ul>
 
 <h3>Bugs Fixed</h3>

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java Wed Oct 15 19:51:25 2008
@@ -199,10 +199,12 @@
         
         callback.setNumberOfSubTasks(totalSteps);
         
-        // setup custom classloader
-        ClassLoader classLoader = 
-            ClassloaderUtility.getCustomClassloader(ibatorConfiguration.getClassPathEntries());
-        IbatorObjectFactory.setClassLoader(classLoader);
+        // setup custom classloader if required
+        if (ibatorConfiguration.getClassPathEntries().size() > 0) {
+            ClassLoader classLoader = 
+                ClassloaderUtility.getCustomClassloader(ibatorConfiguration.getClassPathEntries());
+            IbatorObjectFactory.setExternalClassLoader(classLoader);
+        }
 
         // now run the generates...
         for (IbatorContext ibatorContext : contextsToRun) {

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java Wed Oct 15 19:51:25 2008
@@ -454,18 +454,6 @@
     public abstract void calculateGenerators(List<String> warnings, ProgressCallback progressCallback);
     
     /**
-     * This method should return the number of progress messages
-     * that will be generated by all the generators calculated for
-     * this table. 
-     * 
-     * This method is called after calculateGenerators().
-     * 
-     * @return the number of progress messages that will be generated
-     *   for this table
-     */
-    public abstract int getNumberOfSubtasks();
-
-    /**
      * This method should return a list of generated Java files related to
      * this table.  This list could include various types of model classes,
      * as well as DAO classes.

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java Wed Oct 15 19:51:25 2008
@@ -107,7 +107,7 @@
     }
     /**
      * This method returns the fully qualified name that is suitable
-     * for an import statement (i.e. - without the genercs specified)
+     * for an import statement (i.e. - without the generics specified)
      * 
      * @return Returns the fullyQualifiedName.
      */

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java Wed Oct 15 19:51:25 2008
@@ -365,7 +365,7 @@
      *            the configuration will be used for code generation.
      * 
      * @throws SQLException
-     *             if some error arrises while introspecting the specified
+     *             if some error arises while introspecting the specified
      *             database tables.
      * 
      * @throws InterruptedException

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/JavaGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/JavaGenerator.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/JavaGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/JavaGenerator.java Wed Oct 15 19:51:25 2008
@@ -26,5 +26,4 @@
  */
 public interface JavaGenerator extends AbstractGenerator {
     List<CompilationUnit> getCompilationUnits();
-    int getNumberOfSubtasks();
 }

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/XmlGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/XmlGenerator.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/XmlGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/XmlGenerator.java Wed Oct 15 19:51:25 2008
@@ -24,5 +24,4 @@
  */
 public interface XmlGenerator extends AbstractGenerator {
     Document getDocument();
-    int getNumberOfSubtasks();
 }

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Impl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Impl.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Impl.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Impl.java Wed Oct 15 19:51:25 2008
@@ -85,8 +85,7 @@
         } else if ("GENERIC-SI".equalsIgnoreCase(type)) {
             abstractDAOTemplate = new GenericSIDAOTemplate();
         } else {
-            // TODO - document this as a way to supply custom template for DAOs
-            abstractDAOTemplate = (AbstractDAOTemplate) IbatorObjectFactory.createObject(type);
+            abstractDAOTemplate = (AbstractDAOTemplate) IbatorObjectFactory.createInternalObject(type);
         }
 
         boolean generateForJava5 = "Java5".equalsIgnoreCase(ibatorContext.getTargetJRE());
@@ -169,21 +168,4 @@
         
         return answer;
     }
-
-    @Override
-    public int getNumberOfSubtasks() {
-        int answer = 0;
-        
-        for (JavaGenerator javaGenerator : javaModelGenerators) {
-            answer += javaGenerator.getNumberOfSubtasks();
-        }
-        
-        for (JavaGenerator javaGenerator : daoGenerators) {
-            answer += javaGenerator.getNumberOfSubtasks();
-        }
-        
-        answer += sqlMapGenerator.getNumberOfSubtasks();
-        
-        return answer;
-    }
 }

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java Wed Oct 15 19:51:25 2008
@@ -279,8 +279,4 @@
         methodGenerator.addImplementationElements(topLevelClass);
         methodGenerator.addInterfaceElements(interfaze);
     }
-
-    public int getNumberOfSubtasks() {
-        return 1;
-    }
 }

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DAOElementGeneratorBaseImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DAOElementGeneratorBaseImpl.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DAOElementGeneratorBaseImpl.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DAOElementGeneratorBaseImpl.java Wed Oct 15 19:51:25 2008
@@ -61,7 +61,7 @@
             
             try {
                 dAOMethodNameCalculator = (DAOMethodNameCalculator)
-                    IbatorObjectFactory.createObject(type);
+                    IbatorObjectFactory.createInternalObject(type);
             } catch (Exception e) {
                 dAOMethodNameCalculator = new DefaultDAOMethodNameCalculator();
                 warnings.add(Messages.getString("Warning.17", type, e.getMessage())); //$NON-NLS-1$

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithBLOBsMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithBLOBsMethodGenerator.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithBLOBsMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithBLOBsMethodGenerator.java Wed Oct 15 19:51:25 2008
@@ -103,6 +103,10 @@
         }
         method.setReturnType(returnType);
 
+        if (ibatorContext.getSuppressTypeWarnings()) {
+            method.addSuppressTypeWarningsAnnotation();
+        }
+        
         method.setName(getDAOMethodNameCalculator()
                 .getSelectByExampleWithBLOBsMethodName(introspectedTable));
         method.addParameter(new Parameter(type, "example")); //$NON-NLS-1$

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithoutBLOBsMethodGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithoutBLOBsMethodGenerator.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithoutBLOBsMethodGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithoutBLOBsMethodGenerator.java Wed Oct 15 19:51:25 2008
@@ -107,6 +107,10 @@
 
         method.setReturnType(returnType);
 
+        if (ibatorContext.getSuppressTypeWarnings()) {
+            method.addSuppressTypeWarningsAnnotation();
+        }
+        
         method.setName(getDAOMethodNameCalculator()
                 .getSelectByExampleWithoutBLOBsMethodName(introspectedTable));
         method.addParameter(new Parameter(type, "example")); //$NON-NLS-1$

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java Wed Oct 15 19:51:25 2008
@@ -132,8 +132,4 @@
         return !introspectedTable.getRules().generateRecordWithBLOBsClass()
             && introspectedTable.hasBLOBColumns();
     }
-
-    public int getNumberOfSubtasks() {
-        return 1;
-    }
 }

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java Wed Oct 15 19:51:25 2008
@@ -29,6 +29,7 @@
 import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
 import org.apache.ibatis.ibator.api.dom.java.InnerClass;
 import org.apache.ibatis.ibator.api.dom.java.JavaVisibility;
+import org.apache.ibatis.ibator.api.dom.java.JavaWildcardType;
 import org.apache.ibatis.ibator.api.dom.java.Method;
 import org.apache.ibatis.ibator.api.dom.java.Parameter;
 import org.apache.ibatis.ibator.api.dom.java.TopLevelClass;
@@ -71,6 +72,9 @@
             method.addBodyLine("oredCriteria = new ArrayList<Criteria>();"); //$NON-NLS-1$
         } else {
             method.addBodyLine("oredCriteria = new ArrayList();"); //$NON-NLS-1$
+            if (ibatorContext.getSuppressTypeWarnings()) {
+                method.addSuppressTypeWarningsAnnotation();
+            }
         }
         
         commentGenerator.addGeneralMethodComment(method, table);
@@ -130,6 +134,9 @@
         }
 
         field.setType(fqjt);
+        if (ibatorContext.getSuppressTypeWarnings()) {
+            field.addSuppressTypeWarningsAnnotation();
+        }
         field.setName("oredCriteria"); //$NON-NLS-1$
         commentGenerator.addFieldComment(field, table);
         topLevelClass.addField(field);
@@ -137,6 +144,9 @@
         method = new Method();
         method.setVisibility(JavaVisibility.PUBLIC);
         method.setReturnType(fqjt);
+        if (ibatorContext.getSuppressTypeWarnings()) {
+            method.addSuppressTypeWarningsAnnotation();
+        }
         method.setName("getOredCriteria"); //$NON-NLS-1$
         method.addBodyLine("return oredCriteria;"); //$NON-NLS-1$
         commentGenerator.addGeneralMethodComment(method, table);
@@ -205,6 +215,9 @@
         InnerClass answer = new InnerClass(FullyQualifiedJavaType
                 .getCriteriaInstance());
 
+        if (ibatorContext.getSuppressTypeWarnings()) {
+            answer.addSuppressTypeWarningsAnnotation();
+        }
         answer.setVisibility(JavaVisibility.PUBLIC);
         answer.setStatic(true);
         ibatorContext.getCommentGenerator().addClassComment(answer,
@@ -351,9 +364,6 @@
         // now add the methods for simplifying the individual field set methods
         method = new Method();
         method.setVisibility(JavaVisibility.PROTECTED);
-        if (ibatorContext.getSuppressTypeWarnings()) {
-            method.addSuppressTypeWarningsAnnotation();
-        }
         method.setName("addCriterion"); //$NON-NLS-1$
         method.addParameter(new Parameter(FullyQualifiedJavaType
                 .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -366,9 +376,6 @@
 
         method = new Method();
         method.setVisibility(JavaVisibility.PROTECTED);
-        if (ibatorContext.getSuppressTypeWarnings()) {
-            method.addSuppressTypeWarningsAnnotation();
-        }
         method.setName("addCriterion"); //$NON-NLS-1$
         method.addParameter(new Parameter(FullyQualifiedJavaType
                 .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -393,12 +400,13 @@
 
         FullyQualifiedJavaType listOfObjects = FullyQualifiedJavaType
                 .getNewListInstance();
+        if (generateForJava5) {
+            JavaWildcardType extendsObject = new JavaWildcardType("java.lang.Object", true); //$NON-NLS-1$
+            listOfObjects.addTypeArgument(extendsObject);
+        }
 
         method = new Method();
         method.setVisibility(JavaVisibility.PROTECTED);
-        if (ibatorContext.getSuppressTypeWarnings()) {
-            method.addSuppressTypeWarningsAnnotation();
-        }
         method.setName("addCriterion"); //$NON-NLS-1$
         method.addParameter(new Parameter(FullyQualifiedJavaType
                 .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -422,9 +430,6 @@
 
         method = new Method();
         method.setVisibility(JavaVisibility.PROTECTED);
-        if (ibatorContext.getSuppressTypeWarnings()) {
-            method.addSuppressTypeWarningsAnnotation();
-        }
         method.setName("addCriterion"); //$NON-NLS-1$
         method.addParameter(new Parameter(FullyQualifiedJavaType
                 .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -482,9 +487,6 @@
 
             method = new Method();
             method.setVisibility(JavaVisibility.PROTECTED);
-            if (ibatorContext.getSuppressTypeWarnings()) {
-                method.addSuppressTypeWarningsAnnotation();
-            }
             method.setName("addCriterionForJDBCDate"); //$NON-NLS-1$
             method.addParameter(new Parameter(FullyQualifiedJavaType
                     .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -551,9 +553,6 @@
 
             method = new Method();
             method.setVisibility(JavaVisibility.PROTECTED);
-            if (ibatorContext.getSuppressTypeWarnings()) {
-                method.addSuppressTypeWarningsAnnotation();
-            }
             method.setName("addCriterionForJDBCTime"); //$NON-NLS-1$
             method.addParameter(new Parameter(FullyQualifiedJavaType
                     .getStringInstance(), "condition")); //$NON-NLS-1$
@@ -1117,8 +1116,4 @@
 
         return method;
     }
-
-    public int getNumberOfSubtasks() {
-        return 1;
-    }
 }

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java Wed Oct 15 19:51:25 2008
@@ -90,8 +90,4 @@
         }
         return answer;
     }
-
-    public int getNumberOfSubtasks() {
-        return 1;
-    }
 }

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java Wed Oct 15 19:51:25 2008
@@ -91,8 +91,4 @@
         }
         return answer;
     }
-
-    public int getNumberOfSubtasks() {
-        return 1;
-    }
 }

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RootClassInfo.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RootClassInfo.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RootClassInfo.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RootClassInfo.java Wed Oct 15 19:51:25 2008
@@ -64,7 +64,7 @@
         }
         
         try {
-            Class<?> clazz = IbatorObjectFactory.loadClass(className);
+            Class<?> clazz = IbatorObjectFactory.externalClassForName(className);
             BeanInfo bi = Introspector.getBeanInfo(clazz);
             propertyDescriptors = bi.getPropertyDescriptors();
         } catch (Exception e) {

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java Wed Oct 15 19:51:25 2008
@@ -221,8 +221,4 @@
         
         return document;
     }
-
-    public int getNumberOfSubtasks() {
-        return 1;
-    }
 }

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorObjectFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorObjectFactory.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorObjectFactory.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorObjectFactory.java Wed Oct 15 19:51:25 2008
@@ -37,7 +37,7 @@
  * @author Jeff Butler
  */
 public class IbatorObjectFactory {
-    private static ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+    private static ClassLoader externalClassLoader;
     
     /**
      * Utility class.  No instances allowed 
@@ -46,17 +46,36 @@
         super();
     }
     
-    public static synchronized void setClassLoader(ClassLoader classLoader) {
-        IbatorObjectFactory.classLoader = classLoader;
+    private static ClassLoader getClassLoader() {
+        if (externalClassLoader != null) {
+            return externalClassLoader;
+        } else {
+            return Thread.currentThread().getContextClassLoader();
+        }
+    }
+    
+    public static synchronized void setExternalClassLoader(ClassLoader classLoader) {
+        IbatorObjectFactory.externalClassLoader = classLoader;
     }
 
-    public static Class<?> loadClass(String type) throws ClassNotFoundException {
+    /**
+     * This method returns a class loaded from the context classloader,
+     * or the classloader supplied by a client.  This is appropriate
+     * for JDBC drivers, model root classes, etc.
+     * It is not appropriate for any class that extends one of ibator's
+     * supplied classes or interfaces.
+     * 
+     * @param type
+     * @return
+     * @throws ClassNotFoundException
+     */
+    public static Class<?> externalClassForName(String type) throws ClassNotFoundException {
         
         Class<?> clazz;
 
         try {
-            clazz = classLoader.loadClass(type);
-        } catch (ClassNotFoundException e) {
+            clazz = getClassLoader().loadClass(type);
+        } catch (Throwable e) {
             // ignore - fail safe below
             clazz = null;
         }
@@ -68,11 +87,11 @@
         return clazz;
     }
     
-	public static Object createObject(String type) {
+	public static Object createExternalObject(String type) {
         Object answer;
         
         try {
-            Class<?> clazz = loadClass(type);
+            Class<?> clazz = externalClassForName(type);
             
             answer = clazz.newInstance();
         } catch (Exception e) {
@@ -83,6 +102,21 @@
         return answer;
 	}
 	
+    public static Object createInternalObject(String type) {
+        Object answer;
+        
+        try {
+            Class<?> clazz = Class.forName(type);
+            
+            answer = clazz.newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException(
+              Messages.getString("RuntimeError.6", type), e); //$NON-NLS-1$
+        }
+        
+        return answer;
+    }
+    
 	public static JavaTypeResolver createJavaTypeResolver(IbatorContext context,
 			List<String> warnings) {
         JavaTypeResolverConfiguration config = context.getJavaTypeResolverConfiguration();
@@ -90,11 +124,14 @@
         
         if (config != null && config.getConfigurationType() != null) {
             type = config.getConfigurationType();
+            if ("DEFAULT".equalsIgnoreCase(type)) { //$NON-NLS-1$
+                type = JavaTypeResolverDefaultImpl.class.getName();
+            }
         } else {
             type = JavaTypeResolverDefaultImpl.class.getName();
         }
         
-	    JavaTypeResolver answer = (JavaTypeResolver) createObject(type);
+	    JavaTypeResolver answer = (JavaTypeResolver) createInternalObject(type);
 	    answer.setWarnings(warnings);
 
         if (config != null) {
@@ -107,7 +144,7 @@
 	}
     
     public static IbatorPlugin createIbatorPlugin(IbatorContext ibatorContext, IbatorPluginConfiguration ibatorPluginConfiguration) {
-        IbatorPlugin ibatorPlugin = (IbatorPlugin) createObject(ibatorPluginConfiguration.getConfigurationType());
+        IbatorPlugin ibatorPlugin = (IbatorPlugin) createInternalObject(ibatorPluginConfiguration.getConfigurationType());
         ibatorPlugin.setIbatorContext(ibatorContext);
         ibatorPlugin.setProperties(ibatorPluginConfiguration.getProperties());
         return ibatorPlugin;
@@ -125,7 +162,7 @@
             type = config.getConfigurationType();
         }
         
-        answer = (CommentGenerator) createObject(type);
+        answer = (CommentGenerator) createInternalObject(type);
         
         if (config != null) {
             answer.addConfigurationProperties(config.getProperties());
@@ -141,7 +178,7 @@
         // configuration setting (getting ready for iBATIS 3)
         String type = IntrospectedTableIbatis2Impl.class.getName();
         
-        IntrospectedTable answer = (IntrospectedTable) createObject(type);
+        IntrospectedTable answer = (IntrospectedTable) createInternalObject(type);
         answer.setFullyQualifiedTable(table);
         answer.setIbatorContext(ibatorContext);
         answer.setTableConfiguration(tableConfiguration);

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/ActualTableName.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/ActualTableName.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/ActualTableName.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/ActualTableName.java Wed Oct 15 19:51:25 2008
@@ -30,11 +30,13 @@
     private String tableName;
     private String catalog;
     private String schema;
+    private String fullName;
     
     public ActualTableName (String catalog, String schema, String tableName) {
         this.catalog = catalog;
         this.schema = schema;
         this.tableName = tableName;
+        fullName = StringUtility.composeFullyQualifiedTableName(catalog, schema, tableName, '.'); 
     }
 
     public String getCatalog() {
@@ -60,11 +62,11 @@
 
     @Override
     public int hashCode() {
-        return toString().hashCode();
+        return fullName.hashCode();
     }
 
     @Override
     public String toString() {
-        return StringUtility.composeFullyQualifiedTableName(catalog, schema, tableName, '.');
+        return fullName;
     }
 }

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/ConnectionFactory.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/ConnectionFactory.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/ConnectionFactory.java Wed Oct 15 19:51:25 2008
@@ -79,7 +79,7 @@
 		Driver driver;
         
 		try {
-			Class<?> clazz = IbatorObjectFactory.loadClass(driverClass);
+			Class<?> clazz = IbatorObjectFactory.externalClassForName(driverClass);
 			driver = (Driver) clazz.newInstance();
 		} catch (Exception e) {
 			throw new RuntimeException(Messages.getString("RuntimeError.8"), e); //$NON-NLS-1$

Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java (original)
+++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java Wed Oct 15 19:51:25 2008
@@ -63,6 +63,7 @@
         }
 
         ClassLoader parent = Thread.currentThread().getContextClassLoader();
+        
         URLClassLoader ucl = new URLClassLoader(urls
                 .toArray(new URL[urls.size()]), parent);
 

Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java2/ConditionalJava2Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java2/ConditionalJava2Tests.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java2/ConditionalJava2Tests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java2/ConditionalJava2Tests.java Wed Oct 15 19:51:25 2008
@@ -52,6 +52,7 @@
  */
 public class ConditionalJava2Tests extends BaseConditionalJava2Test {
 
+    @SuppressWarnings("unchecked")
     public void testFieldsOnlyInsert() {
         FieldsonlyDAO dao = getFieldsonlyDAO();
 
@@ -79,6 +80,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsOnlySelectByExample() {
         FieldsonlyDAO dao = getFieldsonlyDAO();
 
@@ -115,6 +117,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsOnlySelectByExampleNoCriteria() {
         FieldsonlyDAO dao = getFieldsonlyDAO();
 
@@ -147,6 +150,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsOnlyDeleteByExample() {
         FieldsonlyDAO dao = getFieldsonlyDAO();
 
@@ -218,6 +222,7 @@
         }
     }
     
+    @SuppressWarnings("unchecked")
     public void testPKOnlyInsert() {
         PkonlyDAO dao = getPkonlyDAO();
 
@@ -239,6 +244,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKOnlyDeleteByPrimaryKey() {
         PkonlyDAO dao = getPkonlyDAO();
 
@@ -270,6 +276,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKOnlyDeleteByExample() {
         PkonlyDAO dao = getPkonlyDAO();
 
@@ -302,6 +309,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKOnlySelectByExample() {
         PkonlyDAO dao = getPkonlyDAO();
 
@@ -330,6 +338,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKOnlySelectByExampleNoCriteria() {
         PkonlyDAO dao = getPkonlyDAO();
 
@@ -524,6 +533,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKfieldsDeleteByPrimaryKey() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -551,6 +561,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsDeleteByExample() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -620,6 +631,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleLike() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -685,6 +697,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleNotLike() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -750,6 +763,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleComplexLike() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -814,6 +828,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleIn() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -887,6 +902,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleBetween() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -944,6 +960,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleNoCriteria() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -1001,6 +1018,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleEscapedFields() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -1101,6 +1119,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsInsert() {
         PkblobsDAO dao = getPkblobsDAO();
 
@@ -1180,6 +1199,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsDeleteByPrimaryKey() {
         PkblobsDAO dao = getPkblobsDAO();
 
@@ -1205,6 +1225,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsDeleteByExample() {
         PkblobsDAO dao = getPkblobsDAO();
 
@@ -1264,6 +1285,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsSelectByExampleWithoutBlobs() {
         PkblobsDAO dao = getPkblobsDAO();
 
@@ -1295,6 +1317,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsSelectByExampleWithoutBlobsNoCriteria() {
         PkblobsDAO dao = getPkblobsDAO();
 
@@ -1321,6 +1344,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsSelectByExampleWithBlobs() {
         PkblobsDAO dao = getPkblobsDAO();
 
@@ -1381,6 +1405,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsInsert() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1517,6 +1542,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsDeleteByPrimaryKey() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1555,6 +1581,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsDeleteByExample() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1592,6 +1619,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsSelectByPrimaryKey() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1630,6 +1658,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsSelectByExampleWithoutBlobs() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1666,6 +1695,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsSelectByExampleWithBlobs() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1702,6 +1732,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1764,6 +1795,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsInsert() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
 
@@ -1792,6 +1824,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsDeleteByExample() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
 
@@ -1827,6 +1860,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsSelectByExampleWithoutBlobs() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
 
@@ -1859,6 +1893,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsSelectByExampleWithBlobs() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
 
@@ -1893,6 +1928,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
 
@@ -2161,6 +2197,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableDeleteByPrimaryKey() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2193,6 +2230,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableDeleteByExample() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2314,6 +2352,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableSelectByExampleLike() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2433,6 +2472,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableSelectByExampleNotLike() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2552,6 +2592,7 @@
         }
     }
     
+    @SuppressWarnings("unchecked")
     public void testAwfulTableSelectByExampleComplexLike() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2669,6 +2710,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableSelectByExampleIn() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2790,6 +2832,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableSelectByExampleBetween() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2899,6 +2942,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableSelectByExampleNoCriteria() {
         AwfulTableDAO dao = getAwfulTableDAO();
 

Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java2/UpdateByExampleTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java2/UpdateByExampleTests.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java2/UpdateByExampleTests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java2/UpdateByExampleTests.java Wed Oct 15 19:51:25 2008
@@ -48,6 +48,7 @@
  */
 public class UpdateByExampleTests extends BaseConditionalJava2Test {
 
+    @SuppressWarnings("unchecked")
     public void testFieldsOnlyUpdateByExampleSelective() {
         FieldsonlyDAO dao = getFieldsonlyDAO();
 
@@ -109,6 +110,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsOnlyUpdateByExample() {
         FieldsonlyDAO dao = getFieldsonlyDAO();
 
@@ -323,6 +325,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsUpdateByExampleSelective() {
         PkblobsDAO dao = getPkblobsDAO();
     
@@ -360,6 +363,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsUpdateByExampleWithoutBLOBs() {
         PkblobsDAO dao = getPkblobsDAO();
     
@@ -397,6 +401,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsUpdateByExampleWithBLOBs() {
         PkblobsDAO dao = getPkblobsDAO();
     
@@ -434,6 +439,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsUpdateByExampleSelective() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
     
@@ -477,6 +483,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsUpdateByExampleWithoutBLOBs() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
     
@@ -522,6 +529,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsUpdateByExampleWithBLOBs() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
     
@@ -567,6 +575,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsUpdateByExampleSelective() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
     
@@ -606,6 +615,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsUpdateByExampleWithoutBLOBs() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
     
@@ -646,6 +656,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsUpdateByExampleWithBLOBs() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
     
@@ -686,6 +697,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableUpdateByExampleSelective() {
         AwfulTableDAO dao = getAwfulTableDAO();
     
@@ -756,6 +768,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableUpdateByExample() {
         AwfulTableDAO dao = getAwfulTableDAO();
     

Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/FlatJava2Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/FlatJava2Tests.java?rev=705122&r1=705121&r2=705122&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/FlatJava2Tests.java (original)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java2/FlatJava2Tests.java Wed Oct 15 19:51:25 2008
@@ -50,6 +50,7 @@
  */
 public class FlatJava2Tests extends BaseFlatJava2Test {
 
+    @SuppressWarnings("unchecked")
     public void testFieldsOnlyInsert() {
         FieldsonlyDAO dao = getFieldsonlyDAO();
 
@@ -77,6 +78,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsOnlySelectByExample() {
         FieldsonlyDAO dao = getFieldsonlyDAO();
 
@@ -113,6 +115,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsOnlySelectByExampleNoCriteria() {
         FieldsonlyDAO dao = getFieldsonlyDAO();
 
@@ -145,6 +148,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsOnlyDeleteByExample() {
         FieldsonlyDAO dao = getFieldsonlyDAO();
 
@@ -217,6 +221,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKOnlyInsert() {
         PkonlyDAO dao = getPkonlyDAO();
 
@@ -238,6 +243,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKOnlyDeleteByPrimaryKey() {
         PkonlyDAO dao = getPkonlyDAO();
 
@@ -266,6 +272,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKOnlyDeleteByExample() {
         PkonlyDAO dao = getPkonlyDAO();
 
@@ -298,6 +305,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKOnlySelectByExample() {
         PkonlyDAO dao = getPkonlyDAO();
 
@@ -326,6 +334,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKOnlySelectByExampleNoCriteria() {
         PkonlyDAO dao = getPkonlyDAO();
 
@@ -508,6 +517,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKfieldsDeleteByPrimaryKey() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -531,6 +541,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsDeleteByExample() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -597,6 +608,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleLike() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -662,6 +674,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleNotLike() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -727,6 +740,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleComplexLike() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -791,6 +805,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleIn() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -864,6 +879,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleBetween() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -921,6 +937,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleNoCriteria() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -978,6 +995,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsSelectByExampleEscapedFields() {
         PkfieldsDAO dao = getPkfieldsDAO();
 
@@ -1078,6 +1096,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsInsert() {
         PkblobsDAO dao = getPkblobsDAO();
 
@@ -1158,6 +1177,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsDeleteByPrimaryKey() {
         PkblobsDAO dao = getPkblobsDAO();
 
@@ -1183,6 +1203,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsDeleteByExample() {
         PkblobsDAO dao = getPkblobsDAO();
 
@@ -1242,6 +1263,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsSelectByExampleWithoutBlobs() {
         PkblobsDAO dao = getPkblobsDAO();
 
@@ -1273,6 +1295,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsSelectByExampleWithoutBlobsNoCriteria() {
         PkblobsDAO dao = getPkblobsDAO();
 
@@ -1299,6 +1322,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKBlobsSelectByExampleWithBlobs() {
         PkblobsDAO dao = getPkblobsDAO();
 
@@ -1359,6 +1383,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsInsert() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1486,6 +1511,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsDeleteByPrimaryKey() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1521,6 +1547,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsDeleteByExample() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1558,6 +1585,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsSelectByPrimaryKey() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1593,6 +1621,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsSelectByExampleWithoutBlobs() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1629,6 +1658,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsSelectByExampleWithBlobs() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1665,6 +1695,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testPKFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
         PkfieldsblobsDAO dao = getPkfieldsblobsDAO();
 
@@ -1727,6 +1758,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsInsert() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
 
@@ -1754,6 +1786,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsDeleteByExample() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
 
@@ -1789,6 +1822,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsSelectByExampleWithoutBlobs() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
 
@@ -1822,6 +1856,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsSelectByExampleWithBlobs() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
 
@@ -1855,6 +1890,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testFieldsBlobsSelectByExampleWithBlobsNoCriteria() {
         FieldsblobsDAO dao = getFieldsblobsDAO();
 
@@ -2119,6 +2155,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableDeleteByPrimaryKey() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2151,6 +2188,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableDeleteByExample() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2272,6 +2310,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableSelectByExampleLike() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2391,6 +2430,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableSelectByExampleNotLike() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2510,6 +2550,7 @@
         }
     }
     
+    @SuppressWarnings("unchecked")
     public void testAwfulTableSelectByExampleComplexLike() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2627,6 +2668,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableSelectByExampleIn() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2748,6 +2790,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableSelectByExampleBetween() {
         AwfulTableDAO dao = getAwfulTableDAO();
 
@@ -2857,6 +2900,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAwfulTableSelectByExampleNoCriteria() {
         AwfulTableDAO dao = getAwfulTableDAO();
 



Mime
View raw message