We'll probably need something in the upgrade guide for 3.1 for this one. Many 
people will have copies of the templates inside their own project that will 
need modifying.

Also, remind me again, why are these templates marked as v1.2? Should we get 
rid of that versioning?

Ari


On 19/02/10 3:32 AM, [email protected] wrote:
Author: andrey
Date: Thu Feb 18 16:32:52 2010
New Revision: 911476

URL: http://svn.apache.org/viewvc?rev=911476&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/client-datamap-superclass.vm

Modified: 
cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/client-datamap-superclass.vm
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/client-datamap-superclass.vm?rev=911476&r1=911475&r2=911476&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/client-datamap-superclass.vm
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-tools/src/main/resources/templates/v1_2/client-datamap-superclass.vm
 Thu Feb 18 16:32:52 2010
@@ -32,8 +32,8 @@
  ##    basePackageName
  ##
  ${importUtils.setPackage($superPackageName)}##
-${importUtils.addReservedType("${superPackageName}.${superClassName}")}##
-${importUtils.addType("${basePackageName}.${baseClassName}")}##
+#if(${superPackageName})${importUtils.addReservedType("${superPackageName}.${superClassName}")}#end##
+#if(${basePackageName})${importUtils.addType("${basePackageName}.${baseClassName}")}#end##
  #if( ${object.hasSelectQueries()} )
  ${importUtils.addType('java.util.List')}##
  ${importUtils.addType('org.apache.cayenne.ObjectContext')}##



--
-------------------------->
Aristedes Maniatis
GPG fingerprint CBFB 84B4 738D 4E87 5E5C  5EFA EF6A 7D2E 3E49 102A

Reply via email to