stephenh 2002/07/24 20:55:53
Modified: src/java/org/apache/torque/task TorqueJDBCTransformTask.java
Log:
Removed the app-data element from the generated schema.xml as brought up by Thomas
Wheeler on torque-user.
Revision Changes Path
1.11 +14 -13
jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java
Index: TorqueJDBCTransformTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TorqueJDBCTransformTask.java 19 Jun 2002 08:00:35 -0000 1.10
+++ TorqueJDBCTransformTask.java 25 Jul 2002 03:55:53 -0000 1.11
@@ -60,20 +60,21 @@
import java.sql.DatabaseMetaData;
import java.sql.DriverManager;
import java.sql.ResultSet;
-import java.sql.Types;
import java.sql.SQLException;
-import java.util.Hashtable;
-import java.util.List;
+import java.sql.Types;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Hashtable;
import java.util.Iterator;
-import org.apache.torque.engine.database.model.TypeMap;
+import java.util.List;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
+import org.apache.torque.engine.database.model.TypeMap;
import org.apache.xerces.dom.DocumentImpl;
import org.apache.xerces.dom.DocumentTypeImpl;
-import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.Method;
+import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -109,7 +110,8 @@
/** DOM document produced. */
protected DocumentImpl doc;
- protected Node database, appData;
+ /** The document root element. */
+ protected Node databaseNode;
/** Hashtable of columns that have primary keys. */
protected Hashtable primaryKeys;
@@ -181,7 +183,7 @@
System.err.println("password : " + dbPassword);
System.err.println("schema : " + dbSchema);
- DocumentTypeImpl docType = new DocumentTypeImpl(null, "app-data", null,
+ DocumentTypeImpl docType = new DocumentTypeImpl(null, "database", null,
"http://jakarta.apache.org/turbine/dtd/database.dtd";);
doc = new DocumentImpl(docType);
doc.appendChild(doc.createComment(" Autogenerated by JDBCToXMLSchema! "));
@@ -227,8 +229,7 @@
// The database map.
List tableList = getTableNames(dbMetaData);
- appData = doc.createElement("app-data");
- database = doc.createElement("database");
+ databaseNode = doc.createElement("database");
// Build a database-wide column -> table map.
columnTableMap = new Hashtable();
@@ -369,10 +370,10 @@
table.appendChild(fk);
}
- database.appendChild(table);
+ databaseNode.appendChild(table);
}
- appData.appendChild(database);
- doc.appendChild(appData);
+
+ doc.appendChild(databaseNode);
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
