Author: jgbutler
Date: Sat Aug 19 21:14:23 2006
New Revision: 432932
URL: http://svn.apache.org/viewvc?rev=432932&view=rev
Log:
Abator plugin updates for version 1.0.0
Modified:
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/build.properties
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/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/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/feature.xml
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=432932&r1=432931&r2=432932&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=432932&r1=432931&r2=432932&view=diff
==============================================================================
Binary files - no diff available.
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/build.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/build.properties?rev=432932&r1=432931&r2=432932&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/build.properties
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/build.properties
Sat Aug 19 21:14:23 2006
@@ -1,5 +1,6 @@
bin.includes = plugin.xml,\
- abator.jar
+ abator.jar,\
+ abator-src.zip
src.includes = plugin.xml,\
abator-src.zip,\
abator.jar
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=432932&r1=432931&r2=432932&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
Sat Aug 19 21:14:23 2006
@@ -3,7 +3,7 @@
<plugin
id="org.apache.ibatis.abator.core"
name="Abator for iBATIS"
- version="0.7.0"
+ version="1.0.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/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=432932&r1=432931&r2=432932&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
Sat Aug 19 21:14:23 2006
@@ -27,7 +27,7 @@
<td><code>org.apache.ibatis.abator.core</code></td>
<td>This plug-in is an Eclipse library plug-in for the standard Abator JAR
file.
The purpose of this plug-in is to package the standard JAR and make it
available to the
- other plug-ins. There is a build filed in this plug-in
(buildAbator.xml) that
+ other plug-ins. There is a build file in this plug-in (buildAbator.xml)
that
will compile the core Abator JAR file and update the wrapped JAR files.
This makes
it easy to keep the plug-in up to date as the core functionality is
developed.</td>
</tr>
@@ -139,8 +139,9 @@
</li>
<li>Select the "Java Project from Existing Ant Buildfile" wizard, press
"Next"</li>
<li>Browse to the "build.xml" file in the checked out project (for example
- /Abator/source/core/build/build.xml). Accept the default for the
- other fields and press "Finish".</li>
+ /Abator/source/core/build/build.xml). Select the javac target that
compiles
+ Abator, not the target for compiling generated code in the test targets.
+ Accept the default for the other fields and press "Finish".</li>
<li>Wait for the workspace to build.</li>
</ol>
@@ -151,10 +152,7 @@
<p>If you make a change in the Abator core files, you can use the
<code>buildAbator.xml</code>
Ant build file in the <code>org.apache.ibatis.abator.core</code> project to
update the
-JAR in the plug-in. If you have both a JDK 1.4 and JDK 5.0 installed on your
machine,
-there could be errors when running this build file. To fix the errors, make
sure
-that the JRE for the "Abator for iBATIS" project is set to the 1.4.2 JRE. You
might need
-to configure a new JRE in Eclipse to make this happen.</p>
+JAR in the plug-in.</p>
</body>
</html>
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=432932&r1=432931&r2=432932&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
Sat Aug 19 21:14:23 2006
@@ -53,15 +53,29 @@
<target name="runAbator">
<eclipse.convertPath
resourcepath="AbatorTest/src/config/abatorConfig.xml"
property="thePath"/>
- <abator.generate configfile="${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. Then we use the "abator.generate"
task to
- run Abator. The only thing to remember when running this from Eclipse
interactively
- is that the Ant launch must be setup to run in the same JRE as the workspace.
+ 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>
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=432932&r1=432931&r2=432932&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
Sat Aug 19 21:14:23 2006
@@ -9,15 +9,17 @@
</head>
<body>
<h1>Abator Eclipse Feature Release Notes</h1>
-<h2>Version 0.7.0</h2>
+<h2>Version 1.0.0</h2>
<ul>
- <li>Upgraded to Abator Version 0.7.0</li>
+ <li>Upgraded to Abator Version 1.0.0</li>
<li>Upgraded to Eclipse Version 3.1</li>
<li>The Java file merger now fully supports JSE 5.0</li>
<li>Fixed bug where multi-segment source paths failed</li>
<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;
+ to allow passing properties into an Abatorf configuration file.</li>
</ul>
<h2>Version 0.6.5</h2>
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=432932&r1=432931&r2=432932&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
Sat Aug 19 21:14:23 2006
@@ -3,7 +3,7 @@
<plugin
id="org.apache.ibatis.abator.doc"
name="Abator Documentation Plug-in"
- version="0.7.0"
+ version="1.0.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=432932&r1=432931&r2=432932&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
Sat Aug 19 21:14:23 2006
@@ -28,6 +28,7 @@
<topic href="core/htmldoc/configreference/javaTypeResolver.html"
label="<javaTypeResolver>"/>
<topic href="core/htmldoc/configreference/javaModelGenerator.html"
label="<javaModelGenerator>"/>
<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>"/>
<topic href="core/htmldoc/configreference/sqlMapGenerator.html"
label="<sqlMapGenerator>"/>
<topic href="core/htmldoc/configreference/table.html"
label="<table>"/>
@@ -66,7 +67,6 @@
<topic label="org.apache.ibatis.abator.exception"
href="html/javadoc/org/apache/ibatis/abator/exception/package-summary.html" />
<topic label="org.apache.ibatis.abator.internal"
href="html/javadoc/org/apache/ibatis/abator/internal/package-summary.html" />
<topic label="org.apache.ibatis.abator.internal.db"
href="html/javadoc/org/apache/ibatis/abator/internal/db/package-summary.html" />
- <topic label="org.apache.ibatis.abator.internal.java"
href="html/javadoc/org/apache/ibatis/abator/internal/java/package-summary.html"
/>
<topic label="org.apache.ibatis.abator.internal.java.dao"
href="html/javadoc/org/apache/ibatis/abator/internal/java/dao/package-summary.html"
/>
<topic label="org.apache.ibatis.abator.internal.java.model"
href="html/javadoc/org/apache/ibatis/abator/internal/java/model/package-summary.html"
/>
<topic label="org.apache.ibatis.abator.internal.rules"
href="html/javadoc/org/apache/ibatis/abator/internal/rules/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=432932&r1=432931&r2=432932&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
Sat Aug 19 21:14:23 2006
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Abator UI Plug-in
Bundle-SymbolicName: org.apache.ibatis.abator.ui; singleton:=true
-Bundle-Version: 0.7.0
+Bundle-Version: 1.0.0
Bundle-ClassPath: abatorui.jar
Bundle-Activator: org.apache.ibatis.abator.ui.plugin.AbatorUIPlugin
Bundle-Localization: plugin
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=432932&r1=432931&r2=432932&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
Sat Aug 19 21:14:23 2006
@@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
import org.apache.ibatis.abator.api.Abator;
import org.apache.ibatis.abator.config.AbatorConfiguration;
@@ -31,7 +32,9 @@
import org.apache.ibatis.abator.ui.plugin.EclipseProgressCallback;
import org.apache.ibatis.abator.ui.plugin.EclipseShellCallback;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.PropertySet;
import org.eclipse.ant.core.AntCorePlugin;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -40,6 +43,7 @@
*/
public class AbatorUIAntTask extends Task {
+ private PropertySet propertyset;
private String configfile;
/**
@@ -68,7 +72,9 @@
}
try {
- AbatorConfigurationParser cp = new AbatorConfigurationParser(
+ Properties p = propertyset == null ? null :
propertyset.getProperties();
+
+ AbatorConfigurationParser cp = new AbatorConfigurationParser(p,
warnings);
AbatorConfiguration config = cp
.parseAbatorConfiguration(configurationFile);
@@ -90,7 +96,7 @@
List errors = e.getErrors();
Iterator iter = errors.iterator();
while (iter.hasNext()) {
- log((String) iter.next());
+ log((String) iter.next(), Project.MSG_ERR);
}
throw new BuildException(e.getMessage());
@@ -106,7 +112,7 @@
Iterator iter = warnings.iterator();
while (iter.hasNext()) {
- log((String) iter.next());
+ log((String) iter.next(), Project.MSG_WARN);
}
}
@@ -123,5 +129,13 @@
*/
public void setConfigfile(String configfile) {
this.configfile = configfile;
+ }
+
+ public PropertySet createPropertyset() {
+ if (propertyset == null) {
+ propertyset = new PropertySet();
+ }
+
+ return propertyset;
}
}
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=432932&r1=432931&r2=432932&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
Sat Aug 19 21:14:23 2006
@@ -2,9 +2,8 @@
<feature
id="org.apache.ibatis.abator"
label="Abator Code Generator for iBATIS"
- version="0.7.0"
+ version="1.0.0"
provider-name="ibatis.apache.org">
-
<install-handler/>
<description>
@@ -219,7 +218,7 @@
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.jdt.core"/>
+ <import plugin="org.eclipse.jdt.core" version="3.1.0"
match="greaterOrEqual"/>
<import plugin="org.eclipse.text"/>
<import plugin="org.eclipse.jdt.launching"/>
<import plugin="org.eclipse.ui.editors"/>
@@ -232,18 +231,18 @@
id="org.apache.ibatis.abator.doc"
download-size="0"
install-size="0"
- version="0.7.0"/>
+ version="1.0.0"/>
<plugin
id="org.apache.ibatis.abator.ui"
download-size="0"
install-size="0"
- version="0.7.0"/>
+ version="1.0.0"/>
<plugin
id="org.apache.ibatis.abator.core"
download-size="0"
install-size="0"
- version="0.7.0"/>
+ version="1.0.0"/>
</feature>
