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 [2/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/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml Sun May 16 16:15:20 2010
@@ -20,14 +20,14 @@
 
 <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.om.dbObject" skipIfExists="true">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
            xsi:type="sourceElementAttributeAction"
@@ -42,19 +42,19 @@
             attribute="dbObjectClassName"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database/table">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.om.dbObject"/>
+    <outlet name="torque.om.dbObject"/>
   </output>
 
   <output name="torque.om.baseDbObject">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action 
             xsi:type="sourceElementAttributeAction"
@@ -68,20 +68,20 @@
             attribute="baseDbObjectClassName"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database/table">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <transformer class="org.apache.torque.templates.transformer.om.dbobject.base.BaseDbObjectTransformer"/>
     </source>
-    <generator name="torque.om.baseDbObject"/>
+    <outlet name="torque.om.baseDbObject"/>
   </output>
   
   <output name="torque.om.inheritanceDbObject" skipIfExists="true">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
             xsi:type="sourceElementAttributeAction"
@@ -96,19 +96,19 @@
             attribute="className"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database/table/column/inheritance">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.om.inheritanceDbObject"/>
+    <outlet name="torque.om.inheritanceDbObject"/>
   </output>
   
   <output name="torque.om.interface" skipIfExists="true">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
             xsi:type="sourceElementAttributeAction"
@@ -123,20 +123,20 @@
             attribute="interface"
             acceptNotSet="true"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database/table"
         filter="org.apache.torque.templates.sourcefilter.InterfaceSourceFilter">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.om.interface"/>
+    <outlet name="torque.om.interface"/>
   </output>
   
   <output name="torque.om.peer" skipIfExists="true">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
             xsi:type="sourceElementAttributeAction"
@@ -151,19 +151,19 @@
             attribute="peerClassName"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database/table">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.om.peer"/>
+    <outlet name="torque.om.peer"/>
   </output>
 
   <output name="torque.om.basePeer">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
             xsi:type="sourceElementAttributeAction"
@@ -178,19 +178,19 @@
             attribute="basePeerClassName"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database/table">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.om.basePeer"/>
+    <outlet name="torque.om.basePeer"/>
   </output>
 
   <output name="torque.om.mapBuilder">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
             xsi:type="sourceElementAttributeAction"
@@ -205,19 +205,19 @@
             attribute="mapBuilderClassName"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database/table">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.om.mapBuilder"/>
+    <outlet name="torque.om.mapBuilder"/>
   </output>
 
   <output name="torque.om.bean" skipIfExists="true">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
             xsi:type="sourceElementAttributeAction"
@@ -232,20 +232,20 @@
             attribute="beanClassName"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database/table"
         filter="org.apache.torque.templates.sourcefilter.BeanSourceFilter">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.om.bean.bean"/>
+    <outlet name="torque.om.bean.bean"/>
   </output>
 
   <output name="torque.om.baseBean">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
             xsi:type="sourceElementAttributeAction"
@@ -260,20 +260,20 @@
             attribute="baseBeanClassName"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database/table"
         filter="org.apache.torque.templates.sourcefilter.BeanSourceFilter">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.om.bean.baseBean"/>
+    <outlet name="torque.om.bean.baseBean"/>
   </output>
   
   <output name="torque.om.inheritanceBean" skipIfExists="true">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
             xsi:type="sourceElementAttributeAction"
@@ -288,20 +288,20 @@
             attribute="beanClassName"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database/table/column/inheritance"
         filter="org.apache.torque.templates.sourcefilter.BeanSourceFilter">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.om.inheritanceBean"/>
+    <outlet name="torque.om.inheritanceBean"/>
   </output>
   
   <output name="torque.om.mapInit" skipIfExists="true">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
             xsi:type="optionAction"
@@ -315,20 +315,20 @@
             attribute="mapInitClassName"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database" 
         filter="org.apache.torque.templates.sourcefilter.MapInitSourceFilter">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.mapInit.MapInitDatabaseTransformer"/>
     </source>
-    <generator name="torque.om.mapInit.mapInit"/>
+    <outlet name="torque.om.mapInit.mapInit"/>
   </output>
 
   <output name="torque.om.baseMapInit">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
             xsi:type="sourceElementAttributeAction"
@@ -343,7 +343,7 @@
             attribute="mapInitClassName"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database" 
         filter="org.apache.torque.templates.sourcefilter.MapInitSourceFilter">
       <include>*schema.xml</include>
@@ -351,13 +351,13 @@
       <transformer class="org.apache.torque.templates.transformer.om.mapInit.MapInitDatabaseTransformer"/>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.om.mapInit.baseMapInit"/>
+    <outlet name="torque.om.mapInit.baseMapInit"/>
   </output>
   
   <output name="torque.om.manager" skipIfExists="true">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
             xsi:type="sourceElementAttributeAction"
@@ -372,21 +372,21 @@
             attribute="managerClassName"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database/table" 
         filter="org.apache.torque.templates.sourcefilter.ManagerSourceFilter">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.om.manager.manager"/>
+    <outlet name="torque.om.manager.manager"/>
   </output>
 
   <!-- Base Manager class -->
   <output name="torque.om.baseManager">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet">
       <mergepoint name="package">
         <action
             xsi:type="sourceElementAttributeAction"
@@ -401,14 +401,14 @@
             attribute="baseManagerClassName"
             acceptNotSet="false"/>
       </mergepoint>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database/table"
         filter="org.apache.torque.templates.sourcefilter.ManagerSourceFilter">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.om.manager.baseManager"/>
+    <outlet name="torque.om.manager.baseManager"/>
   </output>
 </control>
   
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/bean.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/bean.xml?rev=944877&r1=915953&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/bean.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/bean.xml Sun May 16 16:15:20 2010
@@ -18,143 +18,143 @@
  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.om.bean.baseBean" 
-      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.om.bean.baseBean" 
+      xsi:type="velocityOutlet"
       path="bean/base/baseBean.vm">
     <mergepoint name="classJavadoc">
-      <action xsi:type="applyAction" generator="torque.om.bean.base.classJavadoc"/>
+      <action xsi:type="applyAction" outlet="torque.om.bean.base.classJavadoc"/>
     </mergepoint>
     <mergepoint name="serialVersionUid">
-      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+      <action xsi:type="applyAction" outlet="torque.om.serialVersionUid"/>
     </mergepoint>
     <mergepoint name="fieldDefinitions">
       <action xsi:type="traverseAllAction"
           element="column"
-          generator="torque.om.fieldDefinition"/>
+          outlet="torque.om.fieldDefinition"/>
     </mergepoint>
     <mergepoint name="fieldDefinitionsReferencedObjects">
       <action xsi:type="traverseAllAction"
           element="foreign-key/local-field-in-bean"
-          generator="torque.om.fieldDefinition"/>
+          outlet="torque.om.fieldDefinition"/>
     </mergepoint>
     <mergepoint name="fieldDefinitionsReferencingObjects">
       <action xsi:type="traverseAllAction"
           element="referencing-foreign-keys/foreign-key/foreign-field-in-bean"
-          generator="torque.om.fieldDefinition"/>
+          outlet="torque.om.fieldDefinition"/>
     </mergepoint>
     <mergepoint name="gettersSetters">
       <action xsi:type="traverseAllAction"
           element="column"
-          generator="torque.om.bean.base.getterSetter"/>
+          outlet="torque.om.bean.base.getterSetter"/>
     </mergepoint>
     <mergepoint name="gettersSettersReferencedObjects">
       <action xsi:type="traverseAllAction"
           element="foreign-key/local-field-in-bean"
-          generator="torque.om.bean.base.getterSetterReferencedObject"/>
+          outlet="torque.om.bean.base.getterSetterReferencedObject"/>
     </mergepoint>
     <mergepoint name="gettersSettersReferencingObjects">
       <action xsi:type="traverseAllAction"
           element="referencing-foreign-keys/foreign-key/foreign-field-in-bean"
-          generator="torque.om.bean.base.getterSetterReferencingObject"/>
+          outlet="torque.om.bean.base.getterSetterReferencingObject"/>
     </mergepoint>
     <mergepoint name="extensions"/>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.bean.base.classJavadoc"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.bean.base.classJavadoc"
+      xsi:type="velocityOutlet"
       path="bean/base/classJavadoc.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.bean.base.getterSetter"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.bean.base.getterSetter"
+      xsi:type="velocityOutlet"
       path="general/getterSetter.vm">
     <mergepoint name="getter">
-      <action xsi:type="applyAction" generator="torque.om.bean.base.getter"/>
+      <action xsi:type="applyAction" outlet="torque.om.bean.base.getter"/>
     </mergepoint>
     <mergepoint name="setter">
-      <action xsi:type="applyAction" generator="torque.om.bean.base.setter"/>
+      <action xsi:type="applyAction" outlet="torque.om.bean.base.setter"/>
     </mergepoint>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.bean.base.getter"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.bean.base.getter"
+      xsi:type="velocityOutlet"
       path="bean/base/getter.vm">
     <mergepoint name="methodStart" />
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.bean.base.setter"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.bean.base.setter"
+      xsi:type="velocityOutlet"
       path="bean/base/setter.vm">
     <mergepoint name="methodStart">
-      <action xsi:type="applyAction" generator="torque.om.setterMethodStart"/>
+      <action xsi:type="applyAction" outlet="torque.om.setterMethodStart"/>
     </mergepoint>
     <mergepoint name="methodEnd">
-      <action xsi:type="applyAction" generator="torque.om.bean.base.setterMethodEnd"/>
+      <action xsi:type="applyAction" outlet="torque.om.bean.base.setterMethodEnd"/>
     </mergepoint>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.bean.base.setterMethodEnd"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.bean.base.setterMethodEnd"
+      xsi:type="velocityOutlet"
       path="bean/base/setterMethodEnd.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.bean.base.getterSetterReferencedObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.bean.base.getterSetterReferencedObject"
+      xsi:type="velocityOutlet"
       path="general/getterSetter.vm">
     <mergepoint name="getter">
-      <action xsi:type="applyAction" generator="torque.om.bean.base.getterReferencedObject"/>
+      <action xsi:type="applyAction" outlet="torque.om.bean.base.getterReferencedObject"/>
     </mergepoint>
     <mergepoint name="setter">
-      <action xsi:type="applyAction" generator="torque.om.setterReferencedObject"/>
+      <action xsi:type="applyAction" outlet="torque.om.setterReferencedObject"/>
     </mergepoint>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.bean.base.getterReferencedObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.bean.base.getterReferencedObject"
+      xsi:type="velocityOutlet"
       path="bean/base/getterReferencedObject.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.bean.base.getterSetterReferencingObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.bean.base.getterSetterReferencingObject"
+      xsi:type="velocityOutlet"
       path="general/getterSetter.vm">
     <mergepoint name="getter">
       <action xsi:type="applyAction"
-          generator="torque.om.bean.base.getterReferencingObject"/>
+          outlet="torque.om.bean.base.getterReferencingObject"/>
     </mergepoint>
     <mergepoint name="setter">
       <action xsi:type="applyAction"
-          generator="torque.om.bean.base.setterReferencingObject"/>
+          outlet="torque.om.bean.base.setterReferencingObject"/>
     </mergepoint>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.bean.base.getterReferencingObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.bean.base.getterReferencingObject"
+      xsi:type="velocityOutlet"
       path="bean/base/getterReferencingObject.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.bean.base.setterReferencingObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.bean.base.setterReferencingObject"
+      xsi:type="velocityOutlet"
       path="bean/base/setterReferencingObject.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.bean.bean"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.bean.bean"
+      xsi:type="velocityOutlet"
       path="bean/bean.vm">
     <mergepoint name="classJavadoc">
-      <action xsi:type="applyAction" generator="torque.om.bean.classJavadoc"/>
+      <action xsi:type="applyAction" outlet="torque.om.bean.classJavadoc"/>
     </mergepoint>
     <mergepoint name="serialVersionUid">
-      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+      <action xsi:type="applyAction" outlet="torque.om.serialVersionUid"/>
     </mergepoint>
     <mergepoint name="extensions"/>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.bean.classJavadoc"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.bean.classJavadoc"
+      xsi:type="velocityOutlet"
       path="bean/classJavadoc.vm">
-  </generator>
+  </outlet>
 
-</generators>
\ No newline at end of file
+</outlets>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/dbObject.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/dbObject.xml?rev=944877&r1=915953&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/dbObject.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/dbObject.xml Sun May 16 16:15:20 2010
@@ -18,217 +18,217 @@
  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.om.dbObject"
-      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.om.dbObject"
+      xsi:type="velocityOutlet"
       path="dbObject/dbObject.vm">
     <mergepoint name="classJavadoc">
-      <action xsi:type="applyAction" generator="torque.om.dbObjectClassJavadoc"/>
+      <action xsi:type="applyAction" outlet="torque.om.dbObjectClassJavadoc"/>
     </mergepoint>
     <mergepoint name="serialVersionUid">
-      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+      <action xsi:type="applyAction" outlet="torque.om.serialVersionUid"/>
     </mergepoint>
     <mergepoint name="extensions"/>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObjectClassJavadoc"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObjectClassJavadoc"
+      xsi:type="velocityOutlet"
       path="dbObject/classJavadoc.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.baseDbObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.baseDbObject"
+      xsi:type="velocityOutlet"
       path="dbObject/base/baseDbObject.vm">
     <mergepoint name="objectBeanImports">
-      <action xsi:type="applyAction" generator="torque.om.dbObject.base.objectBeanImports"/>
+      <action xsi:type="applyAction" outlet="torque.om.dbObject.base.objectBeanImports"/>
     </mergepoint>
     <mergepoint name="classJavadoc">
-      <action xsi:type="applyAction" generator="torque.om.dbObject.base.classJavadoc"/>
+      <action xsi:type="applyAction" outlet="torque.om.dbObject.base.classJavadoc"/>
     </mergepoint>
     <mergepoint name="serialVersionUid">
-      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+      <action xsi:type="applyAction" outlet="torque.om.serialVersionUid"/>
     </mergepoint>
     <mergepoint name="fieldDefinitions">
       <action xsi:type="traverseAllAction"
           element="column"
-          generator="torque.om.fieldDefinition"/>
+          outlet="torque.om.fieldDefinition"/>
     </mergepoint>
     <mergepoint name="fieldDefinitionsReferencedObjects">
       <action xsi:type="traverseAllAction"
           element="foreign-key/local-field"
-          generator="torque.om.fieldDefinition"/>
+          outlet="torque.om.fieldDefinition"/>
     </mergepoint>
     <mergepoint name="fieldDefinitionsReferencingObjects">
       <action xsi:type="traverseAllAction"
           element="referencing-foreign-keys/foreign-key/foreign-field"
-          generator="torque.om.fieldDefinition"/>
+          outlet="torque.om.fieldDefinition"/>
     </mergepoint>
     <mergepoint name="gettersSetters">
       <action xsi:type="traverseAllAction"
           element="column"
-          generator="torque.om.getterSetter"/>
+          outlet="torque.om.getterSetter"/>
     </mergepoint>
     <mergepoint name="gettersSettersReferencedObjects">
       <action xsi:type="traverseAllAction"
           element="foreign-key/local-field"
-          generator="torque.om.dbObject.base.getterSetterReferencedObject"/>
+          outlet="torque.om.dbObject.base.getterSetterReferencedObject"/>
     </mergepoint>
     <mergepoint name="referencingObjectMethods">
       <action xsi:type="traverseAllAction"
           element="referencing-foreign-keys/foreign-key/foreign-field"
-          generator="torque.om.dbObject.base.referencingObjectMethods"/>
+          outlet="torque.om.dbObject.base.referencingObjectMethods"/>
     </mergepoint>
     <mergepoint name="getByNameMethods">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.getByNameMethods"/>
+          outlet="torque.om.dbObject.base.getByNameMethods"/>
     </mergepoint>
     <mergepoint name="saveMethods">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.saveMethods"/>
+          outlet="torque.om.dbObject.base.saveMethods"/>
     </mergepoint>
     <mergepoint name="primaryKeyMethods">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.primaryKeyMethods"/>
+          outlet="torque.om.dbObject.base.primaryKeyMethods"/>
     </mergepoint>
      <mergepoint name="copyMethods">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.copyMethods"/>
+          outlet="torque.om.dbObject.base.copyMethods"/>
     </mergepoint>
     <mergepoint name="peerGetter">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.peerGetter"/>
+          outlet="torque.om.dbObject.base.peerGetter"/>
     </mergepoint>
     <mergepoint name="tableMapGetter">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.tableMapGetter"/>
+          outlet="torque.om.dbObject.base.tableMapGetter"/>
     </mergepoint>
     <mergepoint name="objectBeanMethods">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.objectBeanMethods"/>
+          outlet="torque.om.dbObject.base.objectBeanMethods"/>
     </mergepoint>
     <mergepoint name="toString">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.toString"/>
+          outlet="torque.om.dbObject.base.toString"/>
     </mergepoint>
     <mergepoint name="extensions"/>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.objectBeanImports"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.objectBeanImports"
+      xsi:type="velocityOutlet"
       path="dbObject/base/bean/objectBeanImports.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.classJavadoc"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.classJavadoc"
+      xsi:type="velocityOutlet"
       path="dbObject/base/classJavadoc.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.getterSetterReferencedObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.getterSetterReferencedObject"
+      xsi:type="velocityOutlet"
       path="general/getterSetter.vm">
     <mergepoint name="getter">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.getterReferencedObject"/>
+          outlet="torque.om.dbObject.base.getterReferencedObject"/>
     </mergepoint>
     <mergepoint name="setter">
       <action xsi:type="applyAction"
-          generator="torque.om.setterReferencedObject"/>
+          outlet="torque.om.setterReferencedObject"/>
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.setterReferencedObjectByObjectKey"/>
+          outlet="torque.om.dbObject.base.setterReferencedObjectByObjectKey"/>
     </mergepoint>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.getterReferencedObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.getterReferencedObject"
+      xsi:type="velocityOutlet"
       path="dbObject/base/getterReferencedObject.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.setterReferencedObjectByObjectKey"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.setterReferencedObjectByObjectKey"
+      xsi:type="velocityOutlet"
       path="dbObject/base/setterReferencedObjectByObjectKey.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.referencingObjectMethods"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.referencingObjectMethods"
+      xsi:type="velocityOutlet"
       path="dbObject/base/referencingObjectMethods.vm">
     <mergepoint name="getter">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.getterReferencingObject"/>
+          outlet="torque.om.dbObject.base.getterReferencingObject"/>
     </mergepoint>
     <mergepoint name="adder">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.adderReferencingObject"/>
+          outlet="torque.om.dbObject.base.adderReferencingObject"/>
     </mergepoint>
     <mergepoint name="initializer">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.initializerReferencingObject"/>
+          outlet="torque.om.dbObject.base.initializerReferencingObject"/>
     </mergepoint>
     <mergepoint name="referencingJoinGetters">
       <action xsi:type="applyAction"
-          generator="torque.om.dbObject.base.joinGettersReferencingObject"/>
+          outlet="torque.om.dbObject.base.joinGettersReferencingObject"/>
     </mergepoint>
     <mergepoint name="setter" />
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.getterReferencingObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.getterReferencingObject"
+      xsi:type="velocityOutlet"
       path="dbObject/base/getterReferencingObject.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.adderReferencingObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.adderReferencingObject"
+      xsi:type="velocityOutlet"
       path="dbObject/base/adderReferencingObject.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.initializerReferencingObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.initializerReferencingObject"
+      xsi:type="velocityOutlet"
       path="dbObject/base/initializerReferencingObject.vm">
-  </generator>
+  </outlet>
   
-  <generator name="torque.om.dbObject.base.joinGettersReferencingObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.joinGettersReferencingObject"
+      xsi:type="velocityOutlet"
       path="dbObject/base/joinGetterReferencingObject.vm">
-  </generator>
+  </outlet>
   
-  <generator name="torque.om.dbObject.base.getByNameMethods"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.getByNameMethods"
+      xsi:type="velocityOutlet"
       path="dbObject/base/getByNameMethods.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.saveMethods"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.saveMethods"
+      xsi:type="velocityOutlet"
       path="dbObject/base/saveMethods.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.primaryKeyMethods"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.primaryKeyMethods"
+      xsi:type="velocityOutlet"
       path="dbObject/base/primaryKeyMethods.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.copyMethods"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.copyMethods"
+      xsi:type="velocityOutlet"
       path="dbObject/base/copyMethods.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.peerGetter"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.peerGetter"
+      xsi:type="velocityOutlet"
       path="dbObject/base/peerGetter.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.tableMapGetter"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.tableMapGetter"
+      xsi:type="velocityOutlet"
       path="dbObject/base/tableMapGetter.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.objectBeanMethods"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.objectBeanMethods"
+      xsi:type="velocityOutlet"
       path="dbObject/base/bean/objectBeanMethods.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.dbObject.base.toString"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.dbObject.base.toString"
+      xsi:type="velocityOutlet"
       path="dbObject/base/toString.vm">
-  </generator>
-</generators>
\ No newline at end of file
+  </outlet>
+</outlets>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/general.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/general.xml?rev=944877&r1=915953&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/general.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/general.xml Sun May 16 16:15:20 2010
@@ -18,60 +18,60 @@
  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.om.serialVersionUid"
-      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.om.serialVersionUid"
+      xsi:type="velocityOutlet"
       path="general/serialVersionUid.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.fieldDefinition"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.fieldDefinition"
+      xsi:type="velocityOutlet"
       path="general/fieldDefinition.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.getterSetter"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.getterSetter"
+      xsi:type="velocityOutlet"
       path="general/getterSetter.vm">
     <mergepoint name="getter">
-      <action xsi:type="applyAction" generator="torque.om.getter"/>
+      <action xsi:type="applyAction" outlet="torque.om.getter"/>
     </mergepoint>
     <mergepoint name="setter">
-      <action xsi:type="applyAction" generator="torque.om.setter"/>
+      <action xsi:type="applyAction" outlet="torque.om.setter"/>
     </mergepoint>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.getter"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.getter"
+      xsi:type="velocityOutlet"
       path="general/getter.vm">
     <mergepoint name="methodStart" />
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.setter"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.setter"
+      xsi:type="velocityOutlet"
       path="general/setter.vm">
     <mergepoint name="methodStart">
-      <action xsi:type="applyAction" generator="torque.om.setterMethodStart"/>
+      <action xsi:type="applyAction" outlet="torque.om.setterMethodStart"/>
     </mergepoint>
     <mergepoint name="methodEnd">
-      <action xsi:type="applyAction" generator="torque.om.setterMethodEnd"/>
+      <action xsi:type="applyAction" outlet="torque.om.setterMethodEnd"/>
     </mergepoint>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.setterMethodStart"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.setterMethodStart"
+      xsi:type="velocityOutlet"
       path="general/setterMethodStart.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.setterMethodEnd"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.setterMethodEnd"
+      xsi:type="velocityOutlet"
       path="general/setterMethodEnd.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.setterReferencedObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.setterReferencedObject"
+      xsi:type="velocityOutlet"
       path="general/setterReferencedObject.vm">
-  </generator>
+  </outlet>
   
-</generators>
\ No newline at end of file
+</outlets>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/inheritanceBean.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/inheritanceBean.xml?rev=944877&r1=915953&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/inheritanceBean.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/inheritanceBean.xml Sun May 16 16:15:20 2010
@@ -18,25 +18,25 @@
  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.om.inheritanceBean"
-      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.om.inheritanceBean"
+      xsi:type="velocityOutlet"
       path="bean/inheritance/inheritanceBean.vm">
     <mergepoint name="classJavadoc">
       <action xsi:type="applyAction"
-          generator="torque.om.inheritanceBean.classJavadoc"/>
+          outlet="torque.om.inheritanceBean.classJavadoc"/>
     </mergepoint>
     <mergepoint name="serialVersionUid">
-      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+      <action xsi:type="applyAction" outlet="torque.om.serialVersionUid"/>
     </mergepoint>
     <mergepoint name="extensions">
     </mergepoint>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.inheritanceBean.classJavadoc"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.inheritanceBean.classJavadoc"
+      xsi:type="velocityOutlet"
       path="bean/inheritance/classJavadoc.vm">
-  </generator>
-</generators>
\ No newline at end of file
+  </outlet>
+</outlets>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/inheritanceDbObject.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/inheritanceDbObject.xml?rev=944877&r1=915953&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/inheritanceDbObject.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/inheritanceDbObject.xml Sun May 16 16:15:20 2010
@@ -18,26 +18,26 @@
  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.om.inheritanceDbObject"
-      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.om.inheritanceDbObject"
+      xsi:type="velocityOutlet"
       path="dbObject/inheritance/inheritanceDbObject.vm">
     <mergepoint name="classJavadoc">
       <action xsi:type="applyAction"
-          generator="torque.om.inheritanceDbObject.classJavadoc"/>
+          outlet="torque.om.inheritanceDbObject.classJavadoc"/>
     </mergepoint>
     <mergepoint name="serialVersionUid">
       <action xsi:type="applyAction"
-          generator="torque.om.serialVersionUid"/>
+          outlet="torque.om.serialVersionUid"/>
     </mergepoint>
     <mergepoint name="extensions">
     </mergepoint>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.inheritanceDbObject.classJavadoc"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.inheritanceDbObject.classJavadoc"
+      xsi:type="velocityOutlet"
       path="dbObject/inheritance/classJavadoc.vm">
-  </generator>
-</generators>
\ No newline at end of file
+  </outlet>
+</outlets>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/interface.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/interface.xml?rev=944877&r1=915953&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/interface.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/interface.xml Sun May 16 16:15:20 2010
@@ -18,11 +18,11 @@
  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.om.interface"
-      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.om.interface"
+      xsi:type="velocityOutlet"
       path="interface/interface.vm">
-   </generator>
-</generators>
\ No newline at end of file
+   </outlet>
+</outlets>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/manager.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/manager.xml?rev=944877&r1=915953&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/manager.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/manager.xml Sun May 16 16:15:20 2010
@@ -18,40 +18,40 @@
  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.om.manager.baseManager" 
-      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.om.manager.baseManager" 
+      xsi:type="velocityOutlet"
       path="manager/base/baseManager.vm">
     <mergepoint name="classJavadoc">
-      <action xsi:type="applyAction" generator="torque.om.manager.base.classJavadoc"/>
+      <action xsi:type="applyAction" outlet="torque.om.manager.base.classJavadoc"/>
     </mergepoint>
     <mergepoint name="serialVersionUid">
-      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+      <action xsi:type="applyAction" outlet="torque.om.serialVersionUid"/>
     </mergepoint>
     <mergepoint name="extensions"/>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.manager.base.classJavadoc"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.manager.base.classJavadoc"
+      xsi:type="velocityOutlet"
       path="manager/base/classJavadoc.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.manager.manager" 
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.manager.manager" 
+      xsi:type="velocityOutlet"
       path="manager/manager.vm">
     <mergepoint name="classJavadoc">
-      <action xsi:type="applyAction" generator="torque.om.manager.classJavadoc"/>
+      <action xsi:type="applyAction" outlet="torque.om.manager.classJavadoc"/>
     </mergepoint>
     <mergepoint name="serialVersionUid">
-      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+      <action xsi:type="applyAction" outlet="torque.om.serialVersionUid"/>
     </mergepoint>
     <mergepoint name="extensions"/>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.manager.classJavadoc"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.manager.classJavadoc"
+      xsi:type="velocityOutlet"
       path="manager/base/classJavadoc.vm">
-  </generator>
-</generators>
\ No newline at end of file
+  </outlet>
+</outlets>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/mapBuilder.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/mapBuilder.xml?rev=944877&r1=915953&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/mapBuilder.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/mapBuilder.xml Sun May 16 16:15:20 2010
@@ -18,68 +18,68 @@
  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.om.mapBuilder"
-      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.om.mapBuilder"
+      xsi:type="velocityOutlet"
       path="mapBuilder/mapBuilder.vm">
     <mergepoint name="imports">
-      <action xsi:type="applyAction" generator="torque.om.mapBuilder.imports"/>
+      <action xsi:type="applyAction" outlet="torque.om.mapBuilder.imports"/>
     </mergepoint>
     <mergepoint name="classJavadoc">
-      <action xsi:type="applyAction" generator="torque.om.mapBuilder.classJavadoc"/>
+      <action xsi:type="applyAction" outlet="torque.om.mapBuilder.classJavadoc"/>
     </mergepoint>
     <mergepoint name="classNameConstant">
-      <action xsi:type="applyAction" generator="torque.om.mapBuilder.classNameConstant"/>
+      <action xsi:type="applyAction" outlet="torque.om.mapBuilder.classNameConstant"/>
     </mergepoint>
     <mergepoint name="dbMapField">
-      <action xsi:type="applyAction" generator="torque.om.mapBuilder.dbMapField"/>
+      <action xsi:type="applyAction" outlet="torque.om.mapBuilder.dbMapField"/>
     </mergepoint>
     <mergepoint name="isBuilt">
-      <action xsi:type="applyAction" generator="torque.om.mapBuilder.isBuilt"/>
+      <action xsi:type="applyAction" outlet="torque.om.mapBuilder.isBuilt"/>
     </mergepoint>
     <mergepoint name="getDatabaseMap">
-      <action xsi:type="applyAction" generator="torque.om.mapBuilder.getDatabaseMap"/>
+      <action xsi:type="applyAction" outlet="torque.om.mapBuilder.getDatabaseMap"/>
     </mergepoint>
     <mergepoint name="doBuild">
-      <action xsi:type="applyAction" generator="torque.om.mapBuilder.doBuild"/>
+      <action xsi:type="applyAction" outlet="torque.om.mapBuilder.doBuild"/>
     </mergepoint>
     <mergepoint name="extensions"/>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.mapBuilder.imports"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.mapBuilder.imports"
+      xsi:type="velocityOutlet"
       path="mapBuilder/imports.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.mapBuilder.classJavadoc"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.mapBuilder.classJavadoc"
+      xsi:type="velocityOutlet"
       path="mapBuilder/classJavadoc.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.mapBuilder.classNameConstant"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.mapBuilder.classNameConstant"
+      xsi:type="velocityOutlet"
       path="mapBuilder/classNameConstant.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.mapBuilder.dbMapField"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.mapBuilder.dbMapField"
+      xsi:type="velocityOutlet"
       path="mapBuilder/dbMapField.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.mapBuilder.isBuilt"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.mapBuilder.isBuilt"
+      xsi:type="velocityOutlet"
       path="mapBuilder/isBuilt.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.mapBuilder.getDatabaseMap"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.mapBuilder.getDatabaseMap"
+      xsi:type="velocityOutlet"
       path="mapBuilder/getDatabaseMap.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.mapBuilder.doBuild"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.mapBuilder.doBuild"
+      xsi:type="velocityOutlet"
       path="mapBuilder/doBuild.vm">
-  </generator>
-</generators>
\ No newline at end of file
+  </outlet>
+</outlets>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/mapInit.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/mapInit.xml?rev=944877&r1=915953&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/mapInit.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/mapInit.xml Sun May 16 16:15:20 2010
@@ -18,16 +18,16 @@
  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.om.mapInit.baseMapInit"
-      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.om.mapInit.baseMapInit"
+      xsi:type="velocityOutlet"
       path="mapInit/baseMapInit.vm">
-  </generator>
+  </outlet>
  
-  <generator name="torque.om.mapInit.mapInit"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.mapInit.mapInit"
+      xsi:type="velocityOutlet"
       path="mapInit/mapInit.vm">
-   </generator>
-</generators>
\ No newline at end of file
+   </outlet>
+</outlets>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/peer.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/peer.xml?rev=944877&r1=915953&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/peer.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/peer.xml Sun May 16 16:15:20 2010
@@ -18,301 +18,301 @@
  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.om.peer"
-      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.om.peer"
+      xsi:type="velocityOutlet"
       path="peer/peer.vm">
     <mergepoint name="classJavadoc">
-      <action xsi:type="applyAction" generator="torque.om.peer.classJavadoc"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.classJavadoc"/>
     </mergepoint>
     <mergepoint name="serialVersionUid">
-      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+      <action xsi:type="applyAction" outlet="torque.om.serialVersionUid"/>
     </mergepoint>
     <mergepoint name="extensions"/>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.classJavadoc"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.classJavadoc"
+      xsi:type="velocityOutlet"
       path="peer/classJavadoc.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.basePeer"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.basePeer"
+      xsi:type="velocityOutlet"
       path="peer/base/basePeer.vm">
     <mergepoint name="imports">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.imports"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.imports"/>
     </mergepoint>
     <mergepoint name="classJavadoc">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.classJavadoc"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.classJavadoc"/>
     </mergepoint>
     <mergepoint name="serialVersionUid">
-      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+      <action xsi:type="applyAction" outlet="torque.om.serialVersionUid"/>
     </mergepoint>
     <mergepoint name="tableDatabaseNameConstants">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.tableDatabaseNameConstants"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.tableDatabaseNameConstants"/>
     </mergepoint>
     <mergepoint name="columnConstants">
       <action xsi:type="traverseAllAction"
           element="column"
-          generator="torque.om.peer.base.columnConstant"/>
+          outlet="torque.om.peer.base.columnConstant"/>
     </mergepoint>
     <mergepoint name="staticInit">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.staticInit"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.staticInit"/>
     </mergepoint>
     <mergepoint name="mapBuilderGetter">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.mapBuilderGetter"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.mapBuilderGetter"/>
     </mergepoint>
     <mergepoint name="numColumnConstant">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.numColumnConstant"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.numColumnConstant"/>
     </mergepoint>
     <mergepoint name="dbObjectClassConstants">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.dbObjectClassConstants"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.dbObjectClassConstants"/>
     </mergepoint>
     <mergepoint name="classMethods">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.classMethods"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.classMethods"/>
     </mergepoint>
     <mergepoint name="resultSet2Objects">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.resultSet2Objects"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.resultSet2Objects"/>
     </mergepoint>
     <mergepoint name="doInsert">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.doInsert"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.doInsert"/>
     </mergepoint>
     <mergepoint name="addSelectColumns">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.addSelectColumns"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.addSelectColumns"/>
     </mergepoint>
     <mergepoint name="correctBooleans">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.correctBooleans"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.correctBooleans"/>
     </mergepoint>
     <mergepoint name="row2Object">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.row2Object"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.row2Object"/>
     </mergepoint>
     <mergepoint name="populateObject">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.populateObject"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.populateObject"/>
     </mergepoint>
     <mergepoint name="doSelect">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.doSelect"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.doSelect"/>
     </mergepoint>
     <mergepoint name="doSelectVillageRecords">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.doSelectVillageRecords"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.doSelectVillageRecords"/>
     </mergepoint>
     <mergepoint name="populateObjects">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.populateObjects"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.populateObjects"/>
     </mergepoint>
     <mergepoint name="getOMClass">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.getOMClass"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.getOMClass"/>
     </mergepoint>
     <mergepoint name="doUpdate">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.doUpdate"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.doUpdate"/>
     </mergepoint>
     <mergepoint name="doDelete">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.doDelete"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.doDelete"/>
     </mergepoint>
     <mergepoint name="buildCriteria">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.buildCriteria"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.buildCriteria"/>
     </mergepoint>
     <mergepoint name="buildSelectCriteria">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.buildSelectCriteria"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.buildSelectCriteria"/>
     </mergepoint>
     <mergepoint name="retrieveByPK">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.retrieveByPK"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.retrieveByPK"/>
     </mergepoint>
     <mergepoint name="retrieveByPKs">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.retrieveByPKs"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.retrieveByPKs"/>
     </mergepoint>
     <mergepoint name="doSelectJoin">
-      <action xsi:type="traverseAllAction" element="foreign-key/foreign-field" generator="torque.om.peer.base.doSelectJoin"/>
+      <action xsi:type="traverseAllAction" element="foreign-key/foreign-field" outlet="torque.om.peer.base.doSelectJoin"/>
     </mergepoint>
     <mergepoint name="doSelectJoinAllExcept">
-      <action xsi:type="traverseAllAction" element="foreign-key/foreign-field" generator="torque.om.peer.base.doSelectJoinAllExcept"/>
+      <action xsi:type="traverseAllAction" element="foreign-key/foreign-field" outlet="torque.om.peer.base.doSelectJoinAllExcept"/>
     </mergepoint>
     <mergepoint name="getTableMap">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.getTableMap"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.getTableMap"/>
     </mergepoint>
     <mergepoint name="setDbName">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.setDbName"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.setDbName"/>
     </mergepoint>
     <mergepoint name="java5Wrappers">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.java5Wrappers"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.java5Wrappers"/>
     </mergepoint>
     <mergepoint name="extensions" />
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.imports"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.imports"
+      xsi:type="velocityOutlet"
       path="peer/base/imports.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.classJavadoc"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.classJavadoc"
+      xsi:type="velocityOutlet"
       path="peer/base/classJavadoc.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.tableDatabaseNameConstants"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.tableDatabaseNameConstants"
+      xsi:type="velocityOutlet"
       path="peer/base/tableDatabaseNameConstants.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.columnConstant"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.columnConstant"
+      xsi:type="velocityOutlet"
       path="peer/base/columnConstant.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.tableDatabaseNameConstantsInit"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.tableDatabaseNameConstantsInit"
+      xsi:type="velocityOutlet"
       path="peer/base/tableDatabaseNameConstantsInit.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.staticInit"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.staticInit"
+      xsi:type="velocityOutlet"
       path="peer/base/staticInit.vm">
     <mergepoint name="tableDatabaseNameConstantsInit">
-      <action xsi:type="applyAction" generator="torque.om.peer.base.tableDatabaseNameConstantsInit"/>
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.tableDatabaseNameConstantsInit"/>
     </mergepoint>
     <mergepoint name="columnConstantsInit">
       <action xsi:type="traverseAllAction"
           element="column"
-          generator="torque.om.peer.base.columnConstantInit"/>
+          outlet="torque.om.peer.base.columnConstantInit"/>
     </mergepoint>
     <mergepoint name="mapBuilderInit">
       <action xsi:type="applyAction"
-          generator="torque.om.peer.base.mapBuilderInit"/>
+          outlet="torque.om.peer.base.mapBuilderInit"/>
     </mergepoint>
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.columnConstantInit"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.columnConstantInit"
+      xsi:type="velocityOutlet"
       path="peer/base/columnConstantInit.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.mapBuilderInit"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.mapBuilderInit"
+      xsi:type="velocityOutlet"
       path="peer/base/mapBuilderInit.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.mapBuilderGetter"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.mapBuilderGetter"
+      xsi:type="velocityOutlet"
       path="peer/base/mapBuilderGetter.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.numColumnConstant"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.numColumnConstant"
+      xsi:type="velocityOutlet"
       path="peer/base/numColumnConstant.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.dbObjectClassConstants"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.dbObjectClassConstants"
+      xsi:type="velocityOutlet"
       path="peer/base/dbObjectClassConstants.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.classMethods"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.classMethods"
+      xsi:type="velocityOutlet"
       path="peer/base/classMethods.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.resultSet2Objects"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.resultSet2Objects"
+      xsi:type="velocityOutlet"
       path="peer/base/resultSet2Objects.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.doInsert"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.doInsert"
+      xsi:type="velocityOutlet"
       path="peer/base/doInsert.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.addSelectColumns"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.addSelectColumns"
+      xsi:type="velocityOutlet"
       path="peer/base/addSelectColumns.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.correctBooleans"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.correctBooleans"
+      xsi:type="velocityOutlet"
       path="peer/base/correctBooleans.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.row2Object"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.row2Object"
+      xsi:type="velocityOutlet"
       path="peer/base/row2Object.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.populateObject"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.populateObject"
+      xsi:type="velocityOutlet"
       path="peer/base/populateObject.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.doSelect"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.doSelect"
+      xsi:type="velocityOutlet"
       path="peer/base/doSelect.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.doSelectVillageRecords"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.doSelectVillageRecords"
+      xsi:type="velocityOutlet"
       path="peer/base/doSelectVillageRecords.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.populateObjects"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.populateObjects"
+      xsi:type="velocityOutlet"
       path="peer/base/populateObjects.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.getOMClass"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.getOMClass"
+      xsi:type="velocityOutlet"
       path="peer/base/getOMClass.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.doUpdate"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.doUpdate"
+      xsi:type="velocityOutlet"
       path="peer/base/doUpdate.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.doDelete"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.doDelete"
+      xsi:type="velocityOutlet"
       path="peer/base/doDelete.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.buildCriteria"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.buildCriteria"
+      xsi:type="velocityOutlet"
       path="peer/base/buildCriteria.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.buildSelectCriteria"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.buildSelectCriteria"
+      xsi:type="velocityOutlet"
       path="peer/base/buildSelectCriteria.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.retrieveByPK"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.retrieveByPK"
+      xsi:type="velocityOutlet"
       path="peer/base/retrieveByPK.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.retrieveByPKs"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.retrieveByPKs"
+      xsi:type="velocityOutlet"
       path="peer/base/retrieveByPKs.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.doSelectJoin"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.doSelectJoin"
+      xsi:type="velocityOutlet"
       path="peer/base/doSelectJoin.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.doSelectJoinAllExcept"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.doSelectJoinAllExcept"
+      xsi:type="velocityOutlet"
       path="peer/base/doSelectJoinAllExcept.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.getTableMap"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.getTableMap"
+      xsi:type="velocityOutlet"
       path="peer/base/getTableMap.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.setDbName"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.setDbName"
+      xsi:type="velocityOutlet"
       path="peer/base/setDbName.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.om.peer.base.java5Wrappers"
-      xsi:type="velocityGenerator"
+  <outlet name="torque.om.peer.base.java5Wrappers"
+      xsi:type="velocityOutlet"
       path="peer/base/java5Wrappers.vm">
-  </generator>
-</generators>
\ No newline at end of file
+  </outlet>
+</outlets>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm Sun May 16 16:15:20 2010
@@ -38,7 +38,7 @@ import java.util.List;
 #end
 
 #set ( $currentPackage = $beanPackage )
-#set ( $foreignKeyElements = $torqueGf.getChildren("foreign-key"))
+#set ( $foreignKeyElements = $torqueGen.getChildren("foreign-key"))
 #foreach ($foreignKeyElement in $foreignKeyElements)
   #set ( $foreignTableElement = $foreignKeyElement.getChild("table"))
   #set ( $foreignBeanPackage = $foreignTableElement.getAttribute("beanPackage"))
@@ -48,10 +48,10 @@ import ${foreignBeanPackage}.${foreignBe
   #end
 #end
 
-$torqueGf.mergepoint("classJavadoc")
+$torqueGen.mergepoint("classJavadoc")
 public abstract class $baseBeanClassName
-#if ( $torqueGf.option("beanExtendsClass") && $torqueGf.option("beanExtendsClass") != "" ) 
-    extends $torqueGf.option("beanExtendsClass")
+#if ( $torqueGen.option("beanExtendsClass") && $torqueGen.option("beanExtendsClass") != "" ) 
+    extends $torqueGen.option("beanExtendsClass")
 #end
     implements Serializable
 {
@@ -72,16 +72,16 @@ public abstract class $baseBeanClassName
     private boolean isNew = true;
 
 ## 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
 
 ## -------------------------
@@ -122,13 +122,13 @@ $torqueGf.mergepoint("fieldDefinitionsRe
         return this.modified;
     }
 
-$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.booleanOption("torque.om.objectIsCaching"))
-$torqueGf.mergepoint("gettersSettersReferencingObjects")
+#if ($torqueGen.booleanOption("torque.om.complexObjectModel") && $torqueGen.booleanOption("torque.om.objectIsCaching"))
+$torqueGen.mergepoint("gettersSettersReferencingObjects")
 #end
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/classJavadoc.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/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/bean/base/classJavadoc.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/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/bean/base/getter.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/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/bean/base/getter.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/getter.vm Sun May 16 16:15:20 2010
@@ -46,6 +46,6 @@
      */
     public $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/bean/base/setter.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/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/bean/base/setter.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setter.vm Sun May 16 16:15:20 2010
@@ -45,8 +45,8 @@
      */
     public 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/bean/base/setterMethodEnd.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/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/bean/base/setterMethodEnd.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/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/bean/bean.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/bean.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/bean.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/bean.vm Sun May 16 16:15:20 2010
@@ -25,10 +25,10 @@
 ##
 package ${beanPackage};
 
-$torqueGf.mergepoint("classJavadoc")
+$torqueGen.mergepoint("classJavadoc")
 public class $beanClassName
     extends ${baseBeanPackage}.${baseBeanClassName}
 {
-$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/bean/classJavadoc.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/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/bean/classJavadoc.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/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/bean/inheritance/classJavadoc.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/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/bean/inheritance/classJavadoc.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/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/bean/inheritance/inheritanceBean.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/inheritance/inheritanceBean.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/inheritance/inheritanceBean.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/inheritance/inheritanceBean.vm Sun May 16 16:15:20 2010
@@ -26,13 +26,13 @@
 package $beanPackage;
 
 import java.io.Serializable;
-#set ( $columnElement = $torqueGf.getParent() )
+#set ( $columnElement = $torqueGen.getParent() )
 #set ( $tableElement = $columnElement.getParent() )
 #if (!$beanExtends)
   #set ( $beanExtends = $tableElement.getAttribute("beanClassName") )
 #end
 
-$torqueGf.mergepoint("classJavadoc")
+$torqueGen.mergepoint("classJavadoc")
 public class $beanClassName
     extends $beanExtends
     implements Serializable



---------------------------------------------------------------------
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