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 2008/03/21 02:05:39 UTC
svn commit: r639508 - in /ibatis/trunk/java/mapper/mapper2/tools/abator:
core/build/ core/doc/ core/htmldoc/ core/htmldoc/configreference/
core/htmldoc/reference/ eclipse/AbatorUpdateSite/
eclipse/AbatorUpdateSite/features/ eclipse/AbatorUpdateSite/plu...
Author: jgbutler
Date: Thu Mar 20 18:05:28 2008
New Revision: 639508
URL: http://svn.apache.org/viewvc?rev=639508&view=rev
Log:
Abator: final changes for Abator 1.1 (hopefully)
Added:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/org.apache.ibatis.abator_1.1.0.jar (with props)
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.core_1.1.0.jar (with props)
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.doc_1.1.0.jar (with props)
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.ui_1.1.0.jar (with props)
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/usingAnt.html
Removed:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/roadmap.html
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaModelGenerator.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/building.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/extending.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/site.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/abator-src.zip
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/abator.jar
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/plugin.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/buildDoc.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/buildingFromSVN.html
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/eclipseui.html
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/quickstart.html
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/releasenotes.html
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/plugin.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/toc.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/META-INF/MANIFEST.MF
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/antsrc/org/apache/ibatis/abator/ui/ant/AbatorUIAntTask.java
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/plugin.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/AbatorHomeInitializer.java
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/JavaFileMerger.java
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator/feature.xml
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=639508&r1=639507&r2=639508&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 Thu Mar 20 18:05:28 2008
@@ -1,4 +1,4 @@
#Abator build version info
-#Tue Mar 11 11:44:54 CDT 2008
+#Thu Mar 20 19:55:36 CDT 2008
version=1.1.0
-buildNum=421
+buildNum=426
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=639508&r1=639507&r2=639508&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 Thu Mar 20 18:05:28 2008
@@ -48,7 +48,8 @@
element.
21. Added a comment generator interface
22. Abator will not generate model properties that would override
- properties in a rootClass.
+ properties in a rootClass. Thanks to Ashok Madhavan for the beginnings
+ of this code.
-------------------------------------------------------------------------------
Version 1.0.0:
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaModelGenerator.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaModelGenerator.html?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaModelGenerator.html (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaModelGenerator.html Thu Mar 20 18:05:28 2008
@@ -121,10 +121,11 @@
<tr>
<td valign="top">rootClasspath</td>
<td>This property can be used to specify a class path for the "rootClass"
- specified here for or on the <table> element. Abator will check
+ specified here or on the <table> element. Abator will check
in the rootClass and will not generate a property if the property exists
in the rootClass. If not specified, Abator will attempt to load the rootClass
- through the current thread context classloader.
+ through the current thread context classloader. If Abator cannot find and load
+ the rootClass, then Abator will generate all properties.
<p>This property is a semi-colon (;) delimited string
of classpath entries.</p>
</td>
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/building.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/building.html?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/building.html (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/building.html Thu Mar 20 18:05:28 2008
@@ -25,7 +25,7 @@
<li>Do a SubVersion checkout of the Abator source tree from the location
<a target="_blank" href="http://svn.apache.org/repos/asf/ibatis/trunk/java/mapper/mapper2/tools/abator/core/">
http://svn.apache.org/repos/asf/ibatis/trunk/java/mapper/mapper2/tools/abator/core/</a>
- (You may use any SubVersion client you prefer. We are recommend
+ (You may use any SubVersion client you prefer. We recommend
<a target="_blank" href="http://tortoisesvn.tigris.org/">TortoiseSVN</a>.)
</li>
<li>The build file requires that ANT_HOME and JAVA_HOME environment variables be defined.
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/extending.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/extending.html?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/extending.html (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/extending.html Thu Mar 20 18:05:28 2008
@@ -43,11 +43,11 @@
<th>Implementation Class</th>
</tr>
<tr>
- <td>Legacy (the default value)</td>
+ <td>Legacy</td>
<td><code>org.apache.ibatis.abator.internal.java.model.JavaModelGeneratorLegacyImpl</code></td>
</tr>
<tr>
- <td>Java2</td>
+ <td>Java2 (the default value)</td>
<td><code>org.apache.ibatis.abator.internal.java.model.JavaModelGeneratorJava2Impl</code></td>
</tr>
<tr>
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=639508&r1=639507&r2=639508&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 Thu Mar 20 18:05:28 2008
@@ -18,6 +18,9 @@
<h3>Announcements</h3>
<ul>
<li>The next release of Abator will require JRE 5.0 or higher.</li>
+ <li>Java2 is now the default generator set. This will cause different code to be
+ generated if you have not specified a generator set previously. To remedy this,
+ set the generator set to "Legacy".</li>
</ul>
<h3>New Generated Methods</h3>
@@ -47,7 +50,6 @@
<h3>Miscellaneous Changes</h3>
<ul>
- <li>Java2 is now the default generator set.</li>
<li>Added the ability to specify properties to ignore qualifiers and change runtime
table names in the generated SQL for a table. Primary use cases for this
support include:
@@ -117,7 +119,8 @@
Abator will not generate the property. The <javaModelGenerator> element now
accepts a property to specify the classpath of the <code>rootClass</code>. See the
<a href="configreference/javaModelGenerator.html"><javaModelGenerator></a>
- reference page for more information.</li>
+ reference page for more information. Thanks to Ashok Madhavan for the beginnings
+ of this code.</li>
<li>Allowed specifying a type (pre or post) for the generated key element. See the
<a href="configreference/generatedKey.html"><generatedKey></a>
reference page for more information.</li>
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/org.apache.ibatis.abator_1.1.0.jar
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/org.apache.ibatis.abator_1.1.0.jar?rev=639508&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/org.apache.ibatis.abator_1.1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.core_1.1.0.jar
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.core_1.1.0.jar?rev=639508&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.core_1.1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.doc_1.1.0.jar
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.doc_1.1.0.jar?rev=639508&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.doc_1.1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.ui_1.1.0.jar
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.ui_1.1.0.jar?rev=639508&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.ui_1.1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/site.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/site.xml?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/site.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/site.xml Thu Mar 20 18:05:28 2008
@@ -6,9 +6,12 @@
<feature url="features/org.apache.ibatis.abator_1.0.0.jar" id="org.apache.ibatis.abator" version="1.0.0">
<category name="Eclipse 3.1 and Higher Compatible Versions"/>
</feature>
+ <feature url="features/org.apache.ibatis.abator_1.1.0.jar" id="org.apache.ibatis.abator" version="1.1.0">
+ <category name="Eclipse 3.2 and Higher Compatible Versions"/>
+ </feature>
<category-def name="Eclipse 3.1 and Higher Compatible Versions" label="Abator for Eclipse 3.1 and Higher">
<description>
- Abator code generator for iBATIS. If you are using Eclipse 3.0, then uncheck the box labled "Show the Latest Version of the Feature Only" and install the 0.6.5 version.
+ Abator code generator for iBATIS. If you are using Eclipse 3.0, then uncheck the box labled "Show the Latest Version of the Feature Only" and install the 0.6.5 version.
</description>
</category-def>
<category-def name="Eclipse 3.0 Compatible Versions" label="Abator for Eclipse 3.0">
@@ -16,4 +19,5 @@
Abator code generator for iBATIS.
</description>
</category-def>
+ <category-def name="Eclipse 3.2 and Higher Compatible Versions" label="Abator for Eclipse 3.2"/>
</site>
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/abator-src.zip
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/abator-src.zip?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
Binary files - no diff available.
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/abator.jar
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/abator.jar?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
Binary files - no diff available.
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/plugin.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/plugin.xml?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/plugin.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/plugin.xml Thu Mar 20 18:05:28 2008
@@ -3,7 +3,7 @@
<plugin
id="org.apache.ibatis.abator.core"
name="Abator for iBATIS"
- version="1.0.1"
+ version="1.1.0"
provider-name="ibatis.apache.org">
<runtime>
<library name="abator.jar">
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/buildDoc.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/buildDoc.xml?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/buildDoc.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/buildDoc.xml Thu Mar 20 18:05:28 2008
@@ -25,6 +25,7 @@
classpathref="org.abache.ibatis.abator.doc.javadocclasspath">
<packageset dir="../../core/src" />
<packageset dir="../org.apache.ibatis.abator.ui/src" />
+ <packageset dir="../org.apache.ibatis.abator.ui/antsrc" />
</javadoc>
<zip destfile="doc.zip" >
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/buildingFromSVN.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/buildingFromSVN.html?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/buildingFromSVN.html (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/buildingFromSVN.html Thu Mar 20 18:05:28 2008
@@ -1,4 +1,3 @@
-<?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">
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/eclipseui.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/eclipseui.html?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/eclipseui.html (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/eclipseui.html Thu Mar 20 18:05:28 2008
@@ -1,4 +1,3 @@
-<?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">
@@ -15,21 +14,18 @@
<li>A custom editor for Abator configuration files</li>
<li>A new file wizard for creating configuration files</li>
<li>An action to run Abator</li>
- <li>An Eclipse Integrated Ant Task</li>
</ul>
<h2>Configuration File Editor</h2>
-<p>The configuration file editor is a low function editor. In this release, it only provides
+<p>The configuration file editor is a low function editor. It only provides
enough functionality to be somewhat better than a plain text editor (like some color
- syntax highlighting). In future releases we hope to add more function to this editor.
+ syntax highlighting).
If you have some better XML file editor available in your environment, it will likely be
a better than this editor. The editor is useful in a very basic Eclipse installation
which has no other XML editor.</p>
-<p>The editor is automatically associated with files named "abatorConfig.xml". If you
- are using a very basic Eclipse install, you might consider associating this editor
- with any XML file. In the Eclipse 3.1 version of the plug-in, we will associate the
- editor with any Abator configuration file, regardless of the file name.</p>
+<p>The editor is automatically associated with XML files that are proper Abator
+ configuration files. </p>
<h2>New Configuration File Wizard</h2>
<p>The new configuration file wizard will create a new XML file with a basic outline
@@ -44,39 +40,6 @@
root element of "abatorConfiguration". To run Abator, right click on an Abator
configuration file in any view and select the menu option.</p>
-<h2>Integrated Ant Task</h2>
-<p>The Abator plug-in declares an Ant task for use within the Eclipse JRE. The
- task is called "abator.generate". Here is en example Ant build file:</p>
-
-<pre>
-<project default="runAbator">
- <target name="runAbator">
- <eclipse.convertPath resourcepath="AbatorTest/src/config/abatorConfig.xml"
- property="thePath"/>
- <eclipse.convertPath resourcepath="AbatorTest/lib/hsqldb.jar"
- property="jdbc.driver.jar"/>
- <abator.generate configfile="${thePath}" >
- <propertyset>
- <propertyref name="jdbc.driver.jar"/>
- </propertyset>
- </abator.generate>
- </target>
-</project>
-</pre>
-<p>This file uses the Eclipse supplied "eclipse.convertPath" task to calculate the
- actual path of the configuration file and the JDBC driver. Then we use the
- "abator.generate" task to run Abator. When running
- this from Eclipse interactively,
- the Ant launch must be setup to run in the same JRE as the workspace.
- This setting is a standard configuration setting for running Ant in Eclipse.
-</p>
-<p>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>jdbc.driver.jar</code> can be
- accessed in the Abator configuration file with the escape sequence
- <code>${jdbc.driver.jar}</code>
-</p>
</body>
</html>
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/quickstart.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/quickstart.html?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/quickstart.html (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/quickstart.html Thu Mar 20 18:05:28 2008
@@ -1,4 +1,3 @@
-<?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">
@@ -37,8 +36,9 @@
<li>Abator will not overwrite any custom changes you make to the objects it generates. You can
run it over and over again without fear of losing custom changes.</li>
<li>Abator does supply a custom editor for Abator configuration files, but it is very low
- function and currently only associated with files named "abatorConfig.xml". With
- Eclipse 3.1, the editor will be more full function. If you are using RAD/RSA, then
+ function. The editor is associated with all XML files that are Abator configuration
+ files.
+ If you are using RAD/RSA, then
the included XML editor is much more useful. Or if you use some other XML plug-in (like
XML Buddy),
it is likely that the editor supplied with the plug-in will be more useful.</li>
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/releasenotes.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/releasenotes.html?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/releasenotes.html (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/releasenotes.html Thu Mar 20 18:05:28 2008
@@ -1,4 +1,3 @@
-<?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">
@@ -9,6 +8,20 @@
</head>
<body>
<h1>Abator Eclipse Feature Release Notes</h1>
+<h2>Version 1.1.0</h2>
+<ul>
+ <li>Upgraded to Abator Version 1.1.0</li>
+ <li>Upgraded to Eclipse Version 3.2</li>
+ <li>The Java merge function will now use the code formatter options
+ from the workspace</li>
+ <li>The integrated Ant task accepts additional properties to
+ match the Ant task in base Abator. See the
+ <a href="usingAnt.html">Using the Integrated Ant Task</a> page for more
+ information.</li>
+ <li>The integrated editor is now associated with any Abator configuration
+ file regardless of the filename.</li>
+</ul>
+
<h2>Version 1.0.0</h2>
<ul>
<li>Upgraded to Abator Version 1.0.0</li>
@@ -18,7 +31,7 @@
<li>Use an adaptable type to associate Abator configuration files with the
popup menu items instead of content type. This should resolve conflicts
with other plug-ins like oXygen</li>
- <li>The built-in Ant task now accepts a nested Ant <propertyset$gt;
+ <li>The built-in Ant task now accepts a nested Ant <propertyset>
to allow passing properties into an Abatorf configuration file.</li>
</ul>
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/usingAnt.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/usingAnt.html?rev=639508&view=auto
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/usingAnt.html (added)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/usingAnt.html Thu Mar 20 18:05:28 2008
@@ -0,0 +1,103 @@
+<!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>Using the Integrated Ant Task</title>
+ <link type="text/css" rel="stylesheet" href="abator.css"/>
+</head>
+<body>
+<h1>Using the Integrated Ant Task</h1>
+<p>The Abator plugin includes an integrated Ant task for running Abator. This
+Ant task is different from the Ant task included in the basic Abator distribution
+in that it supports Java file merging, and is integrated with the eclipse user
+interface, logging system, and progress notification system.</p>
+<p>It is useful to use the integrated Ant task in the following situations:</p>
+<ul>
+ <li>When you want to automate an Abator run, and support merging Java files.
+ In this case, you should setup an Ant build as demonstrated below, then
+ use an eclipse "headless Ant build" to run Abator automatically.
+ The standard eclipse help includes directions for running a headless
+ Ant build. Search in the eclipse help for the word "headless".</li>
+ <li>When you want to provide a custom implementation of one of the
+ core Abator interfaces. For example, if you want to provide a custom implementation
+ of the JavaTypeResolver interface. When running Abator from the simple menu option,
+ you have no control over the classpath of the Abator run. When you run from
+ Ant, you have much more control over the runtime classpath./li>
+</ul>
+
+<h2>Integrated Ant Task Detail</h2>
+<p>The Abator plug-in declares an Ant task for use within the Eclipse JRE. The
+ task is called "abator.generate". Here is en example Ant build file:</p>
+
+<pre>
+<project default="runAbator">
+ <target name="runAbator">
+ <eclipse.convertPath resourcepath="AbatorTest/src/config/abatorConfig.xml"
+ property="thePath"/>
+ <eclipse.convertPath resourcepath="AbatorTest/lib/hsqldb.jar"
+ property="jdbc.driver.jar"/>
+ <abator.generate configfile="${thePath}" >
+ <propertyset>
+ <propertyref name="jdbc.driver.jar"/>
+ </propertyset>
+ </abator.generate>
+ </target>
+</project>
+</pre>
+<p>This file uses the Eclipse supplied "eclipse.convertPath" task to calculate the
+ actual path of the configuration file and the JDBC driver. Then we use the
+ "abator.generate" task to run Abator. When running
+ this from Eclipse interactively,
+ the Ant launch must be setup to run in the same JRE as the workspace.
+ This setting is a standard configuration setting for running Ant in Eclipse.
+</p>
+<p>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>jdbc.driver.jar</code> can be
+ accessed in the Abator configuration file with the escape sequence
+ <code>${jdbc.driver.jar}</code>
+</p>
+
+<p>The integrated Ant task supports the following attributes:</p>
+<table border="1" cellspacing="0" cellpadding="5">
+ <tr>
+ <th>Attribute</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td valign="top">configfile</td>
+ <td>This is the Abator configuration file to use. Use the "eclipse.convertPath"
+ task to convert a workspace path to an absolute path before setting this
+ attribute (as shown above)
+ <p>This attribute is required.</p></td>
+ </tr>
+ <tr>
+ <td valign="top">contextIds</td>
+ <td>If specified, then this is a comma delimited list of contexts to use in
+ the current run of Abator. Any id specified in the list must exactly
+ match the value of the <code>id</code> attribute of an
+ <abatorContext> configuration element. Only ids specified
+ in this list will be active for this run of Abator. If this attribute
+ is not specified, then all contexts will be active.</td>
+ </tr>
+<tr>
+ <td valign="top">fullyQualifiedTableNames</td>
+ <td>If specified, then this is a comma delimited list of tables to use in
+ the current run of Abator. 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 Abator. If this attribute
+ 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>
+
+
+</body>
+</html>
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/plugin.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/plugin.xml?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/plugin.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/plugin.xml Thu Mar 20 18:05:28 2008
@@ -3,7 +3,7 @@
<plugin
id="org.apache.ibatis.abator.doc"
name="Abator Documentation Plug-in"
- version="1.0.0"
+ version="1.1.0"
provider-name="ibatis.apache.org">
<requires>
<import plugin="org.eclipse.help"/>
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/toc.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/toc.xml?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/toc.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/toc.xml Thu Mar 20 18:05:28 2008
@@ -3,10 +3,10 @@
<toc label="Abator for iBATIS User Guide">
<topic label="Eclipse Plugin Documentation">
+ <topic label="Plugin Release Notes" href="html/releasenotes.html"/>
<topic label="Eclipse Plugin Quick Start Guide" href="html/quickstart.html"/>
<topic label="Using the Eclipse User Interface" href="html/eclipseui.html"/>
- <topic label="Plugin Future Roadmap" href="html/roadmap.html"/>
- <topic label="Plugin Release Notes" href="html/releasenotes.html"/>
+ <topic label="Using the Integrated Ant Task" href="html/usingAnt.html"/>
<topic label="Abator Feature Debug Reference" href="html/buildingFromSVN.html"/>
</topic>
@@ -22,11 +22,13 @@
<topic href="core/htmldoc/configreference/abatorContext.html" label="<abatorContext>"/>
<topic href="core/htmldoc/configreference/classPathEntry.html" label="<classPathEntry>"/>
<topic href="core/htmldoc/configreference/columnOverride.html" label="<columnOverride>"/>
+ <topic href="core/htmldoc/configreference/columnRenamingRule.html" label="<columnRenamingRule>"/>
+ <topic href="core/htmldoc/configreference/commentGenerator.html" label="<commentGenerator>"/>
<topic href="core/htmldoc/configreference/daoGenerator.html" label="<daoGenerator>"/>
<topic href="core/htmldoc/configreference/generatedKey.html" label="<generatedKey>"/>
<topic href="core/htmldoc/configreference/ignoreColumn.html" label="<ignoreColumn>"/>
- <topic href="core/htmldoc/configreference/javaTypeResolver.html" label="<javaTypeResolver>"/>
<topic href="core/htmldoc/configreference/javaModelGenerator.html" label="<javaModelGenerator>"/>
+ <topic href="core/htmldoc/configreference/javaTypeResolver.html" label="<javaTypeResolver>"/>
<topic href="core/htmldoc/configreference/jdbcConnection.html" label="<jdbcConnection>"/>
<topic href="core/htmldoc/configreference/properties.html" label="<properties>"/>
<topic href="core/htmldoc/configreference/property.html" label="<property>"/>
@@ -39,6 +41,7 @@
<topic href="core/htmldoc/generatedobjects/sqlmap.html" label="SQL Map Files"/>
<topic href="core/htmldoc/generatedobjects/javadao.html" label="DAO Interfaces and Classes"/>
<topic href="core/htmldoc/generatedobjects/exampleClassUsage.html" label="Example Class Usage Notes"/>
+ <topic href="core/htmldoc/generatedobjects/extendingExampleClass.html" label="Extending the Example Classes"/>
</topic>
<topic href="core/htmldoc/usage/intro.html" label="Database Specific Information">
@@ -53,7 +56,6 @@
</topic>
<topic href="core/htmldoc/philosophy.html" label="Design Philosophy"/>
- <topic href="core/htmldoc/roadmap.html" label="Future Roadmap"/>
<topic href="core/htmldoc/license.html" label="Licensing Information"/>
</topic>
@@ -77,6 +79,7 @@
<topic label="org.apache.ibatis.abator.internal.util.messages" href="html/javadoc/org/apache/ibatis/abator/internal/util/messages/package-summary.html" />
<topic label="org.apache.ibatis.abator.ui" href="html/javadoc/org/apache/ibatis/abator/ui/package-summary.html" />
<topic label="org.apache.ibatis.abator.ui.actions" href="html/javadoc/org/apache/ibatis/abator/ui/actions/package-summary.html" />
+ <topic label="org.apache.ibatis.abator.ui.ant" href="html/javadoc/org/apache/ibatis/abator/ui/ant/package-summary.html" />
<topic label="org.apache.ibatis.abator.ui.content" href="html/javadoc/org/apache/ibatis/abator/ui/content/package-summary.html" />
<topic label="org.apache.ibatis.abator.ui.editors" href="html/javadoc/org/apache/ibatis/abator/ui/editors/package-summary.html" />
<topic label="org.apache.ibatis.abator.ui.plugin" href="html/javadoc/org/apache/ibatis/abator/ui/plugin/package-summary.html" />
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/META-INF/MANIFEST.MF?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/META-INF/MANIFEST.MF (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/META-INF/MANIFEST.MF Thu Mar 20 18:05:28 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Abator UI Plug-in
Bundle-SymbolicName: org.apache.ibatis.abator.ui; singleton:=true
-Bundle-Version: 1.0.1
+Bundle-Version: 1.1.0
Bundle-ClassPath: abatorui.jar
Bundle-Activator: org.apache.ibatis.abator.ui.plugin.AbatorUIPlugin
Bundle-Localization: plugin
@@ -19,5 +19,5 @@
org.eclipse.ui.workbench.texteditor,
org.apache.ant,
org.eclipse.ant.core
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
Bundle-Vendor: ibatis.apache.org
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/antsrc/org/apache/ibatis/abator/ui/ant/AbatorUIAntTask.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/antsrc/org/apache/ibatis/abator/ui/ant/AbatorUIAntTask.java?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/antsrc/org/apache/ibatis/abator/ui/ant/AbatorUIAntTask.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/antsrc/org/apache/ibatis/abator/ui/ant/AbatorUIAntTask.java Thu Mar 20 18:05:28 2008
@@ -19,9 +19,12 @@
import java.io.IOException;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
import org.apache.ibatis.abator.api.Abator;
import org.apache.ibatis.abator.config.AbatorConfiguration;
@@ -45,6 +48,8 @@
private PropertySet propertyset;
private String configfile;
+ private String contextIds;
+ private String fullyQualifiedTableNames;
/**
*
@@ -71,6 +76,28 @@
+ " does not exist");
}
+ Set fullyqualifiedTables = new HashSet();
+ if (StringUtility.stringHasValue(fullyQualifiedTableNames)) {
+ StringTokenizer st = new StringTokenizer(fullyQualifiedTableNames, ","); //$NON-NLS-1$
+ while (st.hasMoreTokens()) {
+ String s = st.nextToken().trim();
+ if (s.length() > 0) {
+ fullyqualifiedTables.add(s);
+ }
+ }
+ }
+
+ Set contexts = new HashSet();
+ if (StringUtility.stringHasValue(contextIds)) {
+ StringTokenizer st = new StringTokenizer(contextIds, ","); //$NON-NLS-1$
+ while (st.hasMoreTokens()) {
+ String s = st.nextToken().trim();
+ if (s.length() > 0) {
+ contexts.add(s);
+ }
+ }
+ }
+
try {
Properties p = propertyset == null ? null : propertyset.getProperties();
@@ -90,7 +117,7 @@
progressCallback = new EclipseProgressCallback(monitor);
}
- abator.generate(progressCallback);
+ abator.generate(progressCallback, contexts, fullyqualifiedTables);
} catch (XMLParserException e) {
List errors = e.getErrors();
@@ -137,5 +164,21 @@
}
return propertyset;
+ }
+
+ public String getContextIds() {
+ return contextIds;
+ }
+
+ public void setContextIds(String contextIds) {
+ this.contextIds = contextIds;
+ }
+
+ public String getFullyQualifiedTableNames() {
+ return fullyQualifiedTableNames;
+ }
+
+ public void setFullyQualifiedTableNames(String fullyQualifiedTableNames) {
+ this.fullyQualifiedTableNames = fullyQualifiedTableNames;
}
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/plugin.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/plugin.xml?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/plugin.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/plugin.xml Thu Mar 20 18:05:28 2008
@@ -56,12 +56,13 @@
<extension
point="org.eclipse.ui.editors">
<editor
- filenames="abatorConfig.xml"
- icon="icons/iBatisLogo.gif"
class="org.apache.ibatis.abator.ui.editors.ConfigFileEditor"
- name="Abator for iBATIS Configuration File Editor"
contributorClass="org.apache.ibatis.abator.ui.editors.ConfigFileEditorActionBarContributor"
- id="org.apache.ibatis.abator.ui.editors.ConfigFileEditor"/>
+ icon="icons/iBatisLogo.gif"
+ id="org.apache.ibatis.abator.ui.editors.ConfigFileEditor"
+ name="Abator for iBATIS Configuration File Editor">
+ <contentTypeBinding contentTypeId="org.apache.ibatis.abator.ui.abator.configuration.file"/>
+ </editor>
</extension>
<extension
point="org.eclipse.ant.core.antTasks">
@@ -77,6 +78,22 @@
class="org.apache.ibatis.abator.ui.content.AdapterFactory">
<adapter type="org.apache.ibatis.abator.ui.content.AbatorConfigurationFileAdapter"/>
</factory>
+ </extension>
+ <extension
+ point="org.eclipse.core.runtime.contentTypes">
+ <content-type
+ base-type="org.eclipse.core.runtime.xml"
+ file-extensions="xml"
+ file-names="abatorConfig.xml"
+ id="org.apache.ibatis.abator.ui.abator.configuration.file"
+ name="Abator for iBATIS Configuration File"
+ priority="normal">
+ <describer class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber">
+ <parameter
+ name="element"
+ value="abatorConfiguration"/>
+ </describer>
+ </content-type>
</extension>
</plugin>
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/AbatorHomeInitializer.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/AbatorHomeInitializer.java?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/AbatorHomeInitializer.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/AbatorHomeInitializer.java Thu Mar 20 18:05:28 2008
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.net.URL;
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.ClasspathVariableInitializer;
@@ -51,7 +52,7 @@
URL installLocation= bundle.getEntry("/"); //$NON-NLS-1$
URL local= null;
try {
- local= Platform.asLocalURL(installLocation);
+ local= FileLocator.toFileURL(installLocation);
} catch (IOException e) {
JavaCore.removeClasspathVariable(ABATOR_HOME, null);
return;
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/JavaFileMerger.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/JavaFileMerger.java?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/JavaFileMerger.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/plugin/JavaFileMerger.java Thu Mar 20 18:05:28 2008
@@ -18,7 +18,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.StringTokenizer;
import org.apache.ibatis.abator.api.GeneratedJavaFile;
@@ -45,7 +44,6 @@
import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -296,9 +294,7 @@
listRewrite.insertAt((ASTNode) iter.next(), i++, null);
}
- Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings();
-
- textEdit = rewrite.rewriteAST(document, options);
+ textEdit = rewrite.rewriteAST(document, JavaCore.getOptions());
try {
textEdit.apply(document);
} catch (BadLocationException e) {
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator/feature.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator/feature.xml?rev=639508&r1=639507&r2=639508&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator/feature.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator/feature.xml Thu Mar 20 18:05:28 2008
@@ -2,7 +2,7 @@
<feature
id="org.apache.ibatis.abator"
label="Abator Code Generator for iBATIS"
- version="1.0.1"
+ version="1.1.0"
provider-name="ibatis.apache.org">
<install-handler/>
@@ -13,199 +13,215 @@
</description>
<copyright>
- Copyright 2005 The Apache Software Foundation
-
+ Copyright 2008 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.
You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied.
-
See the License for the specific language governing permissions
and limitations under the License.
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0">
Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
+Version 2.0, January 2004
+http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+"Licensor" shall mean the copyright owner or entity authorized
+by
+the copyright owner that is granting the License.
+"Legal Entity" shall mean the union of the acting entity and
+all
+other entities that control, are controlled by, or are under
+common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of
+the
+outstanding shares, or (iii) beneficial ownership of such entity.
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by
+a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+"Derivative Works" shall mean any work, whether in Source or
+Object
+form, that is based on (or derived from) the Work and for which
+the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the
+purposes
+of this License, Derivative Works shall not include works that
+remain
+separable from, or merely link (or bind by name) to the interfaces
+of,
+the Work and Derivative Works thereof.
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright
+owner
+or by an individual or Legal Entity authorized to submit on behalf
+of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication
+sent
+to the Licensor or its representatives, including but not limited
+to
+communication on electronic mailing lists, source code control
+systems,
+and issue tracking systems that are managed by, or on behalf
+of, the
+Licensor for the purpose of discussing and improving the Work,
+but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+"Contributor" shall mean Licensor and any individual or Legal
+Entity
+on behalf of whom a Contribution has been received by Licensor
+and
+subsequently incorporated within the Work.
+2. Grant of Copyright License. Subject to the terms and conditions
+of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute
+the
+Work and such Derivative Works in Source or Object form.
+3. Grant of Patent License. Subject to the terms and conditions
+of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have
+made,
+use, offer to sell, sell, import, and otherwise transfer the
+Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If
+You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+4. Redistribution. You may reproduce and distribute copies of
+the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+You may add Your own copyright statement to Your modifications
+and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications,
+or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies
+with
+the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
+any Contribution intentionally submitted for inclusion in the
+Work
+by You to the Licensor shall be under the terms and conditions
+of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or
+modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+6. Trademarks. This License does not grant permission to use
+the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing
+the
+origin of the Work and reproducing the content of the NOTICE
+file.
+7. Disclaimer of Warranty. Unless required by applicable law
+or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining
+the
+appropriateness of using or redistributing the Work and assume
+any
+risks associated with Your exercise of permissions under this
+License.
8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor
+be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising
+as a
+result of this License or out of the use or inability to use
+the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with
+this
+License. However, in accepting such obligations, You may act
+only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by
+reason
+of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
</license>
@@ -216,7 +232,7 @@
<requires>
<import plugin="org.eclipse.help"/>
<import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.core.runtime" version="3.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.jdt.core" version="3.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.text"/>
@@ -225,24 +241,26 @@
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.ui.workbench.texteditor"/>
+ <import plugin="org.apache.ant"/>
+ <import plugin="org.eclipse.ant.core"/>
</requires>
<plugin
- id="org.apache.ibatis.abator.doc"
+ id="org.apache.ibatis.abator.core"
download-size="0"
install-size="0"
- version="1.0.0"/>
+ version="1.1.0"/>
<plugin
- id="org.apache.ibatis.abator.ui"
+ id="org.apache.ibatis.abator.doc"
download-size="0"
install-size="0"
- version="1.0.1"/>
+ version="1.1.0"/>
<plugin
- id="org.apache.ibatis.abator.core"
+ id="org.apache.ibatis.abator.ui"
download-size="0"
install-size="0"
- version="1.0.1"/>
+ version="1.1.0"/>
</feature>