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 [4/4] - in /db/torque/torque4/trunk/torque-templates/src: main/java/org/apache/torque/templates/ main/java/org/apache/torque/templates/schema/ main/java/org/apache/torque/templates/sourcefilter/ main/java/org/apache/torque/templates...
Date Sun, 16 May 2010 16:15:24 GMT
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/database.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/database.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/database.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/database.vm
Sun May 16 16:15:20 2010
@@ -14,8 +14,8 @@
 ## KIND, either express or implied.  See the License for the
 ## specific language governing permissions and limitations
 ## under the License.
-$torqueGf.mergepoint("databaseStart")
-$torqueGf.mergepoint("tables")
-$torqueGf.mergepoint("foreignKeys")
-$torqueGf.mergepoint("comments")
-$torqueGf.mergepoint("databaseEnd")
\ No newline at end of file
+$torqueGen.mergepoint("databaseStart")
+$torqueGen.mergepoint("tables")
+$torqueGen.mergepoint("foreignKeys")
+$torqueGen.mergepoint("comments")
+$torqueGen.mergepoint("databaseEnd")
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/databaseStart.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/databaseStart.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/databaseStart.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/databaseStart.vm
Sun May 16 16:15:20 2010
@@ -15,6 +15,6 @@
 ## specific language governing permissions and limitations
 ## under the License.
 -- -----------------------------------------------------------------------
--- $torqueGf.option("torque.database") SQL script for schema $name
+-- $torqueGen.option("torque.database") SQL script for schema $name
 -- -----------------------------------------------------------------------
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.vm
Sun May 16 16:15:20 2010
@@ -14,7 +14,7 @@
 ## KIND, either express or implied.  See the License for the
 ## specific language governing permissions and limitations
 ## under the License.
-ALTER TABLE $torqueGf.getParent().getAttribute("name")
+ALTER TABLE $torqueGen.getParent().getAttribute("name")
     ADD CONSTRAINT $name 
     FOREIGN KEY ($localColumnNames)
     REFERENCES $foreignTable ($foreignColumnNames)##

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/index.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/index.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/index.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/index.vm
Sun May 16 16:15:20 2010
@@ -14,7 +14,7 @@
 ## KIND, either express or implied.  See the License for the
 ## specific language governing permissions and limitations
 ## under the License.
-#set ( $tableName = $torqueGf.getParent().getAttribute("name") )
+#set ( $tableName = $torqueGen.getParent().getAttribute("name") )
 #if ($indexColumnNames != "")
 CREATE INDEX#if($name) $name#end ON $tableName ($indexColumnNames);
 #end

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/table.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/table.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/table.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/table.vm
Sun May 16 16:15:20 2010
@@ -18,18 +18,18 @@
 -- -----------------------------------------------------------------------
 -- $name
 -- -----------------------------------------------------------------------
-$torqueGf.mergepoint("drop")
+$torqueGen.mergepoint("drop")
 CREATE TABLE $name
 (
-#set ( $cols = $torqueGf.mergepoint("columns") )
-#set ( $pk = $torqueGf.mergepoint("primaryKey") )
-#set ( $unique = $torqueGf.mergepoint("unique") )
+#set ( $cols = $torqueGen.mergepoint("columns") )
+#set ( $pk = $torqueGen.mergepoint("primaryKey") )
+#set ( $unique = $torqueGen.mergepoint("unique") )
 #if($stringUtils.allEmpty([$pk,$unique,$index]))$stringUtils.chop($cols,2)#else$cols#end
 #if($stringUtils.allEmpty([$unique,$index]) && $pk.length()>0)$stringUtils.chop($pk,2)#else$pk#end
 #if($unique.length()>0)$stringUtils.chop($unique,2)#else$unique#end
 )##
-$torqueGf.mergepoint("createOptions")##
+$torqueGen.mergepoint("createOptions")##
 ;
 
