db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r944877 [1/4] - in /db/torque/torque4/trunk/torque-templates/src: main/java/org/apache/torque/templates/ main/java/org/apache/torque/templates/schema/ main/java/org/apache/torque/templates/sourcefilter/ main/java/org/apache/torque/templates...
Date Sun, 16 May 2010 16:15:24 GMT
Author: tfischer
Date: Sun May 16 16:15:20 2010
New Revision: 944877

URL: http://svn.apache.org/viewvc?rev=944877&view=rev
Log:
Adjusted to refactoring in the generator.

Added:
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/schema/
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/schema/DTDResolver.java
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/outlets/
      - copied from r915953, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/generatorDefs/
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/outlets/
      - copied from r915953, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/generatorDefs/
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/outlets/
      - copied from r915953, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/generatorDefs/
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/
      - copied from r915953, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/
      - copied from r915953, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/generatorDefs/
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml
      - copied, changed from r919727, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/generatorDefs/ddl.xml
Removed:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/generatorDefs/
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/generatorDefs/
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/generatorDefs/
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/generatorDefs/
Modified:
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSourceFilter.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSourceFilter.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSourceFilter.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSourceFilter.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/CollectAttributeSetTrueTransformer.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/ColumnChildElementName.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.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/ForeignKeyChildAttributeName.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.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/OMInheritanceTransformer.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMReferencingForeignKeyTableTransformer.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/ReferenceChildElementName.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/om/TableChildElementName.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/dbobject/base/BaseDbObjectTableTransformer.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/dbobject/base/BaseDbObjectTransformer.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/mapInit/MapInitDatabaseTransformer.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/resources/org/apache/torque/templates/doc/html/conf/control.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/outlets/html.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/datamodel.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/table.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/outlets/xdoc.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/datamodel.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/table.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/outlets/idbroker.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/templates/idtable.vm
    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/outlets/bean.xml
    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/inheritanceBean.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/inheritanceDbObject.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/interface.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/manager.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/mapBuilder.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/mapInit.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/bean/base/baseBean.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/classJavadoc.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/getter.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setter.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/bean.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/classJavadoc.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/inheritance/classJavadoc.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/inheritance/inheritanceBean.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/adderReferencingObject.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanImports.vm
    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/classJavadoc.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/getterReferencedObject.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencingObject.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/joinGetterReferencingObject.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/referencingObjectMethods.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/setterReferencedObjectByObjectKey.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/dbObject/classJavadoc.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/dbObject.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/inheritance/classJavadoc.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/inheritance/inheritanceDbObject.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/getter.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/getterSetter.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/serialVersionUid.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setter.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/general/setterMethodStart.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/setterReferencedObject.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/interface/interface.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/manager/base/classJavadoc.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/classJavadoc.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/manager/manager.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/classJavadoc.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/mapBuilder/mapBuilder.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/addSelectColumns.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/classJavadoc.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/doInsert.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/numColumnConstant.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/retrieveByPK.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPKs.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/staticInit.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/tableDatabaseNameConstantsInit.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/classJavadoc.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/peer.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/database.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/databaseStart.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/index.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/databaseStart.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/drop.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/foreignKey.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/index.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/databaseStart.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/foreignKey.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/columnComment.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/databaseStart.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/foreignKey.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/index.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/columnComment.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/databaseStart.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/foreignKey.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/index.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/sql/templates/ddl/postgresql/tableComment.vm
    db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java Sun May 16 16:15:20 2010
