dlr 01/08/22 13:10:03
Modified: src/java/org/apache/torque/task TorqueSQLTask.java
Log:
Call the XmlToAppData ctor with the new params (so that database
type-specific properties file can be located).
Revision Changes Path
1.4 +13 -11
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.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- TorqueSQLTask.java 2001/08/21 01:51:23 1.3
+++ TorqueSQLTask.java 2001/08/22 20:10:02 1.4
@@ -54,9 +54,12 @@
* <http://www.apache.org/>.
*/
-import java.util.Date;
+import org.apache.commons.util.StringUtils;
+
import org.apache.velocity.context.Context;
import org.apache.velocity.texen.ant.TexenTask;
+
+import org.apache.torque.Torque;
import org.apache.torque.engine.database.model.AppData;
import org.apache.torque.engine.database.transform.XmlToAppData;
@@ -66,7 +69,8 @@
*
* @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.3 2001/08/21 01:51:23 dlr Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]>Daniel Rall</a>
+ * @version $Id: TorqueSQLTask.java,v 1.4 2001/08/22 20:10:02 dlr Exp $
*/
public class TorqueSQLTask
extends TexenTask
@@ -117,7 +121,7 @@
*
* @return String target database(s)
*/
- public String getTargetDatabase ()
+ public String getTargetDatabase()
{
return targetDatabase;
}
@@ -127,8 +131,9 @@
* generated java classes will live.
*
* @param String target database(s)
+ * @deprecated Use setConfigFile instead.
*/
- public void setTargetDatabase (String v)
+ public void setTargetDatabase(String v)
{
targetDatabase = v;
}
@@ -145,14 +150,11 @@
{
// Adds $now.
super.populateInitialContext(context);
-
- // Torque could be initialized here.
- /*
- * Transform the XML database schema into an
- * object that represents our model.
- */
- XmlToAppData xmlParser = new XmlToAppData();
+ // Transform the XML database schema into an object that
+ // represents our model.
+ XmlToAppData xmlParser = new XmlToAppData
+ (getTargetDatabase(), getTemplatePath() + "/sql/base/");
app = xmlParser.parseFile(xmlFile);
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