-$torqueGf.mergepoint("index")
+$torqueGen.mergepoint("index")
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/databaseStart.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/databaseStart.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/databaseStart.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/databaseStart.vm
Sun May 16 16:15:20 2010
@@ -15,6 +15,6 @@
 ## specific language governing permissions and limitations
 ## under the License.
 -- -----------------------------------------------------------------------
--- $torqueGf.option("torque.database") SQL script for schema $name
+-- $torqueGen.option("torque.database") SQL script for schema $name
 -- -----------------------------------------------------------------------
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/drop.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/drop.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/drop.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/drop.vm
Sun May 16 16:15:20 2010
@@ -14,7 +14,7 @@
 ## KIND, either express or implied.  See the License for the
 ## specific language governing permissions and limitations
 ## under the License.
-#set ($foreignKeyElements = $torqueGf.getChildren("foreign-key"))
+#set ($foreignKeyElements = $torqueGen.getChildren("foreign-key"))
 #foreach ($foreignKeyElement in $foreignKeyElements)
   #set ($foreignKeyName = $foreignKeyElement.getAttribute("name"))
 IF EXISTS (SELECT 1 FROM sysobjects WHERE type ='RI' AND name='$foreignKeyName')
@@ -22,7 +22,7 @@ IF EXISTS (SELECT 1 FROM sysobjects WHER
 #end
 IF EXISTS (SELECT 1 FROM sysobjects WHERE type = 'U' AND name = '$name')
 BEGIN
-#set ($counter = ${torqueGf.getCounter()})
+#set ($counter = ${torqueGen.getCounter()})
      DECLARE @reftable_${counter} nvarchar(60), @constraintname_${counter} nvarchar(60)
      DECLARE refcursor CURSOR FOR
      select reftables.name tablename, cons.name constraintname

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/foreignKey.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/foreignKey.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/foreignKey.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/foreignKey.vm
Sun May 16 16:15:20 2010
@@ -14,7 +14,7 @@
 ## KIND, either express or implied.  See the License for the
 ## specific language governing permissions and limitations
 ## under the License.
-#set ( $tableName = $torqueGf.getParent().getAttribute("name") )
+#set ( $tableName = $torqueGen.getParent().getAttribute("name") )
 BEGIN
 ALTER TABLE $tableName
     ADD CONSTRAINT $name

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/index.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/index.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/index.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/index.vm
Sun May 16 16:15:20 2010
@@ -14,7 +14,7 @@
 ## KIND, either express or implied.  See the License for the
 ## specific language governing permissions and limitations
 ## under the License.
-#set ( $tableName = $torqueGf.getParent().getAttribute("name") )
+#set ( $tableName = $torqueGen.getParent().getAttribute("name") )
 #if ($indexColumnNames != "")
 CREATE INDEX#if($name) $name#end ON $tableName ($indexColumnNames);
 #end

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/table.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/table.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/table.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/table.vm
Sun May 16 16:15:20 2010
@@ -18,17 +18,17 @@
 /* ---------------------------------------------------------------------- */
 /* $name                                                      */
 /* ---------------------------------------------------------------------- */
-$torqueGf.mergepoint("drop")
+$torqueGen.mergepoint("drop")
 CREATE TABLE $name
 (
-#set ( $cols = $torqueGf.mergepoint("columns") )
-#set ( $pk = $torqueGf.mergepoint("primaryKey") )
-#set ( $unique = $torqueGf.mergepoint("unique") )
+#set ( $cols = $torqueGen.mergepoint("columns") )
+#set ( $pk = $torqueGen.mergepoint("primaryKey") )
+#set ( $unique = $torqueGen.mergepoint("unique") )
 #if($stringUtils.allEmpty([$pk,$unique]))$stringUtils.chop($cols,2)#else$cols#end
 #if($stringUtils.allEmpty([$unique]) && $pk.length()>0)$stringUtils.chop($pk,2)#else$pk#end
 #if($unique.length() > 0)$stringUtils.chop($unique,2)#end
 
 )##
-$torqueGf.mergepoint("createOptions")##
+$torqueGen.mergepoint("createOptions")##
 ;
-$torqueGf.mergepoint("index")
+$torqueGen.mergepoint("index")

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/databaseStart.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/databaseStart.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/databaseStart.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/databaseStart.vm
Sun May 16 16:15:20 2010
@@ -15,6 +15,6 @@
 ## specific language governing permissions and limitations
 ## under the License.
 -- -----------------------------------------------------------------------
--- $torqueGf.option("torque.database") SQL script for schema $name
+-- $torqueGen.option("torque.database") SQL script for schema $name
 -- -----------------------------------------------------------------------
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/foreignKey.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/foreignKey.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/foreignKey.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/foreignKey.vm
Sun May 16 16:15:20 2010
@@ -14,7 +14,7 @@
 ## KIND, either express or implied.  See the License for the
 ## specific language governing permissions and limitations
 ## under the License.
-ALTER TABLE $torqueGf.getParent().getAttribute("name")
+ALTER TABLE $torqueGen.getParent().getAttribute("name")
     ADD CONSTRAINT $name
     FOREIGN KEY ($localColumnNames)
     REFERENCES $foreignTable ($foreignColumnNames)##

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/table.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/table.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/table.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/table.vm
Sun May 16 16:15:20 2010
@@ -18,19 +18,19 @@
 # -----------------------------------------------------------------------
 # $name
 # -----------------------------------------------------------------------
-$torqueGf.mergepoint("drop")
+$torqueGen.mergepoint("drop")
 CREATE TABLE $name
 (
-#set ( $cols = $torqueGf.mergepoint("columns") )
-#set ( $pk = $torqueGf.mergepoint("primaryKey") )
-#set ( $unique = $torqueGf.mergepoint("unique") )
-#set ( $index = $torqueGf.mergepoint("index") )
+#set ( $cols = $torqueGen.mergepoint("columns") )
+#set ( $pk = $torqueGen.mergepoint("primaryKey") )
+#set ( $unique = $torqueGen.mergepoint("unique") )
+#set ( $index = $torqueGen.mergepoint("index") )
 #if($stringUtils.allEmpty([$pk,$unique,$index]))$stringUtils.chop($cols,2)#else$cols#end
 #if($stringUtils.allEmpty([$unique,$index]) && $pk.length()>0)$stringUtils.chop($pk,2)#else$pk#end
 #if($stringUtils.allEmpty([$index]) && $unique.length()>0)$stringUtils.chop($unique,2)#else$unique#end
 #if($index.length()>0)$stringUtils.chop($index,2)#end
 
 )##
-$torqueGf.mergepoint("createOptions")##
+$torqueGen.mergepoint("createOptions")##
 ;
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/columnComment.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/columnComment.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/columnComment.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/columnComment.vm
Sun May 16 16:15:20 2010
@@ -15,6 +15,6 @@
 ## specific language governing permissions and limitations
 ## under the License.
 #if ($description.length() > 0)
-#set ( $tableName = $torqueGf.getParent().getAttribute("name") )
+#set ( $tableName = $torqueGen.getParent().getAttribute("name") )
 COMMENT ON COLUMN ${tableName}.${name} IS '$description';
 #end

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/databaseStart.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/databaseStart.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/databaseStart.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/databaseStart.vm
Sun May 16 16:15:20 2010
@@ -15,6 +15,6 @@
 ## specific language governing permissions and limitations
 ## under the License.
 -- -----------------------------------------------------------------------
--- $torqueGf.option("torque.database") SQL script for schema $name
+-- $torqueGen.option("torque.database") SQL script for schema $name
 -- -----------------------------------------------------------------------
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/foreignKey.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/foreignKey.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/foreignKey.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/foreignKey.vm
Sun May 16 16:15:20 2010
@@ -14,7 +14,7 @@
 ## KIND, either express or implied.  See the License for the
 ## specific language governing permissions and limitations
 ## under the License.
-ALTER TABLE $torqueGf.getParent().getAttribute("name")
+ALTER TABLE $torqueGen.getParent().getAttribute("name")
     ADD CONSTRAINT $name
     FOREIGN KEY ($localColumnNames)
     REFERENCES $foreignTable ($foreignColumnNames)##

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/index.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/index.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/index.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/index.vm
Sun May 16 16:15:20 2010
@@ -14,7 +14,7 @@
 ## KIND, either express or implied.  See the License for the
 ## specific language governing permissions and limitations
 ## under the License.
-#set ( $tableName = $torqueGf.getParent().getAttribute("name") )
+#set ( $tableName = $torqueGen.getParent().getAttribute("name") )
 #if ($indexColumnNames != "")
 CREATE INDEX#if($name) $name#end ON $tableName ($indexColumnNames);
 #end

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/table.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/table.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/table.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/table.vm
Sun May 16 16:15:20 2010
@@ -18,18 +18,18 @@
 -----------------------------------------------------------------------------
 -- $name
 -----------------------------------------------------------------------------
-$torqueGf.mergepoint("drop")
+$torqueGen.mergepoint("drop")
 CREATE TABLE $name
 (
-#set ( $cols = $torqueGf.mergepoint("columns") )
-#set ( $unique = $torqueGf.mergepoint("unique") )
+#set ( $cols = $torqueGen.mergepoint("columns") )
+#set ( $unique = $torqueGen.mergepoint("unique") )
 #if($stringUtils.allEmpty([$unique]))$stringUtils.chop($cols,2)#else$cols#end
 #if($unique.length()>0)$stringUtils.chop($unique,2)#end
 
 )##
-$torqueGf.mergepoint("createOptions")##
+$torqueGen.mergepoint("createOptions")##
 ;
 
-$torqueGf.mergepoint("primaryKey")
-$torqueGf.mergepoint("index")
-$torqueGf.mergepoint("sequence")
+$torqueGen.mergepoint("primaryKey")
+$torqueGen.mergepoint("index")
+$torqueGen.mergepoint("sequence")

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/columnComment.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/columnComment.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/columnComment.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/columnComment.vm
Sun May 16 16:15:20 2010
@@ -15,6 +15,6 @@
 ## specific language governing permissions and limitations
 ## under the License.
 #if ($description.length() > 0)
-#set ( $tableName = $torqueGf.getParent().getAttribute("name") )
+#set ( $tableName = $torqueGen.getParent().getAttribute("name") )
 COMMENT ON COLUMN ${tableName}.${name} IS '$description';
 #end

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/databaseStart.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/databaseStart.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/databaseStart.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/databaseStart.vm
Sun May 16 16:15:20 2010
@@ -15,6 +15,6 @@
 ## specific language governing permissions and limitations
 ## under the License.
 -- -----------------------------------------------------------------------
--- $torqueGf.option("torque.database") SQL script for schema $name
+-- $torqueGen.option("torque.database") SQL script for schema $name
 -- -----------------------------------------------------------------------
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/foreignKey.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/foreignKey.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/foreignKey.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/foreignKey.vm
Sun May 16 16:15:20 2010
@@ -14,7 +14,7 @@
 ## KIND, either express or implied.  See the License for the
 ## specific language governing permissions and limitations
 ## under the License.
-ALTER TABLE $torqueGf.getParent().getAttribute("name")
+ALTER TABLE $torqueGen.getParent().getAttribute("name")
     ADD CONSTRAINT $name
     FOREIGN KEY ($localColumnNames)
     REFERENCES $foreignTable ($foreignColumnNames)##

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/index.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/index.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/index.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/index.vm
Sun May 16 16:15:20 2010
@@ -14,7 +14,7 @@
 ## KIND, either express or implied.  See the License for the
 ## specific language governing permissions and limitations
 ## under the License.
-#set ( $tableName = $torqueGf.getParent().getAttribute("name") )
+#set ( $tableName = $torqueGen.getParent().getAttribute("name") )
 #if ($indexColumnNames != "")
 CREATE INDEX#if($name) $name#end ON $tableName ($indexColumnNames);
 #end

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/table.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/table.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/table.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/table.vm
Sun May 16 16:15:20 2010
@@ -18,19 +18,19 @@
 -----------------------------------------------------------------------------
 -- $name
 -----------------------------------------------------------------------------
-$torqueGf.mergepoint("drop")
+$torqueGen.mergepoint("drop")
 
 CREATE TABLE $name
 (
-#set ( $cols = $torqueGf.mergepoint("columns") )
-#set ( $pk = $torqueGf.mergepoint("primaryKey") )
-#set ( $unique = $torqueGf.mergepoint("unique") )
+#set ( $cols = $torqueGen.mergepoint("columns") )
+#set ( $pk = $torqueGen.mergepoint("primaryKey") )
+#set ( $unique = $torqueGen.mergepoint("unique") )
 #if($stringUtils.allEmpty([$pk,$unique]))$stringUtils.chop($cols,2)#else$cols#end
 #if($stringUtils.allEmpty([$unique]) && $pk.length()>0)$stringUtils.chop($pk,2)#else$pk#end
 #if($unique.length() > 0)$stringUtils.chop($unique,2)#end
 
 )##
-$torqueGf.mergepoint("createOptions")##
+$torqueGen.mergepoint("createOptions")##
 ;
-$torqueGf.mergepoint("index")
-$torqueGf.mergepoint("sequence")
+$torqueGen.mergepoint("index")
+$torqueGen.mergepoint("sequence")

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/tableComment.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/tableComment.vm?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/tableComment.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/tableComment.vm
Sun May 16 16:15:20 2010
@@ -18,4 +18,4 @@
 COMMENT ON TABLE $name IS '$description';
 #end
 
-$torqueGf.mergepoint("columnComment")##
+$torqueGen.mergepoint("columnComment")##

Modified: db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java?rev=944877&r1=944876&r2=944877&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
Sun May 16 16:15:20 2010
@@ -27,13 +27,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.torque.gf.configuration.UnitDescriptor;
-import org.apache.torque.gf.configuration.option.MapOptionsConfiguration;
-import org.apache.torque.gf.configuration.paths.CustomProjectPaths;
-import org.apache.torque.gf.configuration.paths.DefaultTorqueGfPaths;
-import org.apache.torque.gf.configuration.paths.Maven2DirectoryProjectPaths;
-import org.apache.torque.gf.control.Controller;
-import org.apache.torque.gf.file.Fileset;
+import org.apache.torque.generator.configuration.UnitDescriptor;
+import org.apache.torque.generator.configuration.option.MapOptionsConfiguration;
+import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
+import org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
+import org.apache.torque.generator.configuration.paths.Maven2DirectoryProjectPaths;
+import org.apache.torque.generator.control.Controller;
+import org.apache.torque.generator.file.Fileset;
 import org.junit.Test;
 
 public class TestProcessing
@@ -64,7 +64,7 @@ public class TestProcessing
         unitDescriptors.add(new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGfPaths(),
+                new DefaultTorqueGeneratorPaths(),
                 null,
                 sourceFileset,
                 new MapOptionsConfiguration(overrideOptions),
@@ -85,7 +85,7 @@ public class TestProcessing
         unitDescriptors.add(new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGfPaths(),
+                new DefaultTorqueGeneratorPaths(),
                 null,
                 null,
                 new MapOptionsConfiguration(overrideOptions),
@@ -106,7 +106,7 @@ public class TestProcessing
         unitDescriptors.add(new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGfPaths(),
+                new DefaultTorqueGeneratorPaths(),
                 null,
                 null,
                 new MapOptionsConfiguration(overrideOptions),
@@ -126,7 +126,7 @@ public class TestProcessing
         unitDescriptors.add(new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGfPaths(),
+                new DefaultTorqueGeneratorPaths(),
                 null,
                 null,
                 new MapOptionsConfiguration(overrideOptions),
@@ -146,7 +146,7 @@ public class TestProcessing
         unitDescriptors.add(new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGfPaths(),
+                new DefaultTorqueGeneratorPaths(),
                 null,
                 null,
                 new MapOptionsConfiguration(overrideOptions),



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