Index: build-torque.xml
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-2/build-torque.xml,v
retrieving revision 1.1
diff -u -r1.1 build-torque.xml
--- build-torque.xml	4 Jan 2002 12:53:24 -0000	1.1
+++ build-torque.xml	25 Feb 2002 19:14:15 -0000
@@ -17,16 +17,11 @@
     <mkdir dir="${torque.dir}"/>
     <mkdir dir="${torque.dir}/lib"/>
 
-    <copy todir="${torque.dir}/lib">
-      <fileset dir=".">
-        <include name="ant-*.jar"/>
-      </fileset>
-      <fileset dir="lib">
-        <include name="xerces-*.jar"/>
-        <include name="velocity-*.jar"/>
-        <include name="village-*.jar"/>
-      </fileset>
-    </copy>
+    <copy file="${velocity.jar}" todir="${torque.dir}/lib"/>
+    <copy file="${village.jar}" todir="${torque.dir}/lib"/>
+    <copy file="${commons-collections.jar}" todir="${torque.dir}/lib"/>
+    <copy file="${stratum.jar}" todir="${torque.dir}/lib"/>
+    <copy file="${log4j.jar}" todir="${torque.dir}/lib"/>
 
     <filter token="TORQUE_HOME" value="."/>
     <filter token="JARS" value="lib/*.jar"/>
Index: src/java/org/apache/turbine/torque/engine/database/model/AppData.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/AppData.java,v
retrieving revision 1.3
diff -u -r1.3 AppData.java
--- src/java/org/apache/turbine/torque/engine/database/model/AppData.java	16 Feb 2002 19:40:37 -0000	1.3
+++ src/java/org/apache/turbine/torque/engine/database/model/AppData.java	25 Feb 2002 19:14:15 -0000
@@ -54,10 +54,11 @@
  * <http://www.apache.org/>.
  */
 
+import org.xml.sax.AttributeList;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.xml.sax.Attributes;
 
 /**
  * A class for holding application data structures.
@@ -132,7 +133,7 @@
      * An utility method to add a new database from
      * an xml attribute.
      */
