Sorry! From 2.1 branch, I'm so used to working there that
I didn't even pause to think whether I should patch HEAD...
I offer my help in anything that might be needed to properly
apply this patch.
--
Gonzalo A. Diethelm
[EMAIL PROTECTED]
> -----Original Message-----
> From: Jason van Zyl [mailto:[EMAIL PROTECTED]]
> Sent: Tuesday, July 10, 2001 7:08 PM
> To: [EMAIL PROTECTED]
> Subject: Re: cvs commit: jakarta-turbine/conf/torque/templates/om
> ExtensionObject.vm ExtensionPeer.vm MapBuilder.vm MultiExtendObject.vm
> Object.vm Peer.vm
>
>
> On 7/10/01 6:44 PM, "[EMAIL PROTECTED]" <[EMAIL PROTECTED]> wrote:
>
> Did you start with templates from HEAD or from the 2.1 branch?
>
> > gonzalo 01/07/10 15:44:39
> >
> > Modified: conf/torque Tag: T_2_1_BRANCH build.properties
> > conf/torque/templates/om Tag: T_2_1_BRANCH
> > ExtensionObject.vm ExtensionPeer.vm
> MapBuilder.vm
> > MultiExtendObject.vm Object.vm Peer.vm
> > Log:
> > Added a configuration parameter to torque, addTimeStamp, that allows
> > the user to generate files without a timestamp. Default is true,
> > timestamps will be generated.
> >
> > Revision Changes Path
> > No revision
> >
> >
> > No revision
> >
> >
> > 1.2.2.3 +3 -0 jakarta-turbine/conf/torque/build.properties
> >
> > Index: build.properties
> > ===================================================================
> > RCS file: /home/cvs/jakarta-turbine/conf/torque/build.properties,v
> > retrieving revision 1.2.2.2
> > retrieving revision 1.2.2.3
> > diff -u -r1.2.2.2 -r1.2.2.3
> > --- build.properties 2001/06/01 01:32:56 1.2.2.2
> > +++ build.properties 2001/07/10 22:44:21 1.2.2.3
> > @@ -58,6 +58,8 @@
> > # object
> > # set objectModelType=complex to generate an om with collection
> > # support, (not tested - please help to debug)
> > +# set addTimeStamp to false to not include time stamps in
> > +# generated files
> > #
> -------------------------------------------------------------------
> >
> > targetPackage=org.apache.turbine
> > @@ -65,6 +67,7 @@
> > addGetByNameMethod=true
> > complexObjectModel=true
> > basePrefix=Base
> > +addTimeStamp=true
> >
> > #
> -------------------------------------------------------------------
> > #
> >
> >
> >
> > No revision
> >
> >
> > No revision
> >
> >
> > 1.9.4.2 +2 -0
> > jakarta-turbine/conf/torque/templates/om/ExtensionObject.vm
> >
> > Index: ExtensionObject.vm
> > ===================================================================
> > RCS file:
> >
> /home/cvs/jakarta-turbine/conf/torque/templates/om/ExtensionOb
> ject.vm,v
> > retrieving revision 1.9.4.1
> > retrieving revision 1.9.4.2
> > diff -u -r1.9.4.1 -r1.9.4.2
> > --- ExtensionObject.vm 2001/05/14 07:40:10 1.9.4.1
> > +++ ExtensionObject.vm 2001/07/10 22:44:25 1.9.4.2
> > @@ -26,10 +26,12 @@
> > import org.apache.turbine.util.db.pool.DBConnection;
> >
> > /**
> > +#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.
> >
> >
> >
> > 1.7.4.1 +2 -0
> jakarta-turbine/conf/torque/templates/om/ExtensionPeer.vm
> >
> > Index: ExtensionPeer.vm
> > ===================================================================
> > RCS file:
> >
> /home/cvs/jakarta-turbine/conf/torque/templates/om/ExtensionPeer.vm,v
> > retrieving revision 1.7
> > retrieving revision 1.7.4.1
> > diff -u -r1.7 -r1.7.4.1
> > --- ExtensionPeer.vm 2001/03/25 23:08:54 1.7
> > +++ ExtensionPeer.vm 2001/07/10 22:44:26 1.7.4.1
> > @@ -23,10 +23,12 @@
> > import ${package}.map.*;
> >
> > /**
> > +#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.
> >
> >
> >
> > 1.19.4.2 +2 -0
> jakarta-turbine/conf/torque/templates/om/MapBuilder.vm
> >
> > Index: MapBuilder.vm
> > ===================================================================
> > RCS file:
> /home/cvs/jakarta-turbine/conf/torque/templates/om/MapBuilder.vm,v
> > retrieving revision 1.19.4.1
> > retrieving revision 1.19.4.2
> > diff -u -r1.19.4.1 -r1.19.4.2
> > --- MapBuilder.vm 2001/05/20 15:57:01 1.19.4.1
> > +++ MapBuilder.vm 2001/07/10 22:44:27 1.19.4.2
> > @@ -12,10 +12,12 @@
> > import org.apache.turbine.util.db.map.TableMap;
> >
> > /**
> > +#if ($addTimeStamp)
> > * This class was autogenerated by Torque on:
> > *
> > * [$now]
> > *
> > +#end
> > */
> > public class ${table.JavaName}MapBuilder implements MapBuilder
> > {
> >
> >
> >
> > 1.5.4.1 +2 -0
> > jakarta-turbine/conf/torque/templates/om/MultiExtendObject.vm
> >
> > Index: MultiExtendObject.vm
> > ===================================================================
> > RCS file:
> >
> /home/cvs/jakarta-turbine/conf/torque/templates/om/MultiExtend
> Object.vm,v
> > retrieving revision 1.5
> > retrieving revision 1.5.4.1
> > diff -u -r1.5 -r1.5.4.1
> > --- MultiExtendObject.vm 2001/03/25 23:08:54 1.5
> > +++ MultiExtendObject.vm 2001/07/10 22:44:28 1.5.4.1
> > @@ -29,10 +29,12 @@
> > #end
> >
> > /**
> > +#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.
> >
> >
> >
> > 1.53.4.5 +2 -0
> jakarta-turbine/conf/torque/templates/om/Object.vm
> >
> > Index: Object.vm
> > ===================================================================
> > RCS file:
> /home/cvs/jakarta-turbine/conf/torque/templates/om/Object.vm,v
> > retrieving revision 1.53.4.4
> > retrieving revision 1.53.4.5
> > diff -u -r1.53.4.4 -r1.53.4.5
> > --- Object.vm 2001/06/04 23:53:04 1.53.4.4
> > +++ Object.vm 2001/07/10 22:44:29 1.53.4.5
> > @@ -32,10 +32,12 @@
> > #end
> >
> > /**
> > +#if ($addTimeStamp)
> > * This class was autogenerated by Torque on:
> > *
> > * [$now]
> > *
> > +#end
> > * You should not use this class directly. It should not even be
> > * extended all references should be to $table.JavaName
> > */
> >
> >
> >
> > 1.53.4.5 +2 -0
> jakarta-turbine/conf/torque/templates/om/Peer.vm
> >
> > Index: Peer.vm
> > ===================================================================
> > RCS file:
> /home/cvs/jakarta-turbine/conf/torque/templates/om/Peer.vm,v
> > retrieving revision 1.53.4.4
> > retrieving revision 1.53.4.5
> > diff -u -r1.53.4.4 -r1.53.4.5
> > --- Peer.vm 2001/06/04 23:53:04 1.53.4.4
> > +++ Peer.vm 2001/07/10 22:44:30 1.53.4.5
> > @@ -27,10 +27,12 @@
> > import ${package}.map.*;
> >
> > /**
> > +#if ($addTimeStamp)
> > * This class was autogenerated by Torque on:
> > *
> > * [$now]
> > *
> > +#end
> > */
> > public abstract class $basePrefix${table.JavaName}Peer
> > extends $table.BasePeer
> >
> >
> >
> >
> >
> ---------------------------------------------------------------------
> > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > For additional commands, e-mail: [EMAIL PROTECTED]
>
> --
>
> jvz.
>
> Jason van Zyl
>
> http://tambora.zenplex.org
> http://jakarta.apache.org/turbine
> http://jakarta.apache.org/velocity
> http://jakarta.apache.org/alexandria
> http://jakarta.apache.org/commons
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
