jvanzyl 01/10/31 16:39:49
Modified: src/java/org/apache/torque/task TorqueDataModelTask.java
TorqueSQLTask.java
Log:
- resolve the sqldbmap properly using project.resolveFile(file) so that
the datamodel task can be called via <ant> in another build file
and not kak.
Revision Changes Path
1.7 +7 -1
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TorqueDataModelTask.java 2001/10/30 08:21:21 1.6
+++ TorqueDataModelTask.java 2001/11/01 00:39:49 1.7
@@ -117,6 +117,11 @@
*/
protected Hashtable databaseNames;
+ //!! This is probably a crappy idea having the sql file -> db map
+ // here. I can't remember why I put it here at the moment ...
+ // maybe I was going to map something else. It can probably
+ // move into the SQL task.
+
/**
* Name of the properties file that maps an SQL file
* to a particular database.
@@ -130,7 +135,8 @@
*/
public void setSqlDbMap(String sqldbmap)
{
- this.sqldbmap = sqldbmap;
+ //!! Make all these references files not strings.
+ this.sqldbmap = project.resolveFile(sqldbmap).toString();
}
/**
1.8 +1 -3
jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueSQLTask.java
Index: TorqueSQLTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueSQLTask.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TorqueSQLTask.java 2001/10/27 19:04:38 1.7
+++ TorqueSQLTask.java 2001/11/01 00:39:49 1.8
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: TorqueSQLTask.java,v 1.7 2001/10/27 19:04:38 jvanzyl Exp $
+ * @version $Id: TorqueSQLTask.java,v 1.8 2001/11/01 00:39:49 jvanzyl Exp $
*/
public class TorqueSQLTask
extends TorqueDataModelTask
@@ -107,8 +107,6 @@
{
return suffix;
}
-
-
/**
* Get the current target package.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
