henning 2004/05/17 05:41:14
Modified: src/generator/src/java/org/apache/torque/engine/database/model
Tag: TORQUE_3_1_HENNING Database.java
src/generator/src/templates/om Tag: TORQUE_3_1_HENNING
Control.vm
xdocs Tag: TORQUE_3_1_HENNING release-changes.xml
status.xml
Removed: proposals/henning/mapbuilder-init Tag: TORQUE_3_1_HENNING
README mapbuilder-init.patch
Log:
Added the mapbuilder proposal to the TORQUE_3_1_HENNING branch.
Revision Changes Path
No revision
No revision
1.6.2.1.2.1 +8 -1
db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Database.java
Index: Database.java
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Database.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.1.2.1
diff -u -r1.6.2.1 -r1.6.2.1.2.1
--- Database.java 29 Feb 2004 23:03:54 -0000 1.6.2.1
+++ Database.java 17 May 2004 12:41:13 -0000 1.6.2.1.2.1
@@ -22,6 +22,8 @@
import java.util.List;
import java.util.Properties;
+import org.apache.commons.lang.StringUtils;
+
import org.apache.torque.engine.EngineException;
import org.xml.sax.Attributes;
@@ -77,6 +79,11 @@
public String getName()
{
return name;
+ }
+
+ public String getJavaName()
+ {
+ return StringUtils.capitalise(name);
}
/**
No revision
No revision
1.4.4.1 +9 -0 db-torque/src/generator/src/templates/om/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Control.vm,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- Control.vm 7 Aug 2003 13:13:00 -0000 1.4
+++ Control.vm 17 May 2004 12:41:13 -0000 1.4.4.1
@@ -17,10 +17,12 @@
#set ( $pkbase = "${package}" )
#set ( $pkpeer = "${package}" )
#set ( $pkmap = "${package}.map" )
+ #set ( $pkdb = "${package}.db" )
$pkbase
$pkpeer
$pkmap
+ $pkdb
#set ( $path = $strings.getPackageAsPath($pkpeer) )
$files.mkdir("$outputDirectory/$path")
@@ -28,8 +30,15 @@
#set ( $path = $strings.getPackageAsPath($pkmap) )
$files.mkdir("$outputDirectory/$path")
+ #set ( $path = $strings.getPackageAsPath($pkdb) )
+ $files.mkdir("$outputDirectory/$path")
+
#set ( $path = $strings.getPackageAsPath($pkbase) )
$files.mkdir("$outputDirectory/$path")
+
+ #set ( $fname = "${database.JavaName}Init.java" )
+ #set ( $path = "${strings.getPackageAsPath($pkdb)}$fname" )
+ $generator.parse("om/Database.vm", $path, "database", $database)
#foreach ($tbl in $database.Tables)
#if (!$tbl.isForReferenceOnly())
No revision
No revision
1.3.2.5.2.2 +24 -0 db-torque/xdocs/release-changes.xml
Index: release-changes.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v
retrieving revision 1.3.2.5.2.1
retrieving revision 1.3.2.5.2.2
diff -u -r1.3.2.5.2.1 -r1.3.2.5.2.2
--- release-changes.xml 17 May 2004 12:20:47 -0000 1.3.2.5.2.1
+++ release-changes.xml 17 May 2004 12:41:13 -0000 1.3.2.5.2.2
@@ -14,6 +14,30 @@
Changes between Torque 3.1.1 and the HENNING Sub-Branch<br/>
</p>
+<subsection name="MapBuilder Patch">
+<p>
+The Torque generator now builds an additional per-Schema class. This
+class has only one static method called <code>init()</code> which adds
+all the mapbuilders from the schema to the Torque core.<br/>
+
+This allows the developer to have a defined way for finding all the
+tables defined in a schema from a database. Normally, the map builders
+are registered when a peer is used for the first time and there was no
+way to get a list of all defined peers without actually referencing
+all of these.<br/>
+
+Torque now creates an additional package, called <code>db</code> with
+a single class called <your database name capitalised>Init. If
+your database is called "petshop", your class will be called
+<code>PetshopInit</code>.<br/>
+
+After invoking <code>PetShopInit.init()</code>, all your peers will
+have their map builders registered with Torque.<br/>
+</p>
+</subsection>
+
+</section>
+
<section name="Torque 3.1.1.">
<p>
Changes between Torque 3.1 and 3.1.1. <br/>
1.13.4.1 +8 -0 db-torque/xdocs/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/status.xml,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -r1.13 -r1.13.4.1
--- status.xml 1 Sep 2003 20:02:36 -0000 1.13
+++ status.xml 17 May 2004 12:41:13 -0000 1.13.4.1
@@ -19,6 +19,14 @@
A list of changes can be found <a href="release-changes.html">here</a>.
</p>
+ <subsection name="17 May 2004 - Torque (Experimental Version) - TorqueX 3.1.1
Sub Branch created">
+ <p>
+ This is a sub branch of the Torque 3.1 version with some long proposed
changes applied. It is
+ intended as a testbed for these changes, which might be rolled back into
Torque 3.2 at a later
+ date.
+ </p>
+ </subsection>
+
<subsection name="1 September 2003 - Torque 3.1 is released!">
<p>
Downloads are available <a
href="http://db.apache.org/builds/torque/release/3.1/";>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
