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

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

  User: vancek  
  Date: 07/02/03 18:38:00

  Modified:    andromda-ejb3/src/main/resources/templates/ejb3
                        ServiceLocator.vsl
  Added:       andromda-ejb3/src/main/resources/templates/ejb3/common
                        JNDIMacros.vm
  Log:
  extract jndi lookup into reusable macro
  
  Revision  Changes    Path
  1.1                  cartridges/andromda-ejb3/src/main/resources/templates/ejb3/common/JNDIMacros.vm
  
  Index: JNDIMacros.vm
  ===================================================================
  ##
  ##  This macro will render the jndiName template parameter
  ##  for the remote interface.  This takes into account if
  ##  the jndi name is explicity specified.
  ##
  #macro (remoteJndiName $service $includePrefix)
  #**##if ($stringUtils.isNotBlank($service.jndiNameRemote))
  #*  *##set ($jndiName = "${service.jndiNameRemote}")
  #**##else
  #*  *##if ($stringUtils.isNotBlank($service.jndiNamePrefix) && $includePrefix)
  #*      *##set ($jndiName = "${service.jndiNamePrefix}/${service.serviceName}/remote")
  #*  *##else
  #*      *##set ($jndiName = "${service.serviceName}/remote")
  #*  *##end
  #**##end
  #end
  ##
  ##  This macro will render the jndiName template parameter
  ##  for the local interface.  This takes into account if
  ##  the jndi name is explicity specified.
  ##
  #macro (localJndiName $service $includePrefix)
  #**##if ($stringUtils.isNotBlank($service.jndiNameLocal))
  #*  *##set ($jndiName = "${service.jndiNameLocal}")
  #**##else
  #*  *##if ($stringUtils.isNotBlank($service.jndiNamePrefix) && $includePrefix)
  #*    *##set ($jndiName = "${service.jndiNamePrefix}/${service.serviceName}/local")
  #*  *##else
  #*    *##set ($jndiName = "${service.serviceName}/local")
  #*  *##end
  #**##end
  #end
  
  
  1.9       +3 -18     cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceLocator.vsl
  
  Index: ServiceLocator.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceLocator.vsl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -w -r1.8 -r1.9
  --- ServiceLocator.vsl	14 Jun 2006 04:46:35 -0000	1.8
  +++ ServiceLocator.vsl	4 Feb 2007 02:38:00 -0000	1.9
  @@ -1,3 +1,4 @@
  +#parse("templates/ejb3/common/JNDIMacros.vm")
   // license-header java merge-point
   //
   // Attention: Generated code! Do not modify by hand!
  @@ -111,15 +112,7 @@
       public final $service.fullyQualifiedServiceRemoteInterfaceName get_${transform.toUnderscoreName(${service.fullyQualifiedServiceName})}_Remote(java.util.Properties env)
           throws javax.naming.NamingException
       {
  -#*  *##if ($stringUtils.isNotBlank($service.jndiNameRemote))
  -#*    *##set ($jndiName = "${service.jndiNameRemote}")
  -#*  *##else
  -#*    *##if ($stringUtils.isNotBlank($service.jndiNamePrefix))
  -#*        *##set ($jndiName = "${service.jndiNamePrefix}/${service.serviceName}/remote")
  -#*    *##else
  -#*        *##set ($jndiName = "${service.serviceName}/remote")
  -#*    *##end
  -#*  *##end
  +#remoteJndiName($service true)
           return (${service.fullyQualifiedServiceRemoteInterfaceName})
               getContext(env).lookup("${jndiName}");
       }
  @@ -135,15 +128,7 @@
       public final $service.fullyQualifiedServiceLocalInterfaceName get_${transform.toUnderscoreName(${service.fullyQualifiedServiceName})}_Local(java.util.Properties env)
           throws javax.naming.NamingException
       {
  -#*  *##if ($stringUtils.isNotBlank($service.jndiNameLocal))
  -#*    *##set ($jndiName = "${service.jndiNameLocal}")
  -#*  *##else
  -#*    *##if ($stringUtils.isNotBlank($service.jndiNamePrefix))
  -#*      *##set ($jndiName = "${service.jndiNamePrefix}/${service.serviceName}/local")
  -#*    *##else
  -#*      *##set ($jndiName = "${service.serviceName}/local")
  -#*    *##end
  -#*  *##end
  +#localJndiName($service true)
           return (${service.fullyQualifiedServiceLocalInterfaceName})
               getContext(env).lookup("${jndiName}");
       }