db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1056910 [1/3] - in /db/torque/torque4/trunk/torque-templates: ./ src/main/java/org/apache/torque/templates/platform/ src/main/java/org/apache/torque/templates/transformer/ src/main/java/org/apache/torque/templates/transformer/om/ src/main/...
Date Sun, 09 Jan 2011 10:38:24 GMT
Author: tfischer
Date: Sun Jan  9 10:38:22 2011
New Revision: 1056910

URL: http://svn.apache.org/viewvc?rev=1056910&view=rev
Log:
Merged the trunk-without-village branch with the torque4 trunk

Added:
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java
      - copied unchanged from r1056616, db/torque/torque4/branches/trunk-without-village/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/ResultSetGetter.java
      - copied unchanged from r1056616, db/torque/torque4/branches/trunk-without-village/torque-templates/src/main/java/org/apache/torque/templates/typemapping/ResultSetGetter.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SchemaType.java
      - copied unchanged from r1056616, db/torque/torque4/branches/trunk-without-village/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SchemaType.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlTypeWithJdbcType.java
      - copied unchanged from r1056616, db/torque/torque4/branches/trunk-without-village/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlTypeWithJdbcType.java
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/createDbObjectInstance.vm
      - copied unchanged from r1056616, db/torque/torque4/branches/trunk-without-village/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/createDbObjectInstance.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildColumnValues.vm
      - copied unchanged from r1056616, db/torque/torque4/branches/trunk-without-village/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildColumnValues.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/recordmapper/
      - copied from r1056616, db/torque/torque4/branches/trunk-without-village/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/recordmapper/
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/recordmapper/createDbObjectInstanceFromInheritance.vm
      - copied unchanged from r1056616, db/torque/torque4/branches/trunk-without-village/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/recordmapper/createDbObjectInstanceFromInheritance.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/recordmapper/dbObjectFieldGetter.vm
      - copied unchanged from r1056616, db/torque/torque4/branches/trunk-without-village/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/recordmapper/dbObjectFieldGetter.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/recordmapper/recordMapper.vm
      - copied unchanged from r1056616, db/torque/torque4/branches/trunk-without-village/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/recordmapper/recordMapper.vm
Removed:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doSelectVillageRecords.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/populateObject.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/populateObjects.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/row2Object.vm
Modified:
    db/torque/torque4/trunk/torque-templates/pom.xml
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformAxionImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformCloudscapeImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDb2400Impl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDb2Impl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDerbyImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHypersonicImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformInterbaseImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMsaccessImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMysqlImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformPostgresqlImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformSapdbImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformSybaseImpl.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/LoadExternalSchemaTransformer.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyColumnTransformer.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyTransformer.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableTransformer.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTransformer.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/options.properties
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/dbObject.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/general.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/peer.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/copyMethods.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getByNameMethods.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/saveMethods.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/toString.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterMethodEnd.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/base/baseManager.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/doBuild.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapInit/baseMapInit.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/basePeer.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildCriteria.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/buildSelectCriteria.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/dbObjectClassConstants.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doDelete.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doInsert.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doSelect.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doSelectJoin.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doSelectJoinAllExcept.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/doUpdate.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/getOMClass.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/imports.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/resultSet2Objects.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/table.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/table.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/table.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/table.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/table.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/transformer/om/OMTableTransformer.properties

Modified: db/torque/torque4/trunk/torque-templates/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/pom.xml?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/pom.xml (original)
+++ db/torque/torque4/trunk/torque-templates/pom.xml Sun Jan  9 10:38:22 2011
@@ -77,6 +77,9 @@
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
+          <appendAssemblyId>false</appendAssemblyId>
+          <appendAssemblyId>false</appendAssemblyId>
+          <tarLongFileMode>gnu</tarLongFileMode>
           <descriptors>
             <descriptor>../torque-maven-parent/src/main/assembly/bin-with-dependencies.xml</descriptor>
           </descriptors>

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformAxionImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformAxionImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformAxionImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformAxionImpl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformCloudscapeImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformCloudscapeImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformCloudscapeImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformCloudscapeImpl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDb2400Impl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDb2400Impl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDb2400Impl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDb2400Impl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDb2Impl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDb2Impl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDb2Impl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDb2Impl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java Sun Jan  9 10:38:22 2011
@@ -23,7 +23,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDerbyImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDerbyImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDerbyImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDerbyImpl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SizedForBitDataSqlType;
 import org.apache.torque.templates.typemapping.SqlType;
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHypersonicImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHypersonicImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHypersonicImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHypersonicImpl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformInterbaseImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformInterbaseImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformInterbaseImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformInterbaseImpl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMsaccessImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMsaccessImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMsaccessImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMsaccessImpl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMysqlImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMysqlImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMysqlImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMysqlImpl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformPostgresqlImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformPostgresqlImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformPostgresqlImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformPostgresqlImpl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformSapdbImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformSapdbImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformSapdbImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformSapdbImpl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformSybaseImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformSybaseImpl.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformSybaseImpl.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformSybaseImpl.java Sun Jan  9 10:38:22 2011
@@ -19,7 +19,7 @@ package org.apache.torque.templates.plat
  * under the License.
  */
 
-import org.apache.torque.generator.jdbc.SchemaType;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java Sun Jan  9 10:38:22 2011
@@ -20,13 +20,13 @@ package org.apache.torque.templates.tran
  */
 
 import org.apache.torque.generator.control.ControllerState;
-import org.apache.torque.generator.jdbc.SchemaType;
 import org.apache.torque.generator.source.SourceElement;
 import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.apache.torque.templates.TemplateOptionName;
 import org.apache.torque.templates.TorqueSchemaAttributeName;
 import org.apache.torque.templates.platform.Platform;
 import org.apache.torque.templates.platform.PlatformFactory;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java Sun Jan  9 10:38:22 2011
