jvanzyl 01/06/14 08:09:32
Modified: src/java/org/apache/turbine/torque/engine/database/model
Database.java
src/java/org/apache/turbine/torque/engine/database/transform
XmlToAppData.java
Log:
- small changes to start trying to decouple from turbine.
Revision Changes Path
1.11 +4 -3
jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/model/Database.java
Index: Database.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/model/Database.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Database.java 2001/06/07 21:16:16 1.10
+++ Database.java 2001/06/14 15:09:28 1.11
@@ -58,7 +58,6 @@
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
-import org.apache.turbine.services.db.TurbineDB;
import org.xml.sax.Attributes;
/**
@@ -67,7 +66,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]>Leon Messerschmidt</a>
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Martin Poeschl</a>
- * @version $Id: Database.java,v 1.10 2001/06/07 21:16:16 dlr Exp $
+ * @version $Id: Database.java,v 1.11 2001/06/14 15:09:28 jvanzyl Exp $
*/
public class Database
{
@@ -97,7 +96,9 @@
name = attrib.getValue("name");
if ( name == null )
{
- name = TurbineDB.getDefaultDB();
+ //!! Hard coding this for now. It should
+ // be a property.
+ name = "default";
}
pkg = attrib.getValue("package");
baseClass = attrib.getValue("baseClass");
1.10 +6 -3
jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/transform/XmlToAppData.java
Index: XmlToAppData.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/transform/XmlToAppData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XmlToAppData.java 2001/05/05 13:19:16 1.9
+++ XmlToAppData.java 2001/06/14 15:09:31 1.10
@@ -59,7 +59,6 @@
import java.io.PrintStream;
import java.io.Reader;
import java.util.List;
-import org.apache.turbine.services.db.TurbineDB;
import org.apache.turbine.torque.engine.database.model.AppData;
import org.apache.turbine.torque.engine.database.model.Column;
import org.apache.turbine.torque.engine.database.model.Database;
@@ -88,7 +87,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Leon Messerschmidt</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: XmlToAppData.java,v 1.9 2001/05/05 13:19:16 jvanzyl Exp $
+ * @version $Id: XmlToAppData.java,v 1.10 2001/06/14 15:09:31 jvanzyl Exp $
*/
public class XmlToAppData extends DefaultHandler
{
@@ -186,9 +185,13 @@
if (rawName.equals("database"))
{
String s = attributes.getValue("name");
+
if ( s == null )
{
- s = TurbineDB.getDefaultDB();
+ //s = TurbineDB.getDefaultDB();
+ // !!Hard coding this for now it should
+ // be a property.
+ s = "default";
}
currDB = app.getDatabase(s);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
