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

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

  User: vancek  
  Date: 07/06/23 02:07:36

  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:
  fix for child entity with an implementation extending a parent mapped superclass
  
  Revision  Changes    Path
  1.23      +5 -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.22
  retrieving revision 1.23
  diff -u -w -r1.22 -r1.23
  --- changes.xml	23 Jun 2007 08:06:44 -0000	1.22
  +++ changes.xml	23 Jun 2007 09:07:35 -0000	1.23
  @@ -484,6 +484,11 @@
         <action dev="vancek" due-to="heapifyman" type="add">
           JIRA EJB-56 - Add support for multiplicity on enumeration types.
         </action>
  +      <action dev="vancek" tue-to="mrkanban" type="fix">
  +        When a child entity inherits from a mapped superclass and the child entity has an implementation, the
  +        child mapped superclass did not extend the parent mapped superclass correctly.  This was a side-effect of
  +        applying EJB-53.
  +      </action>
       </release>
     </body>
   </document>
  \ No newline at end of file
  
  
  
  1.13      +505 -480  cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
  
  	<<Binary file>>
  
  
  1.8       +259 -272  cartridges/andromda-ejb3/src/test/uml/EJB3CartridgeTestModel.xml.zip
  
  	<<Binary file>>
  
  
  1.53      +1 -1      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.52
  retrieving revision 1.53
  diff -u -w -r1.52 -r1.53
  --- EntityEmbeddable.vsl	14 Jun 2007 15:06:14 -0000	1.52
  +++ EntityEmbeddable.vsl	23 Jun 2007 09:07:36 -0000	1.53
  @@ -131,7 +131,7 @@
   public#if ($entity.entityImplementationRequired) abstract class ${entity.entityEmbeddableName}#else#if($entity.abstract) abstract#end class ${entity.entityName}#end
   
   #if($entity.requiresGeneralizationMapping)
  -#**##if($entity.embeddableSuperclassGeneralizationExists && $entity.entityImplementationRequired)
  +#**##if($entity.embeddableSuperclassGeneralizationExists && $entity.generalization.entityImplementationRequired)
       extends ${entity.generalization.fullyQualifiedEntityEmbeddableName}
   #**##else
       extends ${entity.generalization.fullyQualifiedName}