db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1364080 - in /db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om: outlets/bean.xml outlets/dbObject.xml templates/bean/base/baseBean.vm templates/dbObject/base/imports.vm
Date Sat, 21 Jul 2012 13:16:20 GMT
Author: tfischer
Date: Sat Jul 21 13:16:20 2012
New Revision: 1364080

URL: http://svn.apache.org/viewvc?rev=1364080&view=rev
Log:
TORQUE-217 Fix bean generation

Modified:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/bean.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/dbObject.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/imports.vm

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/bean.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/bean.xml?rev=1364080&r1=1364079&r2=1364080&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/bean.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/bean.xml
Sat Jul 21 13:16:20 2012
@@ -60,6 +60,18 @@
           element="referencing-foreign-keys/foreign-key/foreign-field-in-bean"
           outlet="torque.om.bean.base.getterSetterReferencingObject"/>
     </mergepoint>
+    <mergepoint name="getCurrentDate">
+      <action xsi:type="applyAction"
+          outlet="torque.om.dbObject.base.getCurrentDate"/>
+    </mergepoint>
+    <mergepoint name="getCurrentTime">
+      <action xsi:type="applyAction"
+          outlet="torque.om.dbObject.base.getCurrentTime"/>
+    </mergepoint>
+    <mergepoint name="getCurrentTimestamp">
+      <action xsi:type="applyAction"
+          outlet="torque.om.dbObject.base.getCurrentTimestamp"/>
+    </mergepoint>
     <mergepoint name="extensions"/>
   </outlet>
 

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/dbObject.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/dbObject.xml?rev=1364080&r1=1364079&r2=1364080&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/dbObject.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/dbObject.xml
Sat Jul 21 13:16:20 2012
@@ -44,9 +44,6 @@
     <mergepoint name="imports">
       <action xsi:type="applyAction" outlet="torque.om.dbObject.base.imports"/>
     </mergepoint>
-    <mergepoint name="objectBeanImports">
-      <action xsi:type="applyAction" outlet="torque.om.dbObject.base.objectBeanImports"/>
-    </mergepoint>
     <mergepoint name="classJavadoc">
       <action xsi:type="applyAction" outlet="torque.om.dbObject.base.classJavadoc"/>
     </mergepoint>
@@ -250,14 +247,17 @@
     <mergepoint name="extensions"/>
   </outlet>
 
-  <outlet name="torque.om.dbObject.base.objectBeanImports"
+  <outlet name="torque.om.dbObject.base.imports"
       xsi:type="velocityOutlet"
-      path="dbObject/base/bean/objectBeanImports.vm">
+      path="dbObject/base/imports.vm">
+    <mergepoint name="objectBeanImports">
+      <action xsi:type="applyAction" outlet="torque.om.dbObject.base.objectBeanImports"/>
+    </mergepoint>
   </outlet>
 
-  <outlet name="torque.om.dbObject.base.imports"
+  <outlet name="torque.om.dbObject.base.objectBeanImports"
       xsi:type="velocityOutlet"
-      path="dbObject/base/imports.vm">
+      path="dbObject/base/bean/objectBeanImports.vm">
   </outlet>
 
   <outlet name="torque.om.dbObject.base.classJavadoc"

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm?rev=1364080&r1=1364079&r2=1364080&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm
Sat Jul 21 13:16:20 2012
@@ -31,6 +31,7 @@ import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.List;
 
 import org.apache.commons.lang.ObjectUtils;
@@ -128,4 +129,7 @@ $torqueGen.mergepoint("gettersSetters")
 $torqueGen.mergepoint("gettersSettersReferencedObjects")
 $torqueGen.mergepoint("gettersSettersReferencingObjects")
 #end
+$torqueGen.mergepoint("getCurrentDate")##
+$torqueGen.mergepoint("getCurrentTime")##
+$torqueGen.mergepoint("getCurrentTimestamp")##
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/imports.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/imports.vm?rev=1364080&r1=1364079&r2=1364080&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/imports.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/imports.vm
Sat Jul 21 13:16:20 2012
@@ -71,7 +71,6 @@ import $tblFK.Interface;
  #end
 #end
 #end
-$torqueGen.mergepoint("imports")##
 #if ($torqueGen.booleanOption("torque.om.generateBeans"))
 $torqueGen.mergepoint("objectBeanImports")
 #end



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message