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

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

  User: vancek  
  Date: 06/05/28 18:41:19

  Modified:    andromda-ejb3/src/main/resources/templates/ejb3
                        SessionBeanBase.vsl MessageDrivenListener.vsl
                        Interceptor.vsl
  Log:
  fix interceptor related package names i.e. javax.ejb to javax.interceptor for later EJB 3.0 FR
  
  Revision  Changes    Path
  1.4       +5 -5      cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanBase.vsl
  
  Index: SessionBeanBase.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanBase.vsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- SessionBeanBase.vsl	4 May 2006 02:48:36 -0000	1.3
  +++ SessionBeanBase.vsl	29 May 2006 01:41:19 -0000	1.4
  @@ -59,10 +59,10 @@
   #*  *##set ($lifecycleCallback = "")
   #**##end
   // Lifecycle callback listeners and interceptors are defined in ejb-jar.xml
  -// @javax.ejb.Interceptors({$transform.getInterceptorsAsList(${interceptors}, ${lifecycleCallback})})
  +// @javax.interceptor.Interceptors({$transform.getInterceptorsAsList(${interceptors}, ${lifecycleCallback})})
   #end
   #if ($service.excludeDefaultInterceptors)
  -// @javax.ejb.ExcludeDefaultInterceptors
  +// @javax.interceptor.ExcludeDefaultInterceptors
   #end
   public abstract class ${service.serviceBaseName}
   #if($service.generalization)
  @@ -340,15 +340,15 @@
   #*    *##set ($interceptors = $operation.interceptorReferences)
   #*    *##if ($collectionUtils.size($interceptors) >= 1)
       // Interceptors are defined in ejb-jar.xml
  -    // @javax.ejb.Interceptors({$transform.getInterceptorsAsList(${interceptors}, "")})
  +    // @javax.interceptor.Interceptors({$transform.getInterceptorsAsList(${interceptors}, "")})
   #*    *##end
   #*    *##if ($operation.excludeDefaultInterceptors)
       // Interceptor default exclusions are defined in ejb-jar.xml
  -    // @javax.ejb.ExcludeDefaultInterceptors
  +    // @javax.interceptor.ExcludeDefaultInterceptors
   #*    *##end
   #*    *##if ($operation.excludeClassInterceptors)
       // Interceptor class exclusions are defined in ejb-jar.xm
  -    // @javax.ejb.ExcludeClassInterceptors
  +    // @javax.interceptor.ExcludeClassInterceptors
   #*    *##end
       $operation.visibility $operation.returnType.fullyQualifiedName $operation.signature
   #*    *##if ($operation.exceptionsPresent)
  
  
  
  1.5       +2 -2      cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenListener.vsl
  
  Index: MessageDrivenListener.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenListener.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- MessageDrivenListener.vsl	9 Mar 2006 04:30:12 -0000	1.4
  +++ MessageDrivenListener.vsl	29 May 2006 01:41:19 -0000	1.5
  @@ -19,7 +19,7 @@
           // empty constructor
       }
       
  -    @javax.ejb.PostConstruct
  +    @javax.annotation.PostConstruct
       public void postConstruct(javax.ejb.InvocationContext ctx) 
       {
           try
  @@ -33,7 +33,7 @@
   		}
   	}
   	
  -	@javax.ejb.PreDestroy
  +	@javax.annotation.PreDestroy
   	public void preDestroy(javax.ejb.InvocationContext ctx) 
   	{
           try
  
  
  
  1.3       +1 -1      cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Interceptor.vsl
  
  Index: Interceptor.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Interceptor.vsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- Interceptor.vsl	6 Feb 2006 03:04:29 -0000	1.2
  +++ Interceptor.vsl	29 May 2006 01:41:19 -0000	1.3
  @@ -15,7 +15,7 @@
        * @param ctx the invocation context
        * @return 
        */
  -    @javax.ejb.AroundInvoke
  +    @javax.interceptor.AroundInvoke
       public Object execute(javax.ejb.InvocationContext ctx)
           throws Exception 
       {