db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r910600 [22/29] - in /db/torque/torque4/trunk: maven-torque-gf-plugin/ maven-torque-gf-plugin/src/ maven-torque-gf-plugin/src/main/ maven-torque-gf-plugin/src/main/java/ maven-torque-gf-plugin/src/main/java/org/ maven-torque-gf-plugin/src/m...
Date Tue, 16 Feb 2010 17:16:02 GMT
Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/datamodel.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/datamodel.vm?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/datamodel.vm (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/datamodel.vm Tue Feb 16 17:15:43 2010
@@ -0,0 +1,48 @@
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##   http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+<document>
+  <properties>
+    <title>$name</title>
+  </properties>
+
+  <body>
+
+    <section name="$name">
+
+      <table class="summarytable">
+        <tr class="summaryhead">
+          <th class="summaryheadbackground summaryborder summaryheadtablename">Table Name</th>
+          <th class="summaryheadbackground summaryborder summaryheadjavaname">OM Class</th>
+          <th class="summaryheadbackground summaryborder summaryheaddescription">Description</th>
+        </tr>
+  #set ($tableElements = $torqueGf.getChildren("table"))
+  #foreach ($tableElement in $tableElements)
+    #set ( $tableName = $tableElement.getAttribute("name") )
+    #set ( $tableJavaName = $tableElement.getAttribute("javaName") )
+    #set ( $tableDescription = $tableElement.getAttribute("description") )
+        <tr class="summaryrow">
+          <td class="summarybackground summaryborder summarytablename"><a href="#$tableName" class="link summarytablenamelink">$tableName</a></td>
+          <td class="summarybackground summaryborder summaryjavaname">$tableJavaName</td>
+          <td class="summarybackground summaryborder summarydescription">#if ($tableDescription) $tableDescription#else &nbsp;#end</td>
+        </tr>
+  #end
+      </table>
+
+$torqueGf.mergepoint("tableDocs")
+    </section>
+  </body>
+</document>

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/table.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/table.vm?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/table.vm (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/table.vm Tue Feb 16 17:15:43 2010
@@ -0,0 +1,64 @@
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##   http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+<subsection name="$name">
+  <p>
+    $!description
+  </p>
+
+  <table class="detailtable">
+    <tr class="detailhead">
+      <th class="detailheadbackground detailborder detailheadname">Name</th>
+      <th class="detailheadbackground detailborder detailheadtype">Type</th>
+      <th class="detailheadbackground detailborder detailheadsize">Size</th>
+      <th class="detailheadbackground detailborder detailheaddefault">Default</th>
+      <th class="detailheadbackground detailborder detailheadjavaname">JavaName</th>
+      <th class="detailheadbackground detailborder detailheadpk">PK</th>
+      <th class="detailheadbackground detailborder detailheadfk">FK</th>
+      <th class="detailheadbackground detailborder detailheadnotnull">not null</th>
+      <th class="detailheadbackground detailborder detailheaddescription">Description</th>
+    </tr>
+#foreach ($columnElement in $torqueGf.getChildren("column"))
+    <tr class="detailrow">
+  #set ( $columnName = $columnElement.getAttribute("name"))
+  #set ( $columnSize = $columnElement.getAttribute("size"))
+  #set ( $columnDefault = $columnElement.getAttribute("default"))
+  #set ( $columnDescription = $columnElement.getAttribute("description"))
+  #set ( $columnPrimaryKey = $columnElement.getAttribute("primaryKey"))
+  #set ( $columnJavaName = $columnElement.getAttribute("javaName"))
+  #set ( $columnFieldType = $columnElement.getAttribute("fieldType"))
+  #set ( $columnRequired = $columnElement.getAttribute("required"))
+  #set ( $referencedColumnElements = $columnElement.getChildren("referenced-column"))
+  
+      <td class="detailbackground detailborder detailname#if ($columnPrimaryKey=="true") primarykey#end#if (!$referencedColumnElements.isEmpty()) foreignkey#end#if ($columnRequired=="true") notnull#end" id="$name$columnName">$columnName
+  #foreach ($referencedColumnElement in $referencedColumnElements)
+    #set ( $foreignColumnName = $referencedColumnElement.getChild("column").getAttribute("name") )
+    #set ( $foreignTableName = $referencedColumnElement.getChild("column").getParent().getAttribute("name") )
+        <a href="#$foreignTableName" title="Foreign key to $foreignTableName.${foreignColumnName}" class="link detailforeignkeylink">(fk)</a>
+  #end        
+      </td>
+      <td class="detailbackground detailborder detailtype">$columnFieldType</td>
+      <td class="detailbackground detailborder detailsize">#if ($columnSize && $columnSize.length() > 0) $columnSize #else &#160;#end</td>
+      <td class="detailbackground detailborder detaildefault">#if ($columnDefault) $columnDefault#else &#160;#end</td>
+      <td class="detailbackground detailborder detailjavaname">$columnJavaName</td>
+      <td class="detailbackground detailborder detailpk"><center> #if ($columnPrimaryKey=="true")X#else &#160;#end </center></td>
+      <td class="detailbackground detailborder detailfk"><center> #if (!$referencedColumnElements.isEmpty())X#else &#160;#end </center></td>
+      <td class="detailbackground detailborder detailnotnull"><center> #if ($columnRequired=="true")X#else &#160;#end </center></td>
+      <td class="detailbackground detailborder detaildescription">#if ($columnDescription) $columnDescription#else &#160;#end</td>
+    </tr>
+#end 
+  </table>
+</subsection>

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<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">
+  <options xsi:type="propertiesOptions" path="options.properties"/>
+  <output name="torque.sql.idtable.idtable" file="id-table-init.sql">
+    <source elements="database" path="*schema.xml">
+     </source>
+    <generator name="torque.sql.idtable.idtable"/>
+  </output>
+  
+</control>
+  
\ No newline at end of file

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/options.properties
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/options.properties?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/options.properties (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/options.properties Tue Feb 16 17:15:43 2010
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+torque.idbroker.initialId = 101
+torque.idBroker.initialIdValue = 1000
+torque.idbroker.initialIdStep  = 10

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/generatorDefs/idbroker.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/generatorDefs/idbroker.xml?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/generatorDefs/idbroker.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/generatorDefs/idbroker.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ 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.idtable.idtable"
+      xsi:type="velocityGenerator"
+      path="idtable.vm">
+  </generator>
+</generators>
\ No newline at end of file

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/templates/idtable.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/templates/idtable.vm?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/templates/idtable.vm (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/templates/idtable.vm Tue Feb 16 17:15:43 2010
@@ -0,0 +1,27 @@
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##   http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+##
+#set ( $tableElements = $torqueGf.getChildren("table") )
+#set ( $initialIdValue = $torqueGf.option("torque.idbroker.initialIdValue") )
+#set ( $initialIdStep = $torqueGf.option("torque.idbroker.initialIdStep") )
+#set ( $initialId = $torqueGf.option("torque.idbroker.initialId") )
+#foreach ($tableElement in $tableElements)
+#set ( $tableName = $tableElement.getAttribute("name") )
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES ($initialId, '$tableName', $initialIdValue, $initialIdStep);
+#set ( $initialId = $initialId + 1 )
+#end

Added: 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=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<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">
+  <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">
+      <mergepoint name="package">
+        <action
+           xsi:type="sourceElementAttributeAction"
+           element="."
+           attribute="dbObjectPackage"
+           acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action 
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="dbObjectClassName"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database/table" path="*schema.xml">
+      <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
+    </source>
+    <generator name="torque.om.dbObject"/>
+  </output>
+
+  <output name="torque.om.baseDbObject">
+    <filenameGenerator
+        xsi:type="javaGenerator"
+        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+      <mergepoint name="package">
+        <action 
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="baseDbObjectPackage"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="baseDbObjectClassName"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database/table" path="*schema.xml">
+      <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"/>
+  </output>
+  
+  <output name="torque.om.inheritanceDbObject" skipIfExists="true">
+    <filenameGenerator
+        xsi:type="javaGenerator"
+        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+      <mergepoint name="package">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="package"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="className"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database/table/column/inheritance" path="*schema.xml">
+      <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
+    </source>
+    <generator name="torque.om.inheritanceDbObject"/>
+  </output>
+  
+  <output name="torque.om.interface" skipIfExists="true">
+    <filenameGenerator
+        xsi:type="javaGenerator"
+        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+      <mergepoint name="package">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="dbObjectPackage"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="interface"
+            acceptNotSet="true"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database/table"
+        path="*schema.xml"
+        filter="org.apache.torque.templates.sourcefilter.InterfaceSourceFilter">
+      <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
+    </source>
+    <generator name="torque.om.interface"/>
+  </output>
+  
+  <output name="torque.om.peer" skipIfExists="true">
+    <filenameGenerator
+        xsi:type="javaGenerator"
+        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+      <mergepoint name="package">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="peerPackage"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="peerClassName"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database/table" path="*schema.xml">
+      <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
+    </source>
+    <generator name="torque.om.peer"/>
+  </output>
+
+  <output name="torque.om.basePeer">
+    <filenameGenerator
+        xsi:type="javaGenerator"
+        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+      <mergepoint name="package">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="basePeerPackage"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="basePeerClassName"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database/table" path="*schema.xml">
+      <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
+    </source>
+    <generator name="torque.om.basePeer"/>
+  </output>
+
+  <output name="torque.om.mapBuilder">
+    <filenameGenerator
+        xsi:type="javaGenerator"
+        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+      <mergepoint name="package">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="mapBuilderPackage"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="mapBuilderClassName"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database/table" path="*schema.xml">
+      <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
+    </source>
+    <generator name="torque.om.mapBuilder"/>
+  </output>
+
+  <output name="torque.om.bean" skipIfExists="true">
+    <filenameGenerator
+        xsi:type="javaGenerator"
+        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+      <mergepoint name="package">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="beanPackage"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="beanClassName"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database/table"
+        path="*schema.xml"
+        filter="org.apache.torque.templates.sourcefilter.BeanSourceFilter">
+      <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
+    </source>
+    <generator name="torque.om.bean.bean"/>
+  </output>
+
+  <output name="torque.om.baseBean">
+    <filenameGenerator
+        xsi:type="javaGenerator"
+        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+      <mergepoint name="package">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="baseBeanPackage"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="baseBeanClassName"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database/table"
+        path="*schema.xml"
+        filter="org.apache.torque.templates.sourcefilter.BeanSourceFilter">
+      <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
+    </source>
+    <generator 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">
+      <mergepoint name="package">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="beanPackage"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="beanClassName"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database/table/column/inheritance" path="*schema.xml">
+      <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
+    </source>
+    <generator name="torque.om.inheritanceBean"/>
+  </output>
+  
+  <output name="torque.om.mapInit" skipIfExists="true">
+    <filenameGenerator
+        xsi:type="javaGenerator"
+        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+      <mergepoint name="package">
+        <action
+            xsi:type="optionAction"
+            option="torque.om.mapInit.mapInitPackage"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="mapInitClassName"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database" 
+        path="*schema.xml" 
+        filter="org.apache.torque.templates.sourcefilter.MapInitSourceFilter">
+      <transformer class="org.apache.torque.templates.transformer.om.mapInit.MapInitDatabaseTransformer"/>
+    </source>
+    <generator name="torque.om.mapInit.mapInit"/>
+  </output>
+
+  <output name="torque.om.baseMapInit">
+    <filenameGenerator
+        xsi:type="javaGenerator"
+        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+      <mergepoint name="package">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="mapBuilderPackage"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="mapInitClassName"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database" 
+        path="*schema.xml" 
+        filter="org.apache.torque.templates.sourcefilter.MapInitSourceFilter">
+      <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"/>
+  </output>
+  
+  <output name="torque.om.manager" skipIfExists="true">
+    <filenameGenerator
+        xsi:type="javaGenerator"
+        class="org.apache.torque.gf.generator.java.JavaFilenameGenerator">
+      <mergepoint name="package">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="managerPackage"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="managerClassName"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database/table" 
+        path="*schema.xml"
+        filter="org.apache.torque.templates.sourcefilter.ManagerSourceFilter">
+      <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
+    </source>
+    <generator 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">
+      <mergepoint name="package">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="baseManagerPackage"
+            acceptNotSet="false"/>
+      </mergepoint>
+      <mergepoint name="classname">
+        <action
+            xsi:type="sourceElementAttributeAction"
+            element="."
+            attribute="baseManagerClassName"
+            acceptNotSet="false"/>
+      </mergepoint>
+    </filenameGenerator>
+    <source elements="database/table"
+        path="*schema.xml"
+        filter="org.apache.torque.templates.sourcefilter.ManagerSourceFilter">
+      <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
+    </source>
+    <generator name="torque.om.manager.baseManager"/>
+  </output>
+</control>
+  
\ No newline at end of file

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/options.properties
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/options.properties?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/options.properties (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/options.properties Tue Feb 16 17:15:43 2010
@@ -0,0 +1,107 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+torque.om.addTimeStamp = true
+
+torque.om.addIntakeRetrievable = true
+torque.om.retrievableInterface = org.apache.turbine.om.Retrievable
+
+# replaces torque.correctGetters
+torque.om.useIsForBooleanGetters = true;
+
+torque.om.save.saveException = TorqueException
+
+torque.om.complexObjectModel = true
+torque.om.objectIsCaching = true
+
+torque.om.silentDbFetch = true
+
+torque.om.java5 = true
+
+torque.om.addGetByNameMethods = true
+
+torque.om.generateBeans = true
+torque.om.bean.beanExtendsClass = 
+
+torque.om.useManagers = true
+
+torque.om.save.addSaveMethods = true
+torque.om.trackModified = true
+# trackNew needs to be set to true if addSaveMethods is true 
+torque.om.trackNew = true
+
+torque.om.generateMapInit = true
+torque.om.mapInit.mapInitClassNamePrefix = 
+torque.om.mapInit.mapInitClassNameSuffix = MapInit
+torque.om.mapInit.mapInitPackage = org.apache.torque.linkage
+
+# Settings for the fields representing objects which are referenced by
+# foreign keys.
+#
+# Prefix and Suffix for the instance variable on the "local" side of the fk
+# Field Name is ${prefix}${referencedObjectClass}${suffix}
+# If necessary ${relatedBy} followed by the column names is appended to this. 
+torque.om.complexObjectModel.localFieldNamePrefix = a
+torque.om.complexObjectModel.localFieldNameSuffix = 
+torque.om.complexObjectModel.localFieldNameRelatedBy = RelatedBy
+
+# Prefix and Suffix for the instance variable on the "foreign" side of the fk
+# Field Name is ${prefix}${referencedObjectClass}${suffix}
+# If necessary ${relatedBy} followed by the column names is appended to this. 
+torque.om.complexObjectModel.foreignFieldNamePrefix = coll
+torque.om.complexObjectModel.foreignFieldNameSuffix = s
+torque.om.complexObjectModel.foreignFieldNameRelatedBy = RelatedBy
+
+# Type of the instance variable on the "foreign" side of the fk
+# This type will be generified if java5 is enabled
+torque.om.complexObjectModel.foreignFieldType = List
+# The type of the object the variable on the "foreign" side will be 
+# initialized with in the init method
+torque.om.complexObjectModel.foreignFieldInitType = ArrayList
+
+# new options
+torque.om.dbObjectDefaultBaseClass = org.apache.torque.om.BaseObject
+torque.om.basePeerBaseClass = org.apache.torque.util.BasePeer
+
+torque.om.className.baseDbObjectClassNamePrefix = Base
+torque.om.className.baseDbObjectClassNameSuffix =
+torque.om.className.peerClassNamePrefix =
+torque.om.className.peerClassNameSuffix = Peer
+torque.om.className.basePeerClassNamePrefix = Base
+torque.om.className.basePeerClassNameSuffix = Peer
+torque.om.className.managerClassNamePrefix =
+torque.om.className.managerClassNameSuffix = Manager
+torque.om.className.baseManagerClassNamePrefix = Base
+torque.om.className.baseManagerClassNameSuffix = Manager
+torque.om.className.beanClassNamePrefix =
+torque.om.className.beanClassNameSuffix = Bean
+torque.om.className.baseBeanClassNamePrefix = Base
+torque.om.className.baseBeanClassNameSuffix = Bean
+torque.om.className.mapBuilderClassNamePrefix =
+torque.om.className.mapBuilderClassNameSuffix = MapBuilder
+
+torque.om.package.dbObjectPackageSuffix =
+torque.om.package.baseDbObjectPackageSuffix =
+torque.om.package.peerPackageSuffix =
+torque.om.package.basePeerPackageSuffix =
+torque.om.package.managerPackageSuffix = .manager
+torque.om.package.baseManagerPackageSuffix = .manager.base
+torque.om.package.beanPackageSuffix = .bean
+torque.om.package.baseBeanPackageSuffix = .bean
+torque.om.package.mapPackageSuffix = .map
+
+torque.om.column.defaultType = VARCHAR

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/bean.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/bean.xml?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/bean.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/bean.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ 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"
+      path="bean/base/baseBean.vm">
+    <mergepoint name="classJavadoc">
+      <action xsi:type="applyAction" generator="torque.om.bean.base.classJavadoc"/>
+    </mergepoint>
+    <mergepoint name="serialVersionUid">
+      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+    </mergepoint>
+    <mergepoint name="fieldDefinitions">
+      <action xsi:type="traverseAllAction"
+          element="column"
+          generator="torque.om.fieldDefinition"/>
+    </mergepoint>
+    <mergepoint name="fieldDefinitionsReferencedObjects">
+      <action xsi:type="traverseAllAction"
+          element="foreign-key/local-field-in-bean"
+          generator="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"/>
+    </mergepoint>
+    <mergepoint name="gettersSetters">
+      <action xsi:type="traverseAllAction"
+          element="column"
+          generator="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"/>
+    </mergepoint>
+    <mergepoint name="gettersSettersReferencingObjects">
+      <action xsi:type="traverseAllAction"
+          element="referencing-foreign-keys/foreign-key/foreign-field-in-bean"
+          generator="torque.om.bean.base.getterSetterReferencingObject"/>
+    </mergepoint>
+    <mergepoint name="extensions"/>
+  </generator>
+
+  <generator name="torque.om.bean.base.classJavadoc"
+      xsi:type="velocityGenerator"
+      path="bean/base/classJavadoc.vm">
+  </generator>
+
+  <generator name="torque.om.bean.base.getterSetter"
+      xsi:type="velocityGenerator"
+      path="general/getterSetter.vm">
+    <mergepoint name="getter">
+      <action xsi:type="applyAction" generator="torque.om.bean.base.getter"/>
+    </mergepoint>
+    <mergepoint name="setter">
+      <action xsi:type="applyAction" generator="torque.om.bean.base.setter"/>
+    </mergepoint>
+  </generator>
+
+  <generator name="torque.om.bean.base.getter"
+      xsi:type="velocityGenerator"
+      path="bean/base/getter.vm">
+    <mergepoint name="methodStart" />
+  </generator>
+
+  <generator name="torque.om.bean.base.setter"
+      xsi:type="velocityGenerator"
+      path="bean/base/setter.vm">
+    <mergepoint name="methodStart">
+      <action xsi:type="applyAction" generator="torque.om.setterMethodStart"/>
+    </mergepoint>
+    <mergepoint name="methodEnd">
+      <action xsi:type="applyAction" generator="torque.om.bean.base.setterMethodEnd"/>
+    </mergepoint>
+  </generator>
+
+  <generator name="torque.om.bean.base.setterMethodEnd"
+      xsi:type="velocityGenerator"
+      path="bean/base/setterMethodEnd.vm">
+  </generator>
+
+  <generator name="torque.om.bean.base.getterSetterReferencedObject"
+      xsi:type="velocityGenerator"
+      path="general/getterSetter.vm">
+    <mergepoint name="getter">
+      <action xsi:type="applyAction" generator="torque.om.bean.base.getterReferencedObject"/>
+    </mergepoint>
+    <mergepoint name="setter">
+      <action xsi:type="applyAction" generator="torque.om.setterReferencedObject"/>
+    </mergepoint>
+  </generator>
+
+  <generator name="torque.om.bean.base.getterReferencedObject"
+      xsi:type="velocityGenerator"
+      path="bean/base/getterReferencedObject.vm">
+  </generator>
+
+  <generator name="torque.om.bean.base.getterSetterReferencingObject"
+      xsi:type="velocityGenerator"
+      path="general/getterSetter.vm">
+    <mergepoint name="getter">
+      <action xsi:type="applyAction"
+          generator="torque.om.bean.base.getterReferencingObject"/>
+    </mergepoint>
+    <mergepoint name="setter">
+      <action xsi:type="applyAction"
+          generator="torque.om.bean.base.setterReferencingObject"/>
+    </mergepoint>
+  </generator>
+
+  <generator name="torque.om.bean.base.getterReferencingObject"
+      xsi:type="velocityGenerator"
+      path="bean/base/getterReferencingObject.vm">
+  </generator>
+
+  <generator name="torque.om.bean.base.setterReferencingObject"
+      xsi:type="velocityGenerator"
+      path="bean/base/setterReferencingObject.vm">
+  </generator>
+
+  <generator name="torque.om.bean.bean"
+      xsi:type="velocityGenerator"
+      path="bean/bean.vm">
+    <mergepoint name="classJavadoc">
+      <action xsi:type="applyAction" generator="torque.om.bean.classJavadoc"/>
+    </mergepoint>
+    <mergepoint name="serialVersionUid">
+      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+    </mergepoint>
+    <mergepoint name="extensions"/>
+  </generator>
+
+  <generator name="torque.om.bean.classJavadoc"
+      xsi:type="velocityGenerator"
+      path="bean/classJavadoc.vm">
+  </generator>
+
+</generators>
\ No newline at end of file

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/dbObject.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/dbObject.xml?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/dbObject.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/dbObject.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ 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"
+      path="dbObject/dbObject.vm">
+    <mergepoint name="classJavadoc">
+      <action xsi:type="applyAction" generator="torque.om.dbObjectClassJavadoc"/>
+    </mergepoint>
+    <mergepoint name="serialVersionUid">
+      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+    </mergepoint>
+    <mergepoint name="extensions"/>
+  </generator>
+
+  <generator name="torque.om.dbObjectClassJavadoc"
+      xsi:type="velocityGenerator"
+      path="dbObject/classJavadoc.vm">
+  </generator>
+
+  <generator name="torque.om.baseDbObject"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/baseDbObject.vm">
+    <mergepoint name="objectBeanImports">
+      <action xsi:type="applyAction" generator="torque.om.dbObject.base.objectBeanImports"/>
+    </mergepoint>
+    <mergepoint name="classJavadoc">
+      <action xsi:type="applyAction" generator="torque.om.dbObject.base.classJavadoc"/>
+    </mergepoint>
+    <mergepoint name="serialVersionUid">
+      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+    </mergepoint>
+    <mergepoint name="fieldDefinitions">
+      <action xsi:type="traverseAllAction"
+          element="column"
+          generator="torque.om.fieldDefinition"/>
+    </mergepoint>
+    <mergepoint name="fieldDefinitionsReferencedObjects">
+      <action xsi:type="traverseAllAction"
+          element="foreign-key/local-field"
+          generator="torque.om.fieldDefinition"/>
+    </mergepoint>
+    <mergepoint name="fieldDefinitionsReferencingObjects">
+      <action xsi:type="traverseAllAction"
+          element="referencing-foreign-keys/foreign-key/foreign-field"
+          generator="torque.om.fieldDefinition"/>
+    </mergepoint>
+    <mergepoint name="gettersSetters">
+      <action xsi:type="traverseAllAction"
+          element="column"
+          generator="torque.om.getterSetter"/>
+    </mergepoint>
+    <mergepoint name="gettersSettersReferencedObjects">
+      <action xsi:type="traverseAllAction"
+          element="foreign-key/local-field"
+          generator="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"/>
+    </mergepoint>
+    <mergepoint name="getByNameMethods">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.getByNameMethods"/>
+    </mergepoint>
+    <mergepoint name="saveMethods">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.saveMethods"/>
+    </mergepoint>
+    <mergepoint name="primaryKeyMethods">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.primaryKeyMethods"/>
+    </mergepoint>
+     <mergepoint name="copyMethods">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.copyMethods"/>
+    </mergepoint>
+    <mergepoint name="peerGetter">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.peerGetter"/>
+    </mergepoint>
+    <mergepoint name="tableMapGetter">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.tableMapGetter"/>
+    </mergepoint>
+    <mergepoint name="objectBeanMethods">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.objectBeanMethods"/>
+    </mergepoint>
+    <mergepoint name="toString">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.toString"/>
+    </mergepoint>
+    <mergepoint name="extensions"/>
+  </generator>
+
+  <generator name="torque.om.dbObject.base.objectBeanImports"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/bean/objectBeanImports.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.classJavadoc"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/classJavadoc.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.getterSetterReferencedObject"
+      xsi:type="velocityGenerator"
+      path="general/getterSetter.vm">
+    <mergepoint name="getter">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.getterReferencedObject"/>
+    </mergepoint>
+    <mergepoint name="setter">
+      <action xsi:type="applyAction"
+          generator="torque.om.setterReferencedObject"/>
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.setterReferencedObjectByObjectKey"/>
+    </mergepoint>
+  </generator>
+
+  <generator name="torque.om.dbObject.base.getterReferencedObject"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/getterReferencedObject.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.setterReferencedObjectByObjectKey"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/setterReferencedObjectByObjectKey.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.referencingObjectMethods"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/referencingObjectMethods.vm">
+    <mergepoint name="getter">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.getterReferencingObject"/>
+    </mergepoint>
+    <mergepoint name="adder">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.adderReferencingObject"/>
+    </mergepoint>
+    <mergepoint name="initializer">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.initializerReferencingObject"/>
+    </mergepoint>
+    <mergepoint name="referencingJoinGetters">
+      <action xsi:type="applyAction"
+          generator="torque.om.dbObject.base.joinGettersReferencingObject"/>
+    </mergepoint>
+    <mergepoint name="setter" />
+  </generator>
+
+  <generator name="torque.om.dbObject.base.getterReferencingObject"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/getterReferencingObject.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.adderReferencingObject"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/adderReferencingObject.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.initializerReferencingObject"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/initializerReferencingObject.vm">
+  </generator>
+  
+  <generator name="torque.om.dbObject.base.joinGettersReferencingObject"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/joinGetterReferencingObject.vm">
+  </generator>
+  
+  <generator name="torque.om.dbObject.base.getByNameMethods"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/getByNameMethods.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.saveMethods"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/saveMethods.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.primaryKeyMethods"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/primaryKeyMethods.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.copyMethods"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/copyMethods.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.peerGetter"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/peerGetter.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.tableMapGetter"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/tableMapGetter.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.objectBeanMethods"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/bean/objectBeanMethods.vm">
+  </generator>
+
+  <generator name="torque.om.dbObject.base.toString"
+      xsi:type="velocityGenerator"
+      path="dbObject/base/toString.vm">
+  </generator>
+</generators>
\ No newline at end of file

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/general.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/general.xml?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/general.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/general.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ 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"
+      path="general/serialVersionUid.vm">
+  </generator>
+
+  <generator name="torque.om.fieldDefinition"
+      xsi:type="velocityGenerator"
+      path="general/fieldDefinition.vm">
+  </generator>
+
+  <generator name="torque.om.getterSetter"
+      xsi:type="velocityGenerator"
+      path="general/getterSetter.vm">
+    <mergepoint name="getter">
+      <action xsi:type="applyAction" generator="torque.om.getter"/>
+    </mergepoint>
+    <mergepoint name="setter">
+      <action xsi:type="applyAction" generator="torque.om.setter"/>
+    </mergepoint>
+  </generator>
+
+  <generator name="torque.om.getter"
+      xsi:type="velocityGenerator"
+      path="general/getter.vm">
+    <mergepoint name="methodStart" />
+  </generator>
+
+  <generator name="torque.om.setter"
+      xsi:type="velocityGenerator"
+      path="general/setter.vm">
+    <mergepoint name="methodStart">
+      <action xsi:type="applyAction" generator="torque.om.setterMethodStart"/>
+    </mergepoint>
+    <mergepoint name="methodEnd">
+      <action xsi:type="applyAction" generator="torque.om.setterMethodEnd"/>
+    </mergepoint>
+  </generator>
+
+  <generator name="torque.om.setterMethodStart"
+      xsi:type="velocityGenerator"
+      path="general/setterMethodStart.vm">
+  </generator>
+
+  <generator name="torque.om.setterMethodEnd"
+      xsi:type="velocityGenerator"
+      path="general/setterMethodEnd.vm">
+  </generator>
+
+  <generator name="torque.om.setterReferencedObject"
+      xsi:type="velocityGenerator"
+      path="general/setterReferencedObject.vm">
+  </generator>
+  
+</generators>
\ No newline at end of file

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/inheritanceBean.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/inheritanceBean.xml?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/inheritanceBean.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/inheritanceBean.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ 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"
+      path="bean/inheritance/inheritanceBean.vm">
+    <mergepoint name="classJavadoc">
+      <action xsi:type="applyAction"
+          generator="torque.om.inheritanceBean.classJavadoc"/>
+    </mergepoint>
+    <mergepoint name="serialVersionUid">
+      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+    </mergepoint>
+    <mergepoint name="extensions">
+    </mergepoint>
+  </generator>
+
+  <generator name="torque.om.inheritanceBean.classJavadoc"
+      xsi:type="velocityGenerator"
+      path="bean/inheritance/classJavadoc.vm">
+  </generator>
+</generators>
\ No newline at end of file

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/inheritanceDbObject.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/inheritanceDbObject.xml?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/inheritanceDbObject.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/inheritanceDbObject.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ 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"
+      path="dbObject/inheritance/inheritanceDbObject.vm">
+    <mergepoint name="classJavadoc">
+      <action xsi:type="applyAction"
+          generator="torque.om.inheritanceDbObject.classJavadoc"/>
+    </mergepoint>
+    <mergepoint name="serialVersionUid">
+      <action xsi:type="applyAction"
+          generator="torque.om.serialVersionUid"/>
+    </mergepoint>
+    <mergepoint name="extensions">
+    </mergepoint>
+  </generator>
+
+  <generator name="torque.om.inheritanceDbObject.classJavadoc"
+      xsi:type="velocityGenerator"
+      path="dbObject/inheritance/classJavadoc.vm">
+  </generator>
+</generators>
\ No newline at end of file

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/interface.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/interface.xml?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/interface.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/interface.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ 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"
+      path="interface/interface.vm">
+   </generator>
+</generators>
\ No newline at end of file

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/manager.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/manager.xml?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/manager.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/manager.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ 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"
+      path="manager/base/baseManager.vm">
+    <mergepoint name="classJavadoc">
+      <action xsi:type="applyAction" generator="torque.om.manager.base.classJavadoc"/>
+    </mergepoint>
+    <mergepoint name="serialVersionUid">
+      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+    </mergepoint>
+    <mergepoint name="extensions"/>
+  </generator>
+
+  <generator name="torque.om.manager.base.classJavadoc"
+      xsi:type="velocityGenerator"
+      path="manager/base/classJavadoc.vm">
+  </generator>
+
+  <generator name="torque.om.manager.manager" 
+      xsi:type="velocityGenerator"
+      path="manager/manager.vm">
+    <mergepoint name="classJavadoc">
+      <action xsi:type="applyAction" generator="torque.om.manager.classJavadoc"/>
+    </mergepoint>
+    <mergepoint name="serialVersionUid">
+      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+    </mergepoint>
+    <mergepoint name="extensions"/>
+  </generator>
+
+  <generator name="torque.om.manager.classJavadoc"
+      xsi:type="velocityGenerator"
+      path="manager/base/classJavadoc.vm">
+  </generator>
+</generators>
\ No newline at end of file

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/mapBuilder.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/mapBuilder.xml?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/mapBuilder.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/mapBuilder.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ 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"
+      path="mapBuilder/mapBuilder.vm">
+    <mergepoint name="imports">
+      <action xsi:type="applyAction" generator="torque.om.mapBuilder.imports"/>
+    </mergepoint>
+    <mergepoint name="classJavadoc">
+      <action xsi:type="applyAction" generator="torque.om.mapBuilder.classJavadoc"/>
+    </mergepoint>
+    <mergepoint name="classNameConstant">
+      <action xsi:type="applyAction" generator="torque.om.mapBuilder.classNameConstant"/>
+    </mergepoint>
+    <mergepoint name="dbMapField">
+      <action xsi:type="applyAction" generator="torque.om.mapBuilder.dbMapField"/>
+    </mergepoint>
+    <mergepoint name="isBuilt">
+      <action xsi:type="applyAction" generator="torque.om.mapBuilder.isBuilt"/>
+    </mergepoint>
+    <mergepoint name="getDatabaseMap">
+      <action xsi:type="applyAction" generator="torque.om.mapBuilder.getDatabaseMap"/>
+    </mergepoint>
+    <mergepoint name="doBuild">
+      <action xsi:type="applyAction" generator="torque.om.mapBuilder.doBuild"/>
+    </mergepoint>
+    <mergepoint name="extensions"/>
+  </generator>
+
+  <generator name="torque.om.mapBuilder.imports"
+      xsi:type="velocityGenerator"
+      path="mapBuilder/imports.vm">
+  </generator>
+
+  <generator name="torque.om.mapBuilder.classJavadoc"
+      xsi:type="velocityGenerator"
+      path="mapBuilder/classJavadoc.vm">
+  </generator>
+
+  <generator name="torque.om.mapBuilder.classNameConstant"
+      xsi:type="velocityGenerator"
+      path="mapBuilder/classNameConstant.vm">
+  </generator>
+
+  <generator name="torque.om.mapBuilder.dbMapField"
+      xsi:type="velocityGenerator"
+      path="mapBuilder/dbMapField.vm">
+  </generator>
+
+  <generator name="torque.om.mapBuilder.isBuilt"
+      xsi:type="velocityGenerator"
+      path="mapBuilder/isBuilt.vm">
+  </generator>
+
+  <generator name="torque.om.mapBuilder.getDatabaseMap"
+      xsi:type="velocityGenerator"
+      path="mapBuilder/getDatabaseMap.vm">
+  </generator>
+
+  <generator name="torque.om.mapBuilder.doBuild"
+      xsi:type="velocityGenerator"
+      path="mapBuilder/doBuild.vm">
+  </generator>
+</generators>
\ No newline at end of file

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/mapInit.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/mapInit.xml?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/mapInit.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/mapInit.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ 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"
+      path="mapInit/baseMapInit.vm">
+  </generator>
+ 
+  <generator name="torque.om.mapInit.mapInit"
+      xsi:type="velocityGenerator"
+      path="mapInit/mapInit.vm">
+   </generator>
+</generators>
\ No newline at end of file

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/peer.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/peer.xml?rev=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/peer.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/peer.xml Tue Feb 16 17:15:43 2010
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ 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"
+      path="peer/peer.vm">
+    <mergepoint name="classJavadoc">
+      <action xsi:type="applyAction" generator="torque.om.peer.classJavadoc"/>
+    </mergepoint>
+    <mergepoint name="serialVersionUid">
+      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+    </mergepoint>
+    <mergepoint name="extensions"/>
+  </generator>
+
+  <generator name="torque.om.peer.classJavadoc"
+      xsi:type="velocityGenerator"
+      path="peer/classJavadoc.vm">
+  </generator>
+
+  <generator name="torque.om.basePeer"
+      xsi:type="velocityGenerator"
+      path="peer/base/basePeer.vm">
+    <mergepoint name="imports">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.imports"/>
+    </mergepoint>
+    <mergepoint name="classJavadoc">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.classJavadoc"/>
+    </mergepoint>
+    <mergepoint name="serialVersionUid">
+      <action xsi:type="applyAction" generator="torque.om.serialVersionUid"/>
+    </mergepoint>
+    <mergepoint name="tableDatabaseNameConstants">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.tableDatabaseNameConstants"/>
+    </mergepoint>
+    <mergepoint name="columnConstants">
+      <action xsi:type="traverseAllAction"
+          element="column"
+          generator="torque.om.peer.base.columnConstant"/>
+    </mergepoint>
+    <mergepoint name="staticInit">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.staticInit"/>
+    </mergepoint>
+    <mergepoint name="mapBuilderGetter">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.mapBuilderGetter"/>
+    </mergepoint>
+    <mergepoint name="numColumnConstant">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.numColumnConstant"/>
+    </mergepoint>
+    <mergepoint name="dbObjectClassConstants">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.dbObjectClassConstants"/>
+    </mergepoint>
+    <mergepoint name="classMethods">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.classMethods"/>
+    </mergepoint>
+    <mergepoint name="resultSet2Objects">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.resultSet2Objects"/>
+    </mergepoint>
+    <mergepoint name="doInsert">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.doInsert"/>
+    </mergepoint>
+    <mergepoint name="addSelectColumns">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.addSelectColumns"/>
+    </mergepoint>
+    <mergepoint name="correctBooleans">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.correctBooleans"/>
+    </mergepoint>
+    <mergepoint name="row2Object">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.row2Object"/>
+    </mergepoint>
+    <mergepoint name="populateObject">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.populateObject"/>
+    </mergepoint>
+    <mergepoint name="doSelect">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.doSelect"/>
+    </mergepoint>
+    <mergepoint name="doSelectVillageRecords">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.doSelectVillageRecords"/>
+    </mergepoint>
+    <mergepoint name="populateObjects">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.populateObjects"/>
+    </mergepoint>
+    <mergepoint name="getOMClass">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.getOMClass"/>
+    </mergepoint>
+    <mergepoint name="doUpdate">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.doUpdate"/>
+    </mergepoint>
+    <mergepoint name="doDelete">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.doDelete"/>
+    </mergepoint>
+    <mergepoint name="buildCriteria">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.buildCriteria"/>
+    </mergepoint>
+    <mergepoint name="buildSelectCriteria">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.buildSelectCriteria"/>
+    </mergepoint>
+    <mergepoint name="retrieveByPK">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.retrieveByPK"/>
+    </mergepoint>
+    <mergepoint name="retrieveByPKs">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.retrieveByPKs"/>
+    </mergepoint>
+    <mergepoint name="doSelectJoin">
+      <action xsi:type="traverseAllAction" element="foreign-key/foreign-field" generator="torque.om.peer.base.doSelectJoin"/>
+    </mergepoint>
+    <mergepoint name="doSelectJoinAllExcept">
+      <action xsi:type="traverseAllAction" element="foreign-key/foreign-field" generator="torque.om.peer.base.doSelectJoinAllExcept"/>
+    </mergepoint>
+    <mergepoint name="getTableMap">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.getTableMap"/>
+    </mergepoint>
+    <mergepoint name="setDbName">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.setDbName"/>
+    </mergepoint>
+    <mergepoint name="java5Wrappers">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.java5Wrappers"/>
+    </mergepoint>
+    <mergepoint name="extensions" />
+  </generator>
+
+  <generator name="torque.om.peer.base.imports"
+      xsi:type="velocityGenerator"
+      path="peer/base/imports.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.classJavadoc"
+      xsi:type="velocityGenerator"
+      path="peer/base/classJavadoc.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.tableDatabaseNameConstants"
+      xsi:type="velocityGenerator"
+      path="peer/base/tableDatabaseNameConstants.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.columnConstant"
+      xsi:type="velocityGenerator"
+      path="peer/base/columnConstant.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.tableDatabaseNameConstantsInit"
+      xsi:type="velocityGenerator"
+      path="peer/base/tableDatabaseNameConstantsInit.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.staticInit"
+      xsi:type="velocityGenerator"
+      path="peer/base/staticInit.vm">
+    <mergepoint name="tableDatabaseNameConstantsInit">
+      <action xsi:type="applyAction" generator="torque.om.peer.base.tableDatabaseNameConstantsInit"/>
+    </mergepoint>
+    <mergepoint name="columnConstantsInit">
+      <action xsi:type="traverseAllAction"
+          element="column"
+          generator="torque.om.peer.base.columnConstantInit"/>
+    </mergepoint>
+    <mergepoint name="mapBuilderInit">
+      <action xsi:type="applyAction"
+          generator="torque.om.peer.base.mapBuilderInit"/>
+    </mergepoint>
+  </generator>
+
+  <generator name="torque.om.peer.base.columnConstantInit"
+      xsi:type="velocityGenerator"
+      path="peer/base/columnConstantInit.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.mapBuilderInit"
+      xsi:type="velocityGenerator"
+      path="peer/base/mapBuilderInit.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.mapBuilderGetter"
+      xsi:type="velocityGenerator"
+      path="peer/base/mapBuilderGetter.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.numColumnConstant"
+      xsi:type="velocityGenerator"
+      path="peer/base/numColumnConstant.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.dbObjectClassConstants"
+      xsi:type="velocityGenerator"
+      path="peer/base/dbObjectClassConstants.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.classMethods"
+      xsi:type="velocityGenerator"
+      path="peer/base/classMethods.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.resultSet2Objects"
+      xsi:type="velocityGenerator"
+      path="peer/base/resultSet2Objects.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.doInsert"
+      xsi:type="velocityGenerator"
+      path="peer/base/doInsert.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.addSelectColumns"
+      xsi:type="velocityGenerator"
+      path="peer/base/addSelectColumns.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.correctBooleans"
+      xsi:type="velocityGenerator"
+      path="peer/base/correctBooleans.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.row2Object"
+      xsi:type="velocityGenerator"
+      path="peer/base/row2Object.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.populateObject"
+      xsi:type="velocityGenerator"
+      path="peer/base/populateObject.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.doSelect"
+      xsi:type="velocityGenerator"
+      path="peer/base/doSelect.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.doSelectVillageRecords"
+      xsi:type="velocityGenerator"
+      path="peer/base/doSelectVillageRecords.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.populateObjects"
+      xsi:type="velocityGenerator"
+      path="peer/base/populateObjects.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.getOMClass"
+      xsi:type="velocityGenerator"
+      path="peer/base/getOMClass.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.doUpdate"
+      xsi:type="velocityGenerator"
+      path="peer/base/doUpdate.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.doDelete"
+      xsi:type="velocityGenerator"
+      path="peer/base/doDelete.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.buildCriteria"
+      xsi:type="velocityGenerator"
+      path="peer/base/buildCriteria.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.buildSelectCriteria"
+      xsi:type="velocityGenerator"
+      path="peer/base/buildSelectCriteria.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.retrieveByPK"
+      xsi:type="velocityGenerator"
+      path="peer/base/retrieveByPK.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.retrieveByPKs"
+      xsi:type="velocityGenerator"
+      path="peer/base/retrieveByPKs.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.doSelectJoin"
+      xsi:type="velocityGenerator"
+      path="peer/base/doSelectJoin.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.doSelectJoinAllExcept"
+      xsi:type="velocityGenerator"
+      path="peer/base/doSelectJoinAllExcept.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.getTableMap"
+      xsi:type="velocityGenerator"
+      path="peer/base/getTableMap.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.setDbName"
+      xsi:type="velocityGenerator"
+      path="peer/base/setDbName.vm">
+  </generator>
+
+  <generator name="torque.om.peer.base.java5Wrappers"
+      xsi:type="velocityGenerator"
+      path="peer/base/java5Wrappers.vm">
+  </generator>
+</generators>
\ No newline at end of file

Added: 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=910600&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm Tue Feb 16 17:15:43 2010
@@ -0,0 +1,134 @@
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##   http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+######
+##
+## version $Id: MultiExtendBean.vm 240328 2005-08-26 22:02:48 +0200 (Fr, 26 Aug 2005) tfischer $
+##
+## This template creates source code for a base bean. 
+## The template expects as input a "table" element from the torque schema
+## which was processed by the OMTransformer.  
+##
+package ${baseBeanPackage};
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+#if ($baseBeanPackage != $beanPackage)
+  import ${beanPackage}.*;
+#end
+
+#set ( $currentPackage = $beanPackage )
+#set ( $foreignKeyElements = $torqueGf.getChildren("foreign-key"))
+#foreach ($foreignKeyElement in $foreignKeyElements)
+  #set ( $foreignTableElement = $foreignKeyElement.getChild("table"))
+  #set ( $foreignBeanPackage = $foreignTableElement.getAttribute("beanPackage"))
+  #set ( $foreignBeanClassName = $foreignTableElement.getAttribute("beanClassName"))
+  #if  (!$foreignBeanPackage.equals($currentPackage) )
+import ${foreignBeanPackage}.${foreignBeanClassName};
+  #end
+#end
+
+$torqueGf.mergepoint("classJavadoc")
+public abstract class $baseBeanClassName
+#if ( $torqueGf.option("beanExtendsClass") && $torqueGf.option("beanExtendsClass") != "" ) 
+    extends $torqueGf.option("beanExtendsClass")
+#end
+    implements Serializable
+{
+
+## ----------------
+## member variables
+## ----------------
+    /**
+     * whether the bean or its underlying object has changed
+     * since last reading from the database
+     */
+    private boolean modified = true;
+
+    /**
+     * false if the underlying object has been read from the database,
+     * true otherwise
+     */
+    private boolean isNew = true;
+
+## field definitions for columns
+$torqueGf.mergepoint("fieldDefinitions")
+##
+## field definitions for referenced objects
+#if ($torqueGf.booleanOption("torque.om.complexObjectModel"))
+$torqueGf.mergepoint("fieldDefinitionsReferencedObjects")
+#end
+##
+## field definitions for referencing objects
+#if ($torqueGf.booleanOption("torque.om.complexObjectModel") && $torqueGf.booleanOption("torque.om.objectIsCaching"))
+$torqueGf.mergepoint("fieldDefinitionsReferencingObjects")
+#end
+
+## -------------------------
+## getter and setter methods
+## -------------------------
+
+    /**
+     * sets whether the bean exists in the database
+     */
+    public void setNew(boolean isNew)
+    {
+        this.isNew = isNew;
+    }
+
+    /**
+     * returns whether the bean exists in the database
+     */
+    public boolean isNew()
+    {
+        return this.isNew;
+    }
+
+    /**
+     * sets whether the bean or the object it was created from
+     * was modified since the object was last read from the database
+     */
+    public void setModified(boolean isModified)
+    {
+        this.modified = isModified;
+    }
+
+    /**
+     * returns whether the bean or the object it was created from
+     * was modified since the object was last read from the database
+     */
+    public boolean isModified()
+    {
+        return this.modified;
+    }
+
+$torqueGf.mergepoint("gettersSetters")
+##
+#if ($torqueGf.option("torque.om.complexObjectModel"))
+$torqueGf.mergepoint("gettersSettersReferencedObjects")
+#end
+##
+#if ($torqueGf.booleanOption("torque.om.complexObjectModel") && $torqueGf.booleanOption("torque.om.objectIsCaching"))
+$torqueGf.mergepoint("gettersSettersReferencingObjects")
+#end
+}



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