Author: tfischer
Date: Sun Jan 23 03:51:27 2011
New Revision: 1062316
URL: http://svn.apache.org/viewvc?rev=1062316&view=rev
Log:
Created extension points for plugging in annotations to attributes of generated
java objects (e.g. Bean validation annotations)
Modified:
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/outlets/general.xml
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/fieldDefinition.vm
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=1062316&r1=1062315&r2=1062316&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
Sun Jan 23 03:51:27 2011
@@ -41,6 +41,7 @@
<outlet name="torque.om.baseDbObject"
xsi:type="velocityOutlet"
path="dbObject/base/baseDbObject.vm">
+ <mergepoint name="imports" /><!-- extension -->
<mergepoint name="objectBeanImports">
<action xsi:type="applyAction"
outlet="torque.om.dbObject.base.objectBeanImports"/>
</mergepoint>
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/general.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/general.xml?rev=1062316&r1=1062315&r2=1062316&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/general.xml
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/outlets/general.xml
Sun Jan 23 03:51:27 2011
@@ -29,6 +29,7 @@
<outlet name="torque.om.fieldDefinition"
xsi:type="velocityOutlet"
path="general/fieldDefinition.vm">
+ <mergepoint name="annotation" /><!-- extension -->
</outlet>
<outlet name="torque.om.getterSetter"
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm?rev=1062316&r1=1062315&r2=1062316&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm
Sun Jan 23 03:51:27 2011
@@ -64,6 +64,7 @@ import $tblFK.Interface;
#end
#end
#end
+$torqueGen.mergepoint("imports")##
#if ($torqueGen.booleanOption("torque.om.generateBeans"))
$torqueGen.mergepoint("objectBeanImports")
#end
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/fieldDefinition.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/fieldDefinition.vm?rev=1062316&r1=1062315&r2=1062316&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/fieldDefinition.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/fieldDefinition.vm
Sun Jan 23 03:51:27 2011
@@ -28,6 +28,7 @@
#else
/** Defines the $field field. */
#end
+${torqueGen.mergepoint("annotations")}##
#if (!$fieldAccessModifier)
#set ( $fieldAccessModifier = "private" )
#end
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
