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

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

  User: vancek  
  Date: 06/02/08 23:11:56

  Modified:    andromda-ejb3/src/main/resources/templates/ejb3
                        ServiceLocator.vsl
  Log:
  context lookup used default naming convention [ear file name/ejb name/remote] unless jndi name explicitly defined
  new method performs lookup using local jndi name if local view type exists
  
  Revision  Changes    Path
  1.4       +38 -2     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.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- ServiceLocator.vsl	31 Jan 2006 15:21:36 -0000	1.3
  +++ ServiceLocator.vsl	9 Feb 2006 07:11:56 -0000	1.4
  @@ -97,19 +97,55 @@
       }
   
   #foreach ($service in $services)
  +#**##if ($service.viewTypeRemote)
       /**
        * Gets an instance of {@link ${service.fullyQualifiedServiceRemoteInterfaceName}}.
        *
        * @param env the Context environment properties.  Null represents no properties.
        * @throws javax.naming.NamingException failure to lookup remote service interface.
        */
  -    public final $service.fullyQualifiedServiceRemoteInterfaceName get_${transform.toUnderscoreName(${service.fullyQualifiedServiceName})}(java.util.Properties env)
  +    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
           return (${service.fullyQualifiedServiceRemoteInterfaceName})
  -            getContext(env).lookup(${service.fullyQualifiedServiceRemoteInterfaceName}.class.getName());
  +            getContext(env).lookup("${jndiName}");
       }
   
  +#**##end
  +#**##if ($service.viewTypeLocal)
  +    /**
  +     * Gets an instance of {@link ${service.fullyQualifiedServiceLocalInterfaceName}}.
  +     *
  +     * @param env the Context environment properties.  Null represents no properties.
  +     * @throws javax.naming.NamingException failure to lookup local service interface.
  +     */
  +    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
  +        return (${service.fullyQualifiedServiceLocalInterfaceName})
  +            getContext(env).lookup("${jndiName}");
  +    }
  +
  +#**##end
  +
   #end
       /**
        * Gets an instance of the given service.