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

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

  User: vancek  
  Date: 06/04/11 08:41:05

  Modified:    andromda-ejb3/src/main/resources/templates/ejb3
                        ServiceLocator.vsl
  Log:
  reverted back the jndi name to use the service name rather than the fully qualified service name
  
  Revision  Changes    Path
  1.7       +6 -6      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.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- ServiceLocator.vsl	14 Mar 2006 06:08:36 -0000	1.6
  +++ ServiceLocator.vsl	11 Apr 2006 15:41:05 -0000	1.7
  @@ -100,7 +100,7 @@
   #foreach ($service in $services)
   #**##if ($service.viewTypeRemote)
       /**
  -     * Gets an instance of {@link ${service.fullyQualifiedServiceRemoteInterfaceName}}.
  +     * Gets the remote interface {@link ${service.fullyQualifiedServiceRemoteInterfaceName}}.
        *
        * @param env the Context environment properties.  Null represents no properties.
        * @throws javax.naming.NamingException failure to lookup remote service interface.
  @@ -112,9 +112,9 @@
   #*    *##set ($jndiName = "${service.jndiNameRemote}")
   #*  *##else
   #*    *##if ($stringUtils.isNotBlank($service.jndiNamePrefix))
  -#*        *##set ($jndiName = "${service.jndiNamePrefix}/${service.fullyQualifiedServiceName}/remote")
  +#*        *##set ($jndiName = "${service.jndiNamePrefix}/${service.serviceName}/remote")
   #*    *##else
  -#*        *##set ($jndiName = "${service.fullyQualifiedServiceName}/remote")
  +#*        *##set ($jndiName = "${service.serviceName}/remote")
   #*    *##end
   #*  *##end
           return (${service.fullyQualifiedServiceRemoteInterfaceName})
  @@ -124,7 +124,7 @@
   #**##end
   #**##if ($service.viewTypeLocal)
       /**
  -     * Gets an instance of {@link ${service.fullyQualifiedServiceLocalInterfaceName}}.
  +     * Gets the local interface {@link ${service.fullyQualifiedServiceLocalInterfaceName}}.
        *
        * @param env the Context environment properties.  Null represents no properties.
        * @throws javax.naming.NamingException failure to lookup local service interface.
  @@ -136,9 +136,9 @@
   #*    *##set ($jndiName = "${service.jndiNameLocal}")
   #*  *##else
   #*    *##if ($stringUtils.isNotBlank($service.jndiNamePrefix))
  -#*      *##set ($jndiName = "${service.jndiNamePrefix}/${service.fullyQualifiedServiceName}/local")
  +#*      *##set ($jndiName = "${service.jndiNamePrefix}/${service.serviceName}/local")
   #*    *##else
  -#*      *##set ($jndiName = "${service.fullyQualifidServiceName}/local")
  +#*      *##set ($jndiName = "${service.serviceName}/local")
   #*    *##end
   #*  *##end
           return (${service.fullyQualifiedServiceLocalInterfaceName})