You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by mp...@apache.org on 2002/12/29 19:18:14 UTC
cvs commit: jakarta-turbine-torque/src/templates/ojb/model ExtensionInterface.vm ExtensionObject.vm ExtensionProxyInterface.vm Interface.vm Object.vm ProxyInterface.vm
mpoeschl 2002/12/29 10:18:14
Modified: src/templates/ojb/model ExtensionInterface.vm
ExtensionObject.vm ExtensionProxyInterface.vm
Interface.vm Object.vm ProxyInterface.vm
Log:
handling of package names is done by the model
Revision Changes Path
1.2 +1 -7 jakarta-turbine-torque/src/templates/ojb/model/ExtensionInterface.vm
Index: ExtensionInterface.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/ojb/model/ExtensionInterface.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtensionInterface.vm 30 Sep 2002 04:50:11 -0000 1.1
+++ ExtensionInterface.vm 29 Dec 2002 18:18:14 -0000 1.2
@@ -3,19 +3,13 @@
#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:
*
1.2 +3 -9 jakarta-turbine-torque/src/templates/ojb/model/ExtensionObject.vm
Index: ExtensionObject.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/ojb/model/ExtensionObject.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtensionObject.vm 30 Sep 2002 04:50:11 -0000 1.1
+++ ExtensionObject.vm 29 Dec 2002 18:18:14 -0000 1.2
@@ -3,12 +3,6 @@
#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())
@@ -16,8 +10,8 @@
#end
import org.apache.torque.om.Persistent;
-
-/**
+
+/**
#if ($addTimeStamp)
* The skeleton for this class was autogenerated by Torque on:
*
@@ -28,7 +22,7 @@
* 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
+public $!abstract class $table.JavaName
extends $basePrefix$table.JavaName
implements ${table.JavaName}Interface
{
1.2 +1 -7 jakarta-turbine-torque/src/templates/ojb/model/ExtensionProxyInterface.vm
Index: ExtensionProxyInterface.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/ojb/model/ExtensionProxyInterface.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtensionProxyInterface.vm 30 Sep 2002 04:50:11 -0000 1.1
+++ ExtensionProxyInterface.vm 29 Dec 2002 18:18:14 -0000 1.2
@@ -3,16 +3,10 @@
#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:
*
1.2 +3 -9 jakarta-turbine-torque/src/templates/ojb/model/Interface.vm
Index: Interface.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/ojb/model/Interface.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Interface.vm 30 Sep 2002 04:50:11 -0000 1.1
+++ Interface.vm 29 Dec 2002 18:18:14 -0000 1.2
@@ -1,16 +1,10 @@
-#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:
*
@@ -34,12 +28,12 @@
* @return $cjtype
*/
public $cjtype get${cfc}();
-
+
/**
* Set the value of $cfc
*/
public void set${cfc}($cjtype v );
-
+
#end
}
1.9 +4 -10 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Object.vm 30 Sep 2002 04:50:11 -0000 1.8
+++ Object.vm 29 Dec 2002 18:18:14 -0000 1.9
@@ -1,9 +1,3 @@
-#set ($db = $table.Database)
-#if ($db.Package)
- #set ($package = $db.Package)
-#else
- #set ($package = $targetPackage)
-#end
package ${package};
#if ($table.BaseClass)
@@ -17,20 +11,20 @@
#set ($interface = "Serializable, ${basePrefix}${table.JavaName}Interface, $table.Interface" )
#else
#set ($interface = "Serializable, $table.Interface" )
- #end
+ #end
#else
- #if ($ojbUseInterface == true)
+ #if ($ojbUseInterface == true)
#set ($interface = "Serializable, ${basePrefix}${table.JavaName}Interface" )
#else
#set ($interface = "Serializable" )
- #end
+ #end
#end
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
-/**
+/**
#if ($addTimeStamp)
* This class was autogenerated by Torque on:
*
1.2 +3 -9 jakarta-turbine-torque/src/templates/ojb/model/ProxyInterface.vm
Index: ProxyInterface.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/ojb/model/ProxyInterface.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProxyInterface.vm 30 Sep 2002 04:50:11 -0000 1.1
+++ ProxyInterface.vm 29 Dec 2002 18:18:14 -0000 1.2
@@ -1,23 +1,17 @@
-#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
+ * 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