[prev in list] [next in list] [prev in thread] [next in thread]
List: turbine-torque-dev
Subject: cvs commit: jakarta-turbine-torque/src/templates/ojb/model ExtensionInterface.vm ExtensionObject.vm
From: stephenh () apache ! org
Date: 2002-09-30 4:50:12
[Download RAW message or body]
stephenh 2002/09/29 21:50:12
Modified: src/templates/ojb/model Control.vm Object.vm
Added: src/templates/ojb/model ExtensionInterface.vm
ExtensionObject.vm ExtensionProxyInterface.vm
Interface.vm ProxyInterface.vm
Log:
Another round of OJB modifications by Markus M. May <mmay@javafreedom.org>.
Added Base/Extension classes as per the om stuff, plus Interface and ProxyInterface \
generate classes.
Revision Changes Path
1.2 +38 -2 jakarta-turbine-torque/src/templates/ojb/model/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/ojb/model/Control.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Control.vm 11 Apr 2002 17:10:40 -0000 1.1
+++ Control.vm 30 Sep 2002 04:50:11 -0000 1.2
@@ -1,4 +1,4 @@
-#set ( $basepath = $generator.OutputPath)
+#set ( $basePath = ${generator.OutputPath} )
#foreach ($dataModel in $dataModels)
#foreach ($database in $dataModel.Databases)
@@ -15,10 +15,46 @@
#foreach ($tbl in $database.Tables)
$tbl.Name
#set ( $firstcap=$tbl.JavaName )
+
#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)
+
+ #if ( $ojbUseProxy == true )
+
+ #set ( $fname = "${firstcap}ProxyInterface.java" )
+ #set ( $path = "${strings.getPackageAsPath($package)}$fname" )
+ #if (!$files.file($basePath,$path).exists())
+ $generator.parse("ojb/model/ExtensionProxyInterface.vm",$path,"table",$tbl)
+ #end
+
+ #set ( $fname = "${basePrefix}${firstcap}ProxyInterface.java" )
+ #set ( $path = "${strings.getPackageAsPath($package)}$fname" )
+ $generator.parse("ojb/model/ProxyInterface.vm",$path,"table",$tbl)
+
+ #end
+
+ #if ($ojbUseInterface == true )
+
+ #set ( $fname = "${firstcap}Interface.java" )
+ #set ( $path = "${strings.getPackageAsPath($package)}$fname" )
+ #if (!$files.file($basePath,$path).exists())
+ $generator.parse("ojb/model/ExtensionInterface.vm",$path,"table",$tbl)
+ #end
+
+ #set ( $fname = "${basePrefix}${firstcap}Interface.java" )
+ #set ( $path = "${strings.getPackageAsPath($package)}$fname" )
+ $generator.parse("ojb/model/Interface.vm",$path,"table",$tbl)
+
+ #end
#end
#end
-#end
+#end
\ No newline at end of file
1.8 +18 -8 jakarta-turbine-torque/src/templates/ojb/model/Object.vm
Index: Object.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/ojb/model/Object.vm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Object.vm 27 Sep 2002 22:03:39 -0000 1.7
+++ Object.vm 30 Sep 2002 04:50:11 -0000 1.8
@@ -12,15 +12,23 @@
#set ($extendsBaseClass = "" )
#end
-#if ($table.Interface)
- #set ($interface = "Serializable, $table.Interface" )
+ #if ($table.Interface)
+ #if ($ojbUseInterface == true)
+ #set ($interface = "Serializable, ${basePrefix}${table.JavaName}Interface, \
$table.Interface" ) + #else
+ #set ($interface = "Serializable, $table.Interface" )
+ #end
#else
- #set ($interface = "Serializable" )
-#end
+ #if ($ojbUseInterface == true)
+ #set ($interface = "Serializable, ${basePrefix}${table.JavaName}Interface" )
+ #else
+ #set ($interface = "Serializable" )
+ #end
+ #end
import java.io.Serializable;
import java.util.Date;
-
+import java.math.BigDecimal;
/**
#if ($addTimeStamp)
@@ -29,8 +37,10 @@
* [$now]
*
#end
+ * You should not use this class directly. It should not even be
+ * extended all references should be to $table.JavaName
*/
-public class $table.JavaName $extendsBaseClass
+public class ${basePrefix}${table.JavaName} $extendsBaseClass
implements $interface
{
@@ -40,10 +50,10 @@
#set ( $defaultValue = "null" )
#if ( $cjtype == "boolean")
#set ( $defaultValue = "false" )
- #elseif ($cjtype == "int" || $cjtype == "short" || $cjtype == "long" || \
$cjtype == "float" || $cjtype == "double") + #elseif ($cjtype == "int")
#set ( $defaultValue = "0" )
#end
- protected $cjtype $clo = $defaultValue;
+ private $cjtype $clo = $defaultValue;
#end
#foreach ($col in $table.Columns)
1.1 \
jakarta-turbine-torque/src/templates/ojb/model/ExtensionInterface.vm
Index: ExtensionInterface.vm
===================================================================
#set ($interface = "")
#if ($table.Interface)
#set ($interface = ", $table.Interface")
#end
#set ($db = $table.Database)
#if ($db.Package)
#set ($package = $db.Package)
#else
#set ($package = $targetPackage)
#end
package $package;
#if ($table.isAbstract())
#set ($abstract = "abstract")
#end
/**
#if ($addTimeStamp)
* The skeleton for this interface was autogenerated by Torque on:
*
* [$now]
*
#end
* You should add additional methods to this interface to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*/
public interface ${table.JavaName}Interface
extends ${basePrefix}${table.JavaName}Interface
{
}
1.1 \
jakarta-turbine-torque/src/templates/ojb/model/ExtensionObject.vm
Index: ExtensionObject.vm
===================================================================
#set ($interface = "")
#if ($table.Interface)
#set ($interface = ", $table.Interface")
#end
#set ($db = $table.Database)
#if ($db.Package)
#set ($package = $db.Package)
#else
#set ($package = $targetPackage)
#end
package $package;
#if ($table.isAbstract())
#set ($abstract = "abstract")
#end
import org.apache.torque.om.Persistent;
/**
#if ($addTimeStamp)
* The skeleton for this class was autogenerated by Torque on:
*
* [$now]
*
#end
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*/
public $!abstract class $table.JavaName
extends $basePrefix$table.JavaName
implements ${table.JavaName}Interface
{
}
1.1 \
jakarta-turbine-torque/src/templates/ojb/model/ExtensionProxyInterface.vm
Index: ExtensionProxyInterface.vm
===================================================================
#set ($interface = "")
#if ($table.Interface)
#set ($interface = ", $table.Interface")
#end
#set ($db = $table.Database)
#if ($db.Package)
#set ($package = $db.Package)
#else
#set ($package = $targetPackage)
#end
package $package;
/**
#if ($addTimeStamp)
* The skeleton for this interface was autogenerated by Torque on:
*
* [$now]
*
#end
* You should add additional methods to this interface to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*/
public interface ${table.JavaName}ProxyInterface
extends ${basePrefix}${table.JavaName}ProxyInterface
{
}
1.1 jakarta-turbine-torque/src/templates/ojb/model/Interface.vm
Index: Interface.vm
===================================================================
#set ($db = $table.Database)
#if ($db.Package)
#set ($package = $db.Package)
#else
#set ($package = $targetPackage)
#end
package ${package};
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
/**
#if ($addTimeStamp)
* This interface was autogenerated by Torque on:
*
* [$now]
*
#end
* You should not use this interface directly. It should not even be
* extended all references should be to ${table.JavaName}Interface
*/
public interface ${basePrefix}${table.JavaName}Interface extends Serializable
{
#foreach ($col in $table.Columns)
#set ( $cfc=$col.JavaName )
#set ( $cfc=$cfc.replaceFirst(".", $cfc.substring(0,1).toUpperCase()) )
#set ( $clo=$col.Name.toLowerCase() )
#set ( $cjtype = $col.JavaPrimitive )
/**
* Get the $cfc
* @return $cjtype
*/
public $cjtype get${cfc}();
/**
* Set the value of $cfc
*/
public void set${cfc}($cjtype v );
#end
}
1.1 \
jakarta-turbine-torque/src/templates/ojb/model/ProxyInterface.vm
Index: ProxyInterface.vm
===================================================================
#set ($db = $table.Database)
#if ($db.Package)
#set ($package = $db.Package)
#else
#set ($package = $targetPackage)
#end
package ${package};
import java.io.Serializable;
import java.util.Date;
/**
#if ($addTimeStamp)
* This interface was autogenerated by Torque on:
*
* [$now]
*
#end
* You should not use this proxy interface directly. It should
* not even be extended all references should be to
* ${table.JavaName}ProxyInterface
*/
public interface ${basePrefix}${table.JavaName}ProxyInterface extends Serializable
{
#foreach ($col in $table.PrimaryKey)
#set ( $cfc=$col.JavaName )
#set ( $cfc=$cfc.replaceFirst(".", $cfc.substring(0,1).toUpperCase()) )
#set ( $clo=$col.Name.toLowerCase() )
#set ( $cjtype = $col.JavaPrimitive )
/**
* Get the $cfc
* @return $cjtype
*/
public $cjtype get${cfc}();
#end
}
--
To unsubscribe, e-mail: <mailto:turbine-torque-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-torque-dev-help@jakarta.apache.org>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic