Author: jgbutler
Date: Wed Sep  3 14:20:29 2008
New Revision: 691780

URL: http://svn.apache.org/viewvc?rev=691780&view=rev
Log:
ibator: some initial refactoring

Modified:
    ibatis/trunk/java/tools/ibator/core/build/version.properties
    
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPlugin.java
    
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPluginAdapter.java
    
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/CompilationUnit.java
    
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/Interface.java
    
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelClass.java
    
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelEnumeration.java
    
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorPluginAggregator.java
    
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java
    
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/XmlConstants.java
    
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties
    
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml
    ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml

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=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Wed Sep  3 
14:20:29 2008
@@ -1,4 +1,4 @@
 #ibator build version info
-#Tue Jul 29 16:30:16 CDT 2008
+#Fri Aug 22 20:41:41 CDT 2008
 version=1.2.0
-buildNum=581
+buildNum=582

Modified: 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPlugin.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPlugin.java?rev=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPlugin.java
 (original)
+++ 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPlugin.java
 Wed Sep  3 14:20:29 2008
@@ -829,7 +829,7 @@
      *   of multiple plugins, the first plugin returning false
      *   will disable the calling of further plugins.
      */
-    boolean sqlMapBaseResultMapGenerated(XmlElement element, IntrospectedTable 
introspectedTable);
+    boolean sqlMapResultMapWithoutBLOBsElementGenerated(XmlElement element, 
IntrospectedTable introspectedTable);
 
     /**
      * This method is called when the countByExample element is generated.
@@ -881,7 +881,7 @@
      *   of multiple plugins, the first plugin returning false
      *   will disable the calling of further plugins.
      */
-    boolean sqlMapExampleWhereClauseGenerated(XmlElement element, 
IntrospectedTable introspectedTable);
+    boolean sqlMapExampleWhereClauseElementGenerated(XmlElement element, 
IntrospectedTable introspectedTable);
 
     /**
      * This method is called when the insert element is generated.
@@ -921,7 +921,7 @@
      *   of multiple plugins, the first plugin returning false
      *   will disable the calling of further plugins.
      */
-    boolean sqlMapResultMapWithBLOBsGenerated(XmlElement element, 
IntrospectedTable introspectedTable);
+    boolean sqlMapResultMapWithBLOBsElementGenerated(XmlElement element, 
IntrospectedTable introspectedTable);
 
     /**
      * This method is called when the selectByPrimaryKey element is generated.
@@ -947,7 +947,7 @@
      *   of multiple plugins, the first plugin returning false
      *   will disable the calling of further plugins.
      */
-    boolean sqlMapSelectByExampleElementGenerated(XmlElement element, 
IntrospectedTable introspectedTable);
+    boolean sqlMapSelectByExampleWithoutBLOBsElementGenerated(XmlElement 
element, IntrospectedTable introspectedTable);
 
     /**
      * This method is called when the selectByExampleWithBLOBs element is 
generated.

Modified: 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPluginAdapter.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPluginAdapter.java?rev=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPluginAdapter.java
 (original)
+++ 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPluginAdapter.java
 Wed Sep  3 14:20:29 2008
@@ -218,7 +218,7 @@
         return true;
     }
 
-    public boolean sqlMapBaseResultMapGenerated(XmlElement element, 
IntrospectedTable introspectedTable) {
+    public boolean sqlMapResultMapWithoutBLOBsElementGenerated(XmlElement 
element, IntrospectedTable introspectedTable) {
         return true;
     }
 
@@ -238,7 +238,7 @@
         return true;
     }
 
-    public boolean sqlMapExampleWhereClauseGenerated(XmlElement element, 
IntrospectedTable introspectedTable) {
+    public boolean sqlMapExampleWhereClauseElementGenerated(XmlElement 
element, IntrospectedTable introspectedTable) {
         return true;
     }
 
@@ -250,11 +250,11 @@
         return true;
     }
 
-    public boolean sqlMapResultMapWithBLOBsGenerated(XmlElement element, 
IntrospectedTable introspectedTable) {
+    public boolean sqlMapResultMapWithBLOBsElementGenerated(XmlElement 
element, IntrospectedTable introspectedTable) {
         return true;
     }
 
-    public boolean sqlMapSelectByExampleElementGenerated(XmlElement element, 
IntrospectedTable introspectedTable) {
+    public boolean 
sqlMapSelectByExampleWithoutBLOBsElementGenerated(XmlElement element, 
IntrospectedTable introspectedTable) {
         return true;
     }
 

Modified: 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/CompilationUnit.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/CompilationUnit.java?rev=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/CompilationUnit.java
 (original)
+++ 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/CompilationUnit.java
 Wed Sep  3 14:20:29 2008
@@ -33,6 +33,7 @@
     Set<FullyQualifiedJavaType> getSuperInterfaceTypes();
     FullyQualifiedJavaType getType();
     void addImportedType(FullyQualifiedJavaType importedType);
+    void addImportedTypes(Set<FullyQualifiedJavaType> importedTypes);
     
     /**
      * Comments will be written at the top of the file as is,

Modified: 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/Interface.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/Interface.java?rev=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/Interface.java
 (original)
+++ 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/Interface.java
 Wed Sep  3 14:20:29 2008
@@ -207,4 +207,8 @@
     public List<String> getFileCommentLines() {
         return fileCommentLines;
     }
+
+    public void addImportedTypes(Set<FullyQualifiedJavaType> importedTypes) {
+        this.importedTypes.addAll(importedTypes);
+    }
 }

Modified: 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelClass.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelClass.java?rev=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelClass.java
 (original)
+++ 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelClass.java
 Wed Sep  3 14:20:29 2008
@@ -109,4 +109,8 @@
     public List<String> getFileCommentLines() {
         return fileCommentLines;
     }
+
+    public void addImportedTypes(Set<FullyQualifiedJavaType> importedTypes) {
+        this.importedTypes.addAll(importedTypes);
+    }
 }

Modified: 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelEnumeration.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelEnumeration.java?rev=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelEnumeration.java
 (original)
+++ 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelEnumeration.java
 Wed Sep  3 14:20:29 2008
@@ -126,4 +126,8 @@
     public List<String> getFileCommentLines() {
         return fileCommentLines;
     }
+
+    public void addImportedTypes(Set<FullyQualifiedJavaType> importedTypes) {
+        this.importedTypes.addAll(importedTypes);
+    }
 }

Modified: 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorPluginAggregator.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorPluginAggregator.java?rev=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorPluginAggregator.java
 (original)
+++ 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorPluginAggregator.java
 Wed Sep  3 14:20:29 2008
@@ -193,13 +193,13 @@
         return rc;
     }
 
-    public boolean sqlMapBaseResultMapGenerated(XmlElement element,
+    public boolean sqlMapResultMapWithoutBLOBsElementGenerated(XmlElement 
element,
             IntrospectedTable introspectedTable) {
         boolean rc = true;
 
         for (IbatorPlugin plugin : plugins) {
             if (!plugin
-                    .sqlMapBaseResultMapGenerated(element, introspectedTable)) 
{
+                    .sqlMapResultMapWithoutBLOBsElementGenerated(element, 
introspectedTable)) {
                 rc = false;
                 break;
             }
@@ -208,12 +208,12 @@
         return rc;
     }
 
-    public boolean sqlMapExampleWhereClauseGenerated(XmlElement element,
+    public boolean sqlMapExampleWhereClauseElementGenerated(XmlElement element,
             IntrospectedTable introspectedTable) {
         boolean rc = true;
 
         for (IbatorPlugin plugin : plugins) {
-            if (!plugin.sqlMapExampleWhereClauseGenerated(element,
+            if (!plugin.sqlMapExampleWhereClauseElementGenerated(element,
                     introspectedTable)) {
                 rc = false;
                 break;
@@ -238,12 +238,12 @@
         return rc;
     }
 
-    public boolean sqlMapResultMapWithBLOBsGenerated(XmlElement element,
+    public boolean sqlMapResultMapWithBLOBsElementGenerated(XmlElement element,
             IntrospectedTable introspectedTable) {
         boolean rc = true;
 
         for (IbatorPlugin plugin : plugins) {
-            if (!plugin.sqlMapResultMapWithBLOBsGenerated(element,
+            if (!plugin.sqlMapResultMapWithBLOBsElementGenerated(element,
                     introspectedTable)) {
                 rc = false;
                 break;
@@ -253,12 +253,12 @@
         return rc;
     }
 
-    public boolean sqlMapSelectByExampleElementGenerated(XmlElement element,
+    public boolean 
sqlMapSelectByExampleWithoutBLOBsElementGenerated(XmlElement element,
             IntrospectedTable introspectedTable) {
         boolean rc = true;
 
         for (IbatorPlugin plugin : plugins) {
-            if (!plugin.sqlMapSelectByExampleElementGenerated(element,
+            if 
(!plugin.sqlMapSelectByExampleWithoutBLOBsElementGenerated(element,
                     introspectedTable)) {
                 rc = false;
                 break;

Modified: 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java?rev=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java
 (original)
+++ 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java
 Wed Sep  3 14:20:29 2008
@@ -34,7 +34,6 @@
 import org.apache.ibatis.ibator.api.dom.xml.XmlElement;
 import org.apache.ibatis.ibator.config.GeneratedKey;
 import org.apache.ibatis.ibator.config.IbatorContext;
-import org.apache.ibatis.ibator.config.MergeConstants;
 import org.apache.ibatis.ibator.config.PropertyRegistry;
 import org.apache.ibatis.ibator.internal.db.ColumnDefinition;
 import org.apache.ibatis.ibator.internal.rules.IbatorRules;
@@ -135,7 +134,7 @@
         if (rules.generateBaseResultMap()) {
             element = getBaseResultMapElement(introspectedTable);
             if (element != null) {
-                if (plugins.sqlMapBaseResultMapGenerated(element, 
introspectedTable)) {
+                if 
(plugins.sqlMapResultMapWithoutBLOBsElementGenerated(element, 
introspectedTable)) {
                     answer.addElement(element);
                 }
             }
@@ -144,7 +143,7 @@
         if (rules.generateResultMapWithBLOBs()) {
             element = getResultMapWithBLOBsElement(introspectedTable);
             if (element != null) {
-                if (plugins.sqlMapResultMapWithBLOBsGenerated(element, 
introspectedTable)) {
+                if (plugins.sqlMapResultMapWithBLOBsElementGenerated(element, 
introspectedTable)) {
                     answer.addElement(element);
                 }
             }
@@ -153,7 +152,7 @@
         if (rules.generateSQLExampleWhereClause()) {
             element = getByExampleWhereClauseFragment(introspectedTable);
             if (element != null) {
-                if (plugins.sqlMapExampleWhereClauseGenerated(element, 
introspectedTable)) {
+                if (plugins.sqlMapExampleWhereClauseElementGenerated(element, 
introspectedTable)) {
                     answer.addElement(element);
                 }
             }
@@ -171,7 +170,7 @@
         if (rules.generateSelectByExampleWithoutBLOBs()) {
             element = getSelectByExample(introspectedTable);
             if (element != null) {
-                if (plugins.sqlMapSelectByExampleElementGenerated(element, 
introspectedTable)) {
+                if 
(plugins.sqlMapSelectByExampleWithoutBLOBsElementGenerated(element, 
introspectedTable)) {
                     answer.addElement(element);
                 }
             }
@@ -806,7 +805,7 @@
         sb.setLength(0);
         sb.append(table.getSqlMapNamespace());
         sb.append('.');
-        sb.append(getExampleWhereClauseId());
+        sb.append(XmlConstants.EXAMPLE_WHERE_CLAUSE_ID);
         includeElement.addAttribute(new Attribute("refid", //$NON-NLS-1$
                 sb.toString()));
 
@@ -848,7 +847,7 @@
         sb.setLength(0);
         sb.append(table.getSqlMapNamespace());
         sb.append('.');
-        sb.append(getExampleWhereClauseId());
+        sb.append(XmlConstants.EXAMPLE_WHERE_CLAUSE_ID);
         includeElement.addAttribute(new Attribute("refid", //$NON-NLS-1$
                 sb.toString()));
 
@@ -969,18 +968,6 @@
     }
 
     /**
-     * Calculates the name of the example where clause element.
-     * 
-     * @return the name of the example where clause element
-     */
-    protected String getExampleWhereClauseId() {
-        StringBuilder sb = new 
StringBuilder(MergeConstants.NEW_XML_ELEMENT_PREFIX);
-        sb.append("Example_Where_Clause"); //$NON-NLS-1$
-
-        return sb.toString();
-    }
-
-    /**
      * This method should return an XmlElement for the example where clause SQL
      * fragment (an sql fragment).
      *
@@ -991,7 +978,7 @@
 
         XmlElement answer = new XmlElement("sql"); //$NON-NLS-1$
 
-        answer.addAttribute(new Attribute("id", getExampleWhereClauseId())); 
//$NON-NLS-1$
+        answer.addAttribute(new Attribute("id", 
XmlConstants.EXAMPLE_WHERE_CLAUSE_ID)); //$NON-NLS-1$
 
         ibatorContext.getCommentGenerator().addComment(answer);
 
@@ -1235,7 +1222,7 @@
         
         XmlElement includeElement = new XmlElement("include"); //$NON-NLS-1$
         includeElement.addAttribute(new Attribute("refid", //$NON-NLS-1$
-                table.getSqlMapNamespace() + "." + 
getExampleWhereClauseId())); //$NON-NLS-1$
+                table.getSqlMapNamespace() + "." + 
XmlConstants.EXAMPLE_WHERE_CLAUSE_ID)); //$NON-NLS-1$
         isParameterPresenteElement.addElement(includeElement);
 
         XmlElement isNotNullElement = new XmlElement("isNotNull"); 
//$NON-NLS-1$
@@ -1304,7 +1291,7 @@
         
         XmlElement includeElement = new XmlElement("include"); //$NON-NLS-1$
         includeElement.addAttribute(new Attribute("refid", //$NON-NLS-1$
-                table.getSqlMapNamespace() + "." + 
getExampleWhereClauseId())); //$NON-NLS-1$
+                table.getSqlMapNamespace() + "." + 
XmlConstants.EXAMPLE_WHERE_CLAUSE_ID)); //$NON-NLS-1$
         isParameterPresenteElement.addElement(includeElement);
 
         XmlElement isNotNullElement = new XmlElement("isNotNull"); 
//$NON-NLS-1$
@@ -1450,7 +1437,7 @@
         
         XmlElement includeElement = new XmlElement("include"); //$NON-NLS-1$
         includeElement.addAttribute(new Attribute("refid", //$NON-NLS-1$
-                table.getSqlMapNamespace() + "." + 
getExampleWhereClauseId())); //$NON-NLS-1$
+                table.getSqlMapNamespace() + "." + 
XmlConstants.EXAMPLE_WHERE_CLAUSE_ID)); //$NON-NLS-1$
         isParameterPresentElement.addElement(includeElement);
 
         return answer;
@@ -1501,7 +1488,7 @@
         
         XmlElement includeElement = new XmlElement("include"); //$NON-NLS-1$
         includeElement.addAttribute(new Attribute("refid", //$NON-NLS-1$
-                table.getSqlMapNamespace() + "." + 
getExampleWhereClauseId())); //$NON-NLS-1$
+                table.getSqlMapNamespace() + "." + 
XmlConstants.EXAMPLE_WHERE_CLAUSE_ID)); //$NON-NLS-1$
         isParameterPresentElement.addElement(includeElement);
 
         return answer;
@@ -1552,7 +1539,7 @@
         
         XmlElement includeElement = new XmlElement("include"); //$NON-NLS-1$
         includeElement.addAttribute(new Attribute("refid", //$NON-NLS-1$
-                table.getSqlMapNamespace() + "." + 
getExampleWhereClauseId())); //$NON-NLS-1$
+                table.getSqlMapNamespace() + "." + 
XmlConstants.EXAMPLE_WHERE_CLAUSE_ID)); //$NON-NLS-1$
         isParameterPresentElement.addElement(includeElement);
 
         return answer;

Modified: 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/XmlConstants.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/XmlConstants.java?rev=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/XmlConstants.java
 (original)
+++ 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/XmlConstants.java
 Wed Sep  3 14:20:29 2008
@@ -110,6 +110,11 @@
         sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
         sb.append("ResultMapWithBLOBs"); //$NON-NLS-1$
         RESULT_MAP_WITH_BLOBS_ID = sb.toString();
+
+        sb.setLength(0);
+        sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX);
+        sb.append("Example_Where_Clause"); //$NON-NLS-1$
+        EXAMPLE_WHERE_CLAUSE_ID = sb.toString();
     }
 
     public static final String SQL_MAP_SYSTEM_ID = 
"http://ibatis.apache.org/dtd/sql-map-2.dtd";; //$NON-NLS-1$
@@ -155,4 +160,6 @@
     public static final String BASE_RESULT_MAP_ID;
 
     public static final String RESULT_MAP_WITH_BLOBS_ID;
+    
+    public static final String EXAMPLE_WHERE_CLAUSE_ID;
 }

Modified: 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties?rev=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties
 (original)
+++ 
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties
 Wed Sep  3 14:20:29 2008
@@ -80,6 +80,7 @@
 Progress.11=Generating DAO Interface for table {0}
 Progress.12=Generating SQL Map for table {0}
 Progress.13=Found SQL Statement: {0}
+Progress.14=Generating DAO Interface and Implementation for table {0}
 
 Usage.Lines=19
 Usage.0=Apache iBATIS ibator - a code generator for iBATIS.  Usage:

Modified: 
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml?rev=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- 
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml 
(original)
+++ 
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml 
Wed Sep  3 14:20:29 2008
@@ -31,7 +31,7 @@
 
     <table tableName="FieldsOnly" />
     <table tableName="PKOnly" />
-    <table tableName="PKFields" />
+    <table tableName="PKFields" alias="B" />
     <table tableName="PKBlobs" />
     <table tableName="PKFieldsBlobs" />
     <table tableName="FieldsBlobs" />
@@ -71,7 +71,7 @@
 
     <table tableName="FieldsOnly" />
     <table tableName="PKOnly" />
-    <table tableName="PKFields" />
+    <table tableName="PKFields" alias="B" />
     <table tableName="PKBlobs" />
     <table tableName="PKFieldsBlobs" />
     <table tableName="FieldsBlobs" />
@@ -111,7 +111,7 @@
 
     <table tableName="FieldsOnly" />
     <table tableName="PKOnly" />
-    <table tableName="PKFields" />
+    <table tableName="PKFields" alias="B" />
     <table tableName="PKBlobs" />
     <table tableName="PKFieldsBlobs" />
     <table tableName="FieldsBlobs" />

Modified: 
ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml?rev=691780&r1=691779&r2=691780&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml 
(original)
+++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml 
Wed Sep  3 14:20:29 2008
@@ -34,7 +34,7 @@
 
     <table tableName="FieldsOnly" />
     <table tableName="PKOnly" />
-    <table tableName="PKFields" />
+    <table tableName="PKFields" alias="B" />
     <table tableName="PKBlobs" />
     <table tableName="PKFieldsBlobs" />
     <table tableName="FieldsBlobs" />
@@ -76,7 +76,7 @@
 
     <table tableName="FieldsOnly" />
     <table tableName="PKOnly" />
-    <table tableName="PKFields" />
+    <table tableName="PKFields" alias="B" />
     <table tableName="PKBlobs" />
     <table tableName="PKFieldsBlobs" />
     <table tableName="FieldsBlobs" />
@@ -116,7 +116,7 @@
 
     <table tableName="FieldsOnly" />
     <table tableName="PKOnly" />
-    <table tableName="PKFields" />
+    <table tableName="PKFields" alias="B" />
     <table tableName="PKBlobs" />
     <table tableName="PKFieldsBlobs" />
     <table tableName="FieldsBlobs" />
@@ -158,7 +158,7 @@
 
     <table tableName="FieldsOnly" />
     <table tableName="PKOnly" />
-    <table tableName="PKFields" />
+    <table tableName="PKFields" alias="B" />
     <table tableName="PKBlobs" />
     <table tableName="PKFieldsBlobs" />
     <table tableName="FieldsBlobs" />
@@ -199,7 +199,7 @@
 
     <table tableName="FieldsOnly" />
     <table tableName="PKOnly" />
-    <table tableName="PKFields" />
+    <table tableName="PKFields" alias="B" />
     <table tableName="PKBlobs" />
     <table tableName="PKFieldsBlobs" />
     <table tableName="FieldsBlobs" />
@@ -241,7 +241,7 @@
 
     <table tableName="FieldsOnly" />
     <table tableName="PKOnly" />
-    <table tableName="PKFields" />
+    <table tableName="PKFields" alias="B" />
     <table tableName="PKBlobs" />
     <table tableName="PKFieldsBlobs" />
     <table tableName="FieldsBlobs" />


Reply via email to