db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r944877 [3/4] - in /db/torque/torque4/trunk/torque-templates/src: main/java/org/apache/torque/templates/ main/java/org/apache/torque/templates/schema/ main/java/org/apache/torque/templates/sourcefilter/ main/java/org/apache/torque/templates...
Date Sun, 16 May 2010 16:15:24 GMT
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/adderReferencingObject.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/adderReferencingObject.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/adderReferencingObject.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/adderReferencingObject.vm Sun May 16 16:15:20 2010
@@ -26,7 +26,7 @@
 ## "foreign-key" element from the torque schema, which was generated 
 ## by the OMTransformer.  
 ##
-#set ( $foreignKeyElement = $torqueGf.getParent() )
+#set ( $foreignKeyElement = $torqueGen.getParent() )
 #set ( $localTableElement = $foreignKeyElement.getChild("table") )
 #set ( $localClassName = $localTableElement.getAttribute("dbObjectClassName") )
 #set ( $foreignKeyLocalFieldElement = $foreignKeyElement.getChild("local-field") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm Sun May 16 16:15:20 2010
@@ -33,10 +33,10 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-#if ($torqueGf.booleanOption("torque.addIntakeRetrievable"))
-import $torqueGf.option("torque.retrievableInterface");
+#if ($torqueGen.booleanOption("torque.addIntakeRetrievable"))
+import $torqueGen.option("torque.retrievableInterface");
 #end
-#if (!$torqueGf.booleanOption("torque.om.complexObjectModel"))
+#if (!$torqueGen.booleanOption("torque.om.complexObjectModel"))
 import org.apache.torque.Torque;
 #end
 import org.apache.torque.TorqueException;
@@ -63,64 +63,64 @@ import $tblFK.Interface;
  #end
 #end
 #end
-#if ($torqueGf.booleanOption("torque.om.generateBeans"))
-$torqueGf.mergepoint("objectBeanImports")
+#if ($torqueGen.booleanOption("torque.om.generateBeans"))
+$torqueGen.mergepoint("objectBeanImports")
 #end
 
-$torqueGf.mergepoint("classJavadoc")
+$torqueGen.mergepoint("classJavadoc")
 #if ($baseClass == "")
   #set ($extendsBaseClass = "" )
 #else
   #set ($extendsBaseClass = "extends $baseClass" )
 #end
 public abstract class $baseDbObjectClassName $extendsBaseClass
