jvanzyl 01/10/10 07:01:26
Modified: conf/torque/templates/data Control.vm
conf/torque/templates/data/dump Control.vm
conf/torque/templates/om Control.vm
conf/torque/templates/sql/base Control.vm
conf/torque/templates/sql/db-init/mysql unix.vm windows.vm
conf/torque/templates/sql/db-init/postgresql unix.vm
conf/torque/templates/sql/id-table Control.vm idtable.db2
idtable.hypersonic idtable.interbase idtable.mssql
idtable.mysql idtable.oracle idtable.postgresql
idtable.sapdb idtable.sybase
src/java/org/apache/turbine/services/xmlrpc
TurbineXmlRpcService.java
Log:
- updating templates to match changes made to torque.
Revision Changes Path
1.2 +7 -5 jakarta-turbine-2/conf/torque/templates/data/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/torque/templates/data/Control.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Control.vm 2001/08/16 05:06:58 1.1
+++ Control.vm 2001/10/10 14:01:25 1.2
@@ -1,20 +1,22 @@
#set ( $hfname= "data/dataset.vm" )
#set ( $fname= "data/table.vm" )
-#foreach ($databaseModel in $appData.Databases)
+#foreach ($dataModel in $dataModels)
+#foreach ($database in $dataModel.Databases)
#if ($project)
#if ($appData.MultipleDatabases)
- #set ( $outFile = "${project}-${databaseModel.Name}-data.dtd" )
+ #set ( $outFile = "${project}-${database.Name}-data.dtd" )
#else
#set ( $outFile = "${project}-data.dtd" )
#end
- $generator.parse($hfname,$outFile,"tables",$databaseModel.Tables)
- #foreach ($tbl in $databaseModel.Tables)
+ $generator.parse($hfname,$outFile,"tables",$database.Tables)
+ #foreach ($tbl in $database.Tables)
$generator.parse($fname,$outFile,"table",$tbl)
#end
#else
- #foreach ($tbl in $databaseModel.Tables)
+ #foreach ($tbl in $database.Tables)
$generator.parse($fname,"","table",$tbl)
#end
#end
+#end
#end
1.2 +1 -1 jakarta-turbine-2/conf/torque/templates/data/dump/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/torque/templates/data/dump/Control.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Control.vm 2001/08/16 05:06:58 1.1
+++ Control.vm 2001/10/10 14:01:25 1.2
@@ -28,4 +28,4 @@
$generator.parse($fname,$outFile,"row", $rout)
#end
#end
-$generator.parse($bfname,$outFile,"tables",$databaseModel.Tables)
\ No newline at end of file
+$generator.parse($bfname,$outFile,"tables",$databaseModel.Tables)
1.2 +7 -5 jakarta-turbine-2/conf/torque/templates/om/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/torque/templates/om/Control.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Control.vm 2001/08/16 05:06:58 1.1
+++ Control.vm 2001/10/10 14:01:25 1.2
@@ -1,7 +1,9 @@
#set ($basePath = $generator.OutputPath)
-#foreach ($databaseModel in $appData.Databases)
- #if ($databaseModel.Package)
- #set ($package = $databaseModel.Package)
+
+#foreach ($dataModel in $dataModels)
+#foreach ($database in $dataModel.Databases)
+ #if ($database.Package)
+ #set ($package = $database.Package)
#else
#set ($package = $targetPackage)
#end
@@ -23,7 +25,7 @@
#set ( $path = $strings.getPackageAsPath($pkbase) )
$files.mkdir("$outputDirectory/$path")
- #foreach ($tbl in $databaseModel.Tables)
+ #foreach ($tbl in $database.Tables)
$tbl.Name
#set ( $firstcap=$tbl.JavaName )
@@ -70,6 +72,6 @@
#end
#end
#end
-
+#end
1.4 +15 -33 jakarta-turbine-2/conf/torque/templates/sql/base/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/torque/templates/sql/base/Control.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Control.vm 2001/09/26 22:27:15 1.3
+++ Control.vm 2001/10/10 14:01:25 1.4
@@ -3,40 +3,22 @@
#set ( $fname= "sql/base/$targetDatabase/table.vm" )
#set ( $fnamekeys= "sql/base/$targetDatabase/tablefk.vm" )
-#foreach ($databaseModel in $appData.Databases)
-
- #if ($project)
-
- We have a defined project: $project
-
- #if ($appData.MultipleDatabases)
- #set ( $outFile = "${project}-${databaseModel.Name}-schema.sql" )
- #else
- #set ( $outFile = "${project}-schema.sql" )
- #end
+#foreach ($dataModel in $dataModels)
- File to be created: $outFile
+ #set ( $outFile = "${dataModel.name}.sql" )
- #foreach ($tbl in $databaseModel.Tables)
- #if (!$tbl.isSkipSql())
- $generator.parse($fname,$outFile,"table",$tbl)
- #end
- #end
- #foreach ($tbl in $databaseModel.Tables)
- #if (!$tbl.isSkipSql())
- $generator.parse($fnamekeys,$outFile,"tablefk",$tbl)
- #end
- #end
- #else
- #foreach ($tbl in $databaseModel.Tables)
- #if (!$tbl.isSkipSql())
- $generator.parse($fname,"","table",$tbl)
- #end
- #end
- #foreach ($tbl in $databaseModel.Tables)
- #if (!$tbl.isSkipSql())
- $generator.parse($fnamekeys,"","tablefk",$tbl)
- #end
- #end
+ File to be created: $outFile
+
+ #set ( $database = $dataModel.database )
+ #foreach ($tbl in $database.tables)
+ #if (!$tbl.isSkipSql())
+ $generator.parse($fname,$outFile,"table",$tbl)
+ #end
+ #end
+
+ #foreach ($tbl in $database.tables)
+ #if (!$tbl.isSkipSql())
+ $generator.parse($fnamekeys,$outFile,"tablefk",$tbl)
#end
+ #end
#end
1.3 +3 -3
jakarta-turbine-2/conf/torque/templates/sql/db-init/mysql/unix.vm
Index: unix.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/conf/torque/templates/sql/db-init/mysql/unix.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unix.vm 2001/09/25 19:32:16 1.2
+++ unix.vm 2001/10/10 14:01:25 1.3
@@ -18,7 +18,7 @@
#set ($host = "")
#end
-#foreach ($databaseModel in $appData.Databases)
-mysqladmin $user $password $host --force drop $databaseModel.Name
-mysqladmin $user $password $host --force create $databaseModel.Name
+#foreach ($databaseName in $databaseNames)
+mysqladmin $user $password $host --force drop $databaseName
+mysqladmin $user $password $host --force create $databaseName
#end
1.3 +5 -3
jakarta-turbine-2/conf/torque/templates/sql/db-init/mysql/windows.vm
Index: windows.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/conf/torque/templates/sql/db-init/mysql/windows.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- windows.vm 2001/09/25 19:32:16 1.2
+++ windows.vm 2001/10/10 14:01:25 1.3
@@ -19,7 +19,9 @@
#set ($host = "")
#end
-#foreach ($databaseModel in $appData.Databases)
-mysqladmin $user $password $host --force drop $databaseModel.Name
-mysqladmin $user $password $host --force create $databaseModel.Name
+#foreach ($dataModel in $dataModels)
+#foreach ($database in $dataModel.databases)
+mysqladmin $user $password $host --force drop $database.name
+mysqladmin $user $password $host --force create $database.name
+#end
#end
1.3 +3 -3
jakarta-turbine-2/conf/torque/templates/sql/db-init/postgresql/unix.vm
Index: unix.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/conf/torque/templates/sql/db-init/postgresql/unix.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unix.vm 2001/09/25 19:32:16 1.2
+++ unix.vm 2001/10/10 14:01:25 1.3
@@ -1,6 +1,6 @@
#!/bin/sh
-#foreach ($databaseModel in $appData.Databases)
-dropdb $databaseModel.Name
-createdb $databaseModel.Name
+#foreach ($databaseName in $databaseNames)
+dropdb $databaseName
+createdb $databaseName
#end
1.5 +4 -13 jakarta-turbine-2/conf/torque/templates/sql/id-table/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/torque/templates/sql/id-table/Control.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Control.vm 2001/09/26 22:27:15 1.4
+++ Control.vm 2001/10/10 14:01:25 1.5
@@ -1,15 +1,6 @@
#set ( $fname = "sql/id-table/idtable.$targetDatabase" )
-
-#foreach ($databaseModel in $appData.Databases)
- #if ($project)
- #if ($appData.MultipleDatabases)
- #set ( $outFile = "${project}-${databaseModel.Name}-id-table-init.sql" )
- #else
- #set ( $outFile = "${project}-id-table-init.sql" )
- #end
- #else
- #set ( $outFile = "" )
- #end
-
-$generator.parse($fname,$outFile,"tables",$databaseModel.Tables)
+#foreach ($dataModel in $dataModels)
+#set ( $outFile = "${dataModel.name}-idtable-init.sql" )
+$generator.parse($fname,"$outFile","tables",$dataModel.database.tables)
+#set ( $initialID = $initialID + 10 )
#end
1.2 +0 -2 jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.db2
Index: idtable.db2
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.db2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.db2 2001/08/16 05:07:01 1.1
+++ idtable.db2 2001/10/10 14:01:25 1.2
@@ -1,5 +1,3 @@
-delete from ID_TABLE where id_table_id >= $initialID;
-
#foreach ($tbl in $tables)
insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
#set ( $initialID = $initialID + 1 )
1.2 +0 -2
jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.hypersonic
Index: idtable.hypersonic
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.hypersonic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.hypersonic 2001/08/16 05:07:01 1.1
+++ idtable.hypersonic 2001/10/10 14:01:25 1.2
@@ -1,5 +1,3 @@
-delete from ID_TABLE where id_table_id >= $initialID;
-
#foreach ($tbl in $tables)
insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
#set ( $initialID = $initialID + 1 )
1.2 +0 -2
jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.interbase
Index: idtable.interbase
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.interbase,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.interbase 2001/08/16 05:07:01 1.1
+++ idtable.interbase 2001/10/10 14:01:25 1.2
@@ -1,5 +1,3 @@
-delete from ID_TABLE where id_table_id >= $initialID;
-
#foreach ($tbl in $tables)
insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
#set ( $initialID = $initialID + 1 )
1.2 +0 -1
jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.mssql
Index: idtable.mssql
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.mssql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.mssql 2001/08/16 05:07:01 1.1
+++ idtable.mssql 2001/10/10 14:01:25 1.2
@@ -1,4 +1,3 @@
-delete from ID_TABLE where id_table_id >= $initialID;
#foreach ($tbl in $tables)
insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
#set ( $initialID = $initialID + 1 )
1.2 +0 -2
jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.mysql
Index: idtable.mysql
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.mysql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.mysql 2001/08/16 05:07:01 1.1
+++ idtable.mysql 2001/10/10 14:01:25 1.2
@@ -1,5 +1,3 @@
-delete from ID_TABLE where id_table_id >= $initialID;
-
#foreach ($tbl in $tables)
insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
#set ( $initialID = $initialID + 1 )
1.2 +0 -2
jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.oracle
Index: idtable.oracle
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.oracle,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.oracle 2001/08/16 05:07:01 1.1
+++ idtable.oracle 2001/10/10 14:01:25 1.2
@@ -1,5 +1,3 @@
-delete from ID_TABLE where id_table_id >= $initialID;
-
#foreach ($tbl in $tables)
insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
#set ( $initialID = $initialID + 1 )
1.2 +0 -2
jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.postgresql
Index: idtable.postgresql
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.postgresql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.postgresql 2001/08/16 05:07:01 1.1
+++ idtable.postgresql 2001/10/10 14:01:25 1.2
@@ -1,5 +1,3 @@
-delete from ID_TABLE where id_table_id >= $initialID;
-
#foreach ($tbl in $tables)
insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
#set ( $initialID = $initialID + 1 )
1.2 +0 -2
jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.sapdb
Index: idtable.sapdb
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.sapdb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.sapdb 2001/08/16 05:07:01 1.1
+++ idtable.sapdb 2001/10/10 14:01:25 1.2
@@ -1,5 +1,3 @@
-delete from ID_TABLE where id_table_id >= $initialID;
-
#foreach ($tbl in $tables)
insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
#set ( $initialID = $initialID + 1 )
1.2 +0 -1
jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.sybase
Index: idtable.sybase
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/conf/torque/templates/sql/id-table/idtable.sybase,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idtable.sybase 2001/08/16 05:07:01 1.1
+++ idtable.sybase 2001/10/10 14:01:25 1.2
@@ -1,4 +1,3 @@
-delete from ID_TABLE where ID_TABLE_ID >= $initialID;
#foreach ($tbl in $tables)
insert into ID_TABLE (ID_TABLE_ID, TABLE_NAME, NEXT_ID, QUANTITY) VALUES
($initialID, '$tbl.Name', 100, 10);
#set ( $initialID = $initialID + 1 )
1.2 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java
Index: TurbineXmlRpcService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineXmlRpcService.java 2001/08/16 05:09:27 1.1
+++ TurbineXmlRpcService.java 2001/10/10 14:01:25 1.2
@@ -100,7 +100,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: TurbineXmlRpcService.java,v 1.1 2001/08/16 05:09:27 jvanzyl Exp $
+ * @version $Id: TurbineXmlRpcService.java,v 1.2 2001/10/10 14:01:25 jvanzyl Exp $
*/
public class TurbineXmlRpcService
extends TurbineBaseService
@@ -148,7 +148,7 @@
{
String option = (String) i.next();
String value = secureServerOptions.getString(option);
-
+
Log.debug("JSSE option: " + option + " => " + value);
System.setProperty(option, value);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
