jvanzyl 01/10/31 18:21:40
Modified: src/java/org/apache/torque/task TorqueDataModelTask.java
TorqueSQLExec.java
Log:
- fixing the package name on the torque insert sql task.
- cleaning up the datamodel, fixing little typo with the grokName
when using filesets.
Revision Changes Path
1.8 +4 -7
jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueDataModelTask.java
Index: TorqueDataModelTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueDataModelTask.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TorqueDataModelTask.java 2001/11/01 00:39:49 1.7
+++ TorqueDataModelTask.java 2001/11/01 02:21:40 1.8
@@ -224,7 +224,6 @@
xmlParser = new XmlToAppData();
AppData ad = xmlParser.parseFile(xmlFile);
xmlParser.parseFile(xmlFile);
-
ad.setName(grokName(xmlFile));
dataModels.addElement(ad);
}
@@ -242,13 +241,11 @@
// Make a transaction for each file
for (int j = 0; j < dataModelFiles.length; j++)
{
+ File f = new File(srcDir, dataModelFiles[j]);
xmlParser = new XmlToAppData();
- AppData ad = xmlParser.parseFile(
- new File(srcDir, dataModelFiles[j]).toString());
- xmlParser.parseFile(
- new File(srcDir, dataModelFiles[j]).toString());
-
- ad.setName(grokName(xmlFile));
+ AppData ad = xmlParser.parseFile(f.toString());
+ xmlParser.parseFile(f.toString());
+ ad.setName(grokName(f.toString()));
dataModels.addElement(ad);
}
}
1.2 +1 -1
jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueSQLExec.java
Index: TorqueSQLExec.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueSQLExec.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TorqueSQLExec.java 2001/10/29 15:10:40 1.1
+++ TorqueSQLExec.java 2001/11/01 02:21:40 1.2
@@ -1,4 +1,4 @@
-package org.apache.tdk.task;
+package org.apache.torque.task;
/*
* The Apache Software License, Version 1.1
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
