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

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

  User: vancek  
  Date: 06/01/28 17:48:00

  Modified:    andromda-ejb3/src/main/resources/templates/ejb3
                        MessageDrivenBean.vsl Entity.vsl
                        EntityEmbeddable.vsl
  Log:
  only add the callback listener annotation defining the listener class if listenerEnabled is true
  
  Revision  Changes    Path
  1.7       +2 -0      cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBean.vsl
  
  Index: MessageDrivenBean.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBean.vsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- MessageDrivenBean.vsl	22 Jan 2006 06:21:55 -0000	1.6
  +++ MessageDrivenBean.vsl	29 Jan 2006 01:47:59 -0000	1.7
  @@ -36,7 +36,9 @@
    *}
    *)
    */
  +#if ($mdb.listenerEnabled)
   @javax.ejb.CallbackListener(${mdb.fullyQualifiedMessageDrivenListenerName}.class)
  +#end
   #if ($mdb.transactionManagement)
   @javax.ejb.TransactionManagement(javax.ejb.TransactionManagementType.${mdb.transactionManagement})
   #end
  
  
  
  1.10      +2 -0      cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Entity.vsl
  
  Index: Entity.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Entity.vsl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -r1.9 -r1.10
  --- Entity.vsl	26 Jan 2006 06:53:14 -0000	1.9
  +++ Entity.vsl	29 Jan 2006 01:47:59 -0000	1.10
  @@ -20,7 +20,9 @@
   @javax.persistence.Entity#if ($entity.accessType)(access = javax.persistence.AccessType.${entity.accessType})#end
   
   @javax.persistence.Table(name = "${entity.tableName}")
  +#if ($entity.listenerEnabled)
   @javax.persistence.EntityListener(${entity.fullyQualifiedEntityListenerName}.class)
  +#end
   public#if ($entity.abstract) abstract#end class ${entity.entityName}
       extends ${entity.fullyQualifiedEntityEmbeddableName}
       implements java.io.Serializable
  
  
  
  1.10      +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.9
  retrieving revision 1.10
  diff -u -w -r1.9 -r1.10
  --- EntityEmbeddable.vsl	28 Jan 2006 02:43:59 -0000	1.9
  +++ EntityEmbeddable.vsl	29 Jan 2006 01:47:59 -0000	1.10
  @@ -47,7 +47,7 @@
   #if ($entity.requiresGeneralizationMapping && ($entity.embeddableSuperclassGeneralizationExists || $entity.inheritanceTablePerClass || $entity.inheritanceJoined))
   @javax.persistence.Table(name = "${entity.tableName}")
   #end
  -#if ($entity.requiresGeneralizationMapping)
  +#if ($entity.requiresGeneralizationMapping && $entity.listenerEnabled)
   @javax.persistence.EntityListener(${entity.fullyQualifiedEntityListenerName}.class)
   #end
   ## Only include the inheritance related annotations for inheritance mapping