Author: jgbutler
Date: Wed Aug 16 15:29:55 2006
New Revision: 432055
URL: http://svn.apache.org/viewvc?rev=432055&view=rev
Log:
Abator build, documentation, and test improvements, minor bug fixes
Added:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.bat
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/clean.bat
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/properties.html
Removed:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/devlib/README.txt
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
ibatis/trunk/java/mapper/mapper2/tools/abator/core/devlib/ibatis-common-2.jar
ibatis/trunk/java/mapper/mapper2/tools/abator/core/devlib/ibatis-dao-2.jar
ibatis/trunk/java/mapper/mapper2/tools/abator/core/devlib/ibatis-sqlmap-2.jar
ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/abatorConfiguration.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/menu.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/running.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/ant/AbatorAntTask.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/ant/AntProgressCallback.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/IntrospectedTable.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/FullyQualifiedJavaType.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Parameter.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/GeneratorSet.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TypedPropertyHolder.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/abator-config_1_0.dtd
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericCIJava2DAOGenerator.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericCIJava5DAOGenerator.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericSIJava2DAOGenerator.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericSIJava5DAOGenerator.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/IbatisJava2DAOGenerator.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/IbatisJava5DAOGenerator.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/SpringJava2DAOGenerator.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/SpringJava5DAOGenerator.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/AbatorRules.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/JavaBeansUtil.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/abatortest/abatorConfig.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/abatortest/execute/miscellaneous/MiscellaneousTests.java
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.bat
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.bat?rev=432055&view=auto
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.bat (added)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.bat Wed Aug
16 15:29:55 2006
@@ -0,0 +1,8 @@
[EMAIL PROTECTED] off
+rem This file assumes:
+rem JAVA_HOME is set to a JSE 5.0 or greater JDK/JRE
+rem JAVA_HOME\bin is in the path
+rem ANT_HOME is set to an Ant install
+rem ANT_HOME\bin is in the path
+
+ant -lib ../devlib
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml
(original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml Wed Aug
16 15:29:55 2006
@@ -131,6 +131,9 @@
</target>
<target name="test.generate.test.code" depends="test.prepare">
+ <!-- note that the class does not exist until the build runs.
+ Validating Ant editors will complain that the task cannot be
+ found, but it's not really an error. -->
<taskdef name="abator"
classname="org.apache.ibatis.abator.ant.AbatorAntTask">
<classpath>
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/clean.bat
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/clean.bat?rev=432055&view=auto
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/clean.bat (added)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/clean.bat Wed Aug
16 15:29:55 2006
@@ -0,0 +1,8 @@
[EMAIL PROTECTED] off
+rem This file assumes:
+rem JAVA_HOME is set to a JSE 5.0 or greater JDK/JRE
+rem JAVA_HOME\bin is in the path
+rem ANT_HOME is set to an Ant install
+rem ANT_HOME\bin is in the path
+
+ant clean
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
(original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
Wed Aug 16 15:29:55 2006
@@ -1,4 +1,4 @@
#Abator build version info
-#Tue Aug 15 21:24:31 CDT 2006
-version=0.7.0
-buildNum=178
+#Wed Aug 16 17:24:35 CDT 2006
+version=1.0.0
+buildNum=201
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/devlib/ibatis-common-2.jar
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/devlib/ibatis-common-2.jar?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
Binary files - no diff available.
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/devlib/ibatis-dao-2.jar
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/devlib/ibatis-dao-2.jar?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
Binary files - no diff available.
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/devlib/ibatis-sqlmap-2.jar
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/devlib/ibatis-sqlmap-2.jar?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
Binary files - no diff available.
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
(original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt Wed
Aug 16 15:29:55 2006
@@ -1,5 +1,5 @@
-------------------------------------------------------------------------------
-Version 0.7.0: ??
+Version 1.0.0:
1. Major refactoring of code generators to use new DOM classes. This makes
adding and extending code generators much easier.
2. Added a new set of code generators that take advantage of iBATIS' new
@@ -17,6 +17,9 @@
10. Added the ability to specify wildcards for schema and/or tableName in
<table>
11. Added the ability to suppress type warning messages in a JSE 5.0
environment
12. Added the ability to specify different types of domain models
+13. Added the "verbose" attribute to the Ant task
+14. Allowed the Ant task to accept a property set
+15. Added a <properties> element to the XML configuration
-------------------------------------------------------------------------------
Version 0.6.5:
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/abatorConfiguration.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/abatorConfiguration.html?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/abatorConfiguration.html
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/abatorConfiguration.html
Wed Aug 16 15:29:55 2006
@@ -26,6 +26,7 @@
<h2>Child Elements</h2>
<ul>
+ <li><a href="properties.html"><properties></a> (0 or 1)</li>
<li><a href="abatorContext.html"><abatorContext></a> (1..N)</li>
</ul>
Added:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/properties.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/properties.html?rev=432055&view=auto
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/properties.html
(added)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/properties.html
Wed Aug 16 15:29:55 2006
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>The <properties> Element</title>
+ <link type="text/css" rel="stylesheet" href="../abator.css"/>
+</head>
+<body>
+<h1>The <properties> Element</h1>
+<p>The <properties> element is used to specify an external properties
file
+for use in the parsing of the configuration. Any attribute in the
+configuration will accept a property in the form <code>${property}</code>.
+The specified properties file will be searched for a matching value and the
+matching value will be substituted. The properties file is of the normal
+format for a Java properties file.</p>
+
+<p>The <properties> element is a child element of the
+<a href="abatorConfiguration.html"><abatorConfiguration></a>
+element.</p>
+
+
+<h2>Required Attributes</h2>
+<p>One, and only one, of the following attributes is required.</p>
+<table border="1" cellspacing="0" cellpadding="5">
+ <tr>
+ <th>Attribute</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td valign="top">resource</td>
+ <td>The qualified name of the property file. When specifying the
resource, the
+ classpath will be search for the properties file. So a file specified as
+ <code>com/myproject/abatorConfig.properties</code> must exist in the
+ <code>com.myproject</code> package.</td>
+ </tr>
+ <tr>
+ <td valign="top">url</td>
+ <td>A URL value to use for the property file. This can be used to specify
a property
+ file in a specific place on the file system when used in a form like
+ <code>file://C:/myfolder/abatorConfig.properties</code>.</td>
+ </tr>
+</table>
+
+<h2>Optional Attributes</h2>
+<p>None</p>
+
+<h2>Child Elements</h2>
+<p>None</p>
+
+</body>
+</html>
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/menu.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/menu.html?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/menu.html
(original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/menu.html Wed
Aug 16 15:29:55 2006
@@ -27,6 +27,7 @@
<a href="configreference/javaTypeResolver.html"
target="mainFrame"><javaTypeResolver></a><br/>
<a href="configreference/javaModelGenerator.html"
target="mainFrame"><javaModelGenerator></a><br/>
<a href="configreference/jdbcConnection.html"
target="mainFrame"><jdbcConnection></a><br/>
+ <a href="configreference/properties.html"
target="mainFrame"><properties></a><br/>
<a href="configreference/property.html"
target="mainFrame"><property></a><br/>
<a href="configreference/sqlMapGenerator.html"
target="mainFrame"><sqlMapGenerator></a><br/>
<a href="configreference/table.html"
target="mainFrame"><table></a><br/>
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/running.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/running.html?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/running.html
(original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/running.html Wed
Aug 16 15:29:55 2006
@@ -59,11 +59,17 @@
build.xml file:</p>
<pre>
<project default="genfiles" basedir=".">
+ <property name="generated.source.dir" value="${basedir}" />
+
<target name="genfiles" description="Generate the files">
- <taskdef name="abator.genfiles"
+ <taskdef name="abator"
classname="org.apache.ibatis.abator.ant.AbatorAntTask"
classpath="abator.jar" />
- <abator.genfiles overwrite="true" configfile="abatorConfig.xml" />
+ <abator overwrite="true" configfile="abatorConfig.xml"
verbose="false" >
+ <propertyset>
+ <propertyref name="generated.source.dir"/>
+ </propertyset>
+ </abator>
</target>
</project>
</pre>
@@ -80,6 +86,15 @@
will be saved with a unique filename instead. The default is
"false".</li>
<li>The "configfile" attribute is required - it must specify a valid Abator
configuration XML file.</li>
+ <li>The "verbose" attribute is optional. If "true", "yes", etc then the
task will
+ log Abator progress messages to the Ant console. The default is
"false".</li>
+ <li>The task supports an optional nested <code><propertyset></code>
element which
+ is the standard Ant property set type. This can be used to pass
parameters into
+ a configuration file. For example, the above property
+ <code>generated.source.dir</code> can be
+ accessed in the Abator configuration file with the escape sequence
+ <code>${generated.source.dir}</code>
+ </li>
</ul>
<h2>Running Abator from Java with an XML Configuration File</h2>
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html
(original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html
Wed Aug 16 15:29:55 2006
@@ -9,7 +9,10 @@
</head>
<body>
<h1>What's New in Abator</h1>
-<h2>Generator Sets (Version 0.7.0)</h2>
+<p>Version 1.0.0 is a significant update to Abator from the prior version
0.6.5.
+Many new features have been added as detailed below.</p>
+
+<h2>Generator Sets (Version 1.0.0)</h2>
<p>A generator set is a set of
code generators (SQL Map Generator, Java Model Generator, DAO Generator, and
Java Type Resolver).
Abator now ships three different generator sets. The generated code from
these three
@@ -53,7 +56,7 @@
<a href="generatedobjects/exampleClassUsage.html">Example Class Usage</a> page
for more
information.</p>
-<h2>Model Types (Version 0.7.0)</h2>
+<h2>Model Types (Version 1.0.0)</h2>
<p>A model type is used to give you more control over the types of domain
objects
generated by Abator. Abator now supports three different types of domain
models
as follows:</p>
@@ -86,7 +89,7 @@
<p><b>Important:</b> the default value is conditional - this is a non-backward
compatible
change from previous versions of Abator.</p>
-<h2>updateByPrimaryKeySelective (Version 0.7.0)</h2>
+<h2>updateByPrimaryKeySelective (Version 1.0.0)</h2>
<p>This is a new mapped SQL statement, and new DAO method, that will only
update columns whose corresponding properties in the parameter class are
non-null.
This can be used to update certain
@@ -95,7 +98,7 @@
<p><b>Important:</b> any column that is mapped to a primitive type
will always be updated.</p>
-<h2>Version 0.7.0 Miscellaneous Changes</h2>
+<h2>Version 1.0.0 Miscellaneous Changes</h2>
<ul>
<li>Added the ability to specify a table alias. This aids in reuse of
generated
SQL map elements. See the <a
href="configreference/table.html"><table></a>
@@ -121,6 +124,13 @@
types if you are using the Legacy or Java2 generator sets in a JSE 5.0
environment.
See the <a
href="configreference/abatorContext.html"><abatorContext></a>
reference page for more information.
+ </li>
+ <li>The Ant task now supports a "verbose" attribute. See the
+ <a href="running.html">Running Abator</a> page for more information.
+ </li>
+ <li>The Ant task now supports a nested property set for passing values into
+ an Abator configuration file. See the
+ <a href="running.html">Running Abator</a> page for more information.
</li>
</ul>
</body>
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/ant/AbatorAntTask.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/ant/AbatorAntTask.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/ant/AbatorAntTask.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/ant/AbatorAntTask.java
Wed Aug 16 15:29:55 2006
@@ -41,14 +41,19 @@
* script that shows how to run Abator from Ant:
*
* <pre>
- * <project default="genfiles" basedir=".">
- * <target name="genfiles" description="Generate the files">
- * <taskdef name="abator.genfiles"
- * classname="org.apache.ibatis.abator.ant.AbatorAntTask"
- * classpath="abatorxxx.jar" />
- * <abator.genfiles overwrite="true" configfile="abatorConfig.xml" />
- * </target>
- * </project>
+ * <project default="genfiles" basedir=".">
+ * <property name="generated.source.dir" value="${basedir}" />
+ * <target name="genfiles" description="Generate the files">
+ * <taskdef name="abator"
+ * classname="org.apache.ibatis.abator.ant.AbatorAntTask"
+ * classpath="abator.jar" />
+ * <abator overwrite="true" configfile="abatorConfig.xml"
verbose="false" >
+ * <propertyset>
+ * <propertyref name="generated.source.dir"/>
+ * </propertyset>
+ * </abator>
+ * </target>
+ * </project>
* </pre>
*
* @author Jeff Butler
@@ -58,6 +63,7 @@
private String configfile;
private boolean overwrite;
private PropertySet propertyset;
+ private boolean verbose;
/**
*
@@ -92,7 +98,7 @@
Abator abator = new Abator(config, callback, warnings);
- abator.generate(new AntProgressCallback(this));
+ abator.generate(new AntProgressCallback(this, verbose));
} catch (XMLParserException e) {
List errors = e.getErrors();
@@ -153,5 +159,13 @@
}
return propertyset;
+ }
+
+ public boolean isVerbose() {
+ return verbose;
+ }
+
+ public void setVerbose(boolean verbose) {
+ this.verbose = verbose;
}
}
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/ant/AntProgressCallback.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/ant/AntProgressCallback.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/ant/AntProgressCallback.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/ant/AntProgressCallback.java
Wed Aug 16 15:29:55 2006
@@ -28,13 +28,15 @@
public class AntProgressCallback implements ProgressCallback {
private Task task;
+ private boolean verbose;
/**
*
*/
- public AntProgressCallback(Task task) {
+ public AntProgressCallback(Task task, boolean verbose) {
super();
this.task = task;
+ this.verbose = verbose;
}
/* (non-Javadoc)
@@ -47,7 +49,9 @@
* @see
org.apache.ibatis.abator.api.ProgressCallback#startSubTask(java.lang.String)
*/
public void startSubTask(String subTaskName) {
- task.log(subTaskName);
+ if (verbose) {
+ task.log(subTaskName);
+ }
}
/* (non-Javadoc)
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/IntrospectedTable.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/IntrospectedTable.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/IntrospectedTable.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/IntrospectedTable.java
Wed Aug 16 15:29:55 2006
@@ -40,7 +40,7 @@
* Returns true if any of the columns in the table are JDBC Dates
* (as opposed to timestamps).
*
- * @return
+ * @return true if the table contains DATE columns
*/
boolean hasJDBCDateColumns();
@@ -48,7 +48,7 @@
* Returns true if any of the columns in the table are JDBC Times
* (as opposed to timestamps).
*
- * @return
+ * @return true if the table contains TIME columns
*/
boolean hasJDBCTimeColumns();
@@ -58,7 +58,8 @@
* columns will be iterated as the parameters of the
* selectByPrimaryKay and deleteByPrimaryKey methods
*
- * @return
+ * @return an Iterator of ColumnDefinition objects for
+ * columns in the primary key
*/
Iterator getPrimaryKeyColumns();
@@ -70,7 +71,8 @@
* Returns all columns in the table (for use by the select by
* primary key and select by example with BLOBs methods)
*
- * @return
+ * @return an Iterator of ColumnDefinition objects for
+ * all columns in the table
*/
Iterator getAllColumns();
@@ -78,7 +80,8 @@
* Returns all columns axcept BLOBs (for use by the select by
* example without BLOBs method)
*
- * @return
+ * @return an Iterator of ColumnDefinition objects for
+ * columns in the table that are non BLOBs
*/
Iterator getNonBLOBColumns();
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/FullyQualifiedJavaType.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/FullyQualifiedJavaType.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/FullyQualifiedJavaType.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/FullyQualifiedJavaType.java
Wed Aug 16 15:29:55 2006
@@ -47,7 +47,6 @@
* type parameters
*
* @param fullyQualifiedName
- * @param typeParameters
*/
public FullyQualifiedJavaType(String fullyQualifiedName) {
super();
@@ -174,11 +173,6 @@
return primitiveTypeWrapper;
}
- /**
- * Utility method - returns the single instance of the int type
- *
- * @return
- */
public static final FullyQualifiedJavaType getIntInstance() {
if (intInstance == null) {
intInstance = new FullyQualifiedJavaType("int"); //$NON-NLS-1$
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Parameter.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Parameter.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Parameter.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/api/dom/java/Parameter.java
Wed Aug 16 15:29:55 2006
@@ -23,9 +23,6 @@
private String name;
private FullyQualifiedJavaType type;
- /**
- * @param fullyQualifiedName
- */
public Parameter(FullyQualifiedJavaType type, String name) {
super();
this.name = name;
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/GeneratorSet.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/GeneratorSet.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/GeneratorSet.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/GeneratorSet.java
Wed Aug 16 15:29:55 2006
@@ -41,7 +41,7 @@
* of the special values IBATIS, SPRING, GENERIC-SI and GENERIC-CI.
*
* @param configurationType
- * @return
+ * @return the fully qualified class name of the correct implementation
class
*/
public abstract String translateDAOGeneratorType(String configurationType);
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java
Wed Aug 16 15:29:55 2006
@@ -15,11 +15,11 @@
*/
package org.apache.ibatis.abator.config;
+import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.ibatis.abator.internal.util.EqualsUtil;
import org.apache.ibatis.abator.internal.util.HashCodeUtil;
@@ -43,7 +43,7 @@
private Map columnOverrides;
- private Set ignoredColumns;
+ private Map ignoredColumns;
private GeneratedKey generatedKey;
@@ -64,7 +64,7 @@
this.modelType = abatorContext.getDefaultModelType();
columnOverrides = new HashMap();
- ignoredColumns = new HashSet();
+ ignoredColumns = new HashMap();
insertStatementEnabled = true;
selectByPrimaryKeyStatementEnabled = true;
@@ -111,12 +111,18 @@
public boolean isColumnIgnored(String column) {
String key = column.toUpperCase();
+
+ boolean rc = ignoredColumns.containsKey(key);
+
+ if (rc) {
+ ignoredColumns.put(key, Boolean.TRUE);
+ }
- return ignoredColumns.contains(key);
+ return rc;
}
public void addIgnoredColumn(String column) {
- ignoredColumns.add(column.toUpperCase());
+ ignoredColumns.put(column.toUpperCase(), Boolean.FALSE);
}
public void addColumnOverride(ColumnOverride columnOverride) {
@@ -254,8 +260,27 @@
return columnOverrides.values().iterator();
}
- public Iterator getIgnoredColumns() {
- return ignoredColumns.iterator();
+ /**
+ * This method returns an iterator of Strings. The values
+ * are the columns that were specified to be ignored in the
+ * table, but do not exist in the table.
+ *
+ * @return an Iterator of Strings - the columns that were improperly
+ * configured as ignored columns
+ */
+ public Iterator getIgnoredColumnsInError() {
+ List answer = new ArrayList();
+
+ Iterator iter = ignoredColumns.entrySet().iterator();
+ while (iter.hasNext()) {
+ Map.Entry entry = (Map.Entry) iter.next();
+
+ if (Boolean.FALSE.equals(entry.getValue())) {
+ answer.add(entry.getKey());
+ }
+ }
+
+ return answer.iterator();
}
public ModelType getModelType() {
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TypedPropertyHolder.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TypedPropertyHolder.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TypedPropertyHolder.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TypedPropertyHolder.java
Wed Aug 16 15:29:55 2006
@@ -34,11 +34,10 @@
}
/**
- * This method is protected because subclasses should override it and
allow
- * using special values (like "DEFAULT", or the alias names for the
different
- * DAO generator types).
+ * Sets the value of the type specified in the configuration. If the
+ * special value DEFAULT is specified, then the value will be ignored.
*
- * @param type
+ * @param configurationType the type specified in the configuration
*/
public void setConfigurationType(String configurationType) {
if (!"DEFAULT".equalsIgnoreCase(configurationType)) { //$NON-NLS-1$
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/abator-config_1_0.dtd
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/abator-config_1_0.dtd?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/abator-config_1_0.dtd
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/abator-config_1_0.dtd
Wed Aug 16 15:29:55 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005, 2006 The Apache Software Foundation
+ Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -31,9 +31,6 @@
-->
-<!ENTITY % Boolean "(true|false)">
-<!ENTITY % ModelType "(hierarchical|flat|conditional)">
-
<!--
The abatorConfiguration element is the root element for Abator
configurations.
-->
@@ -56,7 +53,7 @@
<!ELEMENT abatorContext (property*, jdbcConnection, javaTypeResolver?,
javaModelGenerator,
sqlMapGenerator, daoGenerator?, table+)>
<!ATTLIST abatorContext id CDATA #IMPLIED
- defaultModelType %ModelType; #IMPLIED
+ defaultModelType CDATA #IMPLIED
generatorSet CDATA #IMPLIED>
<!--
@@ -143,15 +140,15 @@
tableName CDATA #REQUIRED
alias CDATA #IMPLIED
domainObjectName CDATA #IMPLIED
- enableInsert %Boolean; #IMPLIED
- enableSelectByPrimaryKey %Boolean; #IMPLIED
- enableSelectByExample %Boolean; #IMPLIED
- enableUpdateByPrimaryKey %Boolean; #IMPLIED
- enableDeleteByPrimaryKey %Boolean; #IMPLIED
- enableDeleteByExample %Boolean; #IMPLIED
+ enableInsert CDATA #IMPLIED
+ enableSelectByPrimaryKey CDATA #IMPLIED
+ enableSelectByExample CDATA #IMPLIED
+ enableUpdateByPrimaryKey CDATA #IMPLIED
+ enableDeleteByPrimaryKey CDATA #IMPLIED
+ enableDeleteByExample CDATA #IMPLIED
selectByPrimaryKeyQueryId CDATA #IMPLIED
selectByExampleQueryId CDATA #IMPLIED
- modelType %ModelType; #IMPLIED>
+ modelType CDATA #IMPLIED>
<!--
The columnOverride element is used to change certain attributes of the column
@@ -182,5 +179,5 @@
<!ATTLIST generatedKey
column CDATA #REQUIRED
sqlStatement CDATA #REQUIRED
- identity %Boolean; #REQUIRED>
+ identity CDATA #REQUIRED>
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java
Wed Aug 16 15:29:55 2006
@@ -278,14 +278,12 @@
// make sure that every column listed in ignored columns
// actually exists in the table
- iter = tableConfiguration.getIgnoredColumns();
+ iter = tableConfiguration.getIgnoredColumnsInError();
while (iter.hasNext()) {
String ignoredColumn = (String) iter.next();
- if (columnDefinitions.getColumn(ignoredColumn) == null) {
- warnings.add(Messages.getString("Warning.4", //$NON-NLS-1$
- ignoredColumn, table.toString()));
- }
+ warnings.add(Messages.getString("Warning.4", //$NON-NLS-1$
+ ignoredColumn, table.toString()));
}
GeneratedKey generatedKey = tableConfiguration.getGeneratedKey();
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/BaseDAOGenerator.java
Wed Aug 16 15:29:55 2006
@@ -376,7 +376,8 @@
*
* @param introspectedTable
* @param compilationUnit
- * @return
+ * @return a list of Method objects that will be added to the
implementation
+ * class. May be <code>null</code>.
*/
protected List getExtraImplementationMethods(IntrospectedTable
introspectedTable,
CompilationUnit compilationUnit) {
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericCIJava2DAOGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericCIJava2DAOGenerator.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericCIJava2DAOGenerator.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericCIJava2DAOGenerator.java
Wed Aug 16 15:29:55 2006
@@ -20,9 +20,6 @@
*/
public class GenericCIJava2DAOGenerator extends BaseDAOGenerator {
- /**
- * @param daoTemplate
- */
public GenericCIJava2DAOGenerator() {
super(new GenericCIDAOTemplate(), false);
}
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericCIJava5DAOGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericCIJava5DAOGenerator.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericCIJava5DAOGenerator.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericCIJava5DAOGenerator.java
Wed Aug 16 15:29:55 2006
@@ -20,9 +20,6 @@
*/
public class GenericCIJava5DAOGenerator extends BaseDAOGenerator {
- /**
- * @param daoTemplate
- */
public GenericCIJava5DAOGenerator() {
super(new GenericCIDAOTemplate(), true);
}
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericSIJava2DAOGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericSIJava2DAOGenerator.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericSIJava2DAOGenerator.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericSIJava2DAOGenerator.java
Wed Aug 16 15:29:55 2006
@@ -20,9 +20,6 @@
*/
public class GenericSIJava2DAOGenerator extends BaseDAOGenerator {
- /**
- * @param daoTemplate
- */
public GenericSIJava2DAOGenerator() {
super(new GenericSIDAOTemplate(), false);
}
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericSIJava5DAOGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericSIJava5DAOGenerator.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericSIJava5DAOGenerator.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/GenericSIJava5DAOGenerator.java
Wed Aug 16 15:29:55 2006
@@ -20,9 +20,6 @@
*/
public class GenericSIJava5DAOGenerator extends BaseDAOGenerator {
- /**
- * @param daoTemplate
- */
public GenericSIJava5DAOGenerator() {
super(new GenericSIDAOTemplate(), true);
}
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/IbatisJava2DAOGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/IbatisJava2DAOGenerator.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/IbatisJava2DAOGenerator.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/IbatisJava2DAOGenerator.java
Wed Aug 16 15:29:55 2006
@@ -20,9 +20,6 @@
*/
public class IbatisJava2DAOGenerator extends BaseDAOGenerator {
- /**
- * @param daoTemplate
- */
public IbatisJava2DAOGenerator() {
super(new IbatisDAOTemplate(), false);
}
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/IbatisJava5DAOGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/IbatisJava5DAOGenerator.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/IbatisJava5DAOGenerator.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/IbatisJava5DAOGenerator.java
Wed Aug 16 15:29:55 2006
@@ -20,9 +20,6 @@
*/
public class IbatisJava5DAOGenerator extends BaseDAOGenerator {
- /**
- * @param daoTemplate
- */
public IbatisJava5DAOGenerator() {
super(new IbatisDAOTemplate(), true);
}
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/SpringJava2DAOGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/SpringJava2DAOGenerator.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/SpringJava2DAOGenerator.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/SpringJava2DAOGenerator.java
Wed Aug 16 15:29:55 2006
@@ -20,9 +20,6 @@
*/
public class SpringJava2DAOGenerator extends BaseDAOGenerator {
- /**
- * @param daoTemplate
- */
public SpringJava2DAOGenerator() {
super(new SpringDAOTemplate(), false);
}
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/SpringJava5DAOGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/SpringJava5DAOGenerator.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/SpringJava5DAOGenerator.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/dao/SpringJava5DAOGenerator.java
Wed Aug 16 15:29:55 2006
@@ -20,9 +20,6 @@
*/
public class SpringJava5DAOGenerator extends BaseDAOGenerator {
- /**
- * @param daoTemplate
- */
public SpringJava5DAOGenerator() {
super(new SpringDAOTemplate(), true);
}
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java
Wed Aug 16 15:29:55 2006
@@ -142,7 +142,7 @@
* @param columnDefinitions
* the collection of ColumnDefinitions used to generate fields
* and getter/setter methods.
- * @param answer
+ * @param topLevelClass
* the generated fields and methods will be added to this object
*/
protected void generateClassParts(FullyQualifiedTable table,
@@ -602,7 +602,7 @@
*
* @param cd
* @param betweenMethod
- * @return
+ * @return a generated method for the between or not between method
*/
protected Method getSetBetweenOrNotBetweenMethod(ColumnDefinition cd,
boolean betweenMethod) {
Method method = new Method();
@@ -1091,7 +1091,7 @@
* @param inMethod
* if true generates an "in" method, else generates a "not in"
* method
- * @return
+ * @return a generated method for the in or not in method
*/
protected Method getSetInOrNotInMethod(ColumnDefinition cd, boolean
inMethod) {
Method method = new Method();
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava5Impl.java
Wed Aug 16 15:29:55 2006
@@ -475,7 +475,7 @@
* @param inMethod
* if true generates an "in" method, else generates a "not in"
* method
- * @return
+ * @return a generated method for the in or not in method
*/
protected Method getSetInOrNotInMethod(ColumnDefinition cd, boolean
inMethod) {
Method method = new Method();
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/AbatorRules.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/AbatorRules.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/AbatorRules.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/rules/AbatorRules.java
Wed Aug 16 15:29:55 2006
@@ -64,7 +64,7 @@
*
* @param javaModelGenerator
* @param table
- * @return
+ * @return the type of the class that holds all fields
*/
public FullyQualifiedJavaType calculateAllFieldsClass(JavaModelGenerator
javaModelGenerator,
FullyQualifiedTable table) {
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/JavaBeansUtil.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/JavaBeansUtil.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/JavaBeansUtil.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/JavaBeansUtil.java
Wed Aug 16 15:29:55 2006
@@ -97,7 +97,7 @@
* then the first character should be made lower case
*
* @param inputString
- * @return
+ * @return the valid poperty name
*/
public static String getValidPropertyName(String inputString) {
if (inputString.length() < 2) {
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/abatortest/abatorConfig.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/abatortest/abatorConfig.xml?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/abatortest/abatorConfig.xml
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/abatortest/abatorConfig.xml
Wed Aug 16 15:29:55 2006
@@ -272,7 +272,8 @@
</daoGenerator>
<table tableName="BlobsOnly" /> <!-- should generate a warning -->
- <table tableName="PKFields" domainObjectName="MyObject">
+ <table tableName="NonExistantTable" /> <!-- should generate a warning -->
+ <table tableName="PKFields" domainObjectName="MyObject" alias="A" >
<ignoreColumn column="fred" /> <!-- should generate a warning -->
<ignoreColumn column="decimal30Field" />
<columnOverride column="datefield" property="startDate"/>
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/abatortest/execute/miscellaneous/MiscellaneousTests.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/abatortest/execute/miscellaneous/MiscellaneousTests.java?rev=432055&r1=432054&r2=432055&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/abatortest/execute/miscellaneous/MiscellaneousTests.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/abatortest/execute/miscellaneous/MiscellaneousTests.java
Wed Aug 16 15:29:55 2006
@@ -667,4 +667,13 @@
assertEquals(record.getTimefield(), returnedRecord.getTimefield());
assertEquals(record.getTimestampfield(),
returnedRecord.getTimestampfield());
}
+
+ public void testFieldIgnored() {
+ try {
+ MyObject.class.getDeclaredField("decimal30field");
+ fail("decimal30field should be ignored");
+ } catch (NoSuchFieldException e) {
+ // ignore (normal case)
+ }
+ }
}
