[Andromdaplugins-cvs] CVS update: cartridges/andromda-ejb3/src/main/resources/templates/ejb3 EntityEmbeddable.vsl

[Vance K. <va...@us...>]

  User: vancek  
  Date: 07/06/14 08:06:14

  Modified:    andromda-ejb3/src/site changes.xml
               andromda-ejb3/src/test/expected cartridge-output.zip
               andromda-ejb3/src/test/uml EJB3CartridgeTestModel.xml.zip
               andromda-ejb3/src/main/resources/templates/ejb3
                        EntityEmbeddable.vsl
  Log:
  ejb-50 - fix optimistic locking on version attribute
  
  Revision  Changes    Path
  1.21      +4 -0      cartridges/andromda-ejb3/src/site/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -w -r1.20 -r1.21
  --- changes.xml	14 Jun 2007 14:38:28 -0000	1.20
  +++ changes.xml	14 Jun 2007 15:06:08 -0000	1.21
  @@ -477,6 +477,10 @@
         <action dev="vancek" type="update">
           Fix naming of the serviceRemoteInterfaceName property to serviceRemoteInterfaceNamePattern.
         </action>
  +      <action dev="vancek" due-to="dima" type="fix">
  +        JIRA EJB-55 - Fix optimistic locking - version attribute.  Set the annotation on the getter and change
  +        modifier on version attribute to public.
  +      </action>
       </release>
     </body>
   </document>
  \ No newline at end of file
  
  
  
  1.11      +492 -472  cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
  
  	<<Binary file>>
  
  
  1.7       +268 -313  cartridges/andromda-ejb3/src/test/uml/EJB3CartridgeTestModel.xml.zip
  
  	<<Binary file>>
  
  
  1.52      +7 -7      cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
  
  Index: EntityEmbeddable.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -w -r1.51 -r1.52
  --- EntityEmbeddable.vsl	13 Jun 2007 16:31:35 -0000	1.51
  +++ EntityEmbeddable.vsl	14 Jun 2007 15:06:14 -0000	1.52
  @@ -190,16 +190,11 @@
   #*    *##set ($doAttribute = true)
   #*  *##end
   #*  *##if ($doAttribute)
  -#*    *##if (!$attribute.transient && $attribute.version)
  -##
  -## Add the Version annotation on the attribute itself
  -##
  -    @javax.persistence.Version
  -#*    *##end
   ##
   ## Check for overriding LOB type
  +## If the attribute is used in optimistic locking, make public, otherwise make private
   ##
  -    private #if ($stringUtils.isNotBlank($attribute.lobType))${attribute.lobType}#else${attribute.type.fullyQualifiedName}#end $attribute.name;
  +    #if (!$attribute.transient && $attribute.version)public#else#**#private#end #if ($stringUtils.isNotBlank($attribute.lobType))${attribute.lobType}#else${attribute.type.fullyQualifiedName}#end $attribute.name;
   #*  *##end
   #**##end
   
  @@ -506,6 +501,11 @@
       @org.hibernate.validator.Length(max = $attribute.columnLength)
   #*        *##end
   #*      *##end
  +#*    *##else
  +##
  +## Add the Version annotation on the attribute itself
  +##
  +    @javax.persistence.Version
   #*    *##end
   ##
   ## Override attribute type if attribute is a LOB and lob type is specified