cvs commit: db-torque/xdocs changes.xml

[mpoeschl]

mpoeschl    2003/09/08 15:01:50

  Modified:    src/generator/src/templates/ojb/model Object.vm Control.vm
               xdocs    changes.xml
  Added:       src/generator/src/templates/ojb/model ExtensionObject.vm
  Log:
  Changed ojb-model task to generate Object + BaseObject (like for the torque om)
  
  Revision  Changes    Path
  1.4       +1 -1      db-torque/src/generator/src/templates/ojb/model/Object.vm
  
  Index: Object.vm
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/templates/ojb/model/Object.vm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Object.vm 28 Jun 2003 17:51:40 -0000      1.3
  +++ Object.vm 8 Sep 2003 22:01:50 -0000       1.4
  @@ -19,7 +19,7 @@
    *
   #end
    */
  -public class ${table.JavaName}
  +public class ${basePrefix}${table.JavaName}
   {
     #foreach ($col in $table.Columns)
       private $col.JavaPrimitive $col.UncapitalisedJavaName;
  
  
  
  1.4       +6 -0      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Control.vm        28 Jun 2003 17:51:40 -0000      1.3
  +++ Control.vm        8 Sep 2003 22:01:50 -0000       1.4
  @@ -19,6 +19,12 @@
   
           #set ( $fname = "${firstcap}.java" )
           #set ( $path = "${strings.getPackageAsPath($package)}$fname" )
  +        #if (!$files.file($basePath,$path).exists())
  +          $generator.parse("ojb/model/ExtensionObject.vm",$path,"table",$tbl)
  +        #end
  +
  +        #set ( $fname = "${basePrefix}${firstcap}.java" )
  +        #set ( $path = "${strings.getPackageAsPath($package)}$fname" )
           $generator.parse("ojb/model/Object.vm",$path,"table",$tbl)
         #end
       #end
  
  
  
  1.3       +26 -29    
db-torque/src/generator/src/templates/ojb/model/ExtensionObject.vm
  
  
  
  
  1.110     +6 -0      db-torque/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -r1.109 -r1.110
  --- changes.xml       5 Sep 2003 22:41:41 -0000       1.109
  +++ changes.xml       8 Sep 2003 22:01:50 -0000       1.110
  @@ -9,6 +9,12 @@
   
       <release version="3.2-alpha" date="in CVS">
   
  +      <action dev='mpoeschl' type='add'>
  +        Changed ojb-model task to generate Object + BaseObject (like for the torque 
om).
  +      </action>
  +      <action dev='mpoeschl' type='add'>
  +        Fix package name for TorqueComponent in roleConfiguration.xml
  +      </action>
         <action dev='mpoeschl' type='remove'>
           Removed PasePeer.DEFAULT_MAP_BUILDER and BasePeer.getMapBuilder()
         </action>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]