Author: jgbutler
Date: Mon Jul 17 10:01:21 2006
New Revision: 422762
URL: http://svn.apache.org/viewvc?rev=422762&view=rev
Log:
Changes for 0.7.0
Removed:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/reference/
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/build.properties
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/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/html/roadmap.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/build.properties
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/eclipse/org.apache.ibatis.abator.doc/build.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/build.properties?rev=422762&r1=422761&r2=422762&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/build.properties
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/build.properties
Mon Jul 17 10:01:21 2006
@@ -1,16 +1,10 @@
bin.includes = plugin.xml,\
doc.zip,\
toc.xml,\
- tocgettingstarted.xml,\
- tocreference.xml,\
- tocusage.xml,\
LICENSE,\
NOTICE
src.includes = plugin.xml,\
toc.xml,\
- tocgettingstarted.xml,\
- tocreference.xml,\
- tocusage.xml,\
doc.zip,\
NOTICE,\
LICENSE
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=422762&r1=422761&r2=422762&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
Mon Jul 17 10:01:21 2006
@@ -3,36 +3,15 @@
<path id="org.abache.ibatis.abator.doc.javadocclasspath">
<pathelement location="../org.apache.ibatis.abator.ui/bin"/>
<pathelement location="../org.apache.ibatis.abator.core/abator.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.core.resources_3.0.1\resources.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.ui_3.0.2\ui.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.ui.workbench_3.0.2\workbench.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.osgi_3.0.1\osgi.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.jdt.core_3.0.2\jdtcore.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.osgi_3.0.1\defaultAdaptor.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.ui.workbench.texteditor_3.0.1\texteditor.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.osgi_3.0.1\resolver.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.osgi_3.0.1\eclipseAdaptor.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.osgi_3.0.1\core.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.ui.editors_3.0.1\editors.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.jdt.launching_3.0.2\launching.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.core.filebuffers_3.0.1\filebuffers.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.ui.ide_3.0.2\ide.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.core.runtime_3.0.2\runtime.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.jface.text_3.0.2\jfacetext.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.osgi_3.0.1\console.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.text_3.0.1\text.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.swt.win32_3.0.2\ws\win32\swt.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.eclipse.jface_3.0.2\jface.jar"/>
- <pathelement
location="\JavaTools\eclipse_30\plugins\org.apache.ant_1.6.2\lib\ant.jar"/>
</path>
<target name="javadoc">
- <delete dir="html/reference/javadoc"/>
+ <delete dir="html/javadoc"/>
<javadoc
access="protected"
author="true"
- destdir="html/reference/javadoc"
+ destdir="html/javadoc"
doctitle="Abator for iBATIS"
nodeprecated="false"
nodeprecatedlist="false"
@@ -54,7 +33,7 @@
</zip>
- <delete dir="html/reference/javadoc"/>
+ <delete dir="html/javadoc"/>
<eclipse.refreshLocal resource="org.apache.ibatis.abator.doc"/>
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=422762&r1=422761&r2=422762&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
Mon Jul 17 10:01:21 2006
@@ -1,11 +1,11 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Abator Quick Start Guide</title>
+ <title>Abator for Eclipse Quick Start Guide</title>
</head>
<body>
-<h1>Abator Quick Start Guide</h1>
-<p>To get up and running quickly with Abator, follow these steps:</p>
+<h1>Abator for Eclipse Quick Start Guide</h1>
+<p>To get up and running quickly with Abator in the Eclipse environment,
follow these steps:</p>
<ol>
<li>Create an Abator configuration file:</li>
<ol>
@@ -30,17 +30,12 @@
<ol>
<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>Currently, the configuration options are most fully documented in the
DTD. Look there for
- any questions.</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
the included XML editor is much more useful. Or if you use some other
XML plugin (like
XML Buddy),
it it likely that the editor supplied with the plugin will be more
useful.</li>
- <li>The generated Java classes will not, and should not, contain any JDK 5.0
features. The next
- version of Abator will support Eclipse 3.1 and JDK 5.0. Until that
time, do not add any JDK
- 5.0 features to the generated Java classes - Abator will likely fail if
you do.</li>
</ol>
</body>
</html>
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=422762&r1=422761&r2=422762&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
Mon Jul 17 10:01:21 2006
@@ -5,16 +5,29 @@
</head>
<body>
<h1>Abator Eclipse Feature Release Notes</h1>
+<h2>Version 0.7.0</h2>
+<ul>
+ <li>Upgraded to Abator Version 0.7.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 plugins like oXygen</li>
+</ul>
+
<h2>Version 0.6.5</h2>
<ul>
<li>Upgraded to Abator Version 0.6.5</li>
<li>Changed EclipseShellCallback so that different source folders can be
specified</li>
</ul>
+
<h2>Version 0.6.2</h2>
<ul>
<li>Made our content type high priority to avoid conflicts with other XML
enabled plugins</li>
</ul>
+
<h2>Version 0.6.1</h2>
<ul>
<li>Upgraded to Abator Version 0.6.1</li>
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/roadmap.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/roadmap.html?rev=422762&r1=422761&r2=422762&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/roadmap.html
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.doc/html/roadmap.html
Mon Jul 17 10:01:21 2006
@@ -1,25 +1,14 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Abator Roadmap</title>
+ <title>Abator for Eclipse Roadmap</title>
</head>
<body>
-<h1>Abator Roadmap</h1>
-<p>The following are enhancements that we would like to make to Abator:</p>
+<h1>Abator for Eclipse Roadmap</h1>
+<p>The following are enhancements that we would like to make to Abator for
Eclipse:</p>
<ul>
<li>A better configuration file editor for Eclipse</li>
- <li>A better file association mapping for Eclipse (will be accomplished in
the Eclipse 3.1
- version)</li>
- <li>Ability to provide custom generator objects in the Eclipse environment
(will be accomplished
- in the Eclipse 3.1 version). Eclipse 3.0 does not support robust enough
classpath management
- for plugins to make this possible without major gyrations - this is the
same issue that the
- Hibernate folks faced with their tooling.</li>
- <li>Update By Example Method (???)</li>
- <li>Optional support for JDK 5.0 generics on the appropriate methods (will
be accomplished in the Eclipse 3.1
- version)</li>
- <li>Better "by example" functionality - could be improved if the iBATIS
<code>iterate</code> tag were
- more functional.</li>
- <li>Improve/complete the JavaDoc!</li>
+ <li>Ability to provide custom generator objects in the Eclipse
environment.</li>
</ul>
<p>Your suggestions are welcome too!</p>
</body>
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=422762&r1=422761&r2=422762&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
Mon Jul 17 10:01:21 2006
@@ -3,7 +3,7 @@
<plugin
id="org.apache.ibatis.abator.doc"
name="Abator Documentation Plug-in"
- version="0.6.5"
+ version="0.7.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=422762&r1=422761&r2=422762&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
Mon Jul 17 10:01:21 2006
@@ -2,11 +2,11 @@
<?NLS TYPE="org.eclipse.help.toc"?>
<toc label="Abator for iBATIS User Guide">
- <topic label="Getting Started">
- <topic label="Quick Start Guide" href="html/quickstart.html"/>
+ <topic label="Eclipse Plugin Documentation">
+ <topic label="Eclipse Plugin Quick Start Guide"
href="html/quickstart.html"/>
<topic label="Using the Eclipse User Interface"
href="html/eclipseui.html"/>
- <topic label="Future Roadmap" href="html/roadmap.html"/>
- <topic label="Release Notes" href="html/releasenotes.html"/>
+ <topic label="Plugin Future Roadmap" href="html/roadmap.html"/>
+ <topic label="Plugin Release Notes" href="html/releasenotes.html"/>
</topic>
<topic label="Core Abator Documentation">
@@ -54,26 +54,30 @@
<topic href="core/htmldoc/license.html" label="Licensing Information"/>
</topic>
- <topic label="Javadocs" href="html/reference/javadoc/overview-summary.html">
- <topic label="org.apache.ibatis.abator.ant"
href="html/reference/javadoc/org/apache/ibatis/abator/ant/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.api"
href="html/reference/javadoc/org/apache/ibatis/abator/api/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.config"
href="html/reference/javadoc/org/apache/ibatis/abator/config/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.config.xml"
href="html/reference/javadoc/org/apache/ibatis/abator/config/xml/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.exception"
href="html/reference/javadoc/org/apache/ibatis/abator/exception/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.internal"
href="html/reference/javadoc/org/apache/ibatis/abator/internal/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.internal.db"
href="html/reference/javadoc/org/apache/ibatis/abator/internal/db/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.internal.java"
href="html/reference/javadoc/org/apache/ibatis/abator/internal/java/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.internal.java.dao"
href="html/reference/javadoc/org/apache/ibatis/abator/internal/java/dao/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.internal.java.model"
href="html/reference/javadoc/org/apache/ibatis/abator/internal/java/model/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.internal.rules"
href="html/reference/javadoc/org/apache/ibatis/abator/internal/rules/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.internal.sqlmap"
href="html/reference/javadoc/org/apache/ibatis/abator/internal/sqlmap/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.internal.types"
href="html/reference/javadoc/org/apache/ibatis/abator/internal/types/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.internal.util"
href="html/reference/javadoc/org/apache/ibatis/abator/internal/util/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.internal.util.messages"
href="html/reference/javadoc/org/apache/ibatis/abator/internal/util/messages/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.ui"
href="html/reference/javadoc/org/apache/ibatis/abator/ui/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.ui.actions"
href="html/reference/javadoc/org/apache/ibatis/abator/ui/actions/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.ui.editors"
href="html/reference/javadoc/org/apache/ibatis/abator/ui/editors/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.ui.plugin"
href="html/reference/javadoc/org/apache/ibatis/abator/ui/plugin/package-summary.html"
/>
- <topic label="org.apache.ibatis.abator.ui.wizards"
href="html/reference/javadoc/org/apache/ibatis/abator/ui/wizards/package-summary.html"
/>
+ <topic label="Javadocs" href="html/javadoc/overview-summary.html">
+ <topic label="org.apache.ibatis.abator.ant"
href="html/javadoc/org/apache/ibatis/abator/ant/package-summary.html" />
+ <topic label="org.apache.ibatis.abator.api"
href="html/javadoc/org/apache/ibatis/abator/api/package-summary.html" />
+ <topic label="org.apache.ibatis.abator.api.dom"
href="html/javadoc/org/apache/ibatis/abator/api/dom/package-summary.html" />
+ <topic label="org.apache.ibatis.abator.api.dom.java"
href="html/javadoc/org/apache/ibatis/abator/api/dom/java/package-summary.html"
/>
+ <topic label="org.apache.ibatis.abator.api.dom.xml"
href="html/javadoc/org/apache/ibatis/abator/api/dom/xml/package-summary.html" />
+ <topic label="org.apache.ibatis.abator.config"
href="html/javadoc/org/apache/ibatis/abator/config/package-summary.html" />
+ <topic label="org.apache.ibatis.abator.config.xml"
href="html/javadoc/org/apache/ibatis/abator/config/xml/package-summary.html" />
+ <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"
/>
+ <topic label="org.apache.ibatis.abator.internal.sqlmap"
href="html/javadoc/org/apache/ibatis/abator/internal/sqlmap/package-summary.html"
/>
+ <topic label="org.apache.ibatis.abator.internal.types"
href="html/javadoc/org/apache/ibatis/abator/internal/types/package-summary.html"
/>
+ <topic label="org.apache.ibatis.abator.internal.util"
href="html/javadoc/org/apache/ibatis/abator/internal/util/package-summary.html"
/>
+ <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.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" />
+ <topic label="org.apache.ibatis.abator.ui.wizards"
href="html/javadoc/org/apache/ibatis/abator/ui/wizards/package-summary.html" />
</topic>
</toc>
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/build.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/build.properties?rev=422762&r1=422761&r2=422762&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/build.properties
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/build.properties
Mon Jul 17 10:01:21 2006
@@ -13,28 +13,8 @@
icons/,\
plugin.xml,\
LICENSE,\
- NOTICE,\
- antsrc/org/,\
- src/org/apache/ibatis/abator/ui/editors/,\
-
src/org/apache/ibatis/abator/ui/wizards/NewConfigFileWizard.java,\
-
src/org/apache/ibatis/abator/ui/wizards/NewConfigFileWizardPage1.java,\
- src/org/apache/ibatis/abator/ui/plugin/AbatorUIPlugin.java,\
-
src/org/apache/ibatis/abator/ui/plugin/EclipseProgressCallback.java,\
-
src/org/apache/ibatis/abator/ui/plugin/EclipseShellCallback.java,\
- src/org/apache/ibatis/abator/ui/plugin/JavaFileMerger.java,\
-
src/org/apache/ibatis/abator/ui/plugin/UnableToMergeException.java,\
-
src/org/apache/ibatis/abator/ui/actions/NewConfigFileAction.java,\
- src/org/apache/ibatis/abator/ui/actions/RunAbatorAction.java,\
- src/org/apache/ibatis/abator/ui/actions/RunAbatorThread.java,\
- src/org/apache/ibatis/abator/ui/AbatorHomeInitializer.java
+ NOTICE
bin.excludes = META-INF/.svn/,\
icons/.svn/
src.excludes = META-INF/.svn/,\
- icons/.svn/,\
- src/org/apache/ibatis/abator/ui/editors/.svn/,\
- antsrc/org/.svn/,\
- antsrc/org/apache/.svn/,\
- antsrc/org/apache/ibatis/.svn/,\
- antsrc/org/apache/ibatis/abator/.svn/,\
- antsrc/org/apache/ibatis/abator/ui/.svn/,\
- antsrc/org/apache/ibatis/abator/ui/ant/.svn/
+ icons/.svn/
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=422762&r1=422761&r2=422762&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
Mon Jul 17 10:01:21 2006
@@ -25,6 +25,7 @@
import org.apache.ibatis.abator.exception.ShellException;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.dom.AST;
@@ -180,6 +181,10 @@
}
public String getMergedSource() throws ShellException {
+ if (Platform.inDebugMode()) {
+ System.out.println("Starting Abator Java merge for file " +
generatedJavaFile.getFileName());
+ }
+
ASTParser astParser = ASTParser.newParser(AST.JLS3);
ICompilationUnit icu =
JavaCore.createCompilationUnitFrom(existingFile);
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=422762&r1=422761&r2=422762&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
Mon Jul 17 10:01:21 2006
@@ -232,7 +232,7 @@
id="org.apache.ibatis.abator.doc"
download-size="0"
install-size="0"
- version="0.6.5"/>
+ version="0.7.0"/>
<plugin
id="org.apache.ibatis.abator.ui"
