jvanzyl 01/09/25 13:57:48
Modified: src/java/org/apache/torque/task TorqueCreateDatabase.java
TorqueSQLTask.java
Log:
- databases will now be created according to the data model and
not a specified name so that we can support multiple databases.
Revision Changes Path
1.3 +47 -30
jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueCreateDatabase.java
Index: TorqueCreateDatabase.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueCreateDatabase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueCreateDatabase.java 2001/08/10 12:23:03 1.2
+++ TorqueCreateDatabase.java 2001/09/25 20:57:48 1.3
@@ -58,17 +58,31 @@
import org.apache.velocity.VelocityContext;
import org.apache.velocity.texen.ant.TexenTask;
+import org.apache.torque.engine.database.model.AppData;
+import org.apache.torque.engine.database.transform.XmlToAppData;
+
/**
* An extended Texen task used for generating simple scripts
* for creating databases on various platforms.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: TorqueCreateDatabase.java,v 1.2 2001/08/10 12:23:03 knielsen Exp $
+ * @version $Id: TorqueCreateDatabase.java,v 1.3 2001/09/25 20:57:48 jvanzyl Exp $
*/
public class TorqueCreateDatabase
extends TexenTask
{
/**
+ * Application model. In this case a database model.
+ */
+ private AppData app;
+
+ /**
+ * XML that describes the database model, this is transformed
+ * into the application model object.
+ */
+ private String xmlFile;
+
+ /**
* The target database vendor: MySQL, Oracle.
*/
private String targetDatabase;
@@ -81,11 +95,6 @@
private String targetPlatform;
/**
- * Name of the database to create.
- */
- private String databaseName;
-
- /**
* Database user.
*/
private String databaseUser;
@@ -101,6 +110,28 @@
private String databaseHost;
/**
+ * Get the xml schema describing the application
+ * model.
+ *
+ * @return String xml schema file.
+ */
+ public String getXmlFile ()
+ {
+ return xmlFile;
+ }
+
+ /**
+ * Set the xml schema describing the application
+ * model.
+ *
+ * @param String xml schema file.
+ */
+ public void setXmlFile(String v)
+ {
+ xmlFile = v;
+ }
+
+ /**
* Get the target database.
*
* @return String target database.
@@ -141,26 +172,6 @@
}
/**
- * Get the database name.
- *
- * @return String database name.
- */
- public String getDatabaseName ()
- {
- return databaseName;
- }
-
- /**
- * Set the database name.
- *
- * @param String database name.
- */
- public void setDatabaseName (String v)
- {
- databaseName = v;
- }
-
- /**
* Get the database user.
*
* @return String target platform.
@@ -227,13 +238,19 @@
*/
public Context initControlContext()
{
- /*
- * Create a new Velocity context.
- */
+ // Create a new Velocity context.
Context context = new VelocityContext();
+
+ // Transform the XML database schema into an object that
+ // represents our model.
+ XmlToAppData xmlParser = new XmlToAppData();
+ app = xmlParser.parseFile(xmlFile);
+
+ // Place our model in the context.
+ context.put("appData", app);
+
context.put("targetDatabase", targetDatabase);
context.put("targetPlatform", targetPlatform);
- context.put("databaseName", databaseName);
context.put("databaseUser", databaseUser);
context.put("databasePassword", databasePassword);
context.put("databaseHost", databaseHost);
1.6 +3 -7
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TorqueSQLTask.java 2001/08/22 22:16:32 1.5
+++ TorqueSQLTask.java 2001/09/25 20:57:48 1.6
@@ -70,7 +70,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Daniel Rall</a>
- * @version $Id: TorqueSQLTask.java,v 1.5 2001/08/22 22:16:32 dlr Exp $
+ * @version $Id: TorqueSQLTask.java,v 1.6 2001/09/25 20:57:48 jvanzyl Exp $
*/
public class TorqueSQLTask
extends TexenTask
@@ -156,14 +156,10 @@
(getTargetDatabase(), getTemplatePath() + "/sql/base/");
app = xmlParser.parseFile(xmlFile);
- /*
- * Place our model in the context.
- */
+ // Place our model in the context.
context.put("appData", app);
- /*
- * Place the target database in the context.
- */
+ // Place the target database in the context.
context.put("targetDatabase", targetDatabase);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
