You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2002/02/16 20:40:38 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/sql package.html ParseException.java SQLScanner.java Token.java
mpoeschl 02/02/16 11:40:37
Modified: src/java/org/apache/turbine/torque TorqueCreateDatabase.java
TorqueDataDTDTask.java TorqueDataDumpTask.java
TorqueDataModelTask.java TorqueDataSQLTask.java
TorqueJDBCTransformTask.java
TorqueObjectModelTask.java TorqueSQLTask.java
TorqueSQLTransformTask.java
src/java/org/apache/turbine/torque/engine/database/model
AppData.java Column.java ForeignKey.java
Database.java IdMethodParameter.java Index.java
Inheritance.java Table.java TypeMap.java
Unique.java
src/java/org/apache/turbine/torque/engine/database/transform
DTDResolver.java SQLToAppData.java
XmlToAppData.java XmlToData.java
src/java/org/apache/turbine/torque/engine/sql
ParseException.java SQLScanner.java Token.java
Added: src/java/org/apache/turbine/torque package.html
src/java/org/apache/turbine/torque/engine/database/model
package.html
src/java/org/apache/turbine/torque/engine/database/transform
package.html
src/java/org/apache/turbine/torque/engine/sql package.html
Log:
mark torque as deprecated
Revision Changes Path
1.4 +12 -11 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TorqueCreateDatabase.java 10 Oct 2001 13:59:57 -0000 1.3
+++ TorqueCreateDatabase.java 16 Feb 2002 19:40:36 -0000 1.4
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -62,9 +62,10 @@
* for creating databases on various platforms.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: TorqueCreateDatabase.java,v 1.3 2001/10/10 13:59:57 jvanzyl Exp $
+ * @version $Id: TorqueCreateDatabase.java,v 1.4 2002/02/16 19:40:36 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
-public class TorqueCreateDatabase
+public class TorqueCreateDatabase
extends TorqueDataModelTask
{
/**
@@ -83,12 +84,12 @@
* Database user.
*/
private String databaseUser;
-
+
/**
* Password for specified database user.
*/
private String databasePassword;
-
+
/**
* Host on which specified database resides.
*/
@@ -201,15 +202,15 @@
*/
public Context initControlContext()
throws Exception
- {
+ {
super.initControlContext();
-
+
context.put("targetDatabase", targetDatabase);
context.put("targetPlatform", targetPlatform);
context.put("databaseUser", databaseUser);
context.put("databasePassword", databasePassword);
context.put("databaseHost", databaseHost);
-
+
return context;
}
}
1.3 +3 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueDataDTDTask.java 10 Oct 2001 13:59:57 -0000 1.2
+++ TorqueDataDTDTask.java 16 Feb 2002 19:40:36 -0000 1.3
@@ -59,9 +59,10 @@
* an XML schema describing a database structure.
*
* @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 $
+ * @version $Id: TorqueDataDTDTask.java,v 1.3 2002/02/16 19:40:36 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
-public class TorqueDataDTDTask
+public class TorqueDataDTDTask
extends TorqueDataModelTask
{
}
1.2 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueDataDumpTask.java
Index: TorqueDataDumpTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/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 16 Aug 2001 05:09:29 -0000 1.1
+++ TorqueDataDumpTask.java 16 Feb 2002 19:40:36 -0000 1.2
@@ -75,7 +75,8 @@
* An extended Texen task used for dumping data from db into XML
*
* @author <a href="mailto:fedor.karpelevitch@home.com"> Fedor Karpelevitch </a>
- * @version $Id: TorqueDataDumpTask.java,v 1.1 2001/08/16 05:09:29 jvanzyl Exp $
+ * @version $Id: TorqueDataDumpTask.java,v 1.2 2002/02/16 19:40:36 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class TorqueDataDumpTask extends TexenTask
{
1.5 +21 -20 jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueDataModelTask.java
Index: TorqueDataModelTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueDataModelTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TorqueDataModelTask.java 18 Jan 2002 02:56:50 -0000 1.4
+++ TorqueDataModelTask.java 16 Feb 2002 19:40:36 -0000 1.5
@@ -77,6 +77,7 @@
*
* @author <a href="mailto:jvanzyl@zenplex.com">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
+ * @deprecated use turbine-torque
*/
public class TorqueDataModelTask
extends TexenTask
@@ -91,7 +92,7 @@
* Fileset of XML schemas which represent our data models.
*/
protected Vector filesets = new Vector();
-
+
/**
* Data models that we collect. One from each XML schema file.
*/
@@ -110,7 +111,7 @@
* in a lot of cases they won't be.
*/
protected Hashtable dataModelDbMap;
-
+
/**
* Hashtable containing the names of all the databases
* in our collection of schemas.
@@ -133,7 +134,7 @@
//!! Make all these references files not strings.
this.sqldbmap = project.resolveFile(sqldbmap).toString();
}
-
+
/**
* Get the sqldbmap.
*
@@ -142,7 +143,7 @@
public String getSqlDbMap()
{
return sqldbmap;
- }
+ }
/**
* Return the data models that have been
@@ -153,7 +154,7 @@
public Vector getDataModels()
{
return dataModels;
- }
+ }
/**
* Return the data model to database name map.
@@ -163,7 +164,7 @@
public Hashtable getDataModelDbMap()
{
return dataModelDbMap;
- }
+ }
/**
* Get the xml schema describing the application
@@ -190,7 +191,7 @@
/**
* Adds a set of files (nested fileset attribute).
*/
- public void addFileset(FileSet set)
+ public void addFileset(FileSet set)
{
filesets.addElement(set);
}
@@ -205,12 +206,12 @@
throws Exception
{
XmlToAppData xmlParser;
-
+
if (xmlFile == null && filesets.isEmpty())
{
throw new BuildException("You must specify an XML schema or " +
"fileset of XML schemas!");
- }
+ }
if (xmlFile != null)
{
@@ -221,11 +222,11 @@
xmlParser.parseFile(xmlFile);
ad.setName(grokName(xmlFile));
dataModels.addElement(ad);
- }
- else
- {
+ }
+ else
+ {
// Deal with the filesets.
- for (int i = 0; i < filesets.size(); i++)
+ for (int i = 0; i < filesets.size(); i++)
{
FileSet fs = (FileSet) filesets.elementAt(i);
DirectoryScanner ds = fs.getDirectoryScanner(project);
@@ -245,11 +246,11 @@
}
}
}
-
+
Iterator i = dataModels.iterator();
databaseNames = new Hashtable();
- dataModelDbMap = new Hashtable();
-
+ dataModelDbMap = new Hashtable();
+
// Different datamodels may state the same database
// names, we just want the unique names of databases.
while (i.hasNext())
@@ -262,16 +263,16 @@
// Create a new Velocity context.
context = new VelocityContext();
-
+
// Place our set of data models into the context along
// with the names of the databases as a convenience for
- // now.
+ // now.
context.put("dataModels", dataModels);
context.put("databaseNames", databaseNames);
-
+
return context;
}
-
+
/**
* Gets a name to use for the application's data model.
*
1.3 +11 -10 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueDataSQLTask.java 10 Oct 2001 13:59:57 -0000 1.2
+++ TorqueDataSQLTask.java 16 Feb 2002 19:40:36 -0000 1.3
@@ -71,14 +71,15 @@
* @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 $
+ * @version $Id: TorqueDataSQLTask.java,v 1.3 2002/02/16 19:40:36 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
-public class TorqueDataSQLTask extends
+public class TorqueDataSQLTask extends
TorqueDataModelTask
{
private String dataXmlFile;
private String dataDTD;
-
+
/**
* The target database(s) we are generating SQL
* for. Right now we can only deal with a single
@@ -147,7 +148,7 @@
{
dataDTD = v;
}
-
+
/**
* Set up the initialial context for generating the
* SQL from the XML schema.
@@ -158,10 +159,10 @@
throws Exception
{
super.initControlContext();
-
+
AppData app = (AppData) getDataModels().elementAt(0);
Database db = app.getDatabase();
-
+
try
{
XmlToData dataXmlParser = new XmlToData(db, dataDTD);
@@ -172,21 +173,21 @@
{
throw new Exception("Exception parsing data XML:");
}
-
+
// Place our model in the context.
context.put("appData", app);
// 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 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueJDBCTransformTask.java
Index: TorqueJDBCTransformTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueJDBCTransformTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TorqueJDBCTransformTask.java 16 Aug 2001 05:09:30 -0000 1.1
+++ TorqueJDBCTransformTask.java 16 Feb 2002 19:40:36 -0000 1.2
@@ -92,7 +92,8 @@
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:fedor.karpelevitch@barra.com">Fedor Karpelevitch</a>
- * @version $Id: TorqueJDBCTransformTask.java,v 1.1 2001/08/16 05:09:30 jvanzyl Exp $
+ * @version $Id: TorqueJDBCTransformTask.java,v 1.2 2002/02/16 19:40:36 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class TorqueJDBCTransformTask extends Task
{
1.3 +3 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueObjectModelTask.java 10 Oct 2001 13:59:57 -0000 1.2
+++ TorqueObjectModelTask.java 16 Feb 2002 19:40:36 -0000 1.3
@@ -62,9 +62,10 @@
*
* @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.2 2001/10/10 13:59:57 jvanzyl Exp $
+ * @version $Id: TorqueObjectModelTask.java,v 1.3 2002/02/16 19:40:36 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
-public class TorqueObjectModelTask
+public class TorqueObjectModelTask
extends TorqueDataModelTask
{
/**
1.4 +24 -23 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TorqueSQLTask.java 10 Oct 2001 13:59:57 -0000 1.3
+++ TorqueSQLTask.java 16 Feb 2002 19:40:36 -0000 1.4
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -68,9 +68,10 @@
*
* @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.3 2001/10/10 13:59:57 jvanzyl Exp $
+ * @version $Id: TorqueSQLTask.java,v 1.4 2002/02/16 19:40:36 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
-public class TorqueSQLTask
+public class TorqueSQLTask
extends TorqueDataModelTask
{
/**
@@ -87,26 +88,26 @@
private String database;
private String suffix = "";
-
+
public void setDatabase(String database)
{
this.database = database;
}
-
+
public String getDatabase()
{
return database;
- }
+ }
public void setSuffix(String suffix)
{
this.suffix = suffix;
}
-
+
public String getSuffix()
{
return suffix;
- }
+ }
@@ -137,42 +138,42 @@
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();
}
-
+
Iterator i = getDataModelDbMap().keySet().iterator();
-
+
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");
}
@@ -183,7 +184,7 @@
*/
public Context initControlContext()
throws Exception
- {
+ {
super.initControlContext();
context.put("targetDatabase", targetDatabase);
createSqlDbMap();
1.2 +6 -5 jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueSQLTransformTask.java
Index: TorqueSQLTransformTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/TorqueSQLTransformTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TorqueSQLTransformTask.java 16 Aug 2001 05:09:31 -0000 1.1
+++ TorqueSQLTransformTask.java 16 Feb 2002 19:40:36 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -67,7 +67,8 @@
* An ant task for creating an xml schema from an sql schema
*
* @author <a href="mailto:leon@opticode.co.za>Leon Messerschmidt</a>
- * @version $Id: TorqueSQLTransformTask.java,v 1.1 2001/08/16 05:09:31 jvanzyl Exp $
+ * @version $Id: TorqueSQLTransformTask.java,v 1.2 2002/02/16 19:40:36 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class TorqueSQLTransformTask extends Task
{
1.1 jakarta-turbine-2/src/java/org/apache/turbine/torque/package.html
Index: package.html
===================================================================
<html>
<head>
<!-- head part is ignored -->
</head>
<body>
Torque persistance layer.
<br>
<b>deprecated use the decoupled torque version instead.</b>
<br>
<font size="-2">$Id: package.html,v 1.1 2002/02/16 19:40:36 mpoeschl Exp $</font>
</body>
</html>
1.3 +10 -9 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AppData.java 10 Oct 2001 13:59:57 -0000 1.2
+++ AppData.java 16 Feb 2002 19:40:37 -0000 1.3
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -64,7 +64,8 @@
*
* @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.2 2001/10/10 13:59:57 jvanzyl Exp $
+ * @version $Id: AppData.java,v 1.3 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class AppData
{
@@ -91,16 +92,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; }
-
+
/**
*
*/
@@ -108,7 +109,7 @@
{
return (dbList.size() > 1);
}
-
+
/**
* Return the database with the specified name.
1.3 +13 -12 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Column.java
Index: Column.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Column.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Column.java 1 Oct 2001 14:37:06 -0000 1.2
+++ Column.java 16 Feb 2002 19:40:37 -0000 1.3
@@ -70,7 +70,8 @@
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: Column.java,v 1.2 2001/10/01 14:37:06 jvanzyl Exp $
+ * @version $Id: Column.java,v 1.3 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class Column
{
@@ -104,7 +105,7 @@
*/
public Column()
{
- this(null);
+ this(null);
}
/**
@@ -433,7 +434,7 @@
if (referrers == null)
{
referrers = new ArrayList(5);
- }
+ }
referrers.add(fk);
}
@@ -445,7 +446,7 @@
if (referrers == null)
{
referrers = new ArrayList(5);
- }
+ }
return referrers;
}
@@ -516,21 +517,21 @@
if (size != null)
{
result.append(" size=\"").append(size).append('"');
- }
+ }
if (defaultValue != null)
{
result.append(" default=\"").append(defaultValue).append('"');
- }
+ }
if (isInheritance())
{
- result.append(" inheritance=\"").append(inheritanceType)
- .append('"');
- }
+ result.append(" inheritance=\"").append(inheritanceType)
+ .append('"');
+ }
- // Close the column.
- result.append(" />\n");
+ // Close the column.
+ result.append(" />\n");
return result.toString();
}
@@ -647,7 +648,7 @@
if (size != null)
{
this.size = size;
- }
+ }
if (tn.indexOf ("CHAR") != -1)
{
1.2 +6 -5 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/ForeignKey.java
Index: ForeignKey.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/ForeignKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ForeignKey.java 16 Aug 2001 05:09:32 -0000 1.1
+++ ForeignKey.java 16 Feb 2002 19:40:37 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -63,7 +63,8 @@
* A Class for information about foreign keys of a table
*
* @author <a href="mailto:fedor.karpelevitch@home.com">Fedor</a>
- * @version $Id: ForeignKey.java,v 1.1 2001/08/16 05:09:32 jvanzyl Exp $
+ * @version $Id: ForeignKey.java,v 1.2 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class ForeignKey
{
1.2 +4 -3 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Database.java
Index: Database.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Database.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Database.java 16 Aug 2001 05:09:31 -0000 1.1
+++ Database.java 16 Feb 2002 19:40:37 -0000 1.2
@@ -67,7 +67,8 @@
* @author <a href="mailto:leon@opticode.co.za>Leon Messerschmidt</a>
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
* @author <a href="mailto:mpoeschl@marmot.at>Martin Poeschl</a>
- * @version $Id: Database.java,v 1.1 2001/08/16 05:09:31 jvanzyl Exp $
+ * @version $Id: Database.java,v 1.2 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class Database
{
@@ -145,7 +146,7 @@
*/
public String getBaseClass()
{
- if ( baseClass == null )
+ if ( baseClass == null )
{
return "BaseObject";
}
@@ -167,7 +168,7 @@
*/
public String getBasePeer()
{
- if ( basePeer == null )
+ if ( basePeer == null )
{
return "BasePeer";
}
1.2 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/IdMethodParameter.java
Index: IdMethodParameter.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/IdMethodParameter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IdMethodParameter.java 16 Aug 2001 05:09:32 -0000 1.1
+++ IdMethodParameter.java 16 Feb 2002 19:40:37 -0000 1.2
@@ -60,7 +60,8 @@
* Information related to an ID method.
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: IdMethodParameter.java,v 1.1 2001/08/16 05:09:32 jvanzyl Exp $
+ * @version $Id: IdMethodParameter.java,v 1.2 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class IdMethodParameter
{
1.2 +6 -5 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Index.java
Index: Index.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Index.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Index.java 16 Aug 2001 05:09:32 -0000 1.1
+++ Index.java 16 Feb 2002 19:40:37 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -62,7 +62,8 @@
* A Class for information about indices of a table
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: Index.java,v 1.1 2001/08/16 05:09:32 jvanzyl Exp $
+ * @version $Id: Index.java,v 1.2 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class Index
{
1.2 +26 -25 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Inheritance.java
Index: Inheritance.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Inheritance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Inheritance.java 16 Aug 2001 05:09:32 -0000 1.1
+++ Inheritance.java 16 Feb 2002 19:40:37 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -60,13 +60,14 @@
* A Class for information regarding possible objects representing a table
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: Inheritance.java,v 1.1 2001/08/16 05:09:32 jvanzyl Exp $
+ * @version $Id: Inheritance.java,v 1.2 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class Inheritance
{
private String key;
private String className;
- private String ancestor;
+ private String ancestor;
private Column parent;
/**
@@ -90,75 +91,75 @@
* Get the value of key.
* @return value of key.
*/
- public String getKey()
+ public String getKey()
{
return key;
}
-
+
/**
* Set the value of key.
* @param v Value to assign to key.
*/
- public void setKey(String v)
+ public void setKey(String v)
{
this.key = v;
}
-
-
+
+
/**
* Get the value of parent.
* @return value of parent.
*/
- public Column getColumn()
+ public Column getColumn()
{
return parent;
}
-
+
/**
* Set the value of parent.
* @param v Value to assign to parent.
*/
- public void setColumn(Column v)
+ public void setColumn(Column v)
{
this.parent = v;
}
-
+
/**
* Get the value of className.
* @return value of className.
*/
- public String getClassName()
+ public String getClassName()
{
return className;
}
-
+
/**
* Set the value of className.
* @param v Value to assign to className.
*/
- public void setClassName(String v)
+ public void setClassName(String v)
{
this.className = v;
}
-
+
/**
* Get the value of ancestor.
* @return value of ancestor.
*/
- public String getAncestor()
+ public String getAncestor()
{
return ancestor;
}
-
+
/**
* Set the value of ancestor.
* @param v Value to assign to ancestor.
*/
- public void setAncestor(String v)
+ public void setAncestor(String v)
{
this.ancestor = v;
}
-
+
/**
* String representation of the foreign key. This
* is an xml representation.
@@ -179,9 +180,9 @@
.append(ancestor)
.append('\"');
}
-
+
result.append("/>");
-
+
return result.toString();
}
1.5 +4 -3 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Table.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Table.java 13 Dec 2001 01:08:53 -0000 1.4
+++ Table.java 16 Feb 2002 19:40:37 -0000 1.5
@@ -71,7 +71,8 @@
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: Table.java,v 1.4 2001/12/13 01:08:53 dlr Exp $
+ * @version $Id: Table.java,v 1.5 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class Table implements IDMethod
{
@@ -283,7 +284,7 @@
if (referrers == null)
{
referrers = new ArrayList(5);
- }
+ }
referrers.add(fk);
}
@@ -841,7 +842,7 @@
public boolean hasPrimaryKey()
{
return (getPrimaryKey().size() > 0);
- }
+ }
/**
* Returns all parts of the primary key, separated by commas.
1.2 +28 -27 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/TypeMap.java
Index: TypeMap.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/TypeMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeMap.java 16 Aug 2001 05:09:33 -0000 1.1
+++ TypeMap.java 16 Feb 2002 19:40:37 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -100,13 +100,14 @@
* TIMESTAMP | java.sql.Timestamp | java.util.Date
*
* -------------------------------------------------------
- * A couple variations have been introduced to cover cases
+ * A couple variations have been introduced to cover cases
* that may arise, but are not covered above
* BOOLEANCHAR | boolean | String
* BOOLEANINT | boolean | Integer
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: TypeMap.java,v 1.1 2001/08/16 05:09:33 jvanzyl Exp $
+ * @version $Id: TypeMap.java,v 1.2 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class TypeMap
{
@@ -252,9 +253,9 @@
/*
* Create JDBC -> Java object mappings.
*/
-
+
jdbcToJavaObjectMap = new Hashtable();
-
+
jdbcToJavaObjectMap.put(CHAR, CHAR_OBJECT_TYPE);
jdbcToJavaObjectMap.put(VARCHAR, VARCHAR_OBJECT_TYPE);
jdbcToJavaObjectMap.put(LONGVARCHAR, LONGVARCHAR_OBJECT_TYPE);
@@ -278,13 +279,13 @@
jdbcToJavaObjectMap.put(TIMESTAMP, TIMESTAMP_OBJECT_TYPE);
jdbcToJavaObjectMap.put(BOOLEANCHAR, BOOLEANCHAR_OBJECT_TYPE);
jdbcToJavaObjectMap.put(BOOLEANINT, BOOLEANINT_OBJECT_TYPE);
-
+
/*
* Create JDBC -> native Java type mappings.
*/
-
+
jdbcToJavaNativeMap = new Hashtable();
-
+
jdbcToJavaNativeMap.put(CHAR, CHAR_NATIVE_TYPE);
jdbcToJavaNativeMap.put(VARCHAR, VARCHAR_NATIVE_TYPE);
jdbcToJavaNativeMap.put(LONGVARCHAR, LONGVARCHAR_NATIVE_TYPE);
@@ -312,9 +313,9 @@
/*
* Create JDBC -> Village asX() mappings.
*/
-
+
jdbcToVillageMethodMap = new Hashtable();
-
+
jdbcToVillageMethodMap.put(CHAR, CHAR_VILLAGE_METHOD);
jdbcToVillageMethodMap.put(VARCHAR, VARCHAR_VILLAGE_METHOD);
jdbcToVillageMethodMap.put(LONGVARCHAR, LONGVARCHAR_VILLAGE_METHOD);
@@ -342,9 +343,9 @@
/*
* Create JDBC -> ParameterParser getX() mappings.
*/
-
+
jdbcToPPMethodMap = new Hashtable();
-
+
jdbcToPPMethodMap.put(CHAR, CHAR_PP_METHOD);
jdbcToPPMethodMap.put(VARCHAR, VARCHAR_PP_METHOD);
jdbcToPPMethodMap.put(LONGVARCHAR, LONGVARCHAR_PP_METHOD);
@@ -370,9 +371,9 @@
/*
* Create JDBC -> Java object mappings.
*/
-
+
torqueTypeToJdbcTypeMap = new Hashtable();
-
+
torqueTypeToJdbcTypeMap.put(CHAR, CHAR);
torqueTypeToJdbcTypeMap.put(VARCHAR, VARCHAR);
torqueTypeToJdbcTypeMap.put(LONGVARCHAR, LONGVARCHAR);
@@ -396,7 +397,7 @@
torqueTypeToJdbcTypeMap.put(TIMESTAMP, TIMESTAMP);
torqueTypeToJdbcTypeMap.put(BOOLEANCHAR, CHAR);
torqueTypeToJdbcTypeMap.put(BOOLEANINT, INTEGER);
-
+
/*
* Create JDBC type code to torque type map.
*/
@@ -434,7 +435,7 @@
public static boolean isInitialized()
{
return isInitialized;
- }
+ }
/**
* Return a Java object which corresponds to the
@@ -447,7 +448,7 @@
*/
if (isInitialized == false)
initialize();
-
+
return (String)jdbcToJavaObjectMap.get(jdbcType);
}
@@ -463,7 +464,7 @@
*/
if (isInitialized == false)
initialize();
-
+
return (String) jdbcToJavaNativeMap.get(jdbcType);
}
@@ -479,7 +480,7 @@
*/
if (isInitialized == false)
initialize();
-
+
return (String) jdbcToVillageMethodMap.get(jdbcType);
}
@@ -495,7 +496,7 @@
*/
if (isInitialized == false)
initialize();
-
+
return (String) jdbcToPPMethodMap.get(jdbcType);
}
@@ -509,13 +510,13 @@
*/
if (isInitialized == false)
initialize();
-
+
return (String) torqueTypeToJdbcTypeMap.get(type);
}
-
+
/**
* Returns Torque type constant corresponding to JDBC type code.
- * Used but Torque JDBC task.
+ * Used but Torque JDBC task.
*/
public static String getTorqueType(Integer sqlType)
{
@@ -540,7 +541,7 @@
}
/**
- * Returns true if the type is boolean in the
+ * Returns true if the type is boolean in the
* java object and a String "Y" or "N" in the db.
*
* @param type The type to check.
1.3 +6 -5 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Unique.java
Index: Unique.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/Unique.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Unique.java 28 Nov 2001 09:51:57 -0000 1.2
+++ Unique.java 16 Feb 2002 19:40:37 -0000 1.3
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -62,7 +62,8 @@
* A Class for information about unique indices of a table
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: Unique.java,v 1.2 2001/11/28 09:51:57 dlr Exp $
+ * @version $Id: Unique.java,v 1.3 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class Unique
{
1.1 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/model/package.html
Index: package.html
===================================================================
<html>
<head>
<!-- head part is ignored -->
</head>
<body>
Torque persistance layer.
<br>
<b>deprecated use the decoupled torque version instead.</b>
<br>
<font size="-2">$Id: package.html,v 1.1 2002/02/16 19:40:37 mpoeschl Exp $</font>
</body>
</html>
1.2 +9 -8 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/transform/DTDResolver.java
Index: DTDResolver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/transform/DTDResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DTDResolver.java 16 Aug 2001 05:09:33 -0000 1.1
+++ DTDResolver.java 16 Feb 2002 19:40:37 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -68,7 +68,8 @@
* Bug 4337703</a>
*
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: DTDResolver.java,v 1.1 2001/08/16 05:09:33 jvanzyl Exp $
+ * @version $Id: DTDResolver.java,v 1.2 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class DTDResolver implements EntityResolver
{
@@ -82,11 +83,11 @@
{
try
{
- InputStream dtdStream =
+ InputStream dtdStream =
getClass().getResourceAsStream("database.dtd");
-
+
// getResource was buggy on many systems including Linux,
- // OSX, and some versions of windows in jdk1.3.
+ // OSX, and some versions of windows in jdk1.3.
// getResourceAsStream works on linux, maybe others?
if (dtdStream != null)
{
1.2 +16 -15 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/transform/SQLToAppData.java
Index: SQLToAppData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/transform/SQLToAppData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SQLToAppData.java 16 Aug 2001 05:09:34 -0000 1.1
+++ SQLToAppData.java 16 Feb 2002 19:40:37 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -76,10 +76,11 @@
* sql tokens and the parses these to create the AppData
* class. SQLToAppData is in effect a simplified sql parser.
*
- *
+ *
* @author <a href="mailto:leon@opticode.co.za">Leon Messerschmidt</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: SQLToAppData.java,v 1.1 2001/08/16 05:09:34 jvanzyl Exp $
+ * @version $Id: SQLToAppData.java,v 1.2 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class SQLToAppData
{
@@ -146,7 +147,7 @@
*/
private void err (String name) throws ParseException
{
- throw new ParseException (name + " at [ line: " + token.getLine() +
+ throw new ParseException (name + " at [ line: " + token.getLine() +
" col: "+token.getCol()+" ]");
}
@@ -187,7 +188,7 @@
{
Create_Table_Column(tbl);
}
-
+
if (tbl.getPrimaryKey().size() == 1)
{
tbl.setIdMethod("idbroker");
@@ -196,8 +197,8 @@
{
tbl.setIdMethod("none");
}
-
-
+
+
appDataDB.addTable (tbl);
}
@@ -212,7 +213,7 @@
// PRIMARY/FOREIGN/UNIQUE
if (token.getStr().equals(","))
next();
-
+
if (token.getStr().toUpperCase().equals("PRIMARY"))
Create_Table_Column_Primary (tbl);
else if (token.getStr().toUpperCase().equals("FOREIGN"))
@@ -281,7 +282,7 @@
next(); // skip the )
}
-
+
/**
* Parses FOREIGN KEY (BAR) REFERENCES TABLE (BAR) statement
*/
@@ -418,7 +419,7 @@
columnSize = columnSize + columnPrecision;
col.setTypeFromString (columnType,columnSize);
tbl.addColumn (col);
-
+
if ( inEnum )
{
col.setNotNull(true);
@@ -434,7 +435,7 @@
if (token.getStr().toUpperCase().equals("NOT"))
{
next();
- if (!token.getStr().toUpperCase().equals("NULL"))
+ if (!token.getStr().toUpperCase().equals("NULL"))
err ("NULL expected after NOT");
col.setNotNull(true);
next();
@@ -442,7 +443,7 @@
else if (token.getStr().toUpperCase().equals("PRIMARY"))
{
next();
- if (!token.getStr().toUpperCase().equals("KEY"))
+ if (!token.getStr().toUpperCase().equals("KEY"))
err ("KEY expected after PRIMARY");
col.setPrimaryKey(true);
next();
1.3 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/transform/XmlToAppData.java
Index: XmlToAppData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/transform/XmlToAppData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlToAppData.java 28 Jan 2002 21:05:07 -0000 1.2
+++ XmlToAppData.java 16 Feb 2002 19:40:37 -0000 1.3
@@ -87,7 +87,8 @@
* @author <a href="mailto:leon@opticode.co.za">Leon Messerschmidt</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: XmlToAppData.java,v 1.2 2002/01/28 21:05:07 mpoeschl Exp $
+ * @version $Id: XmlToAppData.java,v 1.3 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class XmlToAppData extends DefaultHandler
{
1.3 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/transform/XmlToData.java
Index: XmlToData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/transform/XmlToData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlToData.java 28 Jan 2002 21:05:07 -0000 1.2
+++ XmlToData.java 16 Feb 2002 19:40:37 -0000 1.3
@@ -87,7 +87,8 @@
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
* @author <a href="mailto:fedor.karpelevitch@home.com">Fedor Karpelevitch</a>
- * @version $Id: XmlToData.java,v 1.2 2002/01/28 21:05:07 mpoeschl Exp $
+ * @version $Id: XmlToData.java,v 1.3 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class XmlToData extends DefaultHandler implements EntityResolver
{
1.1 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/transform/package.html
Index: package.html
===================================================================
<html>
<head>
<!-- head part is ignored -->
</head>
<body>
Torque persistance layer.
<br>
<b>deprecated use the decoupled torque version instead.</b>
<br>
<font size="-2">$Id: package.html,v 1.1 2002/02/16 19:40:37 mpoeschl Exp $</font>
</body>
</html>
1.2 +6 -5 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/sql/ParseException.java
Index: ParseException.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/sql/ParseException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParseException.java 16 Aug 2001 05:09:35 -0000 1.1
+++ ParseException.java 16 Feb 2002 19:40:37 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -59,7 +59,8 @@
* will probably get some extra features in future.
*
* @author <a href="mailto:leon@opticode.co.za">Leon Messerschmidt</a>
- * @version $Id: ParseException.java,v 1.1 2001/08/16 05:09:35 jvanzyl Exp $
+ * @version $Id: ParseException.java,v 1.2 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class ParseException extends Exception
{
1.2 +8 -7 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/sql/SQLScanner.java
Index: SQLScanner.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/sql/SQLScanner.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SQLScanner.java 16 Aug 2001 05:09:35 -0000 1.1
+++ SQLScanner.java 16 Feb 2002 19:40:37 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -64,7 +64,8 @@
*
* @author <a href="mailto:leon@opticode.co.za">Leon Messerschmidt</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: SQLScanner.java,v 1.1 2001/08/16 05:09:35 jvanzyl Exp $
+ * @version $Id: SQLScanner.java,v 1.2 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
public class SQLScanner
{
@@ -77,7 +78,7 @@
static private final char commentSlash = '/';
static private final char commentStar = '*';
static private final char commentDash = '-';
-
+
private Reader in;
private int chr;
private String token;
@@ -167,7 +168,7 @@
inCommentDash = true;
}
}
-
+
if (inCommentDash)
{
if ((char)c == '\n' || (char)c == '\r')
1.2 +6 -6 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/sql/Token.java
Index: Token.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/sql/Token.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Token.java 16 Aug 2001 05:09:35 -0000 1.1
+++ Token.java 16 Feb 2002 19:40:37 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -60,9 +60,9 @@
* of this class unless you are working on SQLScanner.
*
* @author <a href="mailto:leon@opticode.co.za">Leon Messerschmidt</a>
- * @version $Id: Token.java,v 1.1 2001/08/16 05:09:35 jvanzyl Exp $
+ * @version $Id: Token.java,v 1.2 2002/02/16 19:40:37 mpoeschl Exp $
+ * @deprecated use turbine-torque
*/
-
public class Token
{
private String str;
1.1 jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/sql/package.html
Index: package.html
===================================================================
<html>
<head>
<!-- head part is ignored -->
</head>
<body>
Torque persistance layer.
<br>
<b>deprecated use the decoupled torque version instead.</b>
<br>
<font size="-2">$Id: package.html,v 1.1 2002/02/16 19:40:37 mpoeschl Exp $</font>
</body>
</html>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/sql package.html ParseException.java SQLScanner.java Token.java
Posted by Daniel Rall <dl...@finemaltcoding.com>.
mpoeschl@apache.org writes:
> mpoeschl 02/02/16 11:40:37
>
> Modified: src/java/org/apache/turbine/torque TorqueCreateDatabase.java
> TorqueDataDTDTask.java TorqueDataDumpTask.java
> TorqueDataModelTask.java TorqueDataSQLTask.java
> TorqueJDBCTransformTask.java
> TorqueObjectModelTask.java TorqueSQLTask.java
> TorqueSQLTransformTask.java
> src/java/org/apache/turbine/torque/engine/database/model
> AppData.java Column.java ForeignKey.java
> Database.java IdMethodParameter.java Index.java
> Inheritance.java Table.java TypeMap.java
> Unique.java
> src/java/org/apache/turbine/torque/engine/database/transform
> DTDResolver.java SQLToAppData.java
> XmlToAppData.java XmlToData.java
> src/java/org/apache/turbine/torque/engine/sql
> ParseException.java SQLScanner.java Token.java
> Added: src/java/org/apache/turbine/torque package.html
> src/java/org/apache/turbine/torque/engine/database/model
> package.html
> src/java/org/apache/turbine/torque/engine/database/transform
> package.html
> src/java/org/apache/turbine/torque/engine/sql package.html
> Log:
> mark torque as deprecated
Woo hoo! About time. +1
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>