Author: jgbutler
Date: Fri Feb 19 21:00:19 2010
New Revision: 911981
URL: http://svn.apache.org/viewvc?rev=911981&view=rev
Log:
[Ibator] Updates to the Eclipse Plugin for Ibator 1.2.2
Added:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-core-1.2.2-SNAPSHOT-sources.jar
(with props)
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-core-1.2.2-SNAPSHOT.jar
(with props)
Removed:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/buildIbator.xml
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-src.zip
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator.jar
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.classpath
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/buildDoc.xml
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/importWizard.gif
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_javadoc.xml
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/IbatorConfigVerifyer.java
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/wizards/NewConfigFileWizard.java
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.classpath
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.classpath?rev=911981&r1=911980&r2=911981&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.classpath
(original)
+++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.classpath
Fri Feb 19 21:00:19 2010
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry exported="true" kind="lib"
path="ibator-core-1.2.2-SNAPSHOT.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry exported="true" kind="lib" path="ibator.jar"
sourcepath="ibator-src.zip"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF?rev=911981&r1=911980&r2=911981&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF
(original)
+++
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF
Fri Feb 19 21:00:19 2010
@@ -3,7 +3,7 @@
Bundle-Name: Ibator Core Plug-in
Bundle-SymbolicName: org.apache.ibatis.ibator.core
Bundle-Version: 1.2.2
-Bundle-ClassPath: ibator.jar
+Bundle-ClassPath: ibator-core-1.2.2-SNAPSHOT.jar
Export-Package: org.apache.ibatis.ibator.ant,
org.apache.ibatis.ibator.api,
org.apache.ibatis.ibator.api.dom,
@@ -20,6 +20,12 @@
org.apache.ibatis.ibator.generator.ibatis2.model,
org.apache.ibatis.ibator.generator.ibatis2.sqlmap,
org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements,
+ org.apache.ibatis.ibator.generator.ibatis3,
+ org.apache.ibatis.ibator.generator.ibatis3.javamapper,
+ org.apache.ibatis.ibator.generator.ibatis3.javamapper.elements,
+ org.apache.ibatis.ibator.generator.ibatis3.model,
+ org.apache.ibatis.ibator.generator.ibatis3.xmlmapper,
+ org.apache.ibatis.ibator.generator.ibatis3.xmlmapper.elements,
org.apache.ibatis.ibator.internal,
org.apache.ibatis.ibator.internal.db,
org.apache.ibatis.ibator.internal.rules,
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties?rev=911981&r1=911980&r2=911981&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties
(original)
+++
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties
Fri Feb 19 21:00:19 2010
@@ -1,5 +1,5 @@
bin.includes = META-INF/,\
- ibator.jar,\
LICENSE,\
NOTICE,\
- ibator-src.zip
+ ibator-core-1.2.2-SNAPSHOT.jar,\
+ ibator-core-1.2.2-SNAPSHOT-sources.jar
Added:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-core-1.2.2-SNAPSHOT-sources.jar
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-core-1.2.2-SNAPSHOT-sources.jar?rev=911981&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-core-1.2.2-SNAPSHOT-sources.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-core-1.2.2-SNAPSHOT.jar
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-core-1.2.2-SNAPSHOT.jar?rev=911981&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-core-1.2.2-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/buildDoc.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/buildDoc.xml?rev=911981&r1=911980&r2=911981&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/buildDoc.xml
(original)
+++
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/buildDoc.xml
Fri Feb 19 21:00:19 2010
@@ -24,14 +24,14 @@
use="true"
version="true"
classpathref="org.abache.ibatis.ibator.doc.javadocclasspath">
- <packageset dir="../../core/src" />
+ <packageset dir="../../core/ibator-core/src/main/java" />
<packageset dir="../org.apache.ibatis.ibator.eclipse.core/src" />
<packageset dir="../org.apache.ibatis.ibator.eclipse.ui/src" />
<packageset dir="../org.apache.ibatis.ibator.eclipse.ui/antsrc" />
</javadoc>
<copy todir="html/ibatordoc">
- <fileset dir="../../core/htmldoc">
+ <fileset dir="../../core/ibator-core/doc/html">
<exclude name="ibator.css"/>
</fileset>
<fileset dir="html-src/ibatordoc">
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html?rev=911981&r1=911980&r2=911981&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html
(original)
+++
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html
Fri Feb 19 21:00:19 2010
@@ -57,16 +57,15 @@
latest source
in the Subversion repository. We assume that you are somewhat familiar with
Subversion
and the Eclipse plug-in development environment (PDE). These instructions
also assume
-you are using Eclipse version 3.4.1. The plug-in
-code is not supported in versions of Eclipse prior to version 3.4.1.</p>
+you are using Eclipse version 3.5.1.</p>
<ol>
<li>Checkout the latest source code from Subversion
<ol type="a">
<li>Create a local directory where the source will be stored (for example
- /Ibator/source)</li>
+ /Apache/Ibator)</li>
<li>Check out the source tree from the Subversion repository at
- <a
href="http://svn.apache.org/repos/asf/ibatis/trunk/java/tools/ibator/";>
- http://svn.apache.org/repos/asf/ibatis/trunk/java/tools/ibator/</a>
+ <a href="http://svn.apache.org/repos/asf/ibatis/java/ibator/trunk/";>
+ http://svn.apache.org/repos/asf/ibatis/java/ibator/trunk/</a>
<b>Note:</b> this will also checkout the source for the Ibator core
JAR.</li>
</ol>
</li>
@@ -81,9 +80,12 @@
(File>Import>General>Existing Projects into Workspace)
</li>
<li>Set the root directory to the "eclipse" sub-directory of the
directory where
- you did the SVN checkout (for example, /Ibator/source/eclipse)</li>
+ you did the SVN checkout (for example, /Apache/Ibator/eclipse)</li>
<li>Select the five projects under the directory, do not copy the
projects into
- your workspace. The filled out wizard looks like this: <br />
+ your workspace. Note that there is one other project - the Ibator
Update Site
+ project. You do not need to import this project unless you want to
build a
+ local copy of the Eclipse Update site for Ibator.
+ The filled out wizard looks like this: <br />
<p><img src="importWizard.gif" alt="Eclipse Project Import
Wizard"/></p>
</li>
<li>Press "Finish", wait for the workspace to build.</li>
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/importWizard.gif
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/importWizard.gif?rev=911981&r1=911980&r2=911981&view=diff
==============================================================================
Binary files - no diff available.
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_javadoc.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_javadoc.xml?rev=911981&r1=911980&r2=911981&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_javadoc.xml
(original)
+++
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_javadoc.xml
Fri Feb 19 21:00:19 2010
@@ -19,6 +19,12 @@
<topic
href="html/javadoc/org/apache/ibatis/ibator/generator/ibatis2/model/package-summary.html"
label="org.apache.ibatis.ibator.generator.ibatis2.model" />
<topic
href="html/javadoc/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/package-summary.html"
label="org.apache.ibatis.ibator.generator.ibatis2.sqlmap" />
<topic
href="html/javadoc/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/package-summary.html"
label="org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements" />
+ <topic
href="html/javadoc/org/apache/ibatis/ibator/generator/ibatis3/package-summary.html"
label="org.apache.ibatis.ibator.generator.ibatis3" />
+ <topic
href="html/javadoc/org/apache/ibatis/ibator/generator/ibatis3/javamapper/package-summary.html"
label="org.apache.ibatis.ibator.generator.ibatis3.javamapper" />
+ <topic
href="html/javadoc/org/apache/ibatis/ibator/generator/ibatis3/javamapper/elements/package-summary.html"
label="org.apache.ibatis.ibator.generator.ibatis3.javamapper.elements" />
+ <topic
href="html/javadoc/org/apache/ibatis/ibator/generator/ibatis3/model/package-summary.html"
label="org.apache.ibatis.ibator.generator.ibatis3.model" />
+ <topic
href="html/javadoc/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/package-summary.html"
label="org.apache.ibatis.ibator.generator.ibatis3.xmlmapper" />
+ <topic
href="html/javadoc/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/package-summary.html"
label="org.apache.ibatis.ibator.generator.ibatis3.xmlmapper.elements" />
<topic
href="html/javadoc/org/apache/ibatis/ibator/internal/package-summary.html"
label="org.apache.ibatis.ibator.internal" />
<topic
href="html/javadoc/org/apache/ibatis/ibator/internal/db/package-summary.html"
label="org.apache.ibatis.ibator.internal.db" />
<topic
href="html/javadoc/org/apache/ibatis/ibator/internal/rules/package-summary.html"
label="org.apache.ibatis.ibator.internal.rules" />
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/IbatorConfigVerifyer.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/IbatorConfigVerifyer.java?rev=911981&r1=911980&r2=911981&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/IbatorConfigVerifyer.java
(original)
+++
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/IbatorConfigVerifyer.java
Fri Feb 19 21:00:19 2010
@@ -22,7 +22,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.ibatis.ibator.generator.ibatis2.XmlConstants;
+import org.apache.ibatis.ibator.generator.XmlConstants;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/wizards/NewConfigFileWizard.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/wizards/NewConfigFileWizard.java?rev=911981&r1=911980&r2=911981&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/wizards/NewConfigFileWizard.java
(original)
+++
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/wizards/NewConfigFileWizard.java
Fri Feb 19 21:00:19 2010
@@ -24,7 +24,7 @@
import org.apache.ibatis.ibator.api.dom.xml.Document;
import org.apache.ibatis.ibator.api.dom.xml.XmlElement;
import org.apache.ibatis.ibator.eclipse.ui.IbatorUIPlugin;
-import org.apache.ibatis.ibator.generator.ibatis2.XmlConstants;
+import org.apache.ibatis.ibator.generator.XmlConstants;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml?rev=911981&r1=911980&r2=911981&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml
(original)
+++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml Fri
Feb 19 21:00:19 2010
@@ -21,30 +21,9 @@
<update label="%updateSiteName"
url="http://ibatis.apache.org/tools/ibator/"/>
</url>
- <plugin
- id="org.apache.ibatis.ibator.core"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.apache.ibatis.ibator.eclipse.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.ibatis.ibator.eclipse.doc"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.ibatis.ibator.eclipse.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
+ <plugin id="org.apache.ibatis.ibator.core" version="0.0.0"/>
+ <plugin id="org.apache.ibatis.ibator.eclipse.core" version="0.0.0"
unpack="false"/>
+ <plugin id="org.apache.ibatis.ibator.eclipse.doc" version="0.0.0"
unpack="false"/>
+ <plugin id="org.apache.ibatis.ibator.eclipse.ui" version="0.0.0"/>
</feature>