-    public Database addDatabase(Attributes attrib)
+    public Database addDatabase(AttributeList attrib)
     {
         Database db = new Database();
         db.loadFromXML (attrib);
Index: src/java/org/apache/turbine/torque/engine/database/model/Column.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Column.java,v
retrieving revision 1.3
diff -u -r1.3 Column.java
--- src/java/org/apache/turbine/torque/engine/database/model/Column.java	16 Feb 2002 19:40:37 -0000	1.3
+++ src/java/org/apache/turbine/torque/engine/database/model/Column.java	25 Feb 2002 19:14:15 -0000
@@ -54,14 +54,11 @@
  * <http://www.apache.org/>.
  */
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.List;
-
 import org.apache.velocity.util.StringUtils;
+import org.xml.sax.AttributeList;
 
-import org.xml.sax.Attributes;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A Class for holding data about a column used in an Application.
@@ -119,7 +116,7 @@
     /**
      * Imports a column from an XML specification
      */
-    public void loadFromXML (Attributes attrib)
+    public void loadFromXML (AttributeList attrib)
     {
         //Name
         name = attrib.getValue("name");
@@ -255,7 +252,7 @@
      * A utility function to create a new column
      * from attrib and add it to this table.
      */
-    public Inheritance addInheritance(Attributes attrib)
+    public Inheritance addInheritance(AttributeList attrib)
     {
         Inheritance inh = new Inheritance();
         inh.loadFromXML (attrib);
Index: src/java/org/apache/turbine/torque/engine/database/model/Database.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Database.java,v
retrieving revision 1.2
diff -u -r1.2 Database.java
--- src/java/org/apache/turbine/torque/engine/database/model/Database.java	16 Feb 2002 19:40:37 -0000	1.2
+++ src/java/org/apache/turbine/torque/engine/database/model/Database.java	25 Feb 2002 19:14:15 -0000
@@ -54,12 +54,13 @@
  * <http://www.apache.org/>.
  */
 
+import org.apache.turbine.services.db.TurbineDB;
+import org.xml.sax.AttributeList;
+
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.turbine.services.db.TurbineDB;
-import org.xml.sax.Attributes;
 
 /**
  * A class for holding application data structures.
@@ -93,7 +94,7 @@
     /**
      * Load the database object from an xml tag.
      */
-    public void loadFromXML (Attributes attrib)
+    public void loadFromXML (AttributeList attrib)
     {
         name = attrib.getValue("name");
         if ( name == null )
@@ -238,7 +239,7 @@
      * An utility method to add a new table from
      * an xml attribute.
      */
-    public Table addTable(Attributes attrib)
+    public Table addTable(AttributeList attrib)
     {
         Table tbl = new Table();
         tbl.loadFromXML (attrib, this.getDefaultIdMethod());
Index: src/java/org/apache/turbine/torque/engine/database/model/ForeignKey.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/ForeignKey.java,v
retrieving revision 1.2
diff -u -r1.2 ForeignKey.java
--- src/java/org/apache/turbine/torque/engine/database/model/ForeignKey.java	16 Feb 2002 19:40:37 -0000	1.2
+++ src/java/org/apache/turbine/torque/engine/database/model/ForeignKey.java	25 Feb 2002 19:14:16 -0000
@@ -54,10 +54,11 @@
  * <http://www.apache.org/>.
  */
 
+import org.xml.sax.AttributeList;
+
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
-import org.xml.sax.Attributes;
 
 /**
  * A Class for information about foreign keys of a table
@@ -83,7 +84,7 @@
     /**
      * Imports foreign key from an XML specification
      */
-    public void loadFromXML (Attributes attrib)
+    public void loadFromXML (AttributeList attrib)
     {
         foreignTableName = attrib.getValue("foreignTable");
     }
@@ -132,7 +133,7 @@
     /**
      *  adds a new reference entry to the foreign key
      */
-    public void addReference(Attributes attrib)
+    public void addReference(AttributeList attrib)
     {
         addReference(attrib.getValue("local"), attrib.getValue("foreign"));
     }
Index: src/java/org/apache/turbine/torque/engine/database/model/IdMethodParameter.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/IdMethodParameter.java,v
retrieving revision 1.2
diff -u -r1.2 IdMethodParameter.java
--- src/java/org/apache/turbine/torque/engine/database/model/IdMethodParameter.java	16 Feb 2002 19:40:37 -0000	1.2
+++ src/java/org/apache/turbine/torque/engine/database/model/IdMethodParameter.java	25 Feb 2002 19:14:16 -0000
@@ -54,7 +54,7 @@
  * <http://www.apache.org/>.
  */
 
-import org.xml.sax.Attributes;
+import org.xml.sax.AttributeList;
 
 /**
  * Information related to an ID method.
@@ -73,7 +73,7 @@
     /**
      * Imports foreign key from an XML specification
      */
-    public void loadFromXML (Attributes attrib)
+    public void loadFromXML (AttributeList attrib)
     {
         name = attrib.getValue("name");
         value = attrib.getValue("value");
Index: src/java/org/apache/turbine/torque/engine/database/model/Index.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Index.java,v
retrieving revision 1.2
diff -u -r1.2 Index.java
--- src/java/org/apache/turbine/torque/engine/database/model/Index.java	16 Feb 2002 19:40:37 -0000	1.2
+++ src/java/org/apache/turbine/torque/engine/database/model/Index.java	25 Feb 2002 19:14:16 -0000
@@ -54,9 +54,10 @@
  * <http://www.apache.org/>.
  */
 
+import org.xml.sax.AttributeList;
+
 import java.util.ArrayList;
 import java.util.List;
-import org.xml.sax.Attributes;
 
 /**
  * A Class for information about indices of a table
@@ -82,7 +83,7 @@
     /**
      * Imports index from an XML specification
      */
-    public void loadFromXML (Attributes attrib)
+    public void loadFromXML (AttributeList attrib)
     {
         indexName     = attrib.getValue("name");
         String unique = attrib.getValue("unique");
@@ -142,7 +143,7 @@
     /**
      *  adds a new column to an index
      */
-    public void addColumn(Attributes attrib)
+    public void addColumn(AttributeList attrib)
     {
         indexColumns.add(attrib.getValue("name"));
     }
Index: src/java/org/apache/turbine/torque/engine/database/model/Inheritance.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Inheritance.java,v
retrieving revision 1.2
diff -u -r1.2 Inheritance.java
--- src/java/org/apache/turbine/torque/engine/database/model/Inheritance.java	16 Feb 2002 19:40:37 -0000	1.2
+++ src/java/org/apache/turbine/torque/engine/database/model/Inheritance.java	25 Feb 2002 19:14:16 -0000
@@ -54,7 +54,7 @@
  * <http://www.apache.org/>.
  */
 
-import org.xml.sax.Attributes;
+import org.xml.sax.AttributeList;
 
 /**
  * A Class for information regarding possible objects representing a table
@@ -80,7 +80,7 @@
     /**
      * Imports foreign key from an XML specification
      */
-    public void loadFromXML (Attributes attrib)
+    public void loadFromXML (AttributeList attrib)
     {
         setKey(attrib.getValue("key"));
         setClassName(attrib.getValue("class"));
Index: src/java/org/apache/turbine/torque/engine/database/model/Table.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Table.java,v
retrieving revision 1.5
diff -u -r1.5 Table.java
--- src/java/org/apache/turbine/torque/engine/database/model/Table.java	16 Feb 2002 19:40:37 -0000	1.5
+++ src/java/org/apache/turbine/torque/engine/database/model/Table.java	25 Feb 2002 19:14:16 -0000
@@ -54,14 +54,14 @@
  * <http://www.apache.org/>.
  */
 
+import org.apache.turbine.util.db.map.IDMethod;
+import org.apache.velocity.util.StringUtils;
+import org.xml.sax.AttributeList;
+
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.velocity.util.StringUtils;
-import org.xml.sax.Attributes;
-
-import org.apache.turbine.util.db.map.IDMethod;
 
 /**
  * Data about a table used in an application.
@@ -124,7 +124,7 @@
     /**
      * Load the table object from an xml tag.
      */
-    public void loadFromXML (Attributes attrib, String defaultIdMethod)
+    public void loadFromXML (AttributeList attrib, String defaultIdMethod)
     {
         name = attrib.getValue("name");
         javaName = attrib.getValue("javaName");
@@ -213,7 +213,7 @@
      * A utility function to create a new column
      * from attrib and add it to this table.
      */
-    public Column addColumn(Attributes attrib)
+    public Column addColumn(AttributeList attrib)
     {
         Column col = new Column();
         col.loadFromXML (attrib);
@@ -242,7 +242,7 @@
      * A utility function to create a new foreign key
      * from attrib and add it to this table.
      */
-    public ForeignKey addForeignKey(Attributes attrib)
+    public ForeignKey addForeignKey(AttributeList attrib)
     {
         ForeignKey fk = new ForeignKey();
         fk.loadFromXML (attrib);
@@ -347,7 +347,7 @@
      * A utility function to create a new id method parameter
      * from attrib and add it to this table.
      */
-    public IdMethodParameter addIdMethodParameter(Attributes attrib)
+    public IdMethodParameter addIdMethodParameter(AttributeList attrib)
     {
         IdMethodParameter imp = new IdMethodParameter();
         imp.loadFromXML (attrib);
@@ -386,7 +386,7 @@
      * A utility function to create a new index
      * from attrib and add it to this table.
      */
-    public Index addIndex(Attributes attrib)
+    public Index addIndex(AttributeList attrib)
     {
         Index index = new Index();
         index.loadFromXML (attrib);
@@ -408,7 +408,7 @@
      * A utility function to create a new Unique
      * from attrib and add it to this table.
      */
-    public Unique addUnique(Attributes attrib)
+    public Unique addUnique(AttributeList attrib)
     {
         Unique unique = new Unique();
         unique.loadFromXML (attrib);
Index: src/java/org/apache/turbine/torque/engine/database/model/Unique.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Unique.java,v
retrieving revision 1.3
diff -u -r1.3 Unique.java
--- src/java/org/apache/turbine/torque/engine/database/model/Unique.java	16 Feb 2002 19:40:37 -0000	1.3
+++ src/java/org/apache/turbine/torque/engine/database/model/Unique.java	25 Feb 2002 19:14:16 -0000
@@ -54,9 +54,10 @@
  * <http://www.apache.org/>.
  */
 
+import org.xml.sax.AttributeList;
+
 import java.util.ArrayList;
 import java.util.List;
-import org.xml.sax.Attributes;
 
 /**
  * A Class for information about unique indices of a table
@@ -114,7 +115,7 @@
     /**
      *  adds a new column to an index
      */
-    public void addColumn(Attributes attrib)
+    public void addColumn(AttributeList attrib)
     {
         indexColumns.add(attrib.getValue("name"));
     }
@@ -168,7 +169,7 @@
     /**
      * Imports a column from an XML specification
      */
-    public void loadFromXML (Attributes attrib)
+    public void loadFromXML (AttributeList attrib)
     {
         indexName = attrib.getValue("name");
     }
Index: src/java/org/apache/turbine/torque/engine/database/transform/XmlToAppData.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/transform/XmlToAppData.java,v
retrieving revision 1.3
diff -u -r1.3 XmlToAppData.java
--- src/java/org/apache/turbine/torque/engine/database/transform/XmlToAppData.java	16 Feb 2002 19:40:37 -0000	1.3
+++ src/java/org/apache/turbine/torque/engine/database/transform/XmlToAppData.java	25 Feb 2002 19:14:16 -0000
@@ -54,30 +54,15 @@
  * <http://www.apache.org/>.
  */
 
+import org.apache.turbine.services.db.TurbineDB;
+import org.apache.turbine.torque.engine.database.model.*;
+import org.xml.sax.*;
+import org.xml.sax.helpers.DefaultHandler;
+
+import javax.xml.parsers.SAXParserFactory;
 import java.io.BufferedReader;
 import java.io.FileReader;
-import java.io.PrintStream;
-import java.io.Reader;
 import java.util.List;
-import org.apache.turbine.services.db.TurbineDB;
-import org.apache.turbine.torque.engine.database.model.AppData;
-import org.apache.turbine.torque.engine.database.model.Column;
-import org.apache.turbine.torque.engine.database.model.Database;
-import org.apache.turbine.torque.engine.database.model.ForeignKey;
-import org.apache.turbine.torque.engine.database.model.IdMethodParameter;
-import org.apache.turbine.torque.engine.database.model.Index;
-import org.apache.turbine.torque.engine.database.model.Inheritance;
-import org.apache.turbine.torque.engine.database.model.Table;
-import org.apache.turbine.torque.engine.database.model.Unique;
-import org.apache.xerces.parsers.SAXParser;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
 
 /**
  * A Class that is used to parse an input
@@ -90,7 +75,7 @@
  * @version $Id: XmlToAppData.java,v 1.3 2002/02/16 19:40:37 mpoeschl Exp $
  * @deprecated use turbine-torque
  */
-public class XmlToAppData extends DefaultHandler
+public class XmlToAppData extends DefaultHandler implements DocumentHandler
 {
     private AppData app;
     private Database currDB;
@@ -128,19 +113,14 @@
                 app = new AppData();
             }
 
-            SAXParser parser = new SAXParser();
+            Parser parser = SAXParserFactory.newInstance().newSAXParser().getParser();
 
             // set the Resolver for the database DTD
             DTDResolver dtdResolver = new DTDResolver();
             parser.setEntityResolver(dtdResolver);
 
             // We don't use an external content handler - we use this object
-            parser.setContentHandler(this);
-
-            // Validate the input file
-            parser.setFeature
-                ("http://apache.org/xml/features/validation/dynamic", true);
-            parser.setFeature("http://xml.org/sax/features/validation", true);
+            parser.setDocumentHandler(this);
 
             parser.setErrorHandler(this);
 
@@ -171,13 +151,16 @@
         return app;
     }
 
-
+    public void endElement(String s) throws SAXException
+    {
+        // nothing to do
+    }
 
     /**
      * Handles opening elements of the xml file.
      */
-    public void startElement(String uri, String localName, String rawName,
-                             Attributes attributes)
+    public void startElement(String rawName,
+                             AttributeList attributes)
     {
         try
         {