Author: jgbutler Date: Sun Aug 20 15:13:53 2006 New Revision: 433064 URL: http://svn.apache.org/viewvc?rev=433064&view=rev Log: Final changes for Abator version 1.0.0
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/.project ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/org.apache.ibatis.abator_0.6.5.jar (with props) ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/org.apache.ibatis.abator_1.0.0.jar (with props) ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/index.html ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.core_0.6.5.jar (with props) ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.core_1.0.0.jar (with props) ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.doc_0.6.5.jar (with props) ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.doc_1.0.0.jar (with props) ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.ui_0.6.5.jar (with props) ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.ui_1.0.0.jar (with props) ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/site.xml ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/content/AbatorConfigVerifyer.java Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/ParserEntityResolver.java ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/XmlConstants.java 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.ui/src/org/apache/ibatis/abator/ui/content/AdapterFactory.java 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=433064&r1=433063&r2=433064&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 Sun Aug 20 15:13:53 2006 @@ -1,4 +1,4 @@ #Abator build version info -#Sat Aug 19 22:09:49 CDT 2006 +#Sun Aug 20 15:47:25 CDT 2006 version=1.0.0 -buildNum=237 +buildNum=238 Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/ParserEntityResolver.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/ParserEntityResolver.java?rev=433064&r1=433063&r2=433064&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/ParserEntityResolver.java (original) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/ParserEntityResolver.java Sun Aug 20 15:13:53 2006 @@ -18,6 +18,7 @@ import java.io.IOException; import java.io.InputStream; +import org.apache.ibatis.abator.internal.sqlmap.XmlConstants; import org.apache.ibatis.abator.internal.util.messages.Messages; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; @@ -43,7 +44,7 @@ */ public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { - if ("-//Apache Software Foundation//DTD Abator for iBATIS Configuration 1.0//EN".equals(publicId)) { //$NON-NLS-1$ + if (XmlConstants.ABATOR_CONFIG_PUBLIC_ID.equals(publicId)) { InputStream is = getClass() .getClassLoader() .getResourceAsStream( Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/XmlConstants.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/XmlConstants.java?rev=433064&r1=433063&r2=433064&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/XmlConstants.java (original) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/sqlmap/XmlConstants.java Sun Aug 20 15:13:53 2006 @@ -30,4 +30,6 @@ public static final String SQL_MAP_SYSTEM_ID = "http://ibatis.apache.org/dtd/sql-map-2.dtd"; //$NON-NLS-1$ public static final String SQL_MAP_PUBLIC_ID = "-//ibatis.apache.org//DTD SQL Map 2.0//EN"; //$NON-NLS-1$ + + public static final String ABATOR_CONFIG_PUBLIC_ID = "-//Apache Software Foundation//DTD Abator for iBATIS Configuration 1.0//EN"; //$NON-NLS-1$ } Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/.project URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/.project?rev=433064&view=auto ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/.project (added) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/.project Sun Aug 20 15:13:53 2006 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>AbatorUpdateSite</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.UpdateSiteBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.UpdateSiteNature</nature> + </natures> +</projectDescription> Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/org.apache.ibatis.abator_0.6.5.jar URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/org.apache.ibatis.abator_0.6.5.jar?rev=433064&view=auto ============================================================================== Binary file - no diff available. Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/org.apache.ibatis.abator_0.6.5.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/org.apache.ibatis.abator_1.0.0.jar URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/org.apache.ibatis.abator_1.0.0.jar?rev=433064&view=auto ============================================================================== Binary file - no diff available. Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/features/org.apache.ibatis.abator_1.0.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/index.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/index.html?rev=433064&view=auto ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/index.html (added) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/index.html Sun Aug 20 15:13:53 2006 @@ -0,0 +1,37 @@ +<?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"> + +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>Abator for Eclipse Update Site</title> +</head> +<body> +<h1>Abator for Eclipse Update Site</h1> +<p>This is the Abator for Eclipse update site. If you're not sure what Abator is, then +see this page <a href="http://ibatis.apache.org/abator.html"> +http://ibatis.apache.org/abator.html</a></p> +<p>If you've already installed a prior version of Abator for Eclipse, then simply run + the Eclipse Install/Update + tool and any new version will be found automatically.</p> +<p>If you've not already installed Abator, then you can use the built in Eclipse + install support by following these steps:</p> +<ol> + <li>Take the "Help>Software Updates>Find and Install" Menu Option</li> + <li>Select the "Search for new features to install" radio button, press "Next"</li> + <li>Press the "New Remote Site" button</li> + <li>Enter the following information: + <dl> + <dt>Name:</dt> + <dd>Abator for Eclipse Update Site</dd> + <dt>URL:</dt> + <dd>http://ibatis.apache.org/tools/abator</dd> + </dl> + </li> + <li>Press OK</li> + <li>Check the box next to "Abator for Eclipse Update Site"</li> + <li>Follow the remainder of the install wizard</li> +</ol> + +</body> +</html> Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.core_0.6.5.jar URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.core_0.6.5.jar?rev=433064&view=auto ============================================================================== Binary file - no diff available. Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.core_0.6.5.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.core_1.0.0.jar URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.core_1.0.0.jar?rev=433064&view=auto ============================================================================== Binary file - no diff available. Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.core_1.0.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.doc_0.6.5.jar URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.doc_0.6.5.jar?rev=433064&view=auto ============================================================================== Binary file - no diff available. Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.doc_0.6.5.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.doc_1.0.0.jar URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.doc_1.0.0.jar?rev=433064&view=auto ============================================================================== Binary file - no diff available. Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.doc_1.0.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.ui_0.6.5.jar URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.ui_0.6.5.jar?rev=433064&view=auto ============================================================================== Binary file - no diff available. Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.ui_0.6.5.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.ui_1.0.0.jar URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.ui_1.0.0.jar?rev=433064&view=auto ============================================================================== Binary file - no diff available. Propchange: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/plugins/org.apache.ibatis.abator.ui_1.0.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: 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=433064&view=auto ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/site.xml (added) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/AbatorUpdateSite/site.xml Sun Aug 20 15:13:53 2006 @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site> + <feature url="features/org.apache.ibatis.abator_0.6.5.jar" id="org.apache.ibatis.abator" version="0.6.5"> + <category name="Eclipse 3.0 Compatible Versions"/> + </feature> + <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> + <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. + </description> + </category-def> + <category-def name="Eclipse 3.0 Compatible Versions" label="Abator for Eclipse 3.0"> + <description> + Abator code generator for iBATIS. + </description> + </category-def> +</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=433064&r1=433063&r2=433064&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=433064&r1=433063&r2=433064&view=diff ============================================================================== Binary files - no diff available. Added: 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?rev=433064&view=auto ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/content/AbatorConfigVerifyer.java (added) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/content/AbatorConfigVerifyer.java Sun Aug 20 15:13:53 2006 @@ -0,0 +1,94 @@ +/* + * Copyright 2006 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 + * + * 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. + */ + +package org.apache.ibatis.abator.ui.content; + +import java.io.IOException; +import java.io.InputStream; +import java.io.StringReader; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import org.apache.ibatis.abator.internal.sqlmap.XmlConstants; +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + +/** + * This class does an elemental SAX parse to see if the given input + * stream represents an Abator configuration file. The tests performed include: + * + * <ul> + * <li>Ensuring that the public ID is correct</li> + * <li>Ensuring that the root element is abatorConfiguration</li> + * </ul> + * + * @author Jeff Butler + * + */ +public class AbatorConfigVerifyer extends DefaultHandler { + private InputStream inputStream; + private boolean isAbatorConfig; + private boolean rootElementRead; + + /** + * + */ + public AbatorConfigVerifyer(InputStream inputStream) { + super(); + this.inputStream = inputStream; + } + + public boolean isAbatorConfigFile() { + try { + SAXParserFactory factory = SAXParserFactory.newInstance(); + factory.setValidating(false); + SAXParser parser = factory.newSAXParser(); + + parser.parse(inputStream, this); + } catch (Exception e) { + // ignore + ; + } + + return isAbatorConfig; + } + + public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + if (rootElementRead) { + throw new SAXException("Root element was not abatorConfiguration"); + } + + rootElementRead = true; + + if ("abatorConfiguration".equals(qName)) { + isAbatorConfig = true; + throw new SAXException("Ignore the rest of the file"); + } + } + + public InputSource resolveEntity(String publicId, String systemId) throws IOException, SAXException { + if (!XmlConstants.ABATOR_CONFIG_PUBLIC_ID.equals(publicId)) { + throw new SAXException("Not an Abator configuration file"); + } + + // return a null InpputSource - we don't want to go to the Internet + StringReader nullStringReader = new StringReader(""); + return new InputSource(nullStringReader); + } +} Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/content/AdapterFactory.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/AdapterFactory.java?rev=433064&r1=433063&r2=433064&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/content/AdapterFactory.java (original) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/eclipse/org.apache.ibatis.abator.ui/src/org/apache/ibatis/abator/ui/content/AdapterFactory.java Sun Aug 20 15:13:53 2006 @@ -52,7 +52,6 @@ } private boolean isAbatorConfigurationFile(IFile file) { - // TODO - a SAX parse might be more efficient here??? String fileName = file.getName(); if (fileName.length() > 4) { String extension = fileName.substring(fileName.length() - 4); @@ -69,35 +68,18 @@ } catch (CoreException e) { return false; } - - byte[] contents = new byte[1024]; - StringBuffer sb = new StringBuffer(); - + + AbatorConfigVerifyer verifyer = new AbatorConfigVerifyer(is); + + boolean rc = verifyer.isAbatorConfigFile(); + try { - int bytesRead; - do { - bytesRead = is.read(contents); - if (bytesRead > 0) { - sb.append(new String(contents, 0, bytesRead)); - } - } while (bytesRead == contents.length); + is.close(); } catch (IOException e) { - return false; - } finally { - try { - is.close(); - } catch (IOException e) { - // ignore - ; - } + // ignore + ; } - - String s = sb.toString(); - if (s.indexOf("<abatorConfiguration") == -1) { //$NON-NLS-1$ - return false; - } else { - return true; - } + return rc; } }