Author: andrey
Date: Thu Feb 18 16:09:42 2010
New Revision: 911464
URL: http://svn.apache.org/viewvc?rev=911464&view=rev
Log:
CAY-1393 Update velocity to 1.6.3. Fixing templates
Modified:
cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/singleclass.vm
cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/superclass.vm
Modified:
cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/singleclass.vm
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/singleclass.vm?rev=911464&r1=911463&r2=911464&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/singleclass.vm
(original)
+++
cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/singleclass.vm
Thu Feb 18 16:09:42 2010
@@ -58,7 +58,7 @@
#end
#if( $object.DbEntity )
-#foreach( $idAttr in ${object.DbEntity.PrimaryKey} )
+#foreach( $idAttr in ${object.DbEntity.PrimaryKeys} )
public static final String
${stringUtils.capitalizedAsConstant($idAttr.Name)}_PK_COLUMN = "${idAttr.Name}";
#end
#end
Modified:
cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/superclass.vm
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/superclass.vm?rev=911464&r1=911463&r2=911464&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/superclass.vm
(original)
+++
cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/superclass.vm
Thu Feb 18 16:09:42 2010
@@ -63,7 +63,7 @@
#end
#if( $object.DbEntity )
-#foreach( $idAttr in ${object.DbEntity.PrimaryKey} )
+#foreach( $idAttr in ${object.DbEntity.PrimaryKeys} )
public static final String
${stringUtils.capitalizedAsConstant($idAttr.Name)}_PK_COLUMN = "${idAttr.Name}";
#end
#end