jvanzyl 01/05/20 15:54:08
Modified: src/java/org/apache/turbine/torque TorqueDataDumpTask.java
Log:
- making setters and getters for JDBC properties required
for connecting. the context properties are meant to go
straight from a properties file to a template, they aren't
meant to be accessed in tasks.
- this also fixed the gump problem.
Revision Changes Path
1.2 +111 -18
jakarta-turbine/src/java/org/apache/turbine/torque/TorqueDataDumpTask.java
Index: TorqueDataDumpTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/TorqueDataDumpTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TorqueDataDumpTask.java 2001/05/04 21:58:54 1.1
+++ TorqueDataDumpTask.java 2001/05/20 22:54:08 1.2
@@ -67,7 +67,6 @@
import org.apache.velocity.context.Context;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.texen.ant.TexenTask;
-import org.apache.velocity.runtime.configuration.Configuration;
import org.apache.turbine.torque.engine.database.model.AppData;
import org.apache.turbine.torque.engine.database.model.Database;
@@ -77,7 +76,7 @@
* An extended Texen task used for dumping data from db into XML
*
* @author <a href="mailto:[EMAIL PROTECTED]>Fedor Karpelevitch</a>
- * @version $Id: TorqueDataDumpTask.java,v 1.1 2001/05/04 21:58:54 fedor Exp $
+ * @version $Id: TorqueDataDumpTask.java,v 1.2 2001/05/20 22:54:08 jvanzyl Exp $
*/
public class TorqueDataDumpTask extends TexenTask
{
@@ -95,6 +94,26 @@
private String xmlFile;
/**
+ * Database URL used for JDBC connection.
+ */
+ private String databaseUrl;
+
+ /**
+ * Database driver used for JDBC connection.
+ */
+ private String databaseDriver;
+
+ /**
+ * Database user used for JDBC connection.
+ */
+ private String databaseUser;
+
+ /**
+ * Database password used for JDBC connection.
+ */
+ private String databasePassword;
+
+ /**
* Get the xml schema describing the application
* model.
*
@@ -118,8 +137,8 @@
/**
* Get the database name to dump
- *
*
+ * @param String database to dump
*/
public String getDatabaseName ()
{
@@ -137,6 +156,86 @@
}
/**
+ * Get the database url
+ *
+ * @param String database url
+ */
+ public String getDatabaseUrl()
+ {
+ return databaseUrl;
+ }
+
+ /**
+ * Set the database url
+ *
+ * @param String database url
+ */
+ public void setDatabaseUrl(String v)
+ {
+ databaseUrl = v;
+ }
+
+ /**
+ * Get the database driver name
+ *
+ * @return String database driver name
+ */
+ public String getDatabaseDriver()
+ {
+ return databaseDriver;
+ }
+
+ /**
+ * Set the database driver name
+ *
+ * @param String database driver name
+ */
+ public void setDatabaseDriver(String v)
+ {
+ databaseDriver = v;
+ }
+
+ /**
+ * Get the database user
+ *
+ * @return String database user
+ */
+ public String getDatabaseUser()
+ {
+ return databaseUser;
+ }
+
+ /**
+ * Set the database user
+ *
+ * @param String database user
+ */
+ public void setDatabaseUser(String v)
+ {
+ databaseUser = v;
+ }
+
+ /**
+ * Get the database password
+ *
+ * @return String database password
+ */
+ public String getDatabasePassword()
+ {
+ return databasePassword;
+ }
+
+ /**
+ * Set the database password
+ *
+ * @param String database password
+ */
+ public void setDatabasePassword(String v)
+ {
+ databasePassword = v;
+ }
+
+ /**
* Initializes initial context
*/
public Context initControlContext()
@@ -165,28 +264,22 @@
context.put("dataset", "all");
- Configuration props = getContextProperties();
-
- String dbUrl = (String)props.getProperty("databaseUrl");
- String dbDriver = (String)props.getProperty("databaseDriver");
- String dbUser = (String)props.getProperty("databaseUser");
- String dbPassword = (String)props.getProperty("databasePassword");
-
System.err.println("Your DB settings are:");
- System.err.println("driver : "+dbDriver);
- System.err.println("URL : "+dbUrl);
- System.err.println("user : "+dbUser);
- System.err.println("password : "+dbPassword);
+ System.err.println("driver : "+databaseDriver);
+ System.err.println("URL : "+databaseUrl);
+ System.err.println("user : "+databaseUser);
+ System.err.println("password : "+databasePassword);
+
try
{
- Class.forName(dbDriver);
+ Class.forName(databaseDriver);
System.err.println("DB driver sucessfuly instantiated");
// Attemtp to connect to a database.
- Connection conn = DriverManager.getConnection(dbUrl,
- dbUser,
- dbPassword);
+ Connection conn = DriverManager.getConnection(
+ databaseUrl, databaseUser, databasePassword);
+
System.err.println("DB connection established");
context.put("tableTool", new TableTool(conn));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