@@ -59,6 +59,11 @@ public enum ColumnAttributeName implemen
     VILLAGE_METHOD("villageMethod"),
 
     /**
+     * The getter to get the column from a result set.
+     */
+    RESULT_SET_GETTER("resultSetGetter"),
+
+    /**
      * An instance of the object for the type map.
      */
     SAMPLE_OBJECT("sampleObject");

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java Sun Jan  9 10:38:22 2011
@@ -42,25 +42,29 @@ final class FindHelper
     }
 
     /**
-     * Finds a table in the database by name.
+     * Finds a table in the given root element by name. The root element must
+     * be a database element.
      *
-     * @param database the database Source element, not null.
+     * @param root the database Source element, not null.
      * @param tableName the table name, not null.
+     * @param searchExternalSchemata if the table should also be located
+     *        in the external schemata. 
      *
      * @return the column's source element, or null if no matching table
      *         exists.
      */
     public static SourceElement findTable(
-            SourceElement database,
-            String tableName)
+            SourceElement root,
+            String tableName,
+            boolean searchExternalSchemata)
     {
         if (!TorqueSchemaElementName.DATABASE.getName().equals(
-                database.getName()))
+                root.getName()))
         {
             throw new IllegalArgumentException("Wrong source element "
-                    + database.getName());
+                    + root.getName());
         }
