You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by jg...@apache.org on 2010/02/28 00:16:14 UTC
svn commit: r917079 - in /ibatis/java/ibator/trunk: core/
core/ibator-core/doc/ core/ibator-core/doc/html/
core/ibator-core/doc/html/configreference/
core/ibator-core/doc/html/generatedobjects/
core/ibator-core/doc/html/running/ core/ibator-core/src/ma...
Author: jgbutler
Date: Sat Feb 27 23:16:13 2010
New Revision: 917079
URL: http://svn.apache.org/viewvc?rev=917079&view=rev
Log:
[Ibator] documentation updates
Added:
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/running.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningFromCmdLine.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithAnt.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithJava.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithMaven.html
Removed:
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running.html
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt
ibatis/java/ibator/trunk/core/ibator-core/doc/html/afterRunning.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/ibatorContext.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/ibatorPlugin.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/table.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/exampleClassUsage.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/javadao.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/intro.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/menu.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/config/PropertyRegistry.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml
ibatis/java/ibator/trunk/core/pom.xml
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/manualTesting.html
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_ibatordoc.xml
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Sat Feb 27 23:16:13 2010
@@ -42,7 +42,7 @@
17. Added ability to set annotations on method parameters
18. Addedd support for "distinct" on select by example methods
19. Added new "or" method to example classes
-20. Added new "useCompoundColumnNames" property on <table>
+20. Added new "useCompoundPropertyNames" property on <table>
-------------------------------------------------------------------------------
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/afterRunning.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/afterRunning.html?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/afterRunning.html (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/afterRunning.html Sat Feb 27 23:16:13 2010
@@ -19,14 +19,79 @@
<p>After you run Ibator, you will need to create or modify other iBATIS configuration
artifacts. The main tasks are as follows:</p>
<ul>
- <li>Create or Modify the SqlMapConfig.xml file</li>
- <li>Create or modify the dao.xml file (only if using the iBATIS DAO Framework)</li>
+ <li>For iBATIS 3.x:
+ <ul>
+ <li>Create or Modify the MapperConfig.xml file</li>
+ </ul>
+ </li>
+ <li>For iBATIS 2.x:
+ <ul>
+ <li>Create or Modify the SqlMapConfig.xml file</li>
+ <li>Create or modify the dao.xml file (only if using the iBATIS DAO Framework)</li>
+ </ul>
+ </li>
</ul>
<p>Each task is described in detail below.</p>
-<h2>Updating the SqlMapConfig.xml File</h2>
-<p>iBATIS uses an XML file, commonly named <code>SqlMapConfig.xml</code>,
+<h2>Updating the MapperConfig.xml File (iBATIS 3.x)</h2>
+<p>iBATIS 3 uses an XML file, commonly named <code>MapperConfig.xml</code>,
+to specify
+information for a database connection, a transaction management scheme, and XML mapper
+files that will be used in an iBATIS session. Ibator cannot create this file for you
+because Ibator knows nothing about your execution environment. However, some of the
+items in this file relate directly to Ibator generated items. Please refer to
+the standard iBATIS data mapper developer guide for details about the different
+configuration options.</p>
+
+<p>Ibator specific needs in the configuration file are as follows:</p>
+<ul>
+ <li>Ibator generated XML mapper files must be listed</li>
+</ul>
+
+<p>For example, suppose that Ibator has generated an XML mapper file called
+<code>MyTableMapper.xml</code>, and that the file has been placed in the
+<code>test.xml</code> package
+of your project. The <code>MapperConfig.xml</code> file should have these entries:</p>
+<pre>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE configuration
+ PUBLIC "-//ibatis.apache.org//DTD Config 3.0//EN"
+ "http://ibatis.apache.org/dtd/ibatis-3-config.dtd">
+
+ <configuration>
+ <!-- Setup the transaction manager and data source that are
+ appropriate for your environment
+ -->
+ <environments default"...">
+ <environment id"...">
+ <transactionManager type="...">
+ </transactionManager>
+ <dataSource type="...">
+ </dataSource>
+ </environment>
+ </environments>
+
+ <mappers>
+ <!-- XML mapper files should be listed here -->
+ <mapper resource="test/xml/MyTable_SqlMap.xml" />
+ </mappers>
+
+ </configuration>
+</pre>
+
+<p>If there is more than one XML mapper file (as is quite common),
+then the files can be listed in any order with repeated <code><mapper></code>
+elements after the <code><mappers></code> element.</p>
+
+<p><b>Generated MapperConfig.xml</b> You may ask
+Ibator to generate a skeleton Mapper Configuration file with the MapperConfigPlugin.
+See the <a href="configreference/ibatorPlugin.html"><ibatorPlugin></a>
+page for more information.</p>
+
+
+<h2>Updating the SqlMapConfig.xml File (iBATIS 2.x)</h2>
+<p>iBATIS 2 uses an XML file, commonly named <code>SqlMapConfig.xml</code>,
to specify
information for a database connection, a transaction management scheme, and SQL map XML
files that will be used in an iBATIS session. Ibator cannot create this file for you
@@ -77,7 +142,8 @@
Ibator to generate a skeleton SQL Map Configuration file with the SqlMapConfigPlugin.
See the <a href="configreference/ibatorPlugin.html"><ibatorPlugin></a>
page for more information.</p>
-<h2>Updating the dao.xml File</h2>
+
+<h2>Updating the dao.xml File (iBATIS 2.x)</h2>
<p><b>Important Note:</b> this step is only required if you generated DAOs for the iBATIS DAO
framework.</p>
<p>The iBATIS DAO framework is configured by an xml file commonly called
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html Sat Feb 27 23:16:13 2010
@@ -35,10 +35,21 @@
Any user provided DAO generator must extend the class
<code>org.apache.ibatis.ibator.generator.AbstractJavaGenerator</code>
class, and must have a public default constructor.
- <p>The attribute accepts the following four values for selecting one of the
+ <p>The attribute accepts the following values for selecting one of the
predefined DAO generators:</p>
<table cellpadding="5">
<tr>
+ <td colspan="2">If the <ibatorContext> targetRuntime is <b>Ibatis3</b>:</td>
+ <tr>
+ <tr>
+ <th nowrap="nowrap" valign="top">MAPPER</th>
+ <td>The generated "DAO" objects will be Java interfaces to the iBATIS 3.x mapper infrastructure.</td>
+ </tr>
+ <tr>
+ <td colspan="2">If the <ibatorContext> targetRuntime is <b>Ibatis2Java2</b>
+ or <b>Ibatis2Java5</b>:</td>
+ <tr>
+ <tr>
<th nowrap="nowrap" valign="top">IBATIS</th>
<td>The generated DAO objects will conform to the (now deprecated) iBATIS DAO framework.</td>
</tr>
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/ibatorContext.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/ibatorContext.html?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/ibatorContext.html (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/ibatorContext.html Sat Feb 27 23:16:13 2010
@@ -86,7 +86,7 @@
<th valign="top">Ibatis2Java2</th>
<td><i>This is the default value</i>
<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.
+ with iBATIS versions 2.2.0 and higher (but not iBATIS 3), and all levels of Java 2.
The "by example" methods in these generated objects support virtually
unlimited dynamic where clauses. The objects generated with
this set of generators are not 100% compatible with the
@@ -96,8 +96,8 @@
<tr>
<th valign="top">Ibatis2Java5</th>
<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).
+ with iBATIS versions 2.2.0 and higher (but not iBATIS 3), 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
@@ -106,6 +106,16 @@
objects generated with the original version of Abator, or one
of the other sets of code generators.</td>
</tr>
+ <tr>
+ <th valign="top">Ibatis3</th>
+ <td>With the value, Ibator will generate objects that are compatible
+ with iBATIS versions 3.0 and higher, and JSE 5.0 and higher (e.g. the
+ Java model and mapper interfaces 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
+ parameterized types and annotations.</td>
+ </tr>
</table>
<p>If you want to create a different code generator in entirety,
then use this value to specify the fully qualified name of a
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/ibatorPlugin.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/ibatorPlugin.html?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/ibatorPlugin.html (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/ibatorPlugin.html Sat Feb 27 23:16:13 2010
@@ -59,6 +59,24 @@
dependency in this simple plugin.</p></td>
</tr>
<tr>
+ <td valign="top"><code>(package).MapperConfigPlugin</code></td>
+ <td>This plugin generates a skeleton MapperConfig.xml file that contains
+ references to the XML mapper files generated by Ibator.
+ This file can be used to configure iBATIS 3.x environments.
+ <p>This plugin accepts three properties:</p>
+ <ul>
+ <li><tt>fileName</tt> (optional) the name of the generated file.
+ this defaults to "MapperConfig.xml" if not specified.</li>
+ <li><tt>targetPackage</tt> (required) the name of the package where the
+ file should be placed. Specified like "com.mycompany.sql".</li>
+ <li><tt>targetProject</tt> (required) the name of the project where the
+ file should be placed.</li>
+ </ul>
+ <p>Note: <code>targetPackage</code> and <code>targetProject</code> follow
+ the same rules as the <code>targetPackage</code> and <code>targetProject</code>
+ values on the sqlMapGenerator configuration element.</p></td>
+ </tr>
+ <tr>
<td valign="top"><code>(package).RenameExampleClassPlugin</code></td>
<td>This plugin demonstrates usage of the <code>initialized</code> method
by renaming the generated example classes generated by Ibator.
@@ -85,6 +103,7 @@
<td valign="top"><code>(package).SqlMapConfigPlugin</code></td>
<td>This plugin generates a skeleton SqlMapConfig.xml file that contains
references to the SqlMap.xml files generated by Ibator.
+ This file can be used to configure iBATIS 2.x environments.
<p>This plugin accepts three properties:</p>
<ul>
<li><tt>fileName</tt> (optional) the name of the generated file.
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/table.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/table.html?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/table.html (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/table.html Sat Feb 27 23:16:13 2010
@@ -289,6 +289,16 @@
<p><i>The default value is false.</i></p></td>
</tr>
<tr>
+ <td valign="top">useCompoundPropertyNames</td>
+ <td>If true, then
+ Ibator will use generate property names by contatenating the column name with the
+ column reparks. This can be usefull in databases created by 4th generation languages
+ where the column names are generated (e.g. FLD2237), but the remarks contain useful
+ information (e.g. "customer id"). In this case, Ibator will generate a property
+ name of FLD2237_CustomerId.
+ <p><i>The default value is false.</i></p></td>
+ </tr>
+ <tr>
<td valign="top">ignoreQualifiersAtRuntime</td>
<td>If true, then
Ibator will not add the schema or catalog to the table name in the generated SQL.
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/exampleClassUsage.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/exampleClassUsage.html?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/exampleClassUsage.html (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/exampleClassUsage.html Sat Feb 27 23:16:13 2010
@@ -24,15 +24,24 @@
<p>The example classes contain
an inner static class called <code>Criteria</code>
that holds a list of conditions that will be <code>anded</code> together in the where clause. The
-outer class holds a list of <code>Criteria</code> objects and all the clauses
+example class holds a list of <code>Criteria</code> objects and all the clauses
from the inner classes will be <code>ored</code> together. Using different sets of
<code>Criteria</code> classes allows you to generate virtually unlimited
types of where clauses.</p>
-<p><code>Criteria</code> objects must be created with the <code>createCriteria</code> method
-in the example class. When the first <code>Criteria</code> object is created it is automatically
+<p><code>Criteria</code> objects can be created with the either the <code>createCriteria</code> method
+or the <code>or</code> method
+in the example class. When the first <code>Criteria</code> object is created with the
+<code>createCriteria</code> method it is automatically
added to the list of <code>Criteria</code> objects - this makes it easy to write
-a simple where clause if you don't need to <code>or</code> several other clauses together.</p>
+a simple where clause if you don't need to <code>or</code> several other clauses together.
+When using the <code>or</code> method, the <code>Criteria</code> class is added to the
+list in all instances.</p>
+
+<p><b>Important</b> In code generated with Ibator version 1.2.2 and later, we recommend that
+you only use the <code>or</code> method for creating <code>Criteria</code> classes. We
+believe that this method makes for more readable code.</p>
+<h2>Simple Queries</h2>
<p>This example shows how to generate a simple WHERE clause using the generated
example class:</p>
@@ -42,23 +51,31 @@
example.createCriteria().andField1EqualTo(5);
</pre>
-<p>In the above example, the dynamically generated where clause will effectively be:</p>
+<p>Alternatively, the following syntax also works:</p>
+<pre>
+ TestTableExample example = new TestTableExample();
+
+ example.or().andField1EqualTo(5);
+</pre>
+
+<p>In either above example, the dynamically generated where clause will effectively be:</p>
<pre>
where field1 = 5
</pre>
+<h2>Complex Queries</h2>
<p>The next example shows how to generate a complex WHERE clause using the generated
example class (using JSE 5.0 parameterized types):</p>
<pre>
TestTableExample example = new TestTableExample();
- example.createCriteria()
+ example.or()
.andField1EqualTo(5)
.andField2IsNull();
- example.or(example.createCriteria()
+ example.or()
.andField3NotEqualTo(9)
- .andField4IsNotNull());
+ .andField4IsNotNull();
List<Integer> field5Values = new ArrayList<Integer>();
field5Values.add(8);
@@ -66,11 +83,11 @@
field5Values.add(14);
field5Values.add(22);
- example.or(example.createCriteria()
- .andField5In(field5Values));
+ example.or()
+ .andField5In(field5Values);
- example.or(example.createCriteria()
- .andField6Between(3, 7));
+ example.or()
+ .andField6Between(3, 7);
</pre>
<p>In the above example, the dynamically generated where clause will effectively be:</p>
@@ -81,6 +98,8 @@
or (field6 between 3 and 7)
</pre>
<p>Returned records will meet these criteria.</p>
+
+<h2>Criteria Classes</h2>
<p>The <code>Criteria</code> inner class includes <code>andXXX</code> methods for each field,
and each standard SQL predicate including:</p>
<ul>
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/javadao.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/javadao.html?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/javadao.html (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/javadao.html Sat Feb 27 23:16:13 2010
@@ -23,10 +23,19 @@
types:
</p>
<ul>
- <li>IBATIS - for use with the iBATIS DAO Framework</li>
- <li>SPRING - for use with the Spring Framework</li>
- <li>GENERIC-CI - with no dependencies beyond the iBATIS Data Mapper</li>
- <li>GENERIC-SI - also with no dependencies beyond the iBATIS Data Mapper</li>
+ <li>For iBATIS 3.x:
+ <ul>
+ <li>MAPPER - for use with the iBATIS 3.x mapper support</li>
+ </ul>
+ </li>
+ <li>For iBATIS 2.x:
+ <ul>
+ <li>IBATIS - for use with the iBATIS DAO Framework</li>
+ <li>SPRING - for use with the Spring Framework</li>
+ <li>GENERIC-CI - with no dependencies beyond the iBATIS Data Mapper</li>
+ <li>GENERIC-SI - also with no dependencies beyond the iBATIS Data Mapper</li>
+ </ul>
+ </li>
</ul>
<p>Every field and method generated by Ibator includes the non-standard JavaDoc tag
@@ -69,7 +78,24 @@
<a href="exampleClassUsage.html">Example Class Usage</a>
page for an example of using the <code>selectByExample</code> method.</p>
-<h2>IBATIS DAOs</h2>
+<h2>MAPPER DAOs (iBATIS 3.x)</h2>
+<p>MAPPER DAOs are not strictly DAOs. Rather, the are interfaces that will map to
+methods in the generated XML mapper files. For example, suppost that Ibator generated
+an interface called <code>MyTableMapper</code>. You can use the interface as follows:</p>
+<pre>
+ SqlSession sqlSession = sqlSessionFactory.openSession();
+
+ try {
+ MyTableMapper mapper = sqlSession.getMapper(MyTableMapper.class);
+ List<MyTable> allRecords = mapper.selectByExample(null);
+ } finally {
+ sqlSession.close();
+ }
+</pre>
+<p>See the standard iBATIS documentation for details on how to create the instance
+of <code>sqlSessionFactory</code>.</p>
+
+<h2>IBATIS DAOs (iBATIS 2.x)</h2>
<p>iBATIS DAOs depend on the iBATIS DAO framework (an optional part of iBATIS - now deprecated).
They extend the SqlMapDaoTemplate class and are
constructed with an instance of the DAOManager object, and call methods in their super class
@@ -80,15 +106,15 @@
are not already using something like Spring or PicoContainer to manage dependencies.
However, the framework is now deprecated and we suggest that you move to Spring.</p>
-<h2>SPRING DAOs</h2>
+<h2>SPRING DAOs (iBATIS 2.x)</h2>
<p>SPRING DAOs depend on the Spring framework. They extend Spring's SqlMapClientDaoSupport class,
and are constructed by the Spring container.</p>
-<h2>GENERIC-CI DAOs</h2>
+<h2>GENERIC-CI DAOs (iBATIS 2.x)</h2>
<p>GENERIC-CI DAOs call methods in iBATIS' SqlMapClient interface directly. An instance of the
interface is supplied through constructor injection.</p>
-<h2>GENERIC-SI DAOs</h2>
+<h2>GENERIC-SI DAOs (iBATIS 2.x)</h2>
<p>GENERIC-SI DAOs call methods in iBATIS' SqlMapClient interface directly. An instance of the
interface is supplied through setter injection.</p>
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/intro.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/intro.html?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/intro.html (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/intro.html Sat Feb 27 23:16:13 2010
@@ -17,6 +17,7 @@
<h1>Introduction to Ibator</h1>
<p>Ibator is a code generator for <a target="_blank" href="http://ibatis.apache.org">iBATIS</a>.
+ Ibator generates code for all version of iBATIS after version 2.2.0 (including iBATIS 3).
Ibator will introspect a database
table (or many tables) and will generate iBATIS artifacts that can be used to
access the table(s). This lessens the initial nuisance of setting up objects and configuration
@@ -58,7 +59,7 @@
</li>
<li>DAO interface and implementation classes that make appropriate use of the
above objects. The generation of DAO classes is optional. Ibator will
- generate DAOs of the following types:
+ generate DAOs of the following types for iBATIS 2.x:
<ul>
<li>DAOs that conform to the
<a target="_blank" href="http://www.springframework.org">Spring</a> framework</li>
@@ -69,11 +70,16 @@
framework is now deprecated and we suggest that you use the Spring framework
instead)</li>
</ul>
+ Ibator will generate DAOs of the following type for iBATIS 3.x:
+ <ul>
+ <li>A mapper interface that works with the iBATIS 3.x mapper infrastructure</li>
+ </ul>
</li>
</ul>
<p>Ibator is designed to run well in an iterative development environment, and
- Ibator can even be included as an Ant task in a continuous build environment.
+ Ibator can even be included as an Ant task, or a Maven plugin, in a continuous
+ build environment.
Important things to note when running Ibator iteratively include:</p>
<ol>
@@ -101,8 +107,6 @@
<p>"Ibator" is an iBATIS styled version of the noun abator. "Abator" means "one who
abates a nuisance". This describes the purpose of Ibator - it abates some of the nuisance
of creating objects and configuration files for iBATIS.</p>
-<p>Ibator was originally named "Abator", but the name was changed as the result of
-a federal trade registration dispute.</p>
<h2>Support</h2>
<p>Support for Ibator is provided through the iBATIS user mailing list.
@@ -140,7 +144,7 @@
</p>
</blockquote>
-<p>Please select the "Tools" component when creating any JIRA issues for Ibator.</p>
+<p>Please select the "Ibator" component when creating any JIRA issues for Ibator.</p>
</body>
</html>
\ No newline at end of file
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/menu.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/menu.html?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/menu.html (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/menu.html Sat Feb 27 23:16:13 2010
@@ -12,7 +12,11 @@
<a href="intro.html" target="mainFrame">Introduction</a><br/>
<a href="whatsNew.html" target="mainFrame">What's New?</a><br/>
<a href="quickstart.html" target="mainFrame">Quick Start Guide</a><br/>
- <a href="running.html" target="mainFrame">Running Ibator</a><br/>
+ <a href="running/running.html" target="mainFrame">Running Ibator</a><br/>
+ <a href="running/runningFromCmdLine.html" target="mainFrame">From the Command Line</a><br/>
+ <a href="running/runningWithAnt.html" target="mainFrame">With Ant</a><br/>
+ <a href="running/runningWithMaven.html" target="mainFrame">With Maven</a><br/>
+ <a href="running/runningWithJava.html" target="mainFrame">With Java</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/>
Added: ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/running.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/running.html?rev=917079&view=auto
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/running.html (added)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/running.html Sat Feb 27 23:16:13 2010
@@ -0,0 +1,48 @@
+<!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>Running Ibator</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="running.html" target="_top">Hide Menu</a>
+ </p>
+</div>
+
+<h1>Running Ibator</h1>
+<p>Ibator can be run in the following ways:</p>
+<ul>
+ <li>From the
+ <a href="runningFromCmdLine.html">command prompt</a>
+ with an XML configuration</li>
+ <li>As an <a href="runningWithAnt.html">Ant task</a> with an XML configuration</li>
+ <li>As a <a href="runningWithMaven.html">Maven Plugin</a></li>
+ <li>From another <a href="runningWithJava.html">Java program</a> with an XML configuration</li>
+ <li>From another <a href="runningWithJava.html">Java program</a> with a Java based configuration</li>
+</ul>
+<p>Each method is described in detail on the linked pages.</p>
+<p><b>Note:</b> there is also an Eclipse
+plugin for Ibator that adds extra function - namely good integration into Eclipse,
+an Eclipse enabled Ant task, and support for automatic merging of
+Java files. See the
+<a target="_blank" href="http://ibatis.apache.org/ibator.html">Ibator</a>
+home page for information on installing the Eclipse plugin.</p>
+
+<p><b>Important:</b> When running outside of an IDE environment like Eclipse,
+ Ibator interprets the <code>targetProject</code> and
+ <code>targetPackage</code> attributes in all XML configurations as follows:</p>
+<ul>
+ <li><code>targetProject</code> is assumed to be an existing directory structure.
+ Ibator will fail if this directory structure does not exist.</li>
+ <li><code>targetPackage</code> will be translated to a suitable subdirectory
+ structure of the <code>targetProject</code>
+ directory structure. Ibator will create these subdirectories if necessary.</li>
+</ul>
+</body>
+</html>
\ No newline at end of file
Added: ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningFromCmdLine.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningFromCmdLine.html?rev=917079&view=auto
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningFromCmdLine.html (added)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningFromCmdLine.html Sat Feb 27 23:16:13 2010
@@ -0,0 +1,86 @@
+<!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>Running Ibator From a Command Prompt</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="runningFromCmdLine.html" target="_top">Hide Menu</a>
+ </p>
+</div>
+
+<h1>Running Ibator From a Command Prompt</h1>
+<p>Ibator may be run directly from a command prompt. The JAR manifest includes the
+ name of the default class (<code>org.apache.ibatis.ibator.api.IbatorRunner</code>)
+ or you may specify it yourself. The <code>IbatorRunner</code>
+ class accepts several arguments as detailed below:</p>
+<table border="1" cellspacing="0" cellpadding="5">
+<tr>
+ <th>Argument</th>
+ <th>Value</th>
+</tr>
+<tr>
+ <td>-configfile <i>file_name</i> <br/>(required)</td>
+ <td>Specifies the name of the configuration file.</td>
+</tr>
+<tr>
+ <td>-overwrite (optional)</td>
+ <td>If specified, then existing Java files will be overwritten if an existing Java
+ file if found with the same name as a generated file. If not specified, and a
+ Java file already exists with the same name as a generated file, then Ibator
+ will write the newly generated Java file to the proper directory with a
+ unique name (e.g. MyClass.java.1, MyClass.java.2, etc.).
+ <b>Important: Ibator will always merge and overwrite XML files.</b></td>
+</tr>
+<tr>
+ <td>-verbose (optional)</td>
+ <td>If specified, then Ibator will write progress messages to the console.</td>
+</tr>
+<tr>
+ <td>-forceJavaLogging (optional)</td>
+ <td>If specified, then Ibator will use Java logging rather than Log4J even if
+ Log4J is in the runtime classpath.</td>
+</tr>
+<tr>
+ <td>-contextids <i>context1,context2,...</i><br/>(optional)</td>
+ <td>If specified, then this is a comma delimited list of contexts to use in
+ the current run of Ibator. Any id specified in the list must exactly
+ match the value of the <code>id</code> attribute of an
+ <ibatorContext> configuration element. Only ids specified
+ in this list will be active for this run of Ibator. If this argument
+ is not specified, then all contexts will be active.</td>
+</tr>
+<tr>
+ <td>-tables <i>table1, table2,...</i><br/>(optional)</td>
+ <td>If specified, then this is a comma delimited list of tables to use in
+ the current run of Ibator. Any table specified in the list must exactly
+ match the fully qualified table name specified in a
+ <table> configuration element. Only tables specified
+ in this list will be active for this run of Ibator. If this argument
+ is not specified, then all tables will be active.
+ Specify table names as: <br/><br/>
+ <code>table</code><br/>
+ <code>schema.table</code><br/>
+ <code>catalog..table</code><br/>
+ etc.</td>
+</tr>
+</table>
+
+<p>You must create an Ibator XML configuration file to run Ibator from the
+ command line. If the file is
+ named "ibatorConfig.xml", then any of the following command lines will run
+ Ibator:</p>
+<pre>
+ java -jar ibator.jar -configfile ibatorConfig.xml
+ java -jar ibator.jar -configfile ibatorConfig.xml -overwrite
+ java -cp ibator.jar org.apache.ibatis.ibator.api.IbatorRunner -configfile ibatorConfig.xml
+ java -cp ibator.jar org.apache.ibatis.ibator.api.IbatorRunner -configfile ibatorConfig.xml -overwrite
+</pre>
+</body>
+</html>
\ No newline at end of file
Added: ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithAnt.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithAnt.html?rev=917079&view=auto
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithAnt.html (added)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithAnt.html Sat Feb 27 23:16:13 2010
@@ -0,0 +1,107 @@
+<!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>Running Ibator With Ant</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="runningWithAnt.html" target="_top">Hide Menu</a>
+ </p>
+</div>
+
+<h1>Running Ibator With Ant</h1>
+<p>Ibator includes a simple Ant task. The task must be defined in your
+ build.xml file, and the task has three parameters. Here is an example
+ 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="ibator"
+ classname="org.apache.ibatis.ibator.ant.IbatorAntTask"
+ classpath="ibator.jar" />
+ <ibator overwrite="true" configfile="ibatorConfig.xml" verbose="false" >
+ <propertyset>
+ <propertyref name="generated.source.dir"/>
+ </propertyset>
+ </ibator>
+ </target>
+ </project>
+</pre>
+
+<p>Ibator task attributes are as follows:</p>
+<table border="1" cellspacing="0" cellpadding="5">
+<tr>
+ <th>Attribute</th>
+ <th>Value</th>
+</tr>
+<tr>
+ <td>configfile (required)</td>
+ <td>Specifies the name of the configuration file.</td>
+</tr>
+<tr>
+ <td>overwrite (optional)</td>
+ <td>If "true", "yes", etc., then existing Java files will be overwritten if an existing Java
+ file if found with the same name as a generated file. If "false", "no", etc., and a
+ Java file already exists with the same name as a generated file, then Ibator
+ will write the newly generated Java file to the proper directory with a
+ unique name (e.g. MyClass.java.1, MyClass.java.2, etc.).
+ <b>Important: Ibator will always merge and overwrite XML files.</b></td>
+</tr>
+<tr>
+ <td>contextids (optional)</td>
+ <td>If specified, then this is a comma delimited list of contexts to use in
+ the current run of Ibator. Any id specified in the list must exactly
+ match the value of the <code>id</code> attribute of an
+ <ibatorContext> configuration element. Only ids specified
+ in this list will be active for this run of Ibator. If this argument
+ is not specified, then all contexts will be active.</td>
+</tr>
+<tr>
+ <td>tables (optional)</td>
+ <td>If specified, then this is a comma delimited list of tables to use in
+ the current run of Ibator. Any table specified in the list must exactly
+ match the fully qualified table name specified in a
+ <table> configuration element. Only tables specified
+ in this list will be active for this run of Ibator. If this argument
+ is not specified, then all tables will be active.
+ Specify table names as: <br/><br/>
+ <code>table</code><br/>
+ <code>schema.table</code><br/>
+ <code>catalog..table</code><br/>
+ etc.</td>
+</tr>
+<tr>
+ <td>verbose (optional)</td>
+ <td>If "true", "yes", etc., then Ibator will log progress messages to the
+ ant console (if Ant is running in verbose mode). The default is "false".</td>
+</tr>
+</table>
+
+<p>Notes:</p>
+<ul>
+ <li>The classpath on the <taskdef> is used to tell Ant where the Ibator JAR file
+ is. This is optional if you add Ibator to the Ant classpath in one
+ of the other ways described in the Ant manual</li>
+ <li>The name of the task can be anything you desire, "ibator" is
+ simply an example</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 Ibator configuration file with the escape sequence
+ <code>${generated.source.dir}</code>
+ </li>
+ <li>If a property is specified in the configuration file and is not resolved,
+ then the escaped property string will be passed "as is" into the generated code.
+ </li>
+</ul>
+</body>
+</html>
\ No newline at end of file
Added: ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithJava.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithJava.html?rev=917079&view=auto
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithJava.html (added)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithJava.html Sat Feb 27 23:16:13 2010
@@ -0,0 +1,66 @@
+<!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>Running Ibator With Java</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="runningWithJava.html" target="_top">Hide Menu</a>
+ </p>
+</div>
+
+<h1>Running Ibator With Java</h1>
+<h2>Running Ibator from Java with an XML Configuration File</h2>
+<p>The following code sample shows how to call Ibator from Java. It does not
+ show exception handling, but that should be obvious from the compiler
+ errors :)</p>
+<pre>
+ List<String> warnings = new ArrayList<String>();
+ boolean overwrite = true;
+ File configFile = new File("ibatorConfig.xml");
+ IbatorConfigurationParser cp = new IbatorConfigurationParser(warnings);
+ IbatorConfiguration config = cp.parseIbatorConfiguration(configFile);
+ DefaultShellCallback callback = new DefaultShellCallback(overwrite);
+ Ibator ibator = new Ibator(config, callback, warnings);
+ ibator.generate(null);
+</pre>
+
+<p>Notes:</p>
+<ul>
+ <li>Configuration file properties may be passed to the parser as a parameter on
+ the IbatorConfigurationParser constructor. If not passed explicitly, the JVM
+ system properties will be searched for the value of configuration file
+ properties. For example, the property
+ <code>generated.source.dir</code> can be
+ accessed in the Ibator configuration file with the escape sequence
+ <code>${generated.source.dir}</code>
+ </li>
+ <li>If a property is specified in the configuration file and is not resolved,
+ then the escaped property string will be passed "as is" into the generated code.
+ </li>
+</ul>
+
+<h2>Running Ibator from Java with a Java Based Configuration</h2>
+<p>The following code sample shows how to call Ibator from Java only. It does
+ not show exception handling, but that should be obvious from the compiler
+ errors :)</p>
+<pre>
+ List<String> warnings = new ArrayList<String>();
+ boolean overwrite = true;
+ IbatorConfiguration config = new IbatorConfiguration();
+
+ // ... fill out the config object as appropriate...
+
+ DefaultShellCallback callback = new DefaultShellCallback(overwrite);
+ Ibator ibator = new Ibator(config, callback, warnings);
+ ibator.generate(null);
+</pre>
+
+</body>
+</html>
\ No newline at end of file
Added: ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithMaven.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithMaven.html?rev=917079&view=auto
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithMaven.html (added)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithMaven.html Sat Feb 27 23:16:13 2010
@@ -0,0 +1,47 @@
+<!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>Running Ibator With Maven</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="runningWithMaven.html" target="_top">Hide Menu</a>
+ </p>
+</div>
+
+<h1>Running Ibator With Maven</h1>
+<p>Ibator includes a Maven plugin for integration into a maven build. In
+keeping with Maven's configuration by convention strategy, including Ibator
+in a Maven build can be very simple. The minimum configuration is shown below:</p>
+
+<pre>
+ <project ...>
+ ...
+ <build>
+ ...
+ <plugins>
+ ...
+ <plugin>
+ <groupId>org.apache.ibatis.ibator</groupId>
+ <artifactId>ibator-maven-plugin</artifactId>
+ <version>1.2.2</version>
+ </plugin>
+ ...
+ </plugins>
+ ...
+ </build>
+ ...
+ </project>
+
+</pre>
+
+<p>Of course, things are never that easy! </p>
+
+</body>
+</html>
\ No newline at end of file
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html Sat Feb 27 23:16:13 2010
@@ -17,7 +17,20 @@
<h1>What's New in Ibator</h1>
<h2>Version 1.2.2</h2>
-<h3>Announcements</h3>
+<h3>iBATIS 3.x Support</h3>
+<p>Ibator now includes support for iBATIS version 3, as well as maintinaing
+the existing support for iBATIS version 2.2.0 and later. For most users, upgrading
+to iBATIS 3.x only requires two changes to existing Ibator configurations:</p>
+<ol>
+ <li>The <code>targetRuntime</code> attribute of
+ <a href="configreference/ibatorContext.html"><ibatorContext></a>
+ element must be changed to <b>Ibatis3</b></li>
+ <li>The <code>type</code> attribute of
+ <a href="configreference/daoGenerator.html"><daoGenerator></a>
+ element must be changed to <b>MAPPER</b></li>
+</ol>
+
+<h3>Other Announcements</h3>
<ul>
<li>The <code>org.apache.ibatis.ibator.api.CommentGenerator</code> interface
has changed. Classes that implement this interface <b>must be changed</b>. With
@@ -49,6 +62,7 @@
generated names in other code, you can force Ibator to prepend the string
with the property <code>useLegacyXMLIds</code> on the
<a href="configreference/sqlMapGenerator.html"><SqlMapGenerator></a> configuration.</li>
+ <li>Ibator is now built with Maven and includes a Maven plugin</li>
</ul>
<h3>Bugs Fixed</h3>
@@ -61,6 +75,9 @@
fields are null - thanks to Benjamin Klatt for finding this bug.</li>
<li>IBATIS-601 - improper validation of <generatedKey></li>
<li>IBATIS-609 - incorrect parsing of Java generic types</li>
+ <li>Fixed spelling error LONCVARCHAR->LONGVARCHAR (thanks Allard)</li>
+ <li>Fixed IBATIS-731 - change name of primary key variable to avoid conflicts</li>
+ <li>Fixed IBATIS-699 - Overwrite unmergeable XML files if enabled</li>
</ul>
<h3>Enhancements</h3>
@@ -107,6 +124,10 @@
<li>Fixed IbatorRunner so that configuration errors are shown (thanks to Karel Rank)</li>
<li>IBATIS-605 - Added Informix Dialect for
<a href="configreference/generatedKey.html"><generatedKey></a></li>
+ <li>Addedd support for "distinct" on select by example methods</li>
+ <li>Added new "or" method to example classes</li>
+ <li>Added new "useCompoundPropertyNames" property on <table></li>
+
</ul>
<h2>Version 1.2.1</h2>
Modified: ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/config/PropertyRegistry.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/config/PropertyRegistry.java?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/config/PropertyRegistry.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/config/PropertyRegistry.java Sat Feb 27 23:16:13 2010
@@ -40,7 +40,7 @@
public static final String TABLE_USE_COLUMN_INDEXES = "useColumnIndexes"; //$NON-NLS-1$
public static final String TABLE_USE_ACTUAL_COLUMN_NAMES = "useActualColumnNames"; //$NON-NLS-1$
- public static final String TABLE_USE_COMPOUND_COLUMN_NAMES = "useCompoundColumnNames"; //$NON-NLS-1$
+ public static final String TABLE_USE_COMPOUND_PROPERTY_NAMES = "useCompoundPropertyNames"; //$NON-NLS-1$
public static final String TABLE_IGNORE_QUALIFIERS_AT_RUNTIME = "ignoreQualifiersAtRuntime"; //$NON-NLS-1$
public static final String TABLE_RUNTIME_CATALOG = "runtimeCatalog"; //$NON-NLS-1$
public static final String TABLE_RUNTIME_SCHEMA = "runtimeSchema"; //$NON-NLS-1$
Modified: ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java Sat Feb 27 23:16:13 2010
@@ -235,7 +235,7 @@
if (StringUtility.isTrue(tc.getProperty(PropertyRegistry.TABLE_USE_ACTUAL_COLUMN_NAMES))) {
introspectedColumn.setJavaProperty(JavaBeansUtil.getValidPropertyName(calculatedColumnName));
- } else if (StringUtility.isTrue(tc.getProperty(PropertyRegistry.TABLE_USE_COMPOUND_COLUMN_NAMES))) {
+ } else if (StringUtility.isTrue(tc.getProperty(PropertyRegistry.TABLE_USE_COMPOUND_PROPERTY_NAMES))) {
sb.setLength(0);
sb.append(calculatedColumnName);
sb.append('_');
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml Sat Feb 27 23:16:13 2010
@@ -29,7 +29,7 @@
<plugin>
<groupId>org.apache.ibatis.ibator</groupId>
<artifactId>ibator-maven-plugin</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<executions>
<execution>
<id>Generate iBATIS Artifacts</id>
@@ -42,9 +42,9 @@
<sqlScript>src/main/resources/CreateDB.sql</sqlScript>
<jdbcDriver>org.hsqldb.jdbcDriver</jdbcDriver>
<jdbcURL>jdbc:hsqldb:mem:aname</jdbcURL>
- <jdbcUserId>sa</jdbcUserId>
- <overwrite>true</overwrite>
- </configuration>
+ <jdbcUserId>sa</jdbcUserId>
+ <overwrite>true</overwrite>
+ </configuration>
<dependencies>
<dependency>
<groupId>org.hsqldb</groupId>
Modified: ibatis/java/ibator/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/pom.xml?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/pom.xml (original)
+++ ibatis/java/ibator/trunk/core/pom.xml Sat Feb 27 23:16:13 2010
@@ -13,4 +13,23 @@
<module>ibator-systests-ibatis2-java5</module>
<module>ibator-systests-ibatis3</module>
</modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/ibatis/java/ibator/trunk/core/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ibatis/java/ibator/trunk/core</developerConnection>
+ <tag>HEAD</tag>
+ <url>http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/</url>
+ </scm>
+
</project>
\ No newline at end of file
Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/manualTesting.html
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/manualTesting.html?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/manualTesting.html (original)
+++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/manualTesting.html Sat Feb 27 23:16:13 2010
@@ -18,7 +18,7 @@
<li>Make sure that you have downloaded the MySQL Connector for Java and unzipped
it somewhere on your local drive. The following scripts assume the
MySQL JDBC driver is located at
- "/JavaTools/mysql-connector-java-5.0.6/mysql-connector-java-5.0.6-bin.jar".</li>
+ "/JavaTools/mysql-connector-java-5.1.12/mysql-connector-java-5.1.12-bin.jar".</li>
<li>If you have not created the Ibator test database already, then execute the
following script:
<pre>
@@ -108,7 +108,7 @@
PUBLIC "-//Apache Software Foundation//DTD Apache iBATIS Ibator Configuration 1.0//EN"
"http://ibatis.apache.org/dtd/ibator-config_1_0.dtd">
<ibatorConfiguration>
- <classPathEntry location="/JavaTools/mysql-connector-java-5.0.6/mysql-connector-java-5.0.6-bin.jar" />
+ <classPathEntry location="/JavaTools/mysql-connector-java-5.1.12/mysql-connector-java-5.1.12-bin.jar" />
<ibatorContext id="context1" targetRuntime="Ibatis2Java5" >
<jdbcConnection driverClass="com.mysql.jdbc.Driver"
connectionURL="jdbc:mysql://localhost/ibatortest"
Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_ibatordoc.xml
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_ibatordoc.xml?rev=917079&r1=917078&r2=917079&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_ibatordoc.xml (original)
+++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_ibatordoc.xml Sat Feb 27 23:16:13 2010
@@ -8,7 +8,15 @@
</topic>
<topic href="html/ibatordoc/quickstart.html" label="Quick Start Guide">
</topic>
- <topic href="html/ibatordoc/running.html" label="Running Ibator">
+ <topic href="html/ibatordoc/running/running.html" label="Running Ibator">
+ <topic href="html/ibatordoc/running/runningFromCmdLine.html" label="From the Command Line">
+ </topic>
+ <topic href="html/ibatordoc/running/runningWithAnt.html" label="With Ant">
+ </topic>
+ <topic href="html/ibatordoc/running/runningWithMaven.html" label="With Maven">
+ </topic>
+ <topic href="html/ibatordoc/running/runningWithJava.html" label="With Java">
+ </topic>
</topic>
<topic href="html/ibatordoc/afterRunning.html" label="Tasks After Running Ibator">
</topic>