@@ -19,9 +19,9 @@ package org.apache.torque.templates;
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.option.OptionName;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.option.OptionName;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
 
 /**
  * The option names which are used in the java code of the templates.

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java Sun May 16 16:15:20 2010
@@ -19,7 +19,7 @@ package org.apache.torque.templates;
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceAttributeName;
+import org.apache.torque.generator.source.SourceAttributeName;
 
 /**
  * Contains all attribute names from the Torque schema.

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java Sun May 16 16:15:20 2010
@@ -19,7 +19,7 @@ package org.apache.torque.templates;
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceElementName;
+import org.apache.torque.generator.source.SourceElementName;
 
 /**
  * Contains all element names from the Torque schema.

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/schema/DTDResolver.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/schema/DTDResolver.java?rev=944877&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/schema/DTDResolver.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/schema/DTDResolver.java Sun May 16 16:15:20 2010
@@ -0,0 +1,132 @@
+package org.apache.torque.templates.schema;
+
+/*
+ * 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.
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * A resolver to get the database.dtd file for the XML parser from the jar.
+ *
+ * @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
+ * @author <a href="mailto:kschrader@karmalab.org">Kurt Schrader</a>
+ * @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
+ * @version $Id: DTDResolver.java 491216 2006-12-30 12:14:45Z tfischer $
+ */
+public class DTDResolver implements EntityResolver
+{
+    /** Where the DTD is located on the web. */
+    public static final String WEB_SITE_DTD
+            = "http://db.apache.org/torque/dtd/database_3_3.dtd";
+
+    /** Where the 3.2 DTD is located on the web. */
+    public static final String WEB_SITE_DTD_3_2
+            = "http://db.apache.org/torque/dtd/database_3_2.dtd";
+
+    /** Logging class from commons.logging */
+    private static Log log = LogFactory.getLog(DTDResolver.class);
+
+    /**
+     * constructor
+     */
+    public DTDResolver()
+            throws SAXException
+    {
+    }
+
+    /**
+     * An implementation of the SAX <code>EntityResolver</code>
+     * interface to be called by the XML parser.  If the dtd is the
+     * current Torque DTD, the DTD is read from the generator jar.
+     * In all other cases, null is returned to indicate that the parser
+     * should open a regular connection to the systemId URI.
+     *
+     * @param publicId The public identifier of the external entity
+     * @param systemId The system identifier of the external entity
+     * @return An <code>InputSource</code> for the
+     * <code>database.dtd</code> file in the generator jar, or null.
+     */
+    public InputSource resolveEntity(String publicId, String systemId)
+            throws IOException, SAXException
+    {
+        if (WEB_SITE_DTD.equals(systemId))
+        {
+            // TODO: correct dtd location
+            return readFromClasspath("database.dtd");
+        }
+        else if (WEB_SITE_DTD_3_2.equals(systemId))
+        {
+            // TODO: correct dtd location
+            return readFromClasspath("database_3_2.dtd");
+        }
+        else
+        {
+            log.debug("Resolver: used default behaviour");
+            return null;
+        }
+    }
+
+    /**
+     * Reads the resource with the given name from the classpath.
+     *
+     * @param resourceName the name of the resource to read
+     * @return an Inputsource witht the content of the resource.
+     *
+     * @throws SAXException if the resource cannot be read.
+     */
+    private InputSource readFromClasspath(String resourceName)
+        throws SAXException
+    {
+        try
+        {
+            InputStream dtdStream
+                    = getClass().getResourceAsStream(resourceName);
+
+            // getResource was buggy on many systems including Linux,
+            // OSX, and some versions of windows in jdk1.3.
+            // getResourceAsStream works on linux, maybe others?
+            if (dtdStream != null)
+            {
+                String pkg = getClass().getName().substring(0,
+                        getClass().getName().lastIndexOf('.'));
+                log.debug("Resolver: used " + resourceName + " from '"
+                         + pkg + "' package");
+                return new InputSource(dtdStream);
+            }
+            else
+            {
+                log.warn("Could not locate database.dtd");
+                return null;
+            }
+        }
+        catch (Exception ex)
+        {
+            throw new SAXException(
+                    "Could not get stream for " + resourceName,
+                    ex);
+        }
+    }
+}

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSourceFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSourceFilter.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSourceFilter.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSourceFilter.java Sun May 16 16:15:20 2010
@@ -19,8 +19,8 @@ package org.apache.torque.templates.sour
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.filter.SourceFilter;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.filter.SourceFilter;
 import org.apache.torque.templates.TemplateOptionName;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSourceFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSourceFilter.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSourceFilter.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSourceFilter.java Sun May 16 16:15:20 2010
