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 2007/03/14 23:01:30 UTC
svn commit: r518348 - in
/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse:
org.apache.ibatis.abator.core/ org.apache.ibatis.abator.doc/
org.apache.ibatis.abator.ui/META-INF/
org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/content/ org...
Author: jgbutler
Date: Wed Mar 14 15:01:28 2007
New Revision: 518348
URL: http://svn.apache.org/viewvc?view=rev&rev=518348
Log:
Abator: Minor Changes to the Eclipse Plugin
Modified:
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/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/src/org/apache/ibatis/abator/ui/content/AbatorConfigVerifyer.java
ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/wizards/NewConfigFileWizard.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/plugin.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.core/plugin.xml?view=diff&rev=518348&r1=518347&r2=518348
==============================================================================
--- 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 Wed Mar 14 15:01:28 2007
@@ -3,7 +3,7 @@
<plugin
id="org.apache.ibatis.abator.core"
name="Abator for iBATIS"
- version="1.0.0"
+ version="1.0.1"
provider-name="ibatis.apache.org">
<runtime>
<library name="abator.jar">
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?view=diff&rev=518348&r1=518347&r2=518348
==============================================================================
--- 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 Wed Mar 14 15:01:28 2007
@@ -44,6 +44,7 @@
<topic href="core/htmldoc/usage/intro.html" label="Database Specific Information">
<topic href="core/htmldoc/usage/db2.html" label="DB2"/>
<topic href="core/htmldoc/usage/mysql.html" label="MySql"/>
+ <topic href="core/htmldoc/usage/oracle.html" label="Oracle"/>
</topic>
<topic href="core/htmldoc/reference/intro.html" label="Other Reference Information">
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?view=diff&rev=518348&r1=518347&r2=518348
==============================================================================
--- 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 Wed Mar 14 15:01:28 2007
@@ -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.0
+Bundle-Version: 1.0.1
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/src/org/apache/ibatis/abator/ui/content/AbatorConfigVerifyer.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/content/AbatorConfigVerifyer.java?view=diff&rev=518348&r1=518347&r2=518348
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/content/AbatorConfigVerifyer.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/content/AbatorConfigVerifyer.java Wed Mar 14 15:01:28 2007
@@ -16,7 +16,6 @@
package org.apache.ibatis.abator.ui.content;
-import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
@@ -82,7 +81,7 @@
}
}
- public InputSource resolveEntity(String publicId, String systemId) throws IOException, SAXException {
+ public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
if (!XmlConstants.ABATOR_CONFIG_PUBLIC_ID.equals(publicId)) {
throw new SAXException("Not an Abator configuration file");
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/wizards/NewConfigFileWizard.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/wizards/NewConfigFileWizard.java?view=diff&rev=518348&r1=518347&r2=518348
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/wizards/NewConfigFileWizard.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/wizards/NewConfigFileWizard.java Wed Mar 14 15:01:28 2007
@@ -20,6 +20,10 @@
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
+import org.apache.ibatis.abator.api.dom.xml.Attribute;
+import org.apache.ibatis.abator.api.dom.xml.Document;
+import org.apache.ibatis.abator.api.dom.xml.XmlElement;
+import org.apache.ibatis.abator.internal.sqlmap.XmlConstants;
import org.apache.ibatis.abator.ui.plugin.AbatorUIPlugin;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
@@ -157,61 +161,52 @@
*/
private InputStream openContentStream() {
- String lineSeparator = System.getProperty("line.separator"); //$NON-NLS-1$
- if (lineSeparator == null) {
- lineSeparator = "\n"; //$NON-NLS-1$
- }
-
- StringBuffer sb = new StringBuffer();
- sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append("<!DOCTYPE abatorConfiguration PUBLIC \"-//Apache Software Foundation//DTD Abator for iBATIS Configuration 1.0//EN\""); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(" \"http://ibatis.apache.org/dtd/abator-config_1_0.dtd\">"); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(lineSeparator);
- sb.append("<abatorConfiguration>"); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(" <abatorContext>"); //$NON-NLS-1$
-
- sb.append(" <!-- TODO: Add Database Connection Information -->"); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(" <jdbcConnection driverClass=\"???\""); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(" connectionURL=\"???\""); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(" userId=\"???\""); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(" password=\"???\">"); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(" <classPathEntry location=\"???\" />"); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(" </jdbcConnection>"); //$NON-NLS-1$
- sb.append(lineSeparator);
-
- sb.append(lineSeparator);
- sb.append(" <javaModelGenerator targetPackage=\"???\" targetProject=\"???\" />"); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(" <sqlMapGenerator targetPackage=\"???\" targetProject=\"???\" />"); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(" <daoGenerator type=\"IBATIS\" targetPackage=\"???\" targetProject=\"???\" />"); //$NON-NLS-1$
- sb.append(lineSeparator);
-
- sb.append(lineSeparator);
- sb.append(" <table schema=\"???\" tableName=\"???\">"); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(" <columnOverride column=\"???\" property=\"???\" />"); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append(" </table>"); //$NON-NLS-1$
- sb.append(lineSeparator);
-
- sb.append(lineSeparator);
- sb.append(" </abatorContext>"); //$NON-NLS-1$
- sb.append(lineSeparator);
- sb.append("</abatorConfiguration>"); //$NON-NLS-1$
- sb.append(lineSeparator);
-
- return new ByteArrayInputStream(sb.toString().getBytes());
+
+ Document document = new Document(XmlConstants.ABATOR_CONFIG_PUBLIC_ID,
+ XmlConstants.ABATOR_CONFIG_SYSTEM_ID);
+
+ XmlElement abatorConfiguration = new XmlElement("abatorConfiguration"); //$NON-NLS-1$
+ document.setRootElement(abatorConfiguration);
+
+ XmlElement abatorContext = new XmlElement("abatorContext"); //$NON-NLS-1$
+ abatorConfiguration.addElement(abatorContext);
+
+ XmlElement jdbcConnection = new XmlElement("jdbcConnection"); //$NON-NLS-1$
+ jdbcConnection.addAttribute(new Attribute("driverClass", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ jdbcConnection.addAttribute(new Attribute("connectionURL", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ jdbcConnection.addAttribute(new Attribute("userId", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ jdbcConnection.addAttribute(new Attribute("password", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ XmlElement classPathEntry = new XmlElement("classPathEntry"); //$NON-NLS-1$
+ classPathEntry.addAttribute(new Attribute("location", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ jdbcConnection.addElement(classPathEntry);
+ abatorContext.addElement(jdbcConnection);
+
+ XmlElement javaModelGenerator = new XmlElement("javaModelGenerator"); //$NON-NLS-1$
+ javaModelGenerator.addAttribute(new Attribute("targetPackage", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ javaModelGenerator.addAttribute(new Attribute("targetProject", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ abatorContext.addElement(javaModelGenerator);
+
+ XmlElement sqlMapGenerator = new XmlElement("sqlMapGenerator"); //$NON-NLS-1$
+ sqlMapGenerator.addAttribute(new Attribute("targetPackage", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ sqlMapGenerator.addAttribute(new Attribute("targetProject", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ abatorContext.addElement(sqlMapGenerator);
+
+ XmlElement daoGenerator = new XmlElement("daoGenerator"); //$NON-NLS-1$
+ daoGenerator.addAttribute(new Attribute("targetPackage", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ daoGenerator.addAttribute(new Attribute("targetProject", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ daoGenerator.addAttribute(new Attribute("type", "GENERIC-CI")); //$NON-NLS-1$ //$NON-NLS-2$
+ abatorContext.addElement(daoGenerator);
+
+ XmlElement table = new XmlElement("table"); //$NON-NLS-1$
+ table.addAttribute(new Attribute("schema", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ table.addAttribute(new Attribute("tableName", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ XmlElement columnOverride = new XmlElement("columnOverride"); //$NON-NLS-1$
+ columnOverride.addAttribute(new Attribute("column", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ columnOverride.addAttribute(new Attribute("property", "???")); //$NON-NLS-1$ //$NON-NLS-2$
+ table.addElement(columnOverride);
+ abatorContext.addElement(table);
+
+ return new ByteArrayInputStream(document.getFormattedContent().getBytes());
}
private void throwCoreException(String message) throws CoreException {
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?view=diff&rev=518348&r1=518347&r2=518348
==============================================================================
--- 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 Wed Mar 14 15:01:28 2007
@@ -2,7 +2,7 @@
<feature
id="org.apache.ibatis.abator"
label="Abator Code Generator for iBATIS"
- version="1.0.0"
+ version="1.0.1"
provider-name="ibatis.apache.org">
<install-handler/>
@@ -237,12 +237,12 @@
id="org.apache.ibatis.abator.ui"
download-size="0"
install-size="0"
- version="1.0.0"/>
+ version="1.0.1"/>
<plugin
id="org.apache.ibatis.abator.core"
download-size="0"
install-size="0"
- version="1.0.0"/>
+ version="1.0.1"/>
</feature>