-#if ($torqueGf.booleanOption("torque.addIntakeRetrievable"))
-    implements $torqueGf.option("torque.retrievableInterface")
+#if ($torqueGen.booleanOption("torque.addIntakeRetrievable"))
+    implements $torqueGen.option("torque.retrievableInterface")
 #end
 {
-$torqueGf.mergepoint("serialVersionUid")
+$torqueGen.mergepoint("serialVersionUid")
 
 ## field definitions for columns
-$torqueGf.mergepoint("fieldDefinitions")
+$torqueGen.mergepoint("fieldDefinitions")
 
 ## field definitions for referenced objects
-#if ($torqueGf.booleanOption("torque.om.complexObjectModel"))
-$torqueGf.mergepoint("fieldDefinitionsReferencedObjects")
+#if ($torqueGen.booleanOption("torque.om.complexObjectModel"))
+$torqueGen.mergepoint("fieldDefinitionsReferencedObjects")
 #end
 
 ## field definitions for referencing objects
-#if ($torqueGf.booleanOption("torque.om.complexObjectModel") && $torqueGf.booleanOption("torque.om.objectIsCaching"))
-$torqueGf.mergepoint("fieldDefinitionsReferencingObjects")
+#if ($torqueGen.booleanOption("torque.om.complexObjectModel") && $torqueGen.booleanOption("torque.om.objectIsCaching"))
+$torqueGen.mergepoint("fieldDefinitionsReferencingObjects")
 #end
 
 ## getters and setters for member variables for columns 
-$torqueGf.mergepoint("gettersSetters")
+$torqueGen.mergepoint("gettersSetters")
 
-#if ($torqueGf.option("torque.om.complexObjectModel"))
-$torqueGf.mergepoint("gettersSettersReferencedObjects")
+#if ($torqueGen.option("torque.om.complexObjectModel"))
+$torqueGen.mergepoint("gettersSettersReferencedObjects")
 #end
 
-#if ($torqueGf.booleanOption("torque.om.complexObjectModel"))
-$torqueGf.mergepoint("referencingObjectMethods")
+#if ($torqueGen.booleanOption("torque.om.complexObjectModel"))
+$torqueGen.mergepoint("referencingObjectMethods")
 #end
 
-#if ($torqueGf.booleanOption("torque.om.addGetByNameMethods"))
-$torqueGf.mergepoint("getByNameMethods")
+#if ($torqueGen.booleanOption("torque.om.addGetByNameMethods"))
+$torqueGen.mergepoint("getByNameMethods")
 #end
 
-#if ($torqueGf.booleanOption("torque.om.save.addSaveMethods"))
-$torqueGf.mergepoint("saveMethods")
+#if ($torqueGen.booleanOption("torque.om.save.addSaveMethods"))
+$torqueGen.mergepoint("saveMethods")
 #end
 
-$torqueGf.mergepoint("primaryKeyMethods")
-$torqueGf.mergepoint("copyMethods")
-$torqueGf.mergepoint("peerGetter")
-$torqueGf.mergepoint("tableMapGetter")
+$torqueGen.mergepoint("primaryKeyMethods")
+$torqueGen.mergepoint("copyMethods")
+$torqueGen.mergepoint("peerGetter")
+$torqueGen.mergepoint("tableMapGetter")
 
-#if ($torqueGf.booleanOption("torque.om.generateBeans"))
-$torqueGf.mergepoint("objectBeanMethods")
+#if ($torqueGen.booleanOption("torque.om.generateBeans"))
+$torqueGen.mergepoint("objectBeanMethods")
 #end
 
-$torqueGf.mergepoint("toString")
-$torqueGf.mergepoint("extensions")
+$torqueGen.mergepoint("toString")
+$torqueGen.mergepoint("extensions")
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanImports.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanImports.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanImports.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanImports.vm Sun May 16 16:15:20 2010
@@ -30,7 +30,7 @@ import ${beanPackage}.${beanClassName};
 #if ($complexObjectModel)
   ## own foreign keys
   ##
-  #set ( $foreignKeyElements = $torqueGf.getChildren("foreign-key") )
+  #set ( $foreignKeyElements = $torqueGen.getChildren("foreign-key") )
   #foreach ($foreignKeyElement in $foreignKeyElements)
     #set ( $foreignTableElement = $foreignKeyElement.getChild("table") )
     #set ( $foreignBeanClassName = $foreignTableElement.getAttribute("beanClassName") )
@@ -40,7 +40,7 @@ import ${foreignBeanPackage}.${foreignBe
   ## referencing foreign keys
   ##
   #if ($objectIsCaching)
-    #set ( $referencingForeignKeyElements = $torqueGf.getChild("referencing-foreign-keys").getChildren("foreign-key") )
+    #set ( $referencingForeignKeyElements = $torqueGen.getChild("referencing-foreign-keys").getChildren("foreign-key") )
     #foreach ($foreignKeyElement in $referencingForeignKeyElements)
       #set ( $foreignTableElement = $foreignKeyElement.getParent() )
       #set ( $foreignTableName = $foreignTableElement.getAttribute("name") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm Sun May 16 16:15:20 2010
@@ -53,9 +53,9 @@
         result = new ${beanClassName}();
         createdBeans.put(this, result);
 
-#set ( $columnElements = $torqueGf.getChildren("column") )
-#set ( $referencingForeignKeyElements = $torqueGf.getChild("referencing-foreign-keys").getChildren("foreign-key") )
-#set ( $foreignKeyElements = $torqueGf.getChildren("foreign-key") )
+#set ( $columnElements = $torqueGen.getChildren("column") )
+#set ( $referencingForeignKeyElements = $torqueGen.getChild("referencing-foreign-keys").getChildren("foreign-key") )
+#set ( $foreignKeyElements = $torqueGen.getChildren("foreign-key") )
 #foreach ($columnElement in $columnElements)
   #set ( $setter = $columnElement.getAttribute("setter") )
   #set ( $getter = $columnElement.getAttribute("getter") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/classJavadoc.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/classJavadoc.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/classJavadoc.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/classJavadoc.vm Sun May 16 16:15:20 2010
@@ -28,10 +28,10 @@
  * $description
  *
 #end
-#if ($torqueGf.booleanOption("torque.om.addTimeStamp"))
+#if ($torqueGen.booleanOption("torque.om.addTimeStamp"))
  * This class was autogenerated by Torque on:
  *
- * [${torqueGf.now()}]
+ * [${torqueGen.now()}]
  *
 #end
  * You should not use this class directly.  It should not even be

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/copyMethods.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/copyMethods.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/copyMethods.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/copyMethods.vm Sun May 16 16:15:20 2010
@@ -127,7 +127,7 @@
     protected $dbObjectClassName copyInto($dbObjectClassName copyObj) throws TorqueException
 #end
     {
-#set ( $columnElements = $torqueGf.getChildren("column") )
+#set ( $columnElements = $torqueGen.getChildren("column") )
 #foreach ($columnElement in $columnElements)
   #set ( $setter = $columnElement.getAttribute("setter") )
   #set ( $field = $columnElement.getAttribute("field") )
@@ -145,7 +145,7 @@
 #end
 
 #if ($complexObjectModel)
-  #set ($foreignKeyElements = $torqueGf.getChild("referencing-foreign-keys").getChildren("foreign-key"))
+  #set ($foreignKeyElements = $torqueGen.getChild("referencing-foreign-keys").getChildren("foreign-key"))
         if (deepcopy)
         {
   #foreach ($foreignKeyElement in $foreignKeyElements)
@@ -198,7 +198,7 @@
      */
     protected $dbObjectClassName copyInto($dbObjectClassName copyObj, boolean deepcopy, Connection con) throws TorqueException
     {
-  #set ( $columnElements = $torqueGf.getChildren("column") )
+  #set ( $columnElements = $torqueGen.getChildren("column") )
   #foreach ($columnElement in $columnElements)
     #set ( $setter = $columnElement.getAttribute("setter") )
     #set ( $field = $columnElement.getAttribute("field") )
@@ -215,7 +215,7 @@
     #end
   #end
 
-  #set ($foreignKeyElements = $torqueGf.getChild("referencing-foreign-keys").getChildren("foreign-key"))
+  #set ($foreignKeyElements = $torqueGen.getChild("referencing-foreign-keys").getChildren("foreign-key"))
         if (deepcopy)
         {
   #foreach ($foreignKeyElement in $foreignKeyElements)

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getByNameMethods.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getByNameMethods.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getByNameMethods.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getByNameMethods.vm Sun May 16 16:15:20 2010
@@ -23,8 +23,8 @@
 ## This template expects as input a "table" element from the torque schema
 ## which was processed by the OMTransformer.  
 ##
-#set ( $java5 = $torqueGf.booleanOption("torque.om.java5") )
-#set ( $columnElements = $torqueGf.getChildren("column") )
+#set ( $java5 = $torqueGen.booleanOption("torque.om.java5") )
+#set ( $columnElements = $torqueGen.getChildren("column") )
 #set ( $peerName = "${peerPackage}.${peerClassName}" )
 
     private static final List#if($java5)<String>#end FIELD_NAMES;

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm Sun May 16 16:15:20 2010
@@ -26,8 +26,8 @@
 ## "foreign-key" element from the torque schema, which was generated 
 ## by the OMTransformer.  
 ##
-#set ( $silentDbFetch = $torqueGf.booleanOption("torque.om.silentDbFetch") )
-#set ( $foreignKeyElement = $torqueGf.getParent() )
+#set ( $silentDbFetch = $torqueGen.booleanOption("torque.om.silentDbFetch") )
+#set ( $foreignKeyElement = $torqueGen.getParent() )
 #set ( $foreignTableElement = $foreignKeyElement.getChild("table") )
 #set ( $foreignTablePeerClass = "${foreignTableElement.getAttribute('peerPackage')}.${foreignTableElement.getAttribute('peerClassName')}" )
 #set ( $foreignTableManagerClass = "${foreignTableElement.getAttribute('managerPackage')}.${foreignTableElement.getAttribute('managerClassName')}" )
@@ -48,13 +48,13 @@
     #set ( $conditional = "$conditional${and}!org.apache.commons.lang.ObjectUtils.equals(this.${localColumnField}, null)" )
   #end
   #if ($arglist != "" )
-    #if ($torqueGf.booleanOption("torque.om.useManagers"))
+    #if ($torqueGen.booleanOption("torque.om.useManagers"))
       #set ( $arglist = "${arglist}, SimpleKey.keyFor(this.$localColumnField)" )
     #else
       #set ( $arglist = "${arglist}, this.$localColumnField" )
     #end
   #else
-    #if ($torqueGf.booleanOption("torque.om.useManagers"))
+    #if ($torqueGen.booleanOption("torque.om.useManagers"))
       #set ( $arglist = "SimpleKey.keyFor(this.$localColumnField)" )
     #else
       #set ( $arglist = "this.$localColumnField" )
@@ -83,14 +83,14 @@
         if ($field == null$conditional)
         {
   #if ($argsize > 1)
-    #if ($torqueGf.booleanOption("torque.om.useManagers"))
+    #if ($torqueGen.booleanOption("torque.om.useManagers"))
             SimpleKey[] keys = { $arglist };
             $field = ${foreignTableManagerClass}.getInstance(new ComboKey(keys));
     #else
             $field = ${foreignTablePeerClass}.retrieveByPK($arglist);
     #end
   #else
-    #if ($torqueGf.booleanOption("torque.om.useManagers"))
+    #if ($torqueGen.booleanOption("torque.om.useManagers"))
             $field = ${foreignTableManagerClass}.getInstance($arglist);
     #else
             $field = ${foreignTablePeerClass}.retrieveByPK(SimpleKey.keyFor($arglist));
@@ -127,7 +127,7 @@
         if ($field == null$conditional)
         {
       #if ($argsize > 1)
-        #if ($torqueGf.booleanOption("torque.om.useManagers"))
+        #if ($torqueGen.booleanOption("torque.om.useManagers"))
             SimpleKey[] keys = { $arglist };
             ComboKey comboid = new ComboKey(keys);
 
@@ -141,7 +141,7 @@
             $field = ${foreignTablePeerClass}.retrieveByPK($arglist, connection);
         #end
       #else
-        #if ($torqueGf.booleanOption("torque.om.useManagers"))
+        #if ($torqueGen.booleanOption("torque.om.useManagers"))
             $field = ${foreignTableManagerClass}.getCachedInstance($arglist);
             if ($field == null)
             {

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencingObject.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencingObject.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencingObject.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencingObject.vm Sun May 16 16:15:20 2010
@@ -25,9 +25,9 @@
 ## The template expects as input a "foreign-field" element inside a 
 ## "referencing-foreign-keys/foreign-key" element
 ##
-#set ( $silentDbFetch = $torqueGf.booleanOption("torque.om.silentDbFetch") )
-#set ( $objectIsCaching = $torqueGf.booleanOption("torque.om.objectIsCaching") )
-#set ( $foreignKeyElement = $torqueGf.getParent() )
+#set ( $silentDbFetch = $torqueGen.booleanOption("torque.om.silentDbFetch") )
+#set ( $objectIsCaching = $torqueGen.booleanOption("torque.om.objectIsCaching") )
+#set ( $foreignKeyElement = $torqueGen.getParent() )
 #set ( $thisObjectClassName = $foreignKeyElement.getChild("table").getAttribute("baseDbObjectClassName") )
 #set ( $otherTable = $foreignKeyElement.getParent() )
 #set ( $otherTablePeerClass = $otherTable.getAttribute("peerClassName") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/joinGetterReferencingObject.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/joinGetterReferencingObject.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/joinGetterReferencingObject.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/joinGetterReferencingObject.vm Sun May 16 16:15:20 2010
@@ -26,9 +26,9 @@
 ## "foreign-key" element from the torque schema, which was generated 
 ## by the OMTransformer.  
 ##
-#set ( $silentDbFetch = $torqueGf.booleanOption("torque.om.silentDbFetch") )
-#set ( $objectIsCaching = $torqueGf.booleanOption("torque.om.objectIsCaching") )
-#set ( $foreignKeyElement = $torqueGf.getParent() )
+#set ( $silentDbFetch = $torqueGen.booleanOption("torque.om.silentDbFetch") )
+#set ( $objectIsCaching = $torqueGen.booleanOption("torque.om.objectIsCaching") )
+#set ( $foreignKeyElement = $torqueGen.getParent() )
 #set ( $otherTable = $foreignKeyElement.getParent() )
 #set ( $otherTablePeerClass = $otherTable.getAttribute("peerClassName") )
 #set ( $otherTablePeerPackage = $otherTable.getAttribute("peerPackage") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm Sun May 16 16:15:20 2010
@@ -40,7 +40,7 @@
   #set ( $comma = "," )
 #end
 
-#set ( $primaryKeyColumnElements = $torqueGf.getChild("primary-keys").getChildren("column"))
+#set ( $primaryKeyColumnElements = $torqueGen.getChild("primary-keys").getChildren("column"))
 #if ($primaryKeyColumnElements.size() == 1)
   #set ( $columnElement = $primaryKeyColumnElements.get(0) )
   #set ( $field = $columnElement.getAttribute("field") )
@@ -210,7 +210,7 @@
 #end
     }
 
-#if ($torqueGf.booleanOption("torque.om.addIntakeRetrievable"))
+#if ($torqueGen.booleanOption("torque.om.addIntakeRetrievable"))
     /**
      * get an id that differentiates this object from others
      * of its class.

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/referencingObjectMethods.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/referencingObjectMethods.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/referencingObjectMethods.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/referencingObjectMethods.vm Sun May 16 16:15:20 2010
@@ -26,13 +26,13 @@
 ## "foreign-key" element from the torque schema, which was generated 
 ## by the OMTransformer.  
 ##
-#set ( $objectIsCaching = $torqueGf.booleanOption("torque.om.objectIsCaching") )
+#set ( $objectIsCaching = $torqueGen.booleanOption("torque.om.objectIsCaching") )
 #if ($objectIsCaching)
-$torqueGf.mergepoint("initializer")
-$torqueGf.mergepoint("adder")
+$torqueGen.mergepoint("initializer")
+$torqueGen.mergepoint("adder")
 #end
-$torqueGf.mergepoint("getter")
+$torqueGen.mergepoint("getter")
 #if ($objectIsCaching)
-$torqueGf.mergepoint("setter")
+$torqueGen.mergepoint("setter")
 #end
-$torqueGf.mergepoint("referencingJoinGetters")
+$torqueGen.mergepoint("referencingJoinGetters")

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/saveMethods.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/saveMethods.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/saveMethods.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/saveMethods.vm Sun May 16 16:15:20 2010
@@ -23,9 +23,9 @@
 ## The template expects as input a "table" element from the torque schema, 
 ## which was processed by the OMTransformer.  
 ##
-#set ( $complexObjectModel = $torqueGf.booleanOption("torque.om.complexObjectModel") )
-#set ( $objectIsCaching = $torqueGf.booleanOption("torque.om.objectIsCaching") )
-#set ( $saveException = $torqueGf.option("torque.om.save.saveException") )
+#set ( $complexObjectModel = $torqueGen.booleanOption("torque.om.complexObjectModel") )
+#set ( $objectIsCaching = $torqueGen.booleanOption("torque.om.objectIsCaching") )
+#set ( $saveException = $torqueGen.option("torque.om.save.saveException") )
     /**
      * Stores the object in the database.  If the object is new,
      * it inserts it; otherwise an update is performed.
@@ -138,8 +138,8 @@
                 {
                     ${peerClassName}.doUpdate(($dbObjectClassName) this, con);
                 }
-#if ($torqueGf.booleanOption("torque.om.useManagers"))
-  #set ( $primaryKeyColumnElements = $torqueGf.getChild("primary-keys").getChildren("column") )
+#if ($torqueGen.booleanOption("torque.om.useManagers"))
+  #set ( $primaryKeyColumnElements = $torqueGen.getChild("primary-keys").getChildren("column") )
   #if ( $primaryKeyColumnElements.size() != 0)
                 if (isCacheOnSave())
                 {
@@ -150,8 +150,8 @@
             }
 
 #if ($complexObjectModel && $objectIsCaching)
-  #set ( $referencingForeignKeyElements = $torqueGf.getChild("referencing-foreign-keys").getChildren("foreign-key") )
-  #set ( $thisTableName = $torqueGf.getSourceElement().getAttribute("name"))
+  #set ( $referencingForeignKeyElements = $torqueGen.getChild("referencing-foreign-keys").getChildren("foreign-key") )
+  #set ( $thisTableName = $torqueGen.getSourceElement().getAttribute("name"))
   #foreach ($referencingForeignKeyElement in $referencingForeignKeyElements)
     #set ( $otherTable = $referencingForeignKeyElement.getParent())
     #set ( $otherTableName = $otherTable.getAttribute("name"))
@@ -177,8 +177,8 @@
 #end
     }
 
-#if ($torqueGf.booleanOption("torque.om.useManagers"))
-  #set ( $primaryKeyColumnElements = $torqueGf.getChild("primary-keys").getChildren("column") )
+#if ($torqueGen.booleanOption("torque.om.useManagers"))
+  #set ( $primaryKeyColumnElements = $torqueGen.getChild("primary-keys").getChildren("column") )
   #if ( $primaryKeyColumnElements.size() != 0)
 
     /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/setterReferencedObjectByObjectKey.vm Sun May 16 16:15:20 2010
@@ -24,7 +24,7 @@
 ## The template expects as input a "table/foreign-key/local-field" element
 ## from the torque schema, which was processed by the OMTransformer.  
 ##
-#set ( $foreignKeyElement = $torqueGf.getParent() )
+#set ( $foreignKeyElement = $torqueGen.getParent() )
 #set ( $localTableElement = $foreignKeyElement.getParent() )
 #set ( $foreignTableElement = $foreignKeyElement.getChild("table") )
 #set ( $referenceElements = $foreignKeyElement.getChildren("reference") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/toString.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/toString.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/toString.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/toString.vm Sun May 16 16:15:20 2010
@@ -27,7 +27,7 @@
     {
         StringBuffer str = new StringBuffer();
         str.append("$dbObjectClassName:\n");
-#set ( $columnElements = $torqueGf.getChildren("column") )
+#set ( $columnElements = $torqueGen.getChildren("column") )
 #foreach ($columnElement in $columnElements)
   #set ( $field = $columnElement.getAttribute("field") )
   #set ( $fieldType = $columnElement.getAttribute("fieldType") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/classJavadoc.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/classJavadoc.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/classJavadoc.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/classJavadoc.vm Sun May 16 16:15:20 2010
@@ -28,10 +28,10 @@
  * $description
  *
 #end
-#if ($torqueGf.booleanOption("torque.om.addTimeStamp"))
+#if ($torqueGen.booleanOption("torque.om.addTimeStamp"))
  * The skeleton for this class was autogenerated by Torque on:
  *
- * [${torqueGf.now()}]
+ * [${torqueGen.now()}]
  *
 #end
  * You should add additional methods to this class to meet the

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/dbObject.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/dbObject.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/dbObject.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/dbObject.vm Sun May 16 16:15:20 2010
@@ -39,11 +39,11 @@ package $dbObjectPackage;
 
 import org.apache.torque.om.Persistent;
 
-$torqueGf.mergepoint("classJavadoc")
+$torqueGen.mergepoint("classJavadoc")
 public $abstract class $dbObjectClassName
     extends ${baseDbObjectPackage}.${baseDbObjectClassName}
     implements Persistent$interface
 {
-$torqueGf.mergepoint("serialVersionUid")
-$torqueGf.mergepoint("extensions")
+$torqueGen.mergepoint("serialVersionUid")
+$torqueGen.mergepoint("extensions")
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/inheritance/classJavadoc.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/inheritance/classJavadoc.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/inheritance/classJavadoc.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/inheritance/classJavadoc.vm Sun May 16 16:15:20 2010
@@ -24,10 +24,10 @@
 ## from the torque schema which was processed by the OMTransformer.  
 ##
 /**
-#if ($torqueGf.booleanOption("torque.om.addTimeStamp"))
+#if ($torqueGen.booleanOption("torque.om.addTimeStamp"))
  * The skeleton for this class was autogenerated by Torque on:
  *
- * [${torqueGf.now()}]
+ * [${torqueGen.now()}]
  *
 #end
  * You should add additional methods to this class to meet the

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/inheritance/inheritanceDbObject.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/inheritance/inheritanceDbObject.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/inheritance/inheritanceDbObject.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/inheritance/inheritanceDbObject.vm Sun May 16 16:15:20 2010
@@ -25,18 +25,18 @@
 ##
 package $package;
 
-$torqueGf.mergepoint("classJavadoc")
+$torqueGen.mergepoint("classJavadoc")
 public class $className extends $extends
 {
-$torqueGf.mergepoint("serialVersionUid")
+$torqueGen.mergepoint("serialVersionUid")
     public ${className}()
     {
-#set ( $columnElement = $torqueGf.getParent() )
+#set ( $columnElement = $torqueGen.getParent() )
 #set ( $tableElement = $columnElement.getParent() )
 #set ( $setter = $columnElement.getAttribute("setter") )
 #set ( $peerClassName = $tableElement.getAttribute("peerClassName") )
 #set ( $peerPackage = $tableElement.getAttribute("peerPackage") )
         ${setter}(${peerPackage}.${peerClassName}.${classkeyConstant});
     }
-$torqueGf.mergepoint("extensions")
+$torqueGen.mergepoint("extensions")
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/getter.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/getter.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/getter.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/getter.vm Sun May 16 16:15:20 2010
@@ -39,6 +39,6 @@
      */
     $getterAccessModifer $fieldType ${getter}()$getterThrows 
     {
-        $torqueGf.mergepoint("methodStart")
+        $torqueGen.mergepoint("methodStart")
         return $field;
     }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/getterSetter.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/getterSetter.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/getterSetter.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/getterSetter.vm Sun May 16 16:15:20 2010
@@ -23,5 +23,5 @@
 ## It expects to be executed on a source element with the 
 ## field attributes set (as defined in the JavaFieldAttributeName enum). 
 ##
-$torqueGf.mergepoint("getter")
-$torqueGf.mergepoint("setter")
+$torqueGen.mergepoint("getter")
+$torqueGen.mergepoint("setter")

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/serialVersionUid.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/serialVersionUid.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/serialVersionUid.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/serialVersionUid.vm Sun May 16 16:15:20 2010
@@ -23,8 +23,8 @@
 ## time stamp at generation time, if the option torque.om:addTimeStamp
 ## is set to true.
 ##
-#if ($torqueGf.booleanOption("torque.om.addTimeStamp"))
+#if ($torqueGen.booleanOption("torque.om.addTimeStamp"))
     /** Serial version */
-    private static final long serialVersionUID = ${torqueGf.now().Time}L;
+    private static final long serialVersionUID = ${torqueGen.now().Time}L;
 
 #end
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setter.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setter.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setter.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setter.vm Sun May 16 16:15:20 2010
@@ -42,8 +42,8 @@
      */
     $setterAccessModifer void ${setter}($fieldType v)$setterThrows
     {
-$torqueGf.mergepoint("methodStart")
+$torqueGen.mergepoint("methodStart")
         this.$field = v;
-$torqueGf.mergepoint("methodEnd")
+$torqueGen.mergepoint("methodEnd")
     }
     
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodEnd.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodEnd.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodEnd.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodEnd.vm Sun May 16 16:15:20 2010
@@ -24,11 +24,11 @@
 ## The template expects as input a "column" element from the torque schema, 
 ## which was processed by the OMTransformer.  
 ##
-#if ($torqueGf.option("torque.om.complexObjectModel"))
+#if ($torqueGen.option("torque.om.complexObjectModel"))
   ##
   ## set referenced object(s) to null if the id has changed
   ## 
-  #set ( $referencedColumns = $torqueGf.getChildren("referenced-column") )
+  #set ( $referencedColumns = $torqueGen.getChildren("referenced-column") )
   #foreach ($referencedColumnElement in $referencedColumns)
     #set ( $foreignKeyElement = $referencedColumnElement.getChild("foreign-key") )
     #set ( $foreignColumnElement = $referencedColumnElement.getChild("column") )
@@ -48,8 +48,8 @@
   ##
   ## update the id in referencing object(s)
   ## 
-  #if ($torqueGf.option("torque.om.objectIsCaching"))
-    #set ( $referencingColumns = $torqueGf.getChildren("referencing-column") )
+  #if ($torqueGen.option("torque.om.objectIsCaching"))
+    #set ( $referencingColumns = $torqueGen.getChildren("referencing-column") )
     #foreach ($referencingColumnElement in $referencingColumns)
       ## the column on the foreign table
       #set ( $foreignColumnElement = $referencingColumnElement.getChild("column") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodStart.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodStart.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodStart.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodStart.vm Sun May 16 16:15:20 2010
@@ -24,7 +24,7 @@
 ## The template expects as input a "column" element from the torque schema, 
 ## which was processed by the OMTransformer.  
 ##
-#if ($torqueGf.booleanOption("torque.om.trackModified"))
+#if ($torqueGen.booleanOption("torque.om.trackModified"))
   #if ($primitive)
         if (this.$field != v)
   #else

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterReferencedObject.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterReferencedObject.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterReferencedObject.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterReferencedObject.vm Sun May 16 16:15:20 2010
@@ -41,7 +41,7 @@
      */
     public void ${setter}($fieldType v)$setterThrows
     {
-#set ( $foreignKeyElement = $torqueGf.getParent() )
+#set ( $foreignKeyElement = $torqueGen.getParent() )
 #set ( $referenceElements = $foreignKeyElement.getChildren("reference") )
 #foreach ( $referenceElement in $referenceElements )
   #set ( $localColumnElement = $referenceElement.getChild("local-column").getChild("column") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/interface/interface.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/interface/interface.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/interface/interface.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/interface/interface.vm Sun May 16 16:15:20 2010
@@ -34,9 +34,9 @@ package ${dbObjectPackage};
 #end
  * This is an interface that should be filled with the public api of the
  * $dbObjectClassName objects.
- * The skeleton for this class was autogenerated by Torque #if ($torqueGf.booleanOption("torque.om.addTimeStamp"))on:
+ * The skeleton for this class was autogenerated by Torque #if ($torqueGen.booleanOption("torque.om.addTimeStamp"))on:
  *
- * [${torqueGf.now()}]
+ * [${torqueGen.now()}]
  * #end
  * You should add additional methods to this class to meet the
  * application requirements.  This class will only be generated as

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm Sun May 16 16:15:20 2010
@@ -49,11 +49,11 @@ import ${peerPackage}.${peerClassName};
 import ${dbObjectPackage}.${dbObjectClassName};
 #end
 
-$torqueGf.mergepoint("classJavadoc")
+$torqueGen.mergepoint("classJavadoc")
 public abstract class ${baseManagerClassName}
     extends AbstractBaseManager
 {
-$torqueGf.mergepoint("serialVersionUid")
+$torqueGen.mergepoint("serialVersionUid")
     /** The name of the manager */
     protected static final String MANAGED_CLASS = "${dbObjectPackage}.${dbObjectClassName}";
    
@@ -129,7 +129,7 @@ $torqueGf.mergepoint("serialVersionUid")
         return getManager().getInstanceImpl(id, fromCache);
     }
 
-#set ($primaryKeyColumnElements = $torqueGf.getChild("primary-keys").getChildren("column"))
+#set ($primaryKeyColumnElements = $torqueGen.getChild("primary-keys").getChildren("column"))
 #if ($primaryKeyColumnElements.size() == 1)
   #set ($primaryKeyColumnElement = $primaryKeyColumnElements.get(0))
   #set ($fieldType = $primaryKeyColumnElement.getAttribute("fieldType"))
@@ -340,5 +340,5 @@ $torqueGf.mergepoint("serialVersionUid")
     {
         return ${peerClassName}.retrieveByPKs(ids);
     }
-$torqueGf.mergepoint("extensions")
+$torqueGen.mergepoint("extensions")
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/classJavadoc.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/classJavadoc.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/classJavadoc.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/classJavadoc.vm Sun May 16 16:15:20 2010
@@ -30,9 +30,9 @@
  * $description
  *
 #end
- * This class was autogenerated by Torque#if ($torqueGf.booleanOption("torque.om.addTimeStamp")) on:
+ * This class was autogenerated by Torque#if ($torqueGen.booleanOption("torque.om.addTimeStamp")) on:
  *
- * [${torqueGf.now()}]
+ * [${torqueGen.now()}]
 #end
  *
  * You should not use this class directly.  It should not even be

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/classJavadoc.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/classJavadoc.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/classJavadoc.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/classJavadoc.vm Sun May 16 16:15:20 2010
@@ -30,9 +30,9 @@
  * $description
  *
 #end
- * This class was autogenerated by Torque#if ($torqueGf.booleanOption("torque.om.addTimeStamp")) on:
+ * This class was autogenerated by Torque#if ($torqueGen.booleanOption("torque.om.addTimeStamp")) on:
  *
- * [${torqueGf.now()}]
+ * [${torqueGen.now()}]
 #end
  *
  * You should add additional methods to this class to meet the

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/manager.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/manager.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/manager.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/manager.vm Sun May 16 16:15:20 2010
@@ -18,11 +18,11 @@ package $managerPackage;
 
 import org.apache.torque.TorqueException;
 
-$torqueGf.mergepoint("classJavadoc")
+$torqueGen.mergepoint("classJavadoc")
 public class ${managerClassName}
     extends ${baseManagerPackage}.${baseManagerClassName}
 {
-$torqueGf.mergepoint("serialVersionUid")
+$torqueGen.mergepoint("serialVersionUid")
     /**
      * Creates a new <code>${managerClassName}</code> instance.
      *
@@ -33,5 +33,5 @@ $torqueGf.mergepoint("serialVersionUid")
     {
         super();
     }
-$torqueGf.mergepoint("extensions")
+$torqueGen.mergepoint("extensions")
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/classJavadoc.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/classJavadoc.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/classJavadoc.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/classJavadoc.vm Sun May 16 16:15:20 2010
@@ -31,10 +31,10 @@
  * $description
  *
 #end
-#if ($torqueGf.booleanOption("torque.om.addTimeStamp"))
+#if ($torqueGen.booleanOption("torque.om.addTimeStamp"))
  * This class was autogenerated by Torque on:
  *
- * [${torqueGf.now()}]
+ * [${torqueGen.now()}]
  *
 #end
  */

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/doBuild.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/doBuild.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/doBuild.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/doBuild.vm Sun May 16 16:15:20 2010
@@ -27,7 +27,7 @@
 ## The options and the attributes of the current source element must be set
 ## as velocity variables.  
 ##
-#set ( $tableElement = $torqueGf.getSourceElement() )
+#set ( $tableElement = $torqueGen.getSourceElement() )
 #set ( $databaseName = $tableElement.getParent().getAttribute("name") )
     /**
      * The doBuild() method builds the DatabaseMap

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/mapBuilder.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/mapBuilder.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/mapBuilder.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/mapBuilder.vm Sun May 16 16:15:20 2010
@@ -28,14 +28,14 @@
 ## as velocity variables.  
 ##
 package ${mapBuilderPackage};
-$torqueGf.mergepoint("imports")
-$torqueGf.mergepoint("classJavadoc")
+$torqueGen.mergepoint("imports")
+$torqueGen.mergepoint("classJavadoc")
 public class ${mapBuilderClassName} implements MapBuilder
 {
-$torqueGf.mergepoint("classNameConstant")
-$torqueGf.mergepoint("dbMapField")
-$torqueGf.mergepoint("isBuilt")
-$torqueGf.mergepoint("getDatabaseMap")
-$torqueGf.mergepoint("doBuild")
-$torqueGf.mergepoint("extensions")
+$torqueGen.mergepoint("classNameConstant")
+$torqueGen.mergepoint("dbMapField")
+$torqueGen.mergepoint("isBuilt")
+$torqueGen.mergepoint("getDatabaseMap")
+$torqueGen.mergepoint("doBuild")
+$torqueGen.mergepoint("extensions")
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapInit/baseMapInit.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapInit/baseMapInit.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapInit/baseMapInit.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapInit/baseMapInit.vm Sun May 16 16:15:20 2010
@@ -42,7 +42,7 @@ public class ${mapInitClassName}
     public static final void init()
         throws TorqueException
     {
-#set ( $tableElements = $torqueGf.getChildren("table") )
+#set ( $tableElements = $torqueGen.getChildren("table") )
 #foreach ( $tableElement in $tableElements )
   #set ( $mapBuilderClassName = $tableElement.getAttribute("mapBuilderClassName") )
   #set ( $mapBuilderPackage = $tableElement.getAttribute("mapBuilderPackage") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/addSelectColumns.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/addSelectColumns.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/addSelectColumns.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/addSelectColumns.vm Sun May 16 16:15:20 2010
@@ -37,7 +37,7 @@
     public static void addSelectColumns(Criteria criteria)
             throws TorqueException
     {
-#foreach ($columnElement in $torqueGf.getChildren("column"))
+#foreach ($columnElement in $torqueGen.getChildren("column"))
   #set ( $peerColumnName = $columnElement.getAttribute("peerColumnName"))
         criteria.addSelectColumn(${peerClassName}.$peerColumnName);
 #end

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeer.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeer.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeer.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeer.vm Sun May 16 16:15:20 2010
@@ -29,51 +29,51 @@
 ##
 package ${basePeerPackage};
 
-$torqueGf.mergepoint("imports")
+$torqueGen.mergepoint("imports")
 
-$torqueGf.mergepoint("classJavadoc")
+$torqueGen.mergepoint("classJavadoc")
 public abstract class $basePeerClassName
     extends ${basePeerBaseClass}
 {
-$torqueGf.mergepoint("serialVersionUid")
+$torqueGen.mergepoint("serialVersionUid")
 
-$torqueGf.mergepoint("tableDatabaseNameConstants")
+$torqueGen.mergepoint("tableDatabaseNameConstants")
 
-$torqueGf.mergepoint("columnConstants")
+$torqueGen.mergepoint("columnConstants")
 
-$torqueGf.mergepoint("staticInit")
+$torqueGen.mergepoint("staticInit")
 
-$torqueGf.mergepoint("mapBuilderGetter")
-
-$torqueGf.mergepoint("numColumnConstant")
-
-$torqueGf.mergepoint("dbObjectClassConstants")
-
-$torqueGf.mergepoint("classMethods")
-$torqueGf.mergepoint("resultSet2Objects")
-$torqueGf.mergepoint("addSelectColumns")
-$torqueGf.mergepoint("correctBooleans")
-$torqueGf.mergepoint("row2Object")
-$torqueGf.mergepoint("populateObject")
-$torqueGf.mergepoint("doSelect")
-$torqueGf.mergepoint("doSelectVillageRecords")
-$torqueGf.mergepoint("populateObjects")
-$torqueGf.mergepoint("getOMClass")
-$torqueGf.mergepoint("doInsert")
-$torqueGf.mergepoint("doUpdate")
-$torqueGf.mergepoint("doDelete")
-$torqueGf.mergepoint("buildCriteria")
-$torqueGf.mergepoint("buildSelectCriteria")
-$torqueGf.mergepoint("retrieveByPK")
-$torqueGf.mergepoint("retrieveByPKs")
+$torqueGen.mergepoint("mapBuilderGetter")
+
+$torqueGen.mergepoint("numColumnConstant")
+
+$torqueGen.mergepoint("dbObjectClassConstants")
+
+$torqueGen.mergepoint("classMethods")
+$torqueGen.mergepoint("resultSet2Objects")
+$torqueGen.mergepoint("addSelectColumns")
+$torqueGen.mergepoint("correctBooleans")
+$torqueGen.mergepoint("row2Object")
+$torqueGen.mergepoint("populateObject")
+$torqueGen.mergepoint("doSelect")
+$torqueGen.mergepoint("doSelectVillageRecords")
+$torqueGen.mergepoint("populateObjects")
+$torqueGen.mergepoint("getOMClass")
+$torqueGen.mergepoint("doInsert")
+$torqueGen.mergepoint("doUpdate")
+$torqueGen.mergepoint("doDelete")
+$torqueGen.mergepoint("buildCriteria")
+$torqueGen.mergepoint("buildSelectCriteria")
+$torqueGen.mergepoint("retrieveByPK")
+$torqueGen.mergepoint("retrieveByPKs")
 #if ($complexObjectModel == "true")
-$torqueGf.mergepoint("doSelectJoin")
-$torqueGf.mergepoint("doSelectJoinAllExcept")
+$torqueGen.mergepoint("doSelectJoin")
+$torqueGen.mergepoint("doSelectJoinAllExcept")
 #end
-$torqueGf.mergepoint("getTableMap")
-$torqueGf.mergepoint("setDbName")
+$torqueGen.mergepoint("getTableMap")
+$torqueGen.mergepoint("setDbName")
 #if ($java5 == "true")
-$torqueGf.mergepoint("java5Wrappers")
+$torqueGen.mergepoint("java5Wrappers")
 #end
-$torqueGf.mergepoint("extensions")
+$torqueGen.mergepoint("extensions")
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildCriteria.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildCriteria.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildCriteria.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildCriteria.vm Sun May 16 16:15:20 2010
@@ -31,7 +31,7 @@
     public static Criteria buildCriteria(ObjectKey pk)
     {
         Criteria criteria = new Criteria();
-#set ( $primaryKeyColumnElements = $torqueGf.getChild("primary-keys").getChildren("column") )
+#set ( $primaryKeyColumnElements = $torqueGen.getChild("primary-keys").getChildren("column") )
 #if ($primaryKeyColumnElements.size() == 1)
   #set ( $primaryKeyColumnElement = $primaryKeyColumnElements.get(0) )
   #set ( $peerColumnName = $primaryKeyColumnElement.getAttribute("peerColumnName") )
@@ -52,7 +52,7 @@
     public static Criteria buildCriteria($dbObjectClassName obj)
     {
         Criteria criteria = new Criteria(DATABASE_NAME);
-#foreach ($columnElement in $torqueGf.getChildren("column"))
+#foreach ($columnElement in $torqueGen.getChildren("column"))
   #set ( $peerColumnName = $columnElement.getAttribute("peerColumnName") )
   #set ( $getter = $columnElement.getAttribute("getter") )
   #set ( $primaryKey = ($columnElement.getAttribute("primaryKey") == "true") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildSelectCriteria.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildSelectCriteria.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildSelectCriteria.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildSelectCriteria.vm Sun May 16 16:15:20 2010
@@ -31,7 +31,7 @@
     public static Criteria buildSelectCriteria($dbObjectClassName obj)
     {
         Criteria criteria = new Criteria(DATABASE_NAME);
-#foreach ($columnElement in $torqueGf.getChildren("column"))
+#foreach ($columnElement in $torqueGen.getChildren("column"))
   #set ( $peerColumnName = $columnElement.getAttribute("peerColumnName") ) 
   #set ( $fieldType = $columnElement.getAttribute("fieldType") ) 
   #set ( $getter = $columnElement.getAttribute("getter") ) 

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/classJavadoc.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/classJavadoc.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/classJavadoc.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/classJavadoc.vm Sun May 16 16:15:20 2010
@@ -32,10 +32,10 @@
  * $description
  *
 #end
-#if ($torqueGf.booleanOption("torque.om.addTimeStamp"))
+#if ($torqueGen.booleanOption("torque.om.addTimeStamp"))
  * The skeleton for this class was autogenerated by Torque on:
  *
- * [${torqueGf.now()}]
+ * [${torqueGen.now()}]
  *
 #end
  * You should not use this class directly.  It should not even be

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/dbObjectClassConstants.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/dbObjectClassConstants.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/dbObjectClassConstants.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/dbObjectClassConstants.vm Sun May 16 16:15:20 2010
@@ -34,7 +34,7 @@
     /** A class that can be returned by this peer. */
     protected static final Class#if($java5 == "true")<?>#end CLASS_DEFAULT = initClass(CLASSNAME_DEFAULT);
 
-#set ($inheritanceColumnBaseElement = $torqueGf.getChild("inheritance-column"))
+#set ($inheritanceColumnBaseElement = $torqueGen.getChild("inheritance-column"))
 #if ($inheritanceColumnBaseElement)
   #set ( $columnElement = $inheritanceColumnBaseElement.getChild("column") )
   #set ( $inheritanceElements = $columnElement.getChildren("inheritance"))

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doInsert.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doInsert.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doInsert.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doInsert.vm Sun May 16 16:15:20 2010
@@ -75,7 +75,7 @@
      */
     public static void doInsert($dbObjectClassName obj) throws TorqueException
     {
-  #if ($idMethod.equals("none") || $torqueGf.getChild("primary-keys").getChildren("column").isEmpty())
+  #if ($idMethod.equals("none") || $torqueGen.getChild("primary-keys").getChildren("column").isEmpty())
         ${peerClassName}.doInsert(${peerClassName}.buildCriteria(obj));
   #else
         obj.setPrimaryKey(${peerClassName}.doInsert(
@@ -98,7 +98,7 @@
     public static void doInsert($dbObjectClassName obj, Connection con)
         throws TorqueException
     {
-  #if ($idMethod.equals("none") || $torqueGf.getChild("primary-keys").getChildren("column").isEmpty())
+  #if ($idMethod.equals("none") || $torqueGen.getChild("primary-keys").getChildren("column").isEmpty())
         ${peerClassName}.doInsert(${peerClassName}.buildCriteria(obj), con);
   #else
         obj.setPrimaryKey(${peerClassName}.doInsert(

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doSelectJoin.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doSelectJoin.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doSelectJoin.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doSelectJoin.vm Sun May 16 16:15:20 2010
@@ -26,7 +26,7 @@
 ## The options and the attributes of the current source element must be set
 ## as velocity variables.  
 ##
-#set ( $foreignKeyElement = $torqueGf.getParent() )
+#set ( $foreignKeyElement = $torqueGen.getParent() )
 #set ( $tableElement = $foreignKeyElement.getParent() )
 #set ( $joinedTableElement = $foreignKeyElement.getChild("table") )
 #set ( $dbObjectClassName = $tableElement.getAttribute("dbObjectClassName") )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doSelectJoinAllExcept.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doSelectJoinAllExcept.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doSelectJoinAllExcept.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doSelectJoinAllExcept.vm Sun May 16 16:15:20 2010
@@ -26,7 +26,7 @@
 ## The options and the attributes of the current source element must be set
 ## as velocity variables.  
 ##
-#set ( $foreignKeyElement = $torqueGf.getParent() )
+#set ( $foreignKeyElement = $torqueGen.getParent() )
 #set ( $tableElement = $foreignKeyElement.getParent() )
 #set ( $foreignKeyElements = $tableElement.getChildren("foreign-key"))
 #if ($foreignKeyElements.size() > 2)

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doUpdate.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doUpdate.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doUpdate.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doUpdate.vm Sun May 16 16:15:20 2010
@@ -57,7 +57,7 @@
         Criteria selectCriteria = new Criteria(DATABASE_NAME, 2);
         ${peerClassName}.correctBooleans(criteria);
 
-#foreach ($columnElement in $torqueGf.getChildren("column"))
+#foreach ($columnElement in $torqueGen.getChildren("column"))
 
   #if($columnElement.getAttribute("primaryKey") == "true")
     #set ( $peerColumnName = $columnElement.getAttribute("peerColumnName") )
@@ -87,7 +87,7 @@
      */
     public static void doUpdate($dbObjectClassName obj) throws TorqueException
     {
-#if ($torqueGf.getChild("primary-keys").getChildren("column").isEmpty())
+#if ($torqueGen.getChild("primary-keys").getChildren("column").isEmpty())
         throw new TorqueException(
                 "doUpdate does not work for objects without primary key");
 #else
@@ -109,7 +109,7 @@
     public static void doUpdate($dbObjectClassName obj, Connection con)
         throws TorqueException
     {
-  #if ($torqueGf.getChild("primary-keys").getChildren("column").isEmpty())
+  #if ($torqueGen.getChild("primary-keys").getChildren("column").isEmpty())
         throw new TorqueException(
                 "doUpdate does not work for objects without primary key");
   #else

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/getOMClass.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/getOMClass.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/getOMClass.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/getOMClass.vm Sun May 16 16:15:20 2010
@@ -27,7 +27,7 @@
 ## The options and the attributes of the current source element must be set
 ## as velocity variables.  
 ##
-#set ( $inheritanceBaseColumnElement = $torqueGf.getChild("inheritance-column") )
+#set ( $inheritanceBaseColumnElement = $torqueGen.getChild("inheritance-column") )
 #if ($inheritanceBaseColumnElement)
   #set ( $columnElement = $inheritanceBaseColumnElement.getChild("column") )
     /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/numColumnConstant.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/numColumnConstant.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/numColumnConstant.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/numColumnConstant.vm Sun May 16 16:15:20 2010
@@ -25,4 +25,4 @@
 ## from the torque schema.
 ##
     /** number of columns for this peer */
-    public static final int numColumns = $torqueGf.getChildren("column").size();
+    public static final int numColumns = $torqueGen.getChildren("column").size();

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/populateObject.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/populateObject.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/populateObject.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/populateObject.vm Sun May 16 16:15:20 2010
@@ -44,7 +44,7 @@
         try
         {
 #set ( $n=0 )
-#foreach ($columnElement in $torqueGf.getChildren("column"))
+#foreach ($columnElement in $torqueGen.getChildren("column"))
   #set ( $setter = $columnElement.getAttribute("setter") )
   #set ( $villageMethod = $columnElement.getAttribute("villageMethod") )
             obj.${setter}(row.getValue(offset + $n).$villageMethod);

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/populateObjects.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/populateObjects.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/populateObjects.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/populateObjects.vm Sun May 16 16:15:20 2010
@@ -43,7 +43,7 @@
         for (int i = 0; i < records.size(); i++)
         {
             Record row = #if($java5 != "true")(Record)#end records.get(i);
-#if ($torqueGf.getChild("inheritance-column"))
+#if ($torqueGen.getChild("inheritance-column"))
             results.add(${peerClassName}.row2Object(
                     row, 1, ${peerClassName}.getOMClass(row, 1)));
 #else

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm Sun May 16 16:15:20 2010
@@ -27,7 +27,7 @@
 ## The options and the attributes of the current source element must be set
 ## as velocity variables.  
 ##
-#set ( $primaryKeyColumnElements = $torqueGf.getChild("primary-keys").getChildren("column"))
+#set ( $primaryKeyColumnElements = $torqueGen.getChild("primary-keys").getChildren("column"))
 #if (!$primaryKeyColumnElements.isEmpty())
   #if ($primaryKeyColumnElements.size() == 1)
     #set ( $columnElement = $primaryKeyColumnElements.get(0) )

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPKs.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPKs.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPKs.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPKs.vm Sun May 16 16:15:20 2010
@@ -27,7 +27,7 @@
 ## The options and the attributes of the current source element must be set
 ## as velocity variables.  
 ##
-#set ( $primaryKeyColumnElements = $torqueGf.getChild("primary-keys").getChildren("column"))
+#set ( $primaryKeyColumnElements = $torqueGen.getChild("primary-keys").getChildren("column"))
 #if (!$primaryKeyColumnElements.isEmpty())
     /**
      * Retrieve a multiple objects by pk

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/staticInit.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/staticInit.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/staticInit.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/staticInit.vm Sun May 16 16:15:20 2010
@@ -29,7 +29,7 @@
 ##
     static
     {
-$torqueGf.mergepoint("tableDatabaseNameConstantsInit")
-$torqueGf.mergepoint("columnConstantsInit")
-$torqueGf.mergepoint("mapBuilderInit")##
+$torqueGen.mergepoint("tableDatabaseNameConstantsInit")
+$torqueGen.mergepoint("columnConstantsInit")
+$torqueGen.mergepoint("mapBuilderInit")##
     }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/tableDatabaseNameConstantsInit.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/tableDatabaseNameConstantsInit.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/tableDatabaseNameConstantsInit.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/tableDatabaseNameConstantsInit.vm Sun May 16 16:15:20 2010
@@ -27,5 +27,5 @@
 ## The options and the attributes of the current source element must be set
 ## as velocity variables.  
 ##
-        DATABASE_NAME = "$torqueGf.getParent().getAttribute("name")";
+        DATABASE_NAME = "$torqueGen.getParent().getAttribute("name")";
         TABLE_NAME = "$name";

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/classJavadoc.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/classJavadoc.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/classJavadoc.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/classJavadoc.vm Sun May 16 16:15:20 2010
@@ -28,10 +28,10 @@
  * $description
  *
 #end
-#if ($torqueGf.booleanOption("torque.om.addTimeStamp"))
+#if ($torqueGen.booleanOption("torque.om.addTimeStamp"))
  * The skeleton for this class was autogenerated by Torque on:
  *
- * [${torqueGf.now()}]
+ * [${torqueGen.now()}]
  *
 #end
  * You should add additional methods to this class to meet the

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/peer.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/peer.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/peer.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/peer.vm Sun May 16 16:15:20 2010
@@ -25,10 +25,10 @@
 ##
 package ${peerPackage};
 
-$torqueGf.mergepoint("classJavadoc")
+$torqueGen.mergepoint("classJavadoc")
 public class ${peerClassName}
     extends ${basePeerPackage}.${basePeerClassName}
 {
-$torqueGf.mergepoint("serialVersionUid")
-$torqueGf.mergepoint("extensions")
+$torqueGen.mergepoint("serialVersionUid")
+$torqueGen.mergepoint("extensions")
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml Sun May 16 16:15:20 2010
@@ -20,23 +20,23 @@
 
 <control loglevel="info"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/configuration.xsd"
-    xmlns="http://db.apache.org/torque/gf/4.0/configuration">
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xmlns="http://db.apache.org/torque/4.0/generator/configuration">
 
   <options xsi:type="propertiesOptions" path="options.properties"/>
 
   <output name="torque.sql.ddl" file="schema.sql">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.ModifySourcenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.ModifySourcenameOutlet">
       <discardFrom>.</discardFrom>
       <suffix>.sql</suffix>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database">
       <include>*schema.xml</include>
       <transformer class="org.apache.torque.templates.transformer.sql.SQLTransformer"/>
     </source>
-    <generator name="torque.sql.ddl.database"/>
+    <outlet name="torque.sql.ddl.database"/>
   </output>
   
 </control>

Copied: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml (from r919727, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/generatorDefs/ddl.xml)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml?p2=db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml&p1=db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/generatorDefs/ddl.xml&r1=919727&r2=944877&rev=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/generatorDefs/ddl.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml Sun May 16 16:15:20 2010
@@ -18,113 +18,112 @@
  under the License.
 -->
 
-<generators xmlns="http://db.apache.org/torque/gf/4.0/configuration"
-    xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/generator.xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-  <generator name="torque.sql.ddl.database"
-      xsi:type="velocityGenerator"
+<outlets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xmlns="http://db.apache.org/torque/4.0/generator/configuration">
+  <outlet name="torque.sql.ddl.database"
+      xsi:type="velocityOutlet"
       path="ddl/database.vm">
     <mergepoint name="databaseStart">
       <action xsi:type="applyAction" 
-          generator="torque.sql.ddl.databaseStart"/>
+          outlet="torque.sql.ddl.databaseStart"/>
     </mergepoint>
     <mergepoint name="tables">
       <action xsi:type="traverseAllAction" 
           element="table" 
-          generator="torque.sql.ddl.table"/>
+          outlet="torque.sql.ddl.table"/>
     </mergepoint>
     <mergepoint name="foreignKeys">
       <action xsi:type="traverseAllAction" 
           element="table/foreign-key" 
-          generator="torque.sql.ddl.foreignKey"/>
+          outlet="torque.sql.ddl.foreignKey"/>
     </mergepoint>
     <mergepoint name="comments">
       <action xsi:type="traverseAllAction" 
           element="table" 
-          generator="torque.sql.ddl.tableComment"/>
+          outlet="torque.sql.ddl.tableComment"/>
       <action xsi:type="traverseAllAction" 
           element="table/column" 
-          generator="torque.sql.ddl.columnComment"/>
+          outlet="torque.sql.ddl.columnComment"/>
     </mergepoint>
     <mergepoint name="databaseEnd" />
-  </generator>
+  </outlet>
 
-  <generator name="torque.sql.ddl.databaseStart"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.sql.ddl.databaseStart"
+      xsi:type="velocityOutlet"
       path="ddl/${option:database}/databaseStart.vm"/>
 
-  <generator name="torque.sql.ddl.table"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.sql.ddl.table"
+      xsi:type="velocityOutlet"
       path="ddl/${option:database}/table.vm">
     <mergepoint name="drop">
       <action xsi:type="applyAction"
-          generator="torque.sql.ddl.drop"/>
+          outlet="torque.sql.ddl.drop"/>
     </mergepoint>
     <mergepoint name="columns">
       <action xsi:type="traverseAllAction"
           element="column"
-          generator="torque.sql.ddl.column"/>
+          outlet="torque.sql.ddl.column"/>
     </mergepoint>
     <mergepoint name="primaryKey">
       <action xsi:type="applyAction" 
-          generator="torque.sql.ddl.primaryKey"/>
+          outlet="torque.sql.ddl.primaryKey"/>
     </mergepoint>
     <mergepoint name="unique">
       <action xsi:type="traverseAllAction" 
           element="unique"
-          generator="torque.sql.ddl.unique"/>
+          outlet="torque.sql.ddl.unique"/>
     </mergepoint>
     <mergepoint name="index">
       <action xsi:type="traverseAllAction" 
           element="index"
-          generator="torque.sql.ddl.index"/>
+          outlet="torque.sql.ddl.index"/>
     </mergepoint>
     <mergepoint name="sequence">
       <action xsi:type="applyAction"
-          generator="torque.sql.ddl.sequence"/>
+          outlet="torque.sql.ddl.sequence"/>
     </mergepoint>
-  </generator>
+  </outlet>
 
-  <generator name="torque.sql.ddl.drop"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.sql.ddl.drop"
+      xsi:type="velocityOutlet"
       path="ddl/${option:database}/drop.vm" />
 
-  <generator name="torque.sql.ddl.column"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.sql.ddl.column"
+      xsi:type="velocityOutlet"
       path="ddl/column.vm" />
 
-  <generator name="torque.sql.ddl.primaryKey"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.sql.ddl.primaryKey"
+      xsi:type="velocityOutlet"
       path="ddl/${option:database}/primaryKey.vm" />
 
-  <generator name="torque.sql.ddl.unique"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.sql.ddl.unique"
+      xsi:type="velocityOutlet"
       path="ddl/${option:database}/unique.vm" />
 
-  <generator name="torque.sql.ddl.index"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.sql.ddl.index"
+      xsi:type="velocityOutlet"
       path="ddl/${option:database}/index.vm" />
       
-  <generator name="torque.sql.ddl.sequence"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.sql.ddl.sequence"
+      xsi:type="velocityOutlet"
       path="ddl/${option:database}/sequence.vm" />
 
-  <generator name="torque.sql.ddl.tableComment"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.sql.ddl.tableComment"
+      xsi:type="velocityOutlet"
       path="ddl/${option:database}/tableComment.vm">
     <mergepoint name="columnComments">
       <action xsi:type="traverseAllAction" 
           element="column"
-          generator="torque.sql.ddl.columnComment"/>
+          outlet="torque.sql.ddl.columnComment"/>
      </mergepoint>
-  </generator>
+  </outlet>
       
-  <generator name="torque.sql.ddl.columnComment"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.sql.ddl.columnComment"
+      xsi:type="velocityOutlet"
       path="ddl/${option:database}/columnComment.vm" />
       
-  <generator name="torque.sql.ddl.foreignKey"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.sql.ddl.foreignKey"
+      xsi:type="velocityOutlet"
       path="ddl/${option:database}/foreignKey.vm" />
-</generators>
\ No newline at end of file
+</outlets>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message