@@ -19,9 +19,9 @@ package org.apache.torque.templates.sour
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.filter.SourceFilter;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.filter.SourceFilter;
 import org.apache.torque.templates.TorqueSchemaAttributeName;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSourceFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSourceFilter.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSourceFilter.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSourceFilter.java Sun May 16 16:15:20 2010
@@ -21,9 +21,9 @@ package org.apache.torque.templates.sour
 
 import java.util.List;
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.filter.SourceFilter;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.filter.SourceFilter;
 import org.apache.torque.templates.TemplateOptionName;
 import org.apache.torque.templates.TorqueSchemaElementName;
 import org.apache.torque.templates.transformer.om.TableChildElementName;

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSourceFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSourceFilter.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSourceFilter.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSourceFilter.java Sun May 16 16:15:20 2010
@@ -19,8 +19,8 @@ package org.apache.torque.templates.sour
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.filter.SourceFilter;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.filter.SourceFilter;
 import org.apache.torque.templates.TemplateOptionName;
 
 /**

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/CollectAttributeSetTrueTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/CollectAttributeSetTrueTransformer.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/CollectAttributeSetTrueTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/CollectAttributeSetTrueTransformer.java Sun May 16 16:15:20 2010
@@ -22,10 +22,10 @@ package org.apache.torque.templates.tran
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceAttributeName;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.SourceElementName;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceAttributeName;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.SourceElementName;
 
 /**
  * Collects the children which have a certain attribute set to true

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=944877&r1=944876&r2=944877&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 May 16 16:15:20 2010
@@ -19,9 +19,9 @@ package org.apache.torque.templates.tran
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+import org.apache.torque.generator.control.ControllerState;
+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;

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=944877&r1=944876&r2=944877&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 May 16 16:15:20 2010
@@ -19,7 +19,7 @@ package org.apache.torque.templates.tran
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceAttributeName;
+import org.apache.torque.generator.source.SourceAttributeName;
 
 /**
  * Contains the attributes for a column source element which are not

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java Sun May 16 16:15:20 2010
@@ -19,7 +19,7 @@ package org.apache.torque.templates.tran
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceElementName;
+import org.apache.torque.generator.source.SourceElementName;
 
 /**
  * Contains the child elements for a column source element which are not

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java Sun May 16 16:15:20 2010
@@ -19,7 +19,7 @@ package org.apache.torque.templates.tran
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceAttributeName;
+import org.apache.torque.generator.source.SourceAttributeName;
 
 /**
  * Contains the attributes for a database source element which are not

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java Sun May 16 16:15:20 2010
@@ -20,7 +20,7 @@ package org.apache.torque.templates.tran
  */
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.torque.gf.control.ControllerState;
+import org.apache.torque.generator.control.ControllerState;
 import org.apache.torque.templates.TemplateOptionName;
 import org.apache.torque.templates.typemapping.JavaType;
 

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=944877&r1=944876&r2=944877&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 May 16 16:15:20 2010
@@ -22,7 +22,7 @@ package org.apache.torque.templates.tran
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.torque.gf.source.SourceElement;
+import org.apache.torque.generator.source.SourceElement;
 import org.apache.torque.templates.TorqueSchemaAttributeName;
 import org.apache.torque.templates.TorqueSchemaElementName;
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java Sun May 16 16:15:20 2010
@@ -19,7 +19,7 @@ package org.apache.torque.templates.tran
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceAttributeName;
+import org.apache.torque.generator.source.SourceAttributeName;
 
 /**
  * Contains the attribute names of the child elements for a foreign-key

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java Sun May 16 16:15:20 2010
@@ -19,7 +19,7 @@ package org.apache.torque.templates.tran
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceElementName;
+import org.apache.torque.generator.source.SourceElementName;
 
 /**
  * Contains the child elements for a foreign-key source element which are not

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java Sun May 16 16:15:20 2010
@@ -19,7 +19,7 @@ package org.apache.torque.templates.tran
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceAttributeName;
+import org.apache.torque.generator.source.SourceAttributeName;
 
 /**
  * Defines the standard attributes for a source element representing

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=944877&r1=944876&r2=944877&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 May 16 16:15:20 2010
@@ -7,15 +7,15 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.FileSource;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.SourceException;
-import org.apache.torque.gf.source.TransformerDefinition;
-import org.apache.torque.gf.source.transform.SourceTransformer;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
-import org.apache.torque.gf.source.xml.XmlSourceType;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.FileSource;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.SourceException;
+import org.apache.torque.generator.source.TransformerDefinition;
+import org.apache.torque.generator.source.transform.SourceTransformer;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
+import org.apache.torque.generator.source.xml.XmlSourceType;
 import org.apache.torque.templates.TorqueSchemaAttributeName;
 import org.apache.torque.templates.TorqueSchemaElementName;
 

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=944877&r1=944876&r2=944877&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 May 16 16:15:20 2010
@@ -24,10 +24,10 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.processor.string.Camelbacker;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.processor.string.Camelbacker;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.apache.torque.templates.TorqueSchemaAttributeName;
 import org.apache.torque.templates.TorqueSchemaElementName;
 import org.apache.torque.templates.TorqueSchemaJavaType;

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=944877&r1=944876&r2=944877&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 May 16 16:15:20 2010
@@ -21,9 +21,9 @@ package org.apache.torque.templates.tran
 
 import java.util.List;
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.apache.torque.templates.TorqueSchemaAttributeName;
 import org.apache.torque.templates.TorqueSchemaElementName;
 

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=944877&r1=944876&r2=944877&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 May 16 16:15:20 2010
@@ -22,9 +22,9 @@ package org.apache.torque.templates.tran
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.apache.torque.templates.TorqueSchemaAttributeName;
 import org.apache.torque.templates.TorqueSchemaElementName;
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java Sun May 16 16:15:20 2010
@@ -19,9 +19,9 @@ package org.apache.torque.templates.tran
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.apache.torque.templates.TorqueSchemaAttributeName;
 import org.apache.torque.templates.TorqueSchemaElementName;
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMReferencingForeignKeyTableTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMReferencingForeignKeyTableTransformer.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMReferencingForeignKeyTableTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMReferencingForeignKeyTableTransformer.java Sun May 16 16:15:20 2010
@@ -22,9 +22,9 @@ package org.apache.torque.templates.tran
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.apache.torque.templates.TorqueSchemaAttributeName;
 import org.apache.torque.templates.TorqueSchemaElementName;
 

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=944877&r1=944876&r2=944877&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 May 16 16:15:20 2010
@@ -23,11 +23,11 @@ import java.io.InputStreamReader;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.processor.string.Camelbacker;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.transform.AttributeTransformer;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.processor.string.Camelbacker;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.transform.AttributeTransformer;
+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.TorqueSchemaElementName;

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=944877&r1=944876&r2=944877&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 May 16 16:15:20 2010
@@ -19,10 +19,10 @@ package org.apache.torque.templates.tran
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.transform.SourceTransformer;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.transform.SourceTransformer;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.apache.torque.templates.TemplateOptionName;
 import org.apache.torque.templates.TorqueSchemaElementName;
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ReferenceChildElementName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ReferenceChildElementName.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ReferenceChildElementName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ReferenceChildElementName.java Sun May 16 16:15:20 2010
@@ -19,7 +19,7 @@ package org.apache.torque.templates.tran
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceElementName;
+import org.apache.torque.generator.source.SourceElementName;
 
 /**
  * Contains the child elements for a reference source element which are not

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=944877&r1=944876&r2=944877&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 May 16 16:15:20 2010
@@ -19,7 +19,7 @@ package org.apache.torque.templates.tran
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceAttributeName;
+import org.apache.torque.generator.source.SourceAttributeName;
 
 /**
  * Contains the attributes for a table source element which are not

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableChildElementName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableChildElementName.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableChildElementName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableChildElementName.java Sun May 16 16:15:20 2010
@@ -19,7 +19,7 @@ package org.apache.torque.templates.tran
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceElementName;
+import org.apache.torque.generator.source.SourceElementName;
 
 /**
  * Contains the child elements for a table source element which are not

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/dbobject/base/BaseDbObjectTableTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/dbobject/base/BaseDbObjectTableTransformer.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/dbobject/base/BaseDbObjectTableTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/dbobject/base/BaseDbObjectTableTransformer.java Sun May 16 16:15:20 2010
@@ -21,10 +21,10 @@ package org.apache.torque.templates.tran
 
 import java.io.InputStreamReader;
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.transform.AttributeTransformer;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.transform.AttributeTransformer;
+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.TorqueSchemaElementName;

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/dbobject/base/BaseDbObjectTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/dbobject/base/BaseDbObjectTransformer.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/dbobject/base/BaseDbObjectTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/dbobject/base/BaseDbObjectTransformer.java Sun May 16 16:15:20 2010
@@ -21,11 +21,11 @@ package org.apache.torque.templates.tran
 
 import java.util.List;
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.SourcePath;
-import org.apache.torque.gf.source.transform.SourceTransformer;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+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.SourceTransformer;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.apache.torque.templates.TorqueSchemaElementName;
 
 public class BaseDbObjectTransformer implements SourceTransformer

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/mapInit/MapInitDatabaseTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/mapInit/MapInitDatabaseTransformer.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/mapInit/MapInitDatabaseTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/mapInit/MapInitDatabaseTransformer.java Sun May 16 16:15:20 2010
@@ -21,11 +21,11 @@ package org.apache.torque.templates.tran
 
 import java.io.InputStreamReader;
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.processor.string.Camelbacker;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.transform.AttributeTransformer;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.processor.string.Camelbacker;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.transform.AttributeTransformer;
+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.TorqueSchemaElementName;

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=944877&r1=944876&r2=944877&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 May 16 16:15:20 2010
@@ -24,11 +24,11 @@ import java.util.List;
 
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.SourcePath;
-import org.apache.torque.gf.source.transform.SourceTransformer;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+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.SourceTransformer;
+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.TorqueSchemaElementName;

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml Sun May 16 16:15:20 2010
@@ -20,8 +20,8 @@
 
 <control loglevel="info"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/configuration.xsd"
-    xmlns="http://db.apache.org/torque/gf/4.0/configuration">
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xmlns="http://db.apache.org/torque/4.0/generator/configuration">
   <options xsi:type="propertiesOptions" path="options.properties"/>
   
   <!-- Documentation css -->
@@ -29,7 +29,7 @@
     <source elements="database">
       <include>*schema.xml</include>
     </source>
-    <generator name="torque.doc.html.css"/>
+    <outlet name="torque.doc.html.css"/>
   </output>
 
   <!-- Documentation html -->
@@ -38,7 +38,7 @@
       <include>*schema.xml</include>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.doc.html.html"/>
+    <outlet name="torque.doc.html.html"/>
   </output>
 </control>
   
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/outlets/html.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/outlets/html.xml?rev=944877&r1=915953&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/outlets/html.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/outlets/html.xml Sun May 16 16:15:20 2010
@@ -18,24 +18,24 @@
  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.doc.html.css" 
-      xsi:type="velocityGenerator" 
+<outlets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xmlns="http://db.apache.org/torque/4.0/generator/configuration">
+  <outlet name="torque.doc.html.css" 
+      xsi:type="velocityOutlet" 
       path="datamodel.css.vm">
-  </generator>
+  </outlet>
 
-  <generator name="torque.doc.html.html"
-      xsi:type="velocityGenerator" 
+  <outlet name="torque.doc.html.html"
+      xsi:type="velocityOutlet" 
       path="datamodel.vm">
     <mergepoint name="tableDocs">
       <action xsi:type="traverseAllAction" element="table"
-           generator="torque.doc.html.table"/>
+           outlet="torque.doc.html.table"/>
     </mergepoint>
-  </generator>
-  <generator name="torque.doc.html.table"
-      xsi:type="velocityGenerator" 
+  </outlet>
+  <outlet name="torque.doc.html.table"
+      xsi:type="velocityOutlet" 
       path="table.vm">
-  </generator>
-</generators>
\ No newline at end of file
+  </outlet>
+</outlets>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/datamodel.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/datamodel.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/datamodel.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/datamodel.vm Sun May 16 16:15:20 2010
@@ -27,7 +27,7 @@
       <th class="summaryheadbackground summaryborder summaryheadjavaname">OM Class</th>
       <th class="summaryheadbackground summaryborder summaryheaddescription">Description</th>
     </tr>
-  #set ($tableElements = $torqueGf.getChildren("table"))
+  #set ($tableElements = $torqueGen.getChildren("table"))
   #foreach ($tableElement in $tableElements)
     #set ( $tableName = $tableElement.getAttribute("name") )
     #set ( $tableJavaName = $tableElement.getAttribute("javaName") )
@@ -40,6 +40,6 @@
   #end
   </table>
 
-  $torqueGf.mergepoint("tableDocs")
+  $torqueGen.mergepoint("tableDocs")
 </body>
 </html>

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/table.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/table.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/table.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/table.vm Sun May 16 16:15:20 2010
@@ -30,7 +30,7 @@ $!description
     <th class="detailheadbackground detailborder detailheadnotnull">not null</th>
     <th class="detailheadbackground detailborder detailheaddescription">Description</th>
   </tr>
-#foreach ($columnElement in $torqueGf.getChildren("column"))
+#foreach ($columnElement in $torqueGen.getChildren("column"))
   <tr class="detailrow">
   #set ( $columnName = $columnElement.getAttribute("name"))
   #set ( $columnSize = $columnElement.getAttribute("size"))

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml Sun May 16 16:15:20 2010
@@ -20,8 +20,8 @@
 
 <control loglevel="info"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/configuration.xsd"
-    xmlns="http://db.apache.org/torque/gf/4.0/configuration">
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xmlns="http://db.apache.org/torque/4.0/generator/configuration">
   <options xsi:type="propertiesOptions" path="options.properties"/>
   
   <!-- Documentation xdoc -->
@@ -30,7 +30,7 @@
       <include>*schema.xml</include>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
     </source>
-    <generator name="torque.doc.xdoc.xdoc"/>
+    <outlet name="torque.doc.xdoc.xdoc"/>
   </output>
 </control>
   
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/outlets/xdoc.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/outlets/xdoc.xml?rev=944877&r1=915953&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/outlets/xdoc.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/outlets/xdoc.xml Sun May 16 16:15:20 2010
@@ -18,20 +18,20 @@
  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.doc.xdoc.xdoc"
-      xsi:type="velocityGenerator" 
+<outlets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xmlns="http://db.apache.org/torque/4.0/generator/configuration">
+  <outlet name="torque.doc.xdoc.xdoc"
+      xsi:type="velocityOutlet" 
       path="datamodel.vm">
     <mergepoint name="tableDocs">
       <action xsi:type="traverseAllAction"
           element="table"
-          generator="torque.doc.xdoc.table"/>
+          outlet="torque.doc.xdoc.table"/>
     </mergepoint>
-  </generator>
-  <generator name="torque.doc.xdoc.table"
-      xsi:type="velocityGenerator" 
+  </outlet>
+  <outlet name="torque.doc.xdoc.table"
+      xsi:type="velocityOutlet" 
       path="table.vm">
-  </generator>
-</generators>
\ No newline at end of file
+  </outlet>
+</outlets>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/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=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/datamodel.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/datamodel.vm Sun May 16 16:15:20 2010
@@ -29,7 +29,7 @@
           <th class="summaryheadbackground summaryborder summaryheadjavaname">OM Class</th>
           <th class="summaryheadbackground summaryborder summaryheaddescription">Description</th>
         </tr>
-  #set ($tableElements = $torqueGf.getChildren("table"))
+  #set ($tableElements = $torqueGen.getChildren("table"))
   #foreach ($tableElement in $tableElements)
     #set ( $tableName = $tableElement.getAttribute("name") )
     #set ( $tableJavaName = $tableElement.getAttribute("javaName") )
@@ -42,7 +42,7 @@
   #end
       </table>
 
-$torqueGf.mergepoint("tableDocs")
+$torqueGen.mergepoint("tableDocs")
     </section>
   </body>
 </document>

Modified: 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=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/table.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/table.vm Sun May 16 16:15:20 2010
@@ -31,7 +31,7 @@
       <th class="detailheadbackground detailborder detailheadnotnull">not null</th>
       <th class="detailheadbackground detailborder detailheaddescription">Description</th>
     </tr>
-#foreach ($columnElement in $torqueGf.getChildren("column"))
+#foreach ($columnElement in $torqueGen.getChildren("column"))
     <tr class="detailrow">
   #set ( $columnName = $columnElement.getAttribute("name"))
   #set ( $columnSize = $columnElement.getAttribute("size"))

Modified: 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=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml Sun May 16 16:15:20 2010
@@ -20,21 +20,21 @@
 
 <control loglevel="info"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/configuration.xsd"
-    xmlns="http://db.apache.org/torque/gf/4.0/configuration">
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xmlns="http://db.apache.org/torque/4.0/generator/configuration">
   <options xsi:type="propertiesOptions" path="options.properties"/>
   <output name="torque.sql.idtable.idtable">
-    <filenameGenerator
-        xsi:type="javaGenerator"
-        class="org.apache.torque.gf.generator.java.ModifySourcenameGenerator">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.ModifySourcenameOutlet">
       <discardFrom>.</discardFrom>
       <suffix>-idtable-init.sql</suffix>
-    </filenameGenerator>
+    </filenameOutlet>
     <source elements="database">
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
      </source>
-    <generator name="torque.sql.idtable.idtable"/>
+    <outlet name="torque.sql.idtable.idtable"/>
   </output>
   
 </control>

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

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/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=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/templates/idtable.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/templates/idtable.vm Sun May 16 16:15:20 2010
@@ -16,12 +16,12 @@
 ## under the License.
 ##
 ##
-#set ( $tableElements = $torqueGf.getChildren("table") )
-#set ( $initialIdValue = $torqueGf.intOption("torque.idBroker.initialIdValue") )
-#set ( $initialIdStep = $torqueGf.intOption("torque.idbroker.initialIdStep") )
-#set ( $initialId = $torqueGf.getVariable("torque.idbroker.initialId") )
+#set ( $tableElements = $torqueGen.getChildren("table") )
+#set ( $initialIdValue = $torqueGen.intOption("torque.idBroker.initialIdValue") )
+#set ( $initialIdStep = $torqueGen.intOption("torque.idbroker.initialIdStep") )
+#set ( $initialId = $torqueGen.getVariable("torque.idbroker.initialId") )
 #if ( !$initialId )
-  #set ( $initialId = $torqueGf.intOption("torque.idbroker.initialId") )
+  #set ( $initialId = $torqueGen.intOption("torque.idbroker.initialId") )
 #end
 #set ( $idValue = $initialId )
 #foreach ($tableElement in $tableElements)
@@ -29,5 +29,5 @@
 insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES ($idValue, '$tableName', $initialIdValue, $initialIdStep);
   #set ( $idValue = $idValue + 1)
 #end
-#set ( $dummy = $torqueGf.setVariable("torque.idbroker.initialId", $idValue, "GLOBAL" )  )
+#set ( $dummy = $torqueGen.setVariable("torque.idbroker.initialId", $idValue, "GLOBAL" )  )
 



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