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

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

  User: vancek  
  Date: 06/01/16 19:13:49

  Modified:    andromda-ejb3/src/main/resources/templates/ejb3
                        SessionBean.vsl
  Log:
  changed securityDomain to securityRealm, added RemoteBinding & LocalBinding annotations for setting JNDI names, moved Local and Remote annotation to session bean from interface classes, added Interceptor annotation
  
  Revision  Changes    Path
  1.5       +33 -6     cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBean.vsl
  
  Index: SessionBean.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBean.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- SessionBean.vsl	10 Jan 2006 08:11:09 -0000	1.4
  +++ SessionBean.vsl	17 Jan 2006 03:13:48 -0000	1.5
  @@ -3,6 +3,7 @@
   #if ($stringUtils.isNotBlank($service.packageName))
   package $service.packageName;
   #end
  +#set ($generatedFile = "${stringUtils.replace($service.fullyQualifiedServiceName,'.','/')}.java")
   
   /**
    * Autogenerated EJB entity POJO class for the ${service.serviceName} session bean.
  @@ -19,9 +20,9 @@
   #**##end
   #end
   @javax.ejb.CallbackListener(${service.fullyQualifiedServiceListenerName}.class)
  -#if ($service.securityDomain)
  +#if ($stringUtils.isNotBlank($service.securityRealm))
   #**##if ($service.persistenceContainerJboss)
  -...@or...curityDomain("${service.securityDomain}")
  +...@or...curityDomain("${service.securityRealm}")
   #**##end
   #end
   #if ($service.permitAll)
  @@ -34,11 +35,34 @@
   #if ($service.runAs)
   @javax.annotation.security.RunAs("${service.runAs}")
   #end
  +#if ($service.jndiNameRemote)
  +#**##if ($service.persistenceContainerJboss)
  +...@or...moteBinding(jndiBinding = "${service.jndiNameRemote}")
  +#**##end
  +#end
  +#if ($service.jndiNameLocal)
  +#**##if ($service.persistenceContainerJboss)
  +...@or...notation.ejb.LocalBinding(jndiBinding = "${service.jndiNameLocal}")
  +#**##end
  +#end
  +#if ($service.viewTypeLocal)
  +@javax.ejb.Local({${service.fullyQualifiedServiceLocalInterfaceName}.class})
  +#end
  +#if ($service.viewTypeRemote)
  +...@ja...mote({${service.fullyQualifiedServiceRemoteInterfaceName}.class})
  +#end
  +#set ($interceptors = $service.interceptorReferences)
  +#if ($collectionUtils.size($interceptors) == 1)
  +...@ja...erceptor($service.getInterceptorsAsList($interceptors))
  +#elseif ($collectionUtils.size($interceptors) > 1)
  +...@ja...erceptors({$service.getInterceptorsAsList($interceptors)})
  +#end
   public abstract class ${service.serviceName}
   #if($service.generalization)
       extends ${service.generalization.fullyQualifiedName}BeanImpl
   #end
  -    implements ${service.fullyQualifiedServiceLocalInterfaceName}, ${service.fullyQualifiedServiceRemoteInterfaceName}
  +    implements#if ($service.viewTypeLocal) ${service.fullyQualifiedServiceLocalInterfaceName}#if ($service.viewTypeRemote),#end#end#if ($service.viewTypeRemote) ${service.fullyQualifiedServiceRemoteInterfaceName}#end
  +
   {
       // ------ Session Context Injection ------
       
  @@ -96,14 +120,16 @@
   #*  *##set ($reference = $dependency.targetElement)
   #*  *##if ($reference.destinationTypeQueue)
   #*    *##if (!$queueConnectionFactoryDefined)
  -    @javax.annotation.Resource(name = "ConnectionFactory")
  +## NOTE: CHANGE TO USE mappedName
  +    @javax.annotation.Resource(name = "ConnectionFactory", type = javax.jms.QueueConnectionFactory.class)
       protected javax.jms.QueueConnectionFactory queueFactory;
   #*      *##set ($queueConnectionFactoryDefined = true)
       
   #*    *##end
   #*  *##elseif ($reference.destinationTypeTopic)
   #*    *##if (!$topicConnectionFactoryDefined)
  -    @javax.annotation.Resource(name = "ConnectionFactory")
  +## NOTE: CHANGE TO USE mappedName
  +    @javax.annotation.Resource(name = "ConnectionFactory", type = javax.jms.TopicConnectionFactory.class)
       protected javax.jms.TopicConnectionFactory topicFactory;
   #*      *##set ($topicConnectionFactoryDefined = true)
   
  @@ -112,7 +138,8 @@
       /**
        * Inject ${reference.destinationType}
        */
  -    @javax.annotation.Resource(name = "${reference.destination}")
  +    @javax.annotation.Resource(name = "${reference.destination}", type = #if ($reference.destinationTypeQueue)javax.jms.Queue.class#elseif ($reference.destinationTypeTopic)javax.jms.Topic.class#end)
  +    ## NOTE: CHANGE TO USE mappedName
       protected #if ($reference.destinationTypeQueue)javax.jms.Queue#elseif ($reference.destinationTypeTopic)javax.jms.Topic#end $stringUtils.uncapitalize(${reference.name});
   #**##end
   #end