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

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

  User: vancek  
  Date: 06/02/08 23:06:29

  Modified:    andromda-ejb3/src/main/resources/templates/ejb3
                        jboss.xml.vsl
  Log:
  only render jndi-name and local-jndi-name elements if the jndi name has been explicity defined using tagged value
  
  Revision  Changes    Path
  1.6       +5 -5      cartridges/andromda-ejb3/src/main/resources/templates/ejb3/jboss.xml.vsl
  
  Index: jboss.xml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/jboss.xml.vsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- jboss.xml.vsl	29 Jan 2006 01:46:40 -0000	1.5
  +++ jboss.xml.vsl	9 Feb 2006 07:06:29 -0000	1.6
  @@ -9,11 +9,11 @@
   #foreach ($service in $services)
           <session>
               <ejb-name>$service.serviceName</ejb-name>
  -#**##if ($service.viewTypeRemote)
  -            <jndi-name>#if ($service.jndiNameRemote)${service.jndiNameRemote}#else${service.fullyQualifiedServiceRemoteInterfaceName}#end</jndi-name>
  +#**##if ($service.viewTypeRemote && $stringUtils.isNotBlank($service.jndiNameRemote))
  +            <jndi-name>${service.jndiNameRemote}</jndi-name>
   #**##end
  -#**##if ($service.viewTypeLocal)
  -            <local-jndi-name>#if ($service.jndiNameLocal)${service.jndiNameLocal}#else${service.fullyQualifiedServiceLocalInterfaceName}#end</local-jndi-name>
  +#**##if ($service.viewTypeLocal && $stringUtils.isNotBlank($service.jndiNameLocal))
  +            <local-jndi-name>${service.jndiNameLocal}</local-jndi-name>
   #**##end
           </session>