svn commit: r728712 - in /ibatis/trunk/java/tools/ibator: core/build/ core/src/org/apache/ibatis/ibator/api/ core/src/org/apache/ibatis/ibator/config/ eclipse/org.apache.ibatis.ibator.eclipse.doc/html
Author: jgbutler Date: Mon Dec 22 07:41:15 2008 New Revision: 728712 URL: http://svn.apache.org/viewvc?rev=728712view=rev Log: [Ibator] Plugin and documentation improvements Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/eclipseui.html ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/manualTesting.html ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/releasenotes.html Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/version.properties?rev=728712r1=728711r2=728712view=diff == --- ibatis/trunk/java/tools/ibator/core/build/version.properties (original) +++ ibatis/trunk/java/tools/ibator/core/build/version.properties Mon Dec 22 07:41:15 2008 @@ -1,4 +1,4 @@ #Ibator build version info -#Thu Dec 18 16:54:10 CST 2008 +#Sun Dec 21 20:24:13 CST 2008 version=1.2.1 -buildNum=678 +buildNum=680 Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java?rev=728712r1=728711r2=728712view=diff == --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java Mon Dec 22 07:41:15 2008 @@ -111,7 +111,7 @@ protected TableConfiguration tableConfiguration; protected FullyQualifiedTable fullyQualifiedTable; protected IbatorContext ibatorContext; -private IbatorRules rules; +protected IbatorRules rules; protected ListIntrospectedColumn primaryKeyColumns; protected ListIntrospectedColumn baseColumns; protected ListIntrospectedColumn blobColumns; @@ -328,16 +328,6 @@ } public IbatorRules getRules() { -if (rules == null) { -if (tableConfiguration.getModelType() == ModelType.HIERARCHICAL) { -rules = new HierarchicalModelRules(tableConfiguration, this); -} else if (tableConfiguration.getModelType() == ModelType.FLAT) { -rules = new FlatModelRules(tableConfiguration, this); -} else { -rules = new ConditionalModelRules(tableConfiguration, this); -} -} - return rules; } @@ -500,6 +490,14 @@ calculateSqlMapPackage(); calculateSqlMapFileName(); +if (tableConfiguration.getModelType() == ModelType.HIERARCHICAL) { +rules = new HierarchicalModelRules(tableConfiguration, this); +} else if (tableConfiguration.getModelType() == ModelType.FLAT) { +rules = new FlatModelRules(tableConfiguration, this); +} else { +rules = new ConditionalModelRules(tableConfiguration, this); +} + ibatorContext.getPlugins().initialized(this); } @@ -678,4 +676,14 @@ * @return the number of progress messages */ public abstract int getGenerationSteps(); + +/** + * This method exists to give plugins the opportunity + * to replace the calculated rules if necessary. + * + * @param rules + */ +public void setRules(IbatorRules rules) { +this.rules = rules; +} } Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java?rev=728712r1=728711r2=728712view=diff == --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java Mon Dec 22 07:41:15 2008 @@ -452,10 +452,6 @@ } finally { closeConnection(connection); } - -for (IntrospectedTable introspectedTable : introspectedTables) { -introspectedTable.calculateGenerators(warnings, callback); -} } public int getGenerationSteps() { @@ -495,6 +491,7 @@ callback.checkCancel();
svn commit: r728794 - in /ibatis/trunk/java/tools/ibator: core/build/ core/htmldoc/configreference/ core/htmldoc/generatedobjects/ eclipse/IbatorUpdateSite/features/ eclipse/IbatorUpdateSite/plugins/
Author: jgbutler Date: Mon Dec 22 13:42:36 2008 New Revision: 728794 URL: http://svn.apache.org/viewvc?rev=728794view=rev Log: [Ibator} Ibator version 1.2.1 Added: ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/features/org.apache.ibatis.ibator_1.2.1.jar (with props) ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/org.apache.ibatis.ibator.core_1.2.1.jar (with props) ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/org.apache.ibatis.ibator.eclipse.core_1.2.1.jar (with props) ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/org.apache.ibatis.ibator.eclipse.doc_1.2.1.jar (with props) ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/org.apache.ibatis.ibator.eclipse.ui_1.2.1.jar (with props) Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/columnRenamingRule.html ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/table.html ibatis/trunk/java/tools/ibator/core/htmldoc/generatedobjects/extendingExampleClass.html ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator-src.zip ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator.jar ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/manualTesting.html ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/releasenotes.html ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/usingAnt.html Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/version.properties?rev=728794r1=728793r2=728794view=diff == --- ibatis/trunk/java/tools/ibator/core/build/version.properties (original) +++ ibatis/trunk/java/tools/ibator/core/build/version.properties Mon Dec 22 13:42:36 2008 @@ -1,4 +1,4 @@ #Ibator build version info -#Sun Dec 21 20:24:13 CST 2008 +#Mon Dec 22 15:32:20 CST 2008 version=1.2.1 -buildNum=680 +buildNum=681 Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/columnRenamingRule.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/columnRenamingRule.html?rev=728794r1=728793r2=728794view=diff == --- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/columnRenamingRule.html (original) +++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/columnRenamingRule.html Mon Dec 22 13:42:36 2008 @@ -17,7 +17,7 @@ h1The lt;columnRenamingRulegt; Element/h1 pThe lt;columnRenamingRulegt; element is used to tell Ibator to rename -database columns before calulating the corresponding property +database columns before calculating the corresponding property name in an introspected table. This is useful when all columns in a table have a common prefix that should be removed before calculating the property name. For example, suppose a table @@ -30,7 +30,7 @@ /ul pIt might be annoying to have the generated properties all containing the CUST prefix. The prefix can be removed by - specifying a renimg rule like this:/p + specifying a renamimg rule like this:/p pcodelt;columnRenamingRule searchString=^CUST_ replaceString= /gt;/code/p @@ -103,7 +103,7 @@ /tr tr tdreplaceString/td -tdThis is a string to be substituted for every occurance of the +tdThis is a string to be substituted for every occurrence of the search string. If not specified, the empty string is used./td /tr /table Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html?rev=728794r1=728793r2=728794view=diff == --- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html (original) +++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html Mon Dec 22 13:42:36 2008 @@ -155,7 +155,7 @@ compiling the generated objects with a JSE 5.0 compiler. In that situation, the Ibator generated code would generate many compiler warnings if the annotation is not allowed. This property is not needed and will have - no effect when using the Ibatis2Java5 targetRuntime./p + no effect when using the Ibatis2Java5 targetRuntime.p/ piThe default value is false./i/p/td /tr tr @@ -163,7 +163,7 @@ tdThe value to use as the beginning identifier delimiter for SQL
svn commit: r728819 - in /ibatis/trunk/site/pages: ibator.vm index.vm
Author: jgbutler Date: Mon Dec 22 14:56:03 2008 New Revision: 728819 URL: http://svn.apache.org/viewvc?rev=728819view=rev Log: [Ibator] Site updates for version 1.2.1 Modified: ibatis/trunk/site/pages/ibator.vm ibatis/trunk/site/pages/index.vm Modified: ibatis/trunk/site/pages/ibator.vm URL: http://svn.apache.org/viewvc/ibatis/trunk/site/pages/ibator.vm?rev=728819r1=728818r2=728819view=diff == --- ibatis/trunk/site/pages/ibator.vm (original) +++ ibatis/trunk/site/pages/ibator.vm Mon Dec 22 14:56:03 2008 @@ -29,12 +29,16 @@ Abator means one who abates a nuisance./p h3Ibator News/h3 +p(December 22, 2008) Ibator version 1.2.1 is released. This version fixes a couple of bugs + that manifested in the Eclipse plugin, enhances the Plugin API, and adds a couple of features + to the Eclipse plugin. Even though this is a relatively minor release, we recommend that + everyone upgrade./p p(December 11, 2008) Ibator version 1.2.0 is released. This version has several important enhancements over Abator 1.1.0. See the a href=http://ibatis.apache.org/docs/tools/ibator/whatsNew.html;What's New?/a section of the online documentation for full details. Note that Ibator requires Java 5.0 or greater. The Eclipse plugin requires Eclipse 3.4.1 or greater. Ibator - generates code compatible with iATIS version 2.2.0 or greater./p + generates code compatible with iBATIS version 2.2.0 or greater./p p(April 14, 2008) Due to a trade registration dispute, Abator is renamed to Ibator. iBATOR is currently under development. The initial source code drop can be checked out from SVN at a href=http://svn.apache.org/repos/asf/ibatis/trunk/java/tools/ibator/; target=_blank @@ -56,8 +60,8 @@ standalone JAR includes an Ant task to run Ibator, or you can run Ibator from the command line of from Java code./p ul - lia href=http://people.apache.org/builds/ibatis/alpha/ibator-1.2.0-665.zip; - Ibator 1.2.0 w/Binaries and Source/a + lia href=http://people.apache.org/builds/ibatis/alpha/ibator-1.2.1-681.zip; + Ibator 1.2.1 w/Binaries and Source/a /li /ul @@ -74,7 +78,7 @@ pWhen run as an Eclipse plugin, Ibator will persist the generated Java classes and SqlMap files in Eclipse projects. Ibator can be run iteratively multiple time as the database design matures -- and any hand coded additions to generated Java classes or SqlMap files will remain undisturbed./p + - and any hand coded additions to generated Java classes or SqlMap files will remain undisturbed./p pDocumentation for Ibator is integrated into the Eclipse help system./p @@ -85,7 +89,10 @@ liJDK 5.0 or Higher/li /ul h3Automatic Eclipse Install/h3 -pUse the built in Eclipse install support by following these steps:/p +pIf you've already installed a prior version of Ibator, simply run the Eclipse Update + tool and the new version will be found automatically./p +pIf you've not previously installed Ibator, use the built in Eclipse install support by + following these steps:/p ol liTake the Helpgt;Software Updates... Menu Option/li liSelect the Available Software Tab/li @@ -105,7 +112,7 @@ h3Manual Eclipse Install/h3 pThe automatic install is much preferred, but you can also install Ibator manually if you desire. To install manually, download the file - a href=http://people.apache.org/builds/ibatis/alpha/IbatorForEclipse1.2.0.zip;IbatorForEclipse1.2.0.zip/a + a href=http://people.apache.org/builds/ibatis/alpha/IbatorForEclipse1.2.1.zip;IbatorForEclipse1.2.1.zip/a and unzip the file to some convenient location. After unzipping the update site archive, follow these steps in Eclipse:/p Modified: ibatis/trunk/site/pages/index.vm URL: http://svn.apache.org/viewvc/ibatis/trunk/site/pages/index.vm?rev=728819r1=728818r2=728819view=diff == --- ibatis/trunk/site/pages/index.vm (original) +++ ibatis/trunk/site/pages/index.vm Mon Dec 22 14:56:03 2008 @@ -49,13 +49,13 @@ h2News/h2 -h3Apache iBATIS Ibator Version 1.2.0 Released/h3 -p(December 11, 2008) Ibator version 1.2.0 is released. This version has several important - enhancements over Abator 1.1.0. See the +h3Apache iBATIS Ibator Version 1.2.1 Released/h3 +p(December 22, 2008) Ibator version 1.2.1 is released. This version fixes a couple of bugs + that manifested in the Eclipse plugin, enhances the Plugin API, and adds a couple of features + to the Eclipse plugin. Even though this is a relatively minor release, we recommend that + everyone upgrade. See the a href=http://ibatis.apache.org/docs/tools/ibator/whatsNew.html;What's New?/a - section of the online documentation for full details. Note that Ibator requires - Java 5.0 or greater. The Eclipse plugin requires Eclipse 3.4.1 or greater. Ibator - generates code compatible with iATIS version 2.2.0 or greater./p +