You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/10/10 15:59:57 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model AppData.java
jvanzyl 01/10/10 06:59:57
Modified: src/java/org/apache/turbine/torque TorqueCreateDatabase.java
TorqueDataDTDTask.java TorqueDataSQLTask.java
TorqueObjectModelTask.java TorqueSQLTask.java
src/java/org/apache/turbine/torque/engine/database/model
AppData.java
Log:
- here are the changes that i made to torque to easily allow the
management of multiple databases. i will continue to clean up
the code and than port it to 3.x. there has to be some way to
share this code as maintenance of both trees will definitely
prove to be tedious.
Revision Changes Path
1.3 +6 -50 jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueCreateDatabase.java
Index: TorqueCreateDatabase.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueCreateDatabase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueCreateDatabase.java 2001/09/25 19:33:18 1.2
+++ TorqueCreateDatabase.java 2001/10/10 13:59:57 1.3
@@ -56,33 +56,18 @@
import org.apache.velocity.context.Context;
import org.apache.velocity.VelocityContext;
-import org.apache.velocity.texen.ant.TexenTask;
-import org.apache.turbine.torque.engine.database.model.AppData;
-import org.apache.turbine.torque.engine.database.transform.XmlToAppData;
-
/**
* An extended Texen task used for generating simple scripts
* for creating databases on various platforms.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: TorqueCreateDatabase.java,v 1.2 2001/09/25 19:33:18 jvanzyl Exp $
+ * @version $Id: TorqueCreateDatabase.java,v 1.3 2001/10/10 13:59:57 jvanzyl Exp $
*/
public class TorqueCreateDatabase
- extends TexenTask
+ extends TorqueDataModelTask
{
/**
- * 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;
@@ -110,28 +95,6 @@
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.
@@ -237,23 +200,16 @@
* templates.
*/
public Context initControlContext()
- {
- // Create a new Velocity context.
- Context context = new VelocityContext();
+ throws Exception
+ {
+ super.initControlContext();
- // 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("databaseUser", databaseUser);
context.put("databasePassword", databasePassword);
context.put("databaseHost", databaseHost);
+
return context;
}
}
1.2 +6 -76 jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueDataDTDTask.java
Index: TorqueDataDTDTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueDataDTDTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TorqueDataDTDTask.java 2001/08/16 05:09:29 1.1
+++ TorqueDataDTDTask.java 2001/10/10 13:59:57 1.2
@@ -53,86 +53,16 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-import java.util.Date;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.texen.ant.TexenTask;
-
-import org.apache.turbine.torque.engine.database.model.AppData;
-import org.apache.turbine.torque.engine.database.transform.XmlToAppData;
-
/**
- * An extended Texen task used for generating data DTD from
- * an XML schema describing a database structure.
+ * An extended Texen task used for generating data DTD from
+ * an XML schema describing a database structure.
*
- * @author <a href="mailto:fedor.karpelevitch@home.com"> Fedor Karpelevitch </a>
- * @version $Id: TorqueDataDTDTask.java,v 1.1 2001/08/16 05:09:29 jvanzyl Exp $
+ * @author <a href="mailto:fedor.karpelevitch@home.com"> Fedor Karpelevitch </a>
+ * @version $Id: TorqueDataDTDTask.java,v 1.2 2001/10/10 13:59:57 jvanzyl Exp $
*/
-public class TorqueDataDTDTask extends TexenTask
+public class TorqueDataDTDTask
+ extends TorqueDataModelTask
{
- /**
- * 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;
-
-
- /**
- * 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 v The new XmlFile value
- */
- public void setXmlFile(String v)
- {
- xmlFile = v;
- }
-
-
- /**
- * Set up the initialial context for generating the
- * SQL from the XML schema.
- *
- * @return Description of the Returned Value
- */
- public Context initControlContext()
- {
- /*
- * 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);
-
- return context;
- }
}
1.2 +31 -103 jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueDataSQLTask.java
Index: TorqueDataSQLTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueDataSQLTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TorqueDataSQLTask.java 2001/08/16 05:09:30 1.1
+++ TorqueDataSQLTask.java 2001/10/10 13:59:57 1.2
@@ -53,42 +53,32 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-import java.util.Date;
-import java.util.List;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.List;
+import java.util.Properties;
import org.apache.velocity.context.Context;
import org.apache.velocity.VelocityContext;
-import org.apache.velocity.texen.ant.TexenTask;
-
import org.apache.turbine.torque.engine.database.model.AppData;
import org.apache.turbine.torque.engine.database.model.Database;
-import org.apache.turbine.torque.engine.database.transform.XmlToAppData;
import org.apache.turbine.torque.engine.database.transform.XmlToData;
/**
* An extended Texen task used for generating SQL source from
* an XML data file
*
- * @author <a href="mailto:jvanzyl@periapt.com"> Jason van Zyl </a>
- * @author <a href="mailto:jmcnally@collab.net"> John McNally </a>
- * @author <a href="mailto:fedor.karpelevitch@home.com"> Fedor Karpelevitch </a>
- * @version $Id: TorqueDataSQLTask.java,v 1.1 2001/08/16 05:09:30 jvanzyl Exp $
+ * @author <a href="mailto:jvanzyl@periapt.com"> Jason van Zyl </a>
+ * @author <a href="mailto:jmcnally@collab.net"> John McNally </a>
+ * @author <a href="mailto:fedor.karpelevitch@home.com"> Fedor Karpelevitch </a>
+ * @version $Id: TorqueDataSQLTask.java,v 1.2 2001/10/10 13:59:57 jvanzyl Exp $
*/
-public class TorqueDataSQLTask extends TexenTask
+public class TorqueDataSQLTask extends
+ TorqueDataModelTask
{
- /**
- * 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;
private String dataXmlFile;
private String dataDTD;
-
+
/**
* The target database(s) we are generating SQL
* for. Right now we can only deal with a single
@@ -97,33 +87,6 @@
*/
private String targetDatabase;
- private String databaseName;
-
-
- /**
- * 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 v The new XmlFile value
- */
- public void setXmlFile(String v)
- {
- xmlFile = v;
- }
-
-
/**
* Sets the DataXmlFile attribute of the TorqueDataSQLTask object
*
@@ -134,7 +97,6 @@
dataXmlFile = v;
}
-
/**
* Gets the DataXmlFile attribute of the TorqueDataSQLTask object
*
@@ -145,7 +107,6 @@
return dataXmlFile;
}
-
/**
* Get the current target database.
*
@@ -156,7 +117,6 @@
return targetDatabase;
}
-
/**
* Set the current target database. This is where
* generated java classes will live.
@@ -168,30 +128,7 @@
targetDatabase = v;
}
-
/**
- * Gets the DatabaseName attribute of the TorqueDataSQLTask object
- *
- * @return The DatabaseName value
- */
- public String getDatabaseName()
- {
- return databaseName;
- }
-
-
- /**
- * Sets the DatabaseName attribute of the TorqueDataSQLTask object
- *
- * @param v The new DatabaseName value
- */
- public void setDatabaseName(String v)
- {
- databaseName = v;
- }
-
-
- /**
* Gets the DataDTD attribute of the TorqueDataSQLTask object
*
* @return The DataDTD value
@@ -201,7 +138,6 @@
return dataDTD;
}
-
/**
* Sets the DataDTD attribute of the TorqueDataSQLTask object
*
@@ -211,8 +147,7 @@
{
dataDTD = v;
}
-
-
+
/**
* Set up the initialial context for generating the
* SQL from the XML schema.
@@ -220,24 +155,13 @@
* @return Description of the Returned Value
*/
public Context initControlContext()
+ throws Exception
{
- /*
- * 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);
-
- Database db = app.getDatabase(databaseName);
- if (db == null)
- {
- db = app.getDatabases()[0];
- }
+ super.initControlContext();
+
+ AppData app = (AppData) getDataModels().elementAt(0);
+ Database db = app.getDatabase();
+
try
{
XmlToData dataXmlParser = new XmlToData(db, dataDTD);
@@ -246,19 +170,23 @@
}
catch (Exception e)
{
- System.err.println("Exception parsing data XML:");
- e.printStackTrace();
+ throw new Exception("Exception parsing data XML:");
}
- /*
- * 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);
-
+
+ Properties p = new Properties();
+ FileInputStream fis = new FileInputStream(getSqlDbMap());
+ p.load(fis);
+ fis.close();
+
+ p.setProperty(getOutputFile(), db.getName());
+ p.store(new FileOutputStream(getSqlDbMap()),"Sqlfile -> Database map");
+
return context;
}
}
1.2 +3 -66 jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueObjectModelTask.java
Index: TorqueObjectModelTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueObjectModelTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TorqueObjectModelTask.java 2001/08/16 05:09:30 1.1
+++ TorqueObjectModelTask.java 2001/10/10 13:59:57 1.2
@@ -54,61 +54,26 @@
* <http://www.apache.org/>.
*/
-import java.util.Date;
-
import org.apache.velocity.context.Context;
import org.apache.velocity.VelocityContext;
-import org.apache.velocity.texen.ant.TexenTask;
-
-import org.apache.turbine.torque.engine.database.model.AppData;
-import org.apache.turbine.torque.engine.database.transform.XmlToAppData;
/**
* An ant task for generating output by using Velocity
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: TorqueObjectModelTask.java,v 1.1 2001/08/16 05:09:30 jvanzyl Exp $
+ * @version $Id: TorqueObjectModelTask.java,v 1.2 2001/10/10 13:59:57 jvanzyl Exp $
*/
-public class TorqueObjectModelTask extends TexenTask
+public class TorqueObjectModelTask
+ extends TorqueDataModelTask
{
/**
- * Application model.
- */
- private AppData app;
-
- /**
- * XML schema file.
- */
- private String xmlFile;
-
- /**
* Target Java package to place the generated
* files in.
*/
private String targetPackage;
/**
- * Get the current xml file.
- *
- * @return String xml schema file.
- */
- public String getXmlFile ()
- {
- return xmlFile;
- }
-
- /**
- * Set the xml file.
- *
- * @param String xml schema file.
- */
- public void setXmlFile(String v)
- {
- xmlFile = v;
- }
-
- /**
* Get the current target package.
*
* @return return target java package.
@@ -127,33 +92,5 @@
public void setTargetPackage (String v)
{
targetPackage = v;
- }
-
- public Context initControlContext()
- {
- /*
- * Create velocity context.
- */
- Context context = new VelocityContext();
-
- /*
- * Build our application model from the
- * XML schema. Can someone document the
- * double pass here?
- */
- XmlToAppData xmlParser = new XmlToAppData();
-
- app = xmlParser.parseFile(xmlFile);
- xmlParser.parseFile(xmlFile);
-
- /*
- * Place some initial values in the context.
- * most of these could be automatically fed
- * into the context with the contextProperties
- * option.
- */
- context.put("appData", app);
-
- return context;
}
}
1.3 +83 -53 jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueSQLTask.java
Index: TorqueSQLTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueSQLTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueSQLTask.java 2001/09/25 19:33:18 1.2
+++ TorqueSQLTask.java 2001/10/10 13:59:57 1.3
@@ -54,35 +54,26 @@
* <http://www.apache.org/>.
*/
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.Properties;
+import java.util.Iterator;
import org.apache.velocity.context.Context;
import org.apache.velocity.VelocityContext;
-import org.apache.velocity.texen.ant.TexenTask;
-import org.apache.turbine.torque.engine.database.model.AppData;
-import org.apache.turbine.torque.engine.database.transform.XmlToAppData;
-
/**
* An extended Texen task used for generating SQL source from
* an XML schema describing a database structure.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: TorqueSQLTask.java,v 1.2 2001/09/25 19:33:18 jvanzyl Exp $
+ * @version $Id: TorqueSQLTask.java,v 1.3 2001/10/10 13:59:57 jvanzyl Exp $
*/
-public class TorqueSQLTask extends TexenTask
+public class TorqueSQLTask
+ extends TorqueDataModelTask
{
/**
- * 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(s) we are generating SQL
* for. Right now we can only deal with a single
* target, but we will support multiple targets
@@ -90,28 +81,35 @@
*/
private String targetDatabase;
- /**
- * Get the xml schema describing the application
- * model.
- *
- * @return String xml schema file.
- */
- public String getXmlFile ()
+ // if the database is set than all generated sql files
+ // will be placed in the specified database, the database
+ // will not be taken from the data model schema file.
+
+ private String database;
+ private String suffix = "";
+
+ public void setDatabase(String database)
{
- return xmlFile;
+ this.database = database;
}
+
+ public String getDatabase()
+ {
+ return database;
+ }
- /**
- * Set the xml schema describing the application
- * model.
- *
- * @param String xml schema file.
- */
- public void setXmlFile(String v)
+ public void setSuffix(String suffix)
{
- xmlFile = v;
+ this.suffix = suffix;
}
+
+ public String getSuffix()
+ {
+ return suffix;
+ }
+
+
/**
* Get the current target package.
*
@@ -132,31 +130,63 @@
{
targetDatabase = v;
}
-
- /**
- * Set up the initialial context for generating the
- * SQL from the XML schema.
- */
- public Context initControlContext()
- {
- // Create a new Velocity context.
- Context context = new VelocityContext();
+ private void createSqlDbMap()
+ throws Exception
+ {
+ if (getSqlDbMap() == null)
+ {
+ return;
+ }
+
+ // Produce the sql -> database map
+ Properties sqldbmap = new Properties();
+
+ // Check to see if the sqldbmap has already been created.
+ File file = new File(getSqlDbMap());
+
+ if (file.exists())
+ {
+ FileInputStream fis = new FileInputStream(file);
+ sqldbmap.load(fis);
+ fis.close();
+ }
- // Transform the XML database schema into an
- // object that represents our model.
- XmlToAppData xmlParser = new XmlToAppData();
- app = xmlParser.parseFile(xmlFile);
+ Iterator i = getDataModelDbMap().keySet().iterator();
- // Place our model in the context.
- context.put("appData", app);
+ while (i.hasNext())
+ {
+ String dataModelName = (String) i.next();
+ String sqlFile = dataModelName + suffix + ".sql";
+
+ String databaseName;
+
+ if (getDatabase() == null)
+ {
+ databaseName = (String) getDataModelDbMap().get(dataModelName);
+ }
+ else
+ {
+ databaseName = getDatabase();
+ }
+
+ sqldbmap.setProperty(sqlFile,databaseName);
+ }
+
+ sqldbmap.store(new FileOutputStream(getSqlDbMap()),"Sqlfile -> Database map");
+ }
- // Place the target database in the context.
+ /**
+ * Place our target database and target platform
+ * values into the context for use in the
+ * templates.
+ */
+ public Context initControlContext()
+ throws Exception
+ {
+ super.initControlContext();
context.put("targetDatabase", targetDatabase);
-
+ createSqlDbMap();
return context;
}
}
-
-
-
1.2 +12 -3 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/AppData.java
Index: AppData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/AppData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AppData.java 2001/08/16 05:09:31 1.1
+++ AppData.java 2001/10/10 13:59:57 1.2
@@ -64,11 +64,11 @@
*
* @author <a href="mailto:leon@opticode.co.za>Leon Messerschmidt</a>
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: AppData.java,v 1.1 2001/08/16 05:09:31 jvanzyl Exp $
+ * @version $Id: AppData.java,v 1.2 2001/10/10 13:59:57 jvanzyl Exp $
*/
public class AppData
{
-
+ private String name;
private List dbList = new ArrayList(5);
/**
@@ -91,7 +91,16 @@
}
return dbs;
}
-
+
+ public Database getDatabase()
+ {
+ Database[] dbs = getDatabases();
+ return dbs[0];
+ }
+
+ public void setName(String name) { this.name = name; }
+ public String getName() { return name; }
+
/**
*
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model AppData.java
Posted by Daniel Rall <dl...@finemaltcoding.com>.
jvanzyl@apache.org writes:
> jvanzyl 01/10/10 06:59:57
>
> Modified: src/java/org/apache/turbine/torque TorqueCreateDatabase.java
> TorqueDataDTDTask.java TorqueDataSQLTask.java
> TorqueObjectModelTask.java TorqueSQLTask.java
> src/java/org/apache/turbine/torque/engine/database/model
> AppData.java
> Log:
> - here are the changes that i made to torque to easily allow the
> management of multiple databases. i will continue to clean up
> the code and than port it to 3.x. there has to be some way to
> share this code as maintenance of both trees will definitely
> prove to be tedious.
That's what branches are for. And even then, it's still a PITA. :(
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org