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

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

  User: vancek  
  Date: 06/02/05 19:12:29

  Modified:    andromda-ejb3/src/main/resources/templates/ejb3
                        SessionBean.vsl
  Log:
  renamed @Interceptor to @Interceptors
  removed @CallbackListener
  @Interceptors not include lifecycle callback listener
  @Interceptors now applied on session bean methods
  added @ExcludeDefaultInterceptors and @ExcludeClassInterceptors
  fixed casing for EntityManager variable name when persistent context references exist
  
  Revision  Changes    Path
  1.13      +35 -8     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.12
  retrieving revision 1.13
  diff -u -w -r1.12 -r1.13
  --- SessionBean.vsl	29 Jan 2006 01:49:00 -0000	1.12
  +++ SessionBean.vsl	6 Feb 2006 03:12:29 -0000	1.13
  @@ -24,9 +24,6 @@
   @javax.ejb.TransactionAttribute(javax.ejb.TransactionAttributeType.${service.transactionType})
   #**##end
   #end
  -#if ($service.listenerEnabled)
  -...@ja...llbackListener(${service.fullyQualifiedServiceListenerName}.class)
  -#end
   #if ($stringUtils.isNotBlank($service.securityRealm))
   #**##if ($service.persistenceContainerJboss)
   @org.jboss.annotation.security.SecurityDomain("${service.securityRealm}")
  @@ -58,11 +55,17 @@
   #if ($service.viewTypeRemote)
   @javax.ejb.Remote({${service.fullyQualifiedServiceRemoteInterfaceName}.class})
   #end
  +##
  +## Service listener - lifecycle callbacks is defined as an interceptor
  +##
   #set ($interceptors = $service.interceptorReferences)
  -#if ($collectionUtils.size($interceptors) == 1)
  -...@ja...erceptor($service.getInterceptorsAsList($interceptors))
  -#elseif ($collectionUtils.size($interceptors) > 1)
  -...@ja...erceptors({$service.getInterceptorsAsList($interceptors)})
  +#if ($collectionUtils.size($interceptors) >= 1 || $service.listenerEnabled)
  +#**##if ($service.listenerEnabled) 
  +#*  *##set ($lifecycleCallback = "${service.fullyQualifiedServiceListenerName}.class")
  +#**##else 
  +#*  *##set ($lifecycleCallback = "null")
  +#**##end
  +...@ja...erceptors({$transform.getInterceptorsAsList(${interceptors}, ${lifecycleCallback})})
   #end
   public abstract class ${service.serviceName}
   #if($service.generalization)
  @@ -102,7 +105,7 @@
        
        */
       @javax.persistence.PersistenceContext#if ($persistenceContext.persistenceContextUnitName || $persistenceContext.persistenceContextType)(#end#if ($persistenceContext.persistenceContextUnitName)unitName = "${persistenceContext.persistenceContextUnitName}"#set ($argExists = true)#end#if ($persistenceContext.persistenceContextType)#if ($argExists),#end type = javax.persistence.PersistenceContextType.${persistenceContext.persistenceContextType}#end#if ($persistenceContext.persistenceContextUnitName || $persistenceContext.persistenceContextType))#end 
  -    protected javax.persistence.EntityManager ${persistenceContext.name};
  +    protected javax.persistence.EntityManager $stringUtils.uncapitalize(${persistenceContext.name});
   #end
   #set ($references = $service.serviceReferences)
   #if (!$references.empty)
  @@ -302,6 +305,16 @@
   #*  *##if ($operation.timeoutCallback)
       @javax.ejb.Timeout
   #*  *##end
  +#*  *##set ($interceptors = $operation.interceptorReferences)
  +#*  *##if ($collectionUtils.size($interceptors) >= 1)
  +    @javax.ejb.Interceptors({$transform.getInterceptorsAsList(${interceptors}, null)})
  +#*  *##end
  +#*  *##if ($operation.excludeDefaultInterceptors)
  +    @javax.ejb.ExcludeDefaultInterceptors
  +#*  *##end
  +#*  *##if ($operation.excludeClassInterceptors)
  +    @javax.ejb.ExcludeClassInterceptors
  +#*  *##end
       $operation.visibility $operation.returnType.fullyQualifiedName $operation.signature
   #*  *##if ($operation.exceptionsPresent)
           $operation.throwsClause
  @@ -364,4 +377,18 @@
   
   #**##end
   #end
  +    // ------------ Generic Methods ------------
  +    
  +    /**
  +     * Generic remove method
  +     */
  +	@javax.ejb.Remove
  +	public void remove() {
  +		handleRemove();
  +	}
  +	
  +	/**
  +	 * Performs the core logic for {@link #remove())
  +	 */
  +	protected abstract void handleRemove();
   }
  \ No newline at end of file