-        for (SourceElement table : database.getChildren(
+        for (SourceElement table : root.getChildren(
                 TorqueSchemaElementName.TABLE))
         {
             if (tableName.equals(table.getAttribute(
@@ -69,6 +73,23 @@ final class FindHelper
                 return table;
             }
         }
+        if (searchExternalSchemata)
+        {
+            for (SourceElement externalSchema : root.getChildren(
+                    TorqueSchemaElementName.EXTERNAL_SCHEMA))
+            {
+                SourceElement databaseElement
+                    = externalSchema.getChild(TorqueSchemaElementName.DATABASE);
+                SourceElement result = findTable(
+                        databaseElement,
+                        tableName,
+                        searchExternalSchemata);
+                if (result != null)
+                {
+                    return result;
+                }
+            }
+        }
         return null;
     }
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/LoadExternalSchemaTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/LoadExternalSchemaTransformer.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/LoadExternalSchemaTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/LoadExternalSchemaTransformer.java Sun Jan  9 10:38:22 2011
@@ -41,7 +41,6 @@ import org.apache.torque.templates.Torqu
  *
  * @version $Id: $
  */
-// TODO: move to parent package org.apache.torque.templates.transformer
 public class LoadExternalSchemaTransformer implements SourceTransformer
 {
     /** The class log. */
@@ -50,9 +49,11 @@ public class LoadExternalSchemaTransform
 
     /**
      * Loads the external schemata tables into the current graph.
-     * The tables are added as if they were  normal tables
-     * but with the attribute fromExternalSchema set to the path
-     * of the external schema from which the table was added.
+     * The external database element is added as child of the
+     * external-schema element.
+     * Also, an all-tables child element is added to the root element,
+     * which is filled with all tables from the external schema plus its own
+     * tables.
      *
      * @param root the database root element of the source tree, not null.
      * @param controllerState the controller state, not null.
@@ -66,6 +67,14 @@ public class LoadExternalSchemaTransform
     {
         List<SourceElement> externalSchemaElementList
                 = root.getChildren(TorqueSchemaElementName.EXTERNAL_SCHEMA);
+        SourceElement allTables = root.getChild(
+                DatabaseChildElementName.ALL_TABLES);
+        if (allTables == null)
+        {
+            allTables = new SourceElement(DatabaseChildElementName.ALL_TABLES);
+            root.getChildren().add(allTables);
+        }
+
         for (SourceElement externalSchemaElement : externalSchemaElementList)
         {
             File currentSourceFile = controllerState.getSourceFile();
@@ -82,19 +91,22 @@ public class LoadExternalSchemaTransform
                         controllerState);
                 SourceElement externalSchemaRootElement
                         = fileSource.getRootElement();
+
                 this.transform(externalSchemaRootElement, controllerState);
-                Iterator<SourceElement> childIt
-                        = externalSchemaRootElement.getChildren().iterator();
-                while (childIt.hasNext())
+
+                externalSchemaElement.getChildren().add(
+                        externalSchemaRootElement);
+
+                SourceElement externalAllTables 
+                        = externalSchemaRootElement.getChild(
+                                DatabaseChildElementName.ALL_TABLES);
+
+                // fill root's all-tables with all external tables
+                for (SourceElement externalTable 
+                        : externalAllTables.getChildren(
+                            TorqueSchemaElementName.TABLE))
                 {
-                    SourceElement child = childIt.next();
-                    root.getChildren().add(child);
-                    child.setAttribute(
-                            TableAttributeName.FROM_EXTERNAL_SCHEMA,
-                            relativePath);
-                    // detach from previous parent so that the
-                    // new parent is the primary parent.
-                    childIt.remove();
+                    allTables.getChildren().add(externalTable);
                 }
             }
             catch (SourceException e)
@@ -105,6 +117,12 @@ public class LoadExternalSchemaTransform
                 throw new SourceTransformerException(e);
             }
         }
+        // add own tablkes to root's all-tables
+        for (SourceElement table 
+                : root.getChildren(TorqueSchemaElementName.TABLE))
+        {
+            allTables.getChildren().add(table);
+        }
         return root;
     }
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java Sun Jan  9 10:38:22 2011
@@ -25,8 +25,8 @@ import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.torque.generator.control.ControllerState;
-import org.apache.torque.generator.jdbc.SchemaType;
 import org.apache.torque.generator.processor.string.Camelbacker;
+import org.apache.torque.generator.processor.string.WrapReservedJavaWords;
 import org.apache.torque.generator.source.SourceElement;
 import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.apache.torque.templates.TorqueSchemaAttributeName;
@@ -34,8 +34,9 @@ import org.apache.torque.templates.Torqu
 import org.apache.torque.templates.TorqueSchemaJavaType;
 import org.apache.torque.templates.transformer.SchemaTypeHelper;
 import org.apache.torque.templates.typemapping.JavaType;
+import org.apache.torque.templates.typemapping.ResultSetGetter;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.TypeMap;
-import org.apache.torque.templates.typemapping.VillageMethod;
 
 /**
  * Sets the class names and packages for the OM model.
@@ -52,6 +53,10 @@ public class OMColumnTransformer
     /** Names which cannot be used as constants for column names. */
     private static final Set<String> RESERVED_CONSTANT_NAMES;
 
+    /** Prevents reserved java words. */
+    private static WrapReservedJavaWords reservedJavaWordsWrapper
+            = new WrapReservedJavaWords();
+
     static
     {
         Set<String> reservedConstantNames = new HashSet<String>();
@@ -78,6 +83,7 @@ public class OMColumnTransformer
         SchemaType schemaType = SchemaTypeHelper.getSchemaType(
                 columnElement,
                 controllerState);
+        columnElement.setAttribute("schemaType", schemaType);
 
         JavaType fieldJavaType = getFieldJavaType(columnElement, schemaType);
         columnElement.setAttribute(
@@ -95,7 +101,7 @@ public class OMColumnTransformer
         setSetterNameAttribute(columnElement);
         setAccessModifierAttributes(columnElement);
         setDefaultValueAttribute(columnElement, fieldJavaType);
-        setVillageMethodAttribute(columnElement, fieldJavaType, schemaType);
+        setResultSetGetterAttribute(columnElement, schemaType);
         setSampleObjectAttribute(columnElement, schemaType);
 
         for (SourceElement inheritanceElement : columnElement.getChildren(
@@ -313,6 +319,7 @@ public class OMColumnTransformer
         String javaName = (String) columnElement.getAttribute(
                 TorqueSchemaAttributeName.JAVA_NAME);
         String fieldName = StringUtils.uncapitalize(javaName);
+        fieldName = reservedJavaWordsWrapper.process(fieldName);
         columnElement.setAttribute(
                 JavaFieldAttributeName.FIELD_NAME,
                 fieldName);
@@ -600,39 +607,43 @@ public class OMColumnTransformer
     }
 
     /**
-     * Sets the villageMethod attribute of the column element
-     * if it is not already set.
+     * Sets the resultSetGetter attribute of the column element
+     * if it is not already set. 
+     * If the resultSetGetter is a string value, it is converted to
+     * a ResultSetGetter value.
      *
      * @param columnElement the column element, not null.
-     * @param javaType the type of the java field corresponding to the
-     *        column, not null.
      * @param schemaType the schema type of the column, not null.
      */
-    protected void setVillageMethodAttribute(
+    protected void setResultSetGetterAttribute(
             SourceElement columnElement,
-            JavaType javaType,
             SchemaType schemaType)
     {
-        if (columnElement.getAttribute(ColumnAttributeName.VILLAGE_METHOD)
-                != null)
+        ResultSetGetter resultSetGetter = null; 
+        Object originalValue = columnElement.getAttribute(
+                ColumnAttributeName.RESULT_SET_GETTER);
+
+        if (originalValue != null)
         {
-            return;
+            if (originalValue instanceof String)
+            {
+                resultSetGetter = ResultSetGetter.getByMethodName(
+                        (String) originalValue);
+            }
         }
-        VillageMethod villageMethod;
-        if (javaType.isPrimitive())
+        else
         {
-            villageMethod = TypeMap.getVillageMethod(schemaType);
+            resultSetGetter = TypeMap.getResultSetGetter(schemaType);
         }
-        else
+
+        if (resultSetGetter != null)
         {
-            villageMethod = TypeMap.getVillageObjectMethod(schemaType);
+            columnElement.setAttribute(
+                    ColumnAttributeName.RESULT_SET_GETTER,
+                    resultSetGetter);
         }
-        columnElement.setAttribute(
-                ColumnAttributeName.VILLAGE_METHOD,
-                villageMethod);
     }
 
-
     /**
      * Sets the sampleObject attribute of the column element
      * if it is not already set.

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyColumnTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyColumnTransformer.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyColumnTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyColumnTransformer.java Sun Jan  9 10:38:22 2011
@@ -78,7 +78,7 @@ import org.apache.torque.templates.Torqu
  *   ...
  *
  * Note that the foreign keys in the foreign-keys and referencing-foreign-keys
- * are
+ * are the original elements, not just copies.
  */
 public class OMForeignKeyColumnTransformer
 {
@@ -129,7 +129,8 @@ public class OMForeignKeyColumnTransform
                                         TorqueSchemaAttributeName.FOREIGN);
                         SourceElement foreignTable = FindHelper.findTable(
                                 database,
-                                foreignTableName);
+                                foreignTableName,
+                                true);
                         if (foreignTable == null)
                         {
                             throw new SourceTransformerException(
@@ -184,7 +185,7 @@ public class OMForeignKeyColumnTransform
                 {
                     Object referenceForeignColumnName
                             = reference.getAttribute(
-                                    TorqueSchemaAttributeName.FOREIGN_TABLE);
+                                    TorqueSchemaAttributeName.FOREIGN);
                     String referenceLocalColumnName
                             = (String) reference.getAttribute(
                                     TorqueSchemaAttributeName.LOCAL);

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyTransformer.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyTransformer.java Sun Jan  9 10:38:22 2011
@@ -22,8 +22,10 @@ package org.apache.torque.templates.tran
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.torque.generator.GeneratorException;
 import org.apache.torque.generator.control.ControllerState;
 import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.SourcePath;
 import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.apache.torque.templates.TorqueSchemaAttributeName;
 import org.apache.torque.templates.TorqueSchemaElementName;
@@ -140,7 +142,7 @@ public class OMForeignKeyTransformer
         String foreignTableName = (String) foreignKey.getAttribute(
                 TorqueSchemaAttributeName.FOREIGN_TABLE);
         SourceElement foreignTable
-                = FindHelper.findTable(database, foreignTableName);
+                = FindHelper.findTable(database, foreignTableName, true);
         foreignKey.getChildren().add(foreignTable);
 
         for (SourceElement reference : foreignKey.getChildren(
@@ -150,19 +152,22 @@ public class OMForeignKeyTransformer
             createForeignElementForReference(foreignTable, reference);
         }
 
-        // create reference only if this table was not loaded from
-        // an external schema
-        if (localTable.getAttribute(TableAttributeName.FROM_EXTERNAL_SCHEMA)
-                == null)
+        StringBuilder localParentPath = new StringBuilder();
+        getParentPath(localTable, localParentPath);
+
+        StringBuilder foreignParentPath = new StringBuilder();
+        getParentPath(foreignTable, foreignParentPath);
+        // create reference only if this table is not in a external-schema
+        // element of the foreign table's database
+        if (foreignParentPath.toString().startsWith(localParentPath.toString()))
         {
             addLocalField(foreignKey, controllerState);
             addLocalFieldInBean(foreignKey, controllerState);
         }
 
-        // create backreference only if the foreign table was not loaded from
-        // an external schema
-        if (foreignTable.getAttribute(TableAttributeName.FROM_EXTERNAL_SCHEMA)
-                == null)
+        // create backreference only if the foreign table is not
+        // in a external-schema element of this table's database
+        if (localParentPath.toString().startsWith(foreignParentPath.toString()))
         {
             addForeignField(foreignKey, controllerState);
             addForeignFieldInBean(foreignKey, controllerState);
@@ -719,4 +724,25 @@ public class OMForeignKeyTransformer
             reference.getChildren().add(localColumnElement);
         }
     }
+
+    private void getParentPath(
+            SourceElement sourceElement,
+            StringBuilder result)
+    {
+        SourceElement parent = sourceElement.getParent();
+        if (parent == null)
+        {
+            return;
+        }
+        result.append(parent.getName());
+        if (TorqueSchemaElementName.EXTERNAL_SCHEMA.getName().equals(
+                parent.getName()))
+        {
+            result.append("[")
+                .append(parent.getAttribute(TorqueSchemaAttributeName.FILENAME))
+                .append("]");
+        }
+        result.append("/");
+        getParentPath(parent, result);
+    }
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableTransformer.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableTransformer.java Sun Jan  9 10:38:22 2011
@@ -25,6 +25,7 @@ import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import org.apache.torque.generator.control.ControllerState;
 import org.apache.torque.generator.processor.string.Camelbacker;
+import org.apache.torque.generator.processor.string.WrapReservedJavaWords;
 import org.apache.torque.generator.source.SourceElement;
 import org.apache.torque.generator.source.transform.AttributeTransformer;
 import org.apache.torque.generator.source.transform.SourceTransformerException;
@@ -56,6 +57,10 @@ public class OMTableTransformer extends 
     /** The Camelbacker for producing the java name from the table name. */
     private static Camelbacker javaNameCamelbacker = new Camelbacker();
 
+    /** Prevents reserved java words. */
+    private static WrapReservedJavaWords reservedJavaWordsWrapper
+            = new WrapReservedJavaWords();
+
     public OMTableTransformer() throws SourceTransformerException
     {
         super(new InputStreamReader(
@@ -71,6 +76,7 @@ public class OMTableTransformer extends 
     {
         checkElementName(tableElement);
         setJavaNameAttribute(tableElement);
+        setFieldNameAttribute(tableElement);
         setIdMethodAttribute(tableElement);
         setSequenceAttributeIfNecessary(tableElement);
         setBaseClass(tableElement, controllerState);
@@ -349,4 +355,28 @@ public class OMTableTransformer extends 
                 TorqueSchemaAttributeName.BASE_CLASS,
                 baseClass);
     }
+
+    /**
+     * Sets the fieldName attribute of the table element if it is not
+     * already set. The field name can be used to contain a database object
+     * corresponding to the table.
+     * The javaName attribute of the column must be set.
+     *
+     * @param tableElement the table element, not null.
+     */
+    protected void setFieldNameAttribute(SourceElement tableElement)
+    {
+        if (tableElement.getAttribute(JavaFieldAttributeName.FIELD_NAME)
+                != null)
+        {
+            return;
+        }
+        String javaName = (String) tableElement.getAttribute(
+                TorqueSchemaAttributeName.JAVA_NAME);
+        String fieldName = StringUtils.uncapitalize(javaName);
+        fieldName = reservedJavaWordsWrapper.process(fieldName);
+        tableElement.setAttribute(
+                JavaFieldAttributeName.FIELD_NAME,
+                fieldName);
+    }
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTransformer.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTransformer.java Sun Jan  9 10:38:22 2011
@@ -104,28 +104,31 @@ public class OMTransformer implements So
     {
         TemplateOptionName.checkRequiredOptions(controllerState);
 
+        // load referenced external schemata
         loadExternalSchemaTransformer.transform(root, controllerState);
-
-        for (SourceElement tableElement : root.getChildren(
-                TorqueSchemaElementName.TABLE.getName()))
+        
+        SourceElement allTablesRoot 
+                = root.getChild(DatabaseChildElementName.ALL_TABLES);
+        for (SourceElement tableElement : allTablesRoot.getChildren(
+                TorqueSchemaElementName.TABLE))
         {
             tableTransformer.transform(
                     tableElement,
                     controllerState);
         }
 
-        for (SourceElement tableElement : root.getChildren(
-                TorqueSchemaElementName.TABLE.getName()))
+        for (SourceElement tableElement : allTablesRoot.getChildren(
+                TorqueSchemaElementName.TABLE))
         {
             for (SourceElement columnElement : tableElement.getChildren(
-                    TorqueSchemaElementName.COLUMN.getName()))
+                    TorqueSchemaElementName.COLUMN))
             {
                 foreignKeyColumnTransformer.transform(
                         columnElement,
                         controllerState);
             }
             for (SourceElement foreignKeyElement : tableElement.getChildren(
-                    TorqueSchemaElementName.FOREIGN_KEY.getName()))
+                    TorqueSchemaElementName.FOREIGN_KEY))
             {
                 foreignKeyTransformer.transform(
                         foreignKeyElement,

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java Sun Jan  9 10:38:22 2011
@@ -60,12 +60,7 @@ public enum TableAttributeName implement
     /**
      * The package name of the bean class.
      */
-    BEAN_PACKAGE("beanPackage"),
-
-    /**
-     * The file name of the external schema from which this Element stems.
-     */
-    FROM_EXTERNAL_SCHEMA("fromExternalSchema");
+    BEAN_PACKAGE("beanPackage");
 
     /** The name of the source element attribute, not null. */
     private String name;

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java Sun Jan  9 10:38:22 2011
@@ -25,7 +25,6 @@ import java.util.List;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.torque.generator.control.ControllerState;
-import org.apache.torque.generator.jdbc.SchemaType;
 import org.apache.torque.generator.source.SourceElement;
 import org.apache.torque.generator.source.SourcePath;
 import org.apache.torque.generator.source.transform.SourceTransformer;
@@ -39,6 +38,7 @@ import org.apache.torque.templates.platf
 import org.apache.torque.templates.transformer.CollectAttributeSetTrueTransformer;
 import org.apache.torque.templates.transformer.SchemaTypeHelper;
 import org.apache.torque.templates.transformer.om.TableChildElementName;
+import org.apache.torque.templates.typemapping.SchemaType;
 import org.apache.torque.templates.typemapping.SqlType;
 import org.apache.torque.templates.typemapping.TypeMap;
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java?rev=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java Sun Jan  9 10:38:22 2011
@@ -25,8 +25,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.torque.generator.jdbc.SchemaType;
-
 /**
  * Various mappings for schema types, e.g. to their corresponding
  * Java object types, and Java native types.
@@ -136,19 +134,12 @@ public final class TypeMap
     private static final Map<SchemaType, JavaType>
             SCHEMA_TYPE_TO_JAVA_OBJECT_TYPE_MAP;
 
-    /**
-     * The village method used for a given schema type.
-     * Conversions to primitive types are used where possible.
-     */
-    private static final Map<SchemaType, VillageMethod>
-            SCHEMA_TYPE_TO_VILLAGE_METHOD_MAP;
 
     /**
-     * The village method used for a given schema type.
-     * No conversions to primitive types are used.
+     * The result set getter methods for a given schema type.
      */
-    private static final Map<SchemaType, VillageMethod>
-            SCHEMA_TYPE_TO_VILLAGE_OBJECT_METHOD_MAP;
+    private static Map<SchemaType, ResultSetGetter>
+            SCHEMA_TYPE_TO_RESULT_SET_GETTER;
 
     // fill SCHEMA_TYPE_TO_INIT_VALUE_MAP
     static {
@@ -249,66 +240,34 @@ public final class TypeMap
 
     static
     {
-        Map<SchemaType, VillageMethod> schema2VillageMethod
-                = new HashMap<SchemaType, VillageMethod>();
-
-        schema2VillageMethod.put(SchemaType.CHAR, VillageMethod.STRING);
-        schema2VillageMethod.put(SchemaType.VARCHAR, VillageMethod.STRING);
-        schema2VillageMethod.put(SchemaType.LONGVARCHAR, VillageMethod.STRING);
-        schema2VillageMethod.put(SchemaType.CLOB, VillageMethod.STRING);
-        schema2VillageMethod.put(SchemaType.NUMERIC, VillageMethod.BIG_DECIMAL);
-        schema2VillageMethod.put(SchemaType.DECIMAL, VillageMethod.BIG_DECIMAL);
-        schema2VillageMethod.put(SchemaType.BIT, VillageMethod.BOOLEAN);
-        schema2VillageMethod.put(SchemaType.TINYINT, VillageMethod.BYTE);
-        schema2VillageMethod.put(SchemaType.SMALLINT, VillageMethod.SHORT);
-        schema2VillageMethod.put(SchemaType.INTEGER, VillageMethod.INT);
-        schema2VillageMethod.put(SchemaType.BIGINT, VillageMethod.LONG);
-        schema2VillageMethod.put(SchemaType.REAL, VillageMethod.FLOAT);
-        schema2VillageMethod.put(SchemaType.FLOAT, VillageMethod.DOUBLE);
-        schema2VillageMethod.put(SchemaType.DOUBLE, VillageMethod.DOUBLE);
-        schema2VillageMethod.put(SchemaType.BINARY, VillageMethod.BYTES);
-        schema2VillageMethod.put(SchemaType.VARBINARY, VillageMethod.BYTES);
-        schema2VillageMethod.put(SchemaType.LONGVARBINARY, VillageMethod.BYTES);
-        schema2VillageMethod.put(SchemaType.BLOB, VillageMethod.BYTES);
-        schema2VillageMethod.put(SchemaType.DATE, VillageMethod.UTIL_DATE);
-        schema2VillageMethod.put(SchemaType.TIME, VillageMethod.UTIL_DATE);
-        schema2VillageMethod.put(SchemaType.TIMESTAMP, VillageMethod.UTIL_DATE);
-        schema2VillageMethod.put(SchemaType.BOOLEANCHAR, VillageMethod.BOOLEAN);
-        schema2VillageMethod.put(SchemaType.BOOLEANINT, VillageMethod.BOOLEAN);
-        SCHEMA_TYPE_TO_VILLAGE_METHOD_MAP
-                = Collections.unmodifiableMap(schema2VillageMethod);
-    }
-
-    static
-    {
-        Map<SchemaType, VillageMethod> schemaToVillageMethod
-                = new HashMap<SchemaType, VillageMethod>();
+        Map<SchemaType, ResultSetGetter> schemaToResultSetGetter
+                = new HashMap<SchemaType, ResultSetGetter>();
 
-        schemaToVillageMethod.put(SchemaType.CHAR, VillageMethod.STRING);
-        schemaToVillageMethod.put(SchemaType.VARCHAR, VillageMethod.STRING);
-        schemaToVillageMethod.put(SchemaType.LONGVARCHAR, VillageMethod.STRING);
-        schemaToVillageMethod.put(SchemaType.CLOB, VillageMethod.STRING);
-        schemaToVillageMethod.put(SchemaType.NUMERIC, VillageMethod.BIG_DECIMAL);
-        schemaToVillageMethod.put(SchemaType.DECIMAL, VillageMethod.BIG_DECIMAL);
-        schemaToVillageMethod.put(SchemaType.BIT, VillageMethod.BOOLEAN_OBJECT);
-        schemaToVillageMethod.put(SchemaType.TINYINT, VillageMethod.BYTE_OBJECT);
-        schemaToVillageMethod.put(SchemaType.SMALLINT, VillageMethod.SHORT_OBJECT);
-        schemaToVillageMethod.put(SchemaType.INTEGER, VillageMethod.INTEGER_OBJECT);
-        schemaToVillageMethod.put(SchemaType.BIGINT, VillageMethod.LONG_OBJECT);
-        schemaToVillageMethod.put(SchemaType.REAL, VillageMethod.FLOAT_OBJECT);
-        schemaToVillageMethod.put(SchemaType.FLOAT, VillageMethod.DOUBLE_OBJECT);
-        schemaToVillageMethod.put(SchemaType.DOUBLE, VillageMethod.DOUBLE);
-        schemaToVillageMethod.put(SchemaType.BINARY, VillageMethod.BYTES);
-        schemaToVillageMethod.put(SchemaType.VARBINARY, VillageMethod.BYTES);
-        schemaToVillageMethod.put(SchemaType.LONGVARBINARY, VillageMethod.BYTES);
-        schemaToVillageMethod.put(SchemaType.BLOB, VillageMethod.BYTES);
-        schemaToVillageMethod.put(SchemaType.DATE, VillageMethod.UTIL_DATE);
-        schemaToVillageMethod.put(SchemaType.TIME, VillageMethod.UTIL_DATE);
-        schemaToVillageMethod.put(SchemaType.TIMESTAMP, VillageMethod.UTIL_DATE);
-        schemaToVillageMethod.put(SchemaType.BOOLEANCHAR, VillageMethod.BOOLEAN_OBJECT);
-        schemaToVillageMethod.put(SchemaType.BOOLEANINT, VillageMethod.BOOLEAN_OBJECT);
-        SCHEMA_TYPE_TO_VILLAGE_OBJECT_METHOD_MAP
-                = Collections.unmodifiableMap(schemaToVillageMethod);
+        schemaToResultSetGetter.put(SchemaType.CHAR, ResultSetGetter.STRING);
+        schemaToResultSetGetter.put(SchemaType.VARCHAR, ResultSetGetter.STRING);
+        schemaToResultSetGetter.put(SchemaType.LONGVARCHAR, ResultSetGetter.STRING);
+        schemaToResultSetGetter.put(SchemaType.CLOB, ResultSetGetter.STRING);
+        schemaToResultSetGetter.put(SchemaType.NUMERIC, ResultSetGetter.BIG_DECIMAL);
+        schemaToResultSetGetter.put(SchemaType.DECIMAL, ResultSetGetter.BIG_DECIMAL);
+        schemaToResultSetGetter.put(SchemaType.BIT, ResultSetGetter.BOOLEAN);
+        schemaToResultSetGetter.put(SchemaType.TINYINT, ResultSetGetter.BYTE);
+        schemaToResultSetGetter.put(SchemaType.SMALLINT, ResultSetGetter.SHORT);
+        schemaToResultSetGetter.put(SchemaType.INTEGER, ResultSetGetter.INT);
+        schemaToResultSetGetter.put(SchemaType.BIGINT, ResultSetGetter.LONG);
+        schemaToResultSetGetter.put(SchemaType.REAL, ResultSetGetter.FLOAT);
+        schemaToResultSetGetter.put(SchemaType.FLOAT, ResultSetGetter.DOUBLE);
+        schemaToResultSetGetter.put(SchemaType.DOUBLE, ResultSetGetter.DOUBLE);
+        schemaToResultSetGetter.put(SchemaType.BINARY, ResultSetGetter.BYTES);
+        schemaToResultSetGetter.put(SchemaType.VARBINARY, ResultSetGetter.BYTES);
+        schemaToResultSetGetter.put(SchemaType.LONGVARBINARY, ResultSetGetter.BYTES);
+        schemaToResultSetGetter.put(SchemaType.BLOB, ResultSetGetter.BYTES);
+        schemaToResultSetGetter.put(SchemaType.DATE, ResultSetGetter.DATE);
+        schemaToResultSetGetter.put(SchemaType.TIME, ResultSetGetter.TIME);
+        schemaToResultSetGetter.put(SchemaType.TIMESTAMP, ResultSetGetter.TIMESTAMP);
+        schemaToResultSetGetter.put(SchemaType.BOOLEANCHAR, ResultSetGetter.STRING);
+        schemaToResultSetGetter.put(SchemaType.BOOLEANINT, ResultSetGetter.INT);
+        SCHEMA_TYPE_TO_RESULT_SET_GETTER
+                = Collections.unmodifiableMap(schemaToResultSetGetter);
     }
 
     /**
@@ -355,27 +314,15 @@ public final class TypeMap
     }
 
     /**
-     * Return Village asX() method which corresponds to the
-     * Schema type provided.
-     *
-     * @param schemaType the Schema type
-     * @return name of the Village asX() method
-     */
-    public static VillageMethod getVillageMethod(SchemaType schemaType)
-    {
-        return SCHEMA_TYPE_TO_VILLAGE_METHOD_MAP.get(schemaType);
-    }
-
-    /**
-     * Return Village asX() method which corresponds to the
+     * Returns the result set getter method which corresponds to the
      * Schema type provided.
      *
      * @param schemaType the schema type
-     * @return name of the Village asX() method
+     * @return the result set getter method.
      */
-    public static VillageMethod getVillageObjectMethod(SchemaType schemaType)
+    public static ResultSetGetter getResultSetGetter(SchemaType schemaType)
     {
-        return SCHEMA_TYPE_TO_VILLAGE_OBJECT_METHOD_MAP.get(schemaType);
+        return SCHEMA_TYPE_TO_RESULT_SET_GETTER.get(schemaType);
     }
 
     /**

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=1056910&r1=1056909&r2=1056910&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 Jan  9 10:38:22 2011
@@ -51,7 +51,7 @@
             acceptNotSet="false"/>
       </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="database/table">
+    <source xsi:type="fileSource" elements="database/all-tables/table">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
@@ -77,7 +77,7 @@
             acceptNotSet="false"/>
       </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="database/table">
+    <source xsi:type="fileSource" elements="database/all-tables/table">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
@@ -104,7 +104,7 @@
             acceptNotSet="false"/>
       </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="database/table/column/inheritance">
+    <source xsi:type="fileSource" elements="database/all-tables/table/column/inheritance">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
@@ -131,7 +131,7 @@
             acceptNotSet="true"/>
       </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="database/table"
+    <source xsi:type="fileSource" elements="database/all-tables/table"
         skipDecider="org.apache.torque.templates.skipdecider.InterfaceSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
@@ -159,7 +159,7 @@
             acceptNotSet="false"/>
       </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="database/table">
+    <source xsi:type="fileSource" elements="database/all-tables/table">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
@@ -186,7 +186,7 @@
             acceptNotSet="false"/>
       </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="database/table">
+    <source xsi:type="fileSource" elements="database/all-tables/table">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
@@ -213,7 +213,7 @@
             acceptNotSet="false"/>
       </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="database/table">
+    <source xsi:type="fileSource" elements="database/all-tables/table">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
@@ -240,7 +240,7 @@
             acceptNotSet="false"/>
       </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="database/table"
+    <source xsi:type="fileSource" elements="database/all-tables/table"
         skipDecider="org.apache.torque.templates.skipdecider.BeanSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
@@ -268,7 +268,7 @@
             acceptNotSet="false"/>
       </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="database/table"
+    <source xsi:type="fileSource" elements="database/all-tables/table"
         skipDecider="org.apache.torque.templates.skipdecider.BeanSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
@@ -296,7 +296,7 @@
             acceptNotSet="false"/>
       </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="database/table/column/inheritance"
+    <source xsi:type="fileSource" elements="database/all-tables/table/column/inheritance"
         skipDecider="org.apache.torque.templates.skipdecider.BeanSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
@@ -380,7 +380,7 @@
             acceptNotSet="false"/>
       </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="database/table" 
+    <source xsi:type="fileSource" elements="database/all-tables/table" 
         skipDecider="org.apache.torque.templates.skipdecider.ManagerSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
@@ -409,7 +409,7 @@
             acceptNotSet="false"/>
       </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="database/table"
+    <source xsi:type="fileSource" elements="database/all-tables/table"
         skipDecider="org.apache.torque.templates.skipdecider.ManagerSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>

Modified: 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=1056910&r1=1056909&r2=1056910&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/options.properties (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/options.properties Sun Jan  9 10:38:22 2011
@@ -90,6 +90,8 @@ torque.om.className.baseBeanClassNamePre
 torque.om.className.baseBeanClassNameSuffix = Bean
 torque.om.className.mapBuilderClassNamePrefix =
 torque.om.className.mapBuilderClassNameSuffix = MapBuilder
+torque.om.className.recordMapperClassNamePrefix =
+torque.om.className.recordMapperClassNameSuffix = RecordMapper
 
 torque.om.package.dbObjectPackageSuffix =
 torque.om.package.baseDbObjectPackageSuffix =

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=1056910&r1=1056909&r2=1056910&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 Jan  9 10:38:22 2011
@@ -210,6 +210,10 @@
   <outlet name="torque.om.dbObject.base.copyMethods"
       xsi:type="velocityOutlet"
       path="dbObject/base/copyMethods.vm">
+    <mergepoint name="createObjectInstance">
+      <action xsi:type="applyAction"
+          outlet="torque.om.createDbObjectInstance"/>
+    </mergepoint>
   </outlet>
 
   <outlet name="torque.om.dbObject.base.peerGetter"

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=1056910&r1=1056909&r2=1056910&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 Jan  9 10:38:22 2011
@@ -74,4 +74,8 @@
       path="general/setterReferencedObject.vm">
   </outlet>
   
+  <outlet name="torque.om.createDbObjectInstance"
+      xsi:type="velocityOutlet"
+      path="general/createDbObjectInstance.vm">
+  </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=1056910&r1=1056909&r2=1056910&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 Jan  9 10:38:22 2011
@@ -85,21 +85,9 @@
     <mergepoint name="correctBooleans">
       <action xsi:type="applyAction" outlet="torque.om.peer.base.correctBooleans"/>
     </mergepoint>
-    <mergepoint name="row2Object">
-      <action xsi:type="applyAction" outlet="torque.om.peer.base.row2Object"/>
-    </mergepoint>
-    <mergepoint name="populateObject">
-      <action xsi:type="applyAction" outlet="torque.om.peer.base.populateObject"/>
-    </mergepoint>
     <mergepoint name="doSelect">
       <action xsi:type="applyAction" outlet="torque.om.peer.base.doSelect"/>
     </mergepoint>
-    <mergepoint name="doSelectVillageRecords">
-      <action xsi:type="applyAction" outlet="torque.om.peer.base.doSelectVillageRecords"/>
-    </mergepoint>
-    <mergepoint name="populateObjects">
-      <action xsi:type="applyAction" outlet="torque.om.peer.base.populateObjects"/>
-    </mergepoint>
     <mergepoint name="getOMClass">
       <action xsi:type="applyAction" outlet="torque.om.peer.base.getOMClass"/>
     </mergepoint>
@@ -115,6 +103,9 @@
     <mergepoint name="buildSelectCriteria">
       <action xsi:type="applyAction" outlet="torque.om.peer.base.buildSelectCriteria"/>
     </mergepoint>
+    <mergepoint name="buildColumnValues">
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.buildColumnValues"/>
+    </mergepoint>
     <mergepoint name="retrieveByPK">
       <action xsi:type="applyAction" outlet="torque.om.peer.base.retrieveByPK"/>
     </mergepoint>
@@ -133,6 +124,9 @@
     <mergepoint name="setDbName">
       <action xsi:type="applyAction" outlet="torque.om.peer.base.setDbName"/>
     </mergepoint>
+    <mergepoint name="recordMapper">
+      <action xsi:type="applyAction" outlet="torque.om.peer.base.recordmapper.recordMapper"/>
+    </mergepoint>
     <mergepoint name="extensions" />
   </outlet>
 
@@ -228,31 +222,11 @@
       path="peer/base/correctBooleans.vm">
   </outlet>
 
-  <outlet name="torque.om.peer.base.row2Object"
-      xsi:type="velocityOutlet"
-      path="peer/base/row2Object.vm">
-  </outlet>
-
-  <outlet name="torque.om.peer.base.populateObject"
-      xsi:type="velocityOutlet"
-      path="peer/base/populateObject.vm">
-  </outlet>
-
   <outlet name="torque.om.peer.base.doSelect"
       xsi:type="velocityOutlet"
       path="peer/base/doSelect.vm">
   </outlet>
 
-  <outlet name="torque.om.peer.base.doSelectVillageRecords"
-      xsi:type="velocityOutlet"
-      path="peer/base/doSelectVillageRecords.vm">
-  </outlet>
-
-  <outlet name="torque.om.peer.base.populateObjects"
-      xsi:type="velocityOutlet"
-      path="peer/base/populateObjects.vm">
-  </outlet>
-
   <outlet name="torque.om.peer.base.getOMClass"
       xsi:type="velocityOutlet"
       path="peer/base/getOMClass.vm">
@@ -278,6 +252,11 @@
       path="peer/base/buildSelectCriteria.vm">
   </outlet>
 
+  <outlet name="torque.om.peer.base.buildColumnValues"
+      xsi:type="velocityOutlet"
+      path="peer/base/buildColumnValues.vm">
+  </outlet>
+
   <outlet name="torque.om.peer.base.retrieveByPK"
       xsi:type="velocityOutlet"
       path="peer/base/retrieveByPK.vm">
@@ -308,4 +287,32 @@
       path="peer/base/setDbName.vm">
   </outlet>
 
+  <outlet name="torque.om.peer.base.recordmapper.recordMapper"
+      xsi:type="velocityOutlet"
+      path="peer/base/recordmapper/recordMapper.vm">
+    <mergepoint name="createDbObjectInstance">
+      <action xsi:type="applyAction"
+          outlet="torque.om.createDbObjectInstance"/>
+    </mergepoint>
+    <mergepoint name="createDbObjectInstanceFromInheritance">
+      <action xsi:type="traverseAllAction"
+          element="inheritance-column"
+          outlet="torque.om.peer.base.recordmapper.createDbObjectInstanceFromInheritance"/>
+    </mergepoint>
+    <mergepoint name="dbObjectFieldGetters">
+      <action xsi:type="traverseAllAction"
+          element="column"
+          outlet="torque.om.peer.base.recordmapper.dbObjectFieldGetter"/>
+    </mergepoint>
+  </outlet>
+
+  <outlet name="torque.om.peer.base.recordmapper.dbObjectFieldGetter"
+      xsi:type="velocityOutlet"
+      path="peer/base/recordmapper/dbObjectFieldGetter.vm">
+  </outlet>
+  <outlet name="torque.om.peer.base.recordmapper.createDbObjectInstanceFromInheritance"
+      xsi:type="velocityOutlet"
+      path="peer/base/recordmapper/createDbObjectInstanceFromInheritance.vm">
+  </outlet>
+
 </outlets>
\ No newline at end of file



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


Mime
View raw message