mpoeschl 2003/10/30 11:53:38
Modified: src/generator/src/templates/ojb/model Control.vm
src/generator/src/templates/ojb/repository Repository.vm
MainRepository.vm Control.vm
Log:
fix ojb tasks (missed them when i removed AppData)
Revision Changes Path
1.6 +1 -3 db-torque/src/generator/src/templates/ojb/model/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/templates/ojb/model/Control.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Control.vm 11 Sep 2003 06:42:13 -0000 1.5
+++ Control.vm 30 Oct 2003 19:53:38 -0000 1.6
@@ -1,7 +1,6 @@
#set ($basePath = $generator.OutputPath)
-#foreach ($dataModel in $dataModels)
- #foreach ($database in $dataModel.Databases)
+#foreach ($database in $dataModels)
#if ($database.Package)
#set ($package = $database.Package)
@@ -38,5 +37,4 @@
$generator.parse("ojb/model/BaseManager.vm",$path,"table",$tbl)
#end
#end
- #end
#end
1.5 +0 -1
db-torque/src/generator/src/templates/ojb/repository/Repository.vm
Index: Repository.vm
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/ojb/repository/Repository.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Repository.vm 2 Jul 2003 22:04:52 -0000 1.4
+++ Repository.vm 30 Oct 2003 19:53:38 -0000 1.5
@@ -1,4 +1,3 @@
-#set ( $database = $dataModel.database )
#set ( $unknownTorqueTypes = [ 'NULL', 'OTHER', 'JAVA_OBJECT', 'DISTINCT',
'STRUCT', 'ARRAY', 'REF', 'BOOLEANINT', 'BOOLEANCHAR' ] )
#set ( $mappedJdbcTypes = ['INTEGER', 'BLOB', 'BLOB', 'BLOB', 'BLOB', 'BLOB',
'BLOB', 'INTEGER', 'CHAR' ] )
#set ( $fieldsWithNoSize = ['INTEGER', 'BLOB', 'CLOB', 'DATE', 'TIME', 'TIMESTAMP',
'BINARY', 'BIGINT', 'SMALLINT', 'TINYINT' ] )
1.7 +2 -2
db-torque/src/generator/src/templates/ojb/repository/MainRepository.vm
Index: MainRepository.vm
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/ojb/repository/MainRepository.vm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MainRepository.vm 9 Jul 2003 06:29:31 -0000 1.6
+++ MainRepository.vm 30 Oct 2003 19:53:38 -0000 1.7
@@ -12,7 +12,7 @@
[
<!ENTITY internal SYSTEM "repository_internal.xml">
#foreach ($dataModel in $dataModels)
-<!ENTITY $dataModel.shortName SYSTEM "repository_${dataModel.shortName}.xml">
+<!ENTITY $dataModel.shortName SYSTEM "repository_${dataModel.Name}.xml">
#end
]>
@@ -49,7 +49,7 @@
<!-- include mappings here -->
#foreach ($dataModel in $dataModels)
- &${dataModel.shortName};
+ &${dataModel.Name};
#end
</descriptor-repository>
1.3 +5 -5 db-torque/src/generator/src/templates/ojb/repository/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/templates/ojb/repository/Control.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Control.vm 26 Jun 2003 17:36:40 -0000 1.2
+++ Control.vm 30 Oct 2003 19:53:38 -0000 1.3
@@ -2,18 +2,18 @@
#set ( $rname = "ojb/repository/Repository.vm" )
#set ( $basepath = $generator.OutputPath)
-#foreach ($dataModel in $dataModels)
+#foreach ($database in $dataModels)
#if($velocityCount==1)
-
$generator.parse("ojb/repository/MainRepository.vm","repository.xml","dataModel",$dataModel)
+
$generator.parse("ojb/repository/MainRepository.vm","repository.xml","database",$database)
#end
#end
-#foreach ($dataModel in $dataModels)
+#foreach ($database in $dataModels)
#if ($project)
- #set ( $outFile = "repository_${dataModel.shortName}.xml" )
+ #set ( $outFile = "repository_${database.Name}.xml" )
#set ( $modelCount = $velocityCount )
File to be created: $outFile
- $generator.parse($rname,$outFile,"dataModel",$dataModel)
+ $generator.parse($rname,$outFile,"database",$database)
#end
#end
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
