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

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

  User: vancek  
  Date: 06/03/20 00:16:47

  Modified:    andromda-ejb3/src/main/resources/templates/ejb3/config/jboss
                        ejb3-entity-cache-service.xml.vsl
  Log:
  define entity and query cache regions is not using default cache region.
  
  Revision  Changes    Path
  1.2       +3 -3      cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/ejb3-entity-cache-service.xml.vsl
  
  Index: ejb3-entity-cache-service.xml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/ejb3-entity-cache-service.xml.vsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- ejb3-entity-cache-service.xml.vsl	14 Mar 2006 06:13:49 -0000	1.1
  +++ ejb3-entity-cache-service.xml.vsl	20 Mar 2006 08:16:46 -0000	1.2
  @@ -86,7 +86,7 @@
             <attribute name="timeToLiveSeconds">1000</attribute>
           </region>
   #foreach ($entity in $entities)
  -#**##if ($stringUtils.isNotBlank(${entity.cacheType}))
  +#**##if ($stringUtils.isNotBlank(${entity.cacheType}) && !$entity.useDefaultCacheRegion)
   
           <!-- The $entity.entityName entity cache -->
           <region name="/${entity.fullyQualifiedNamePath}">
  @@ -97,10 +97,10 @@
   #end
   #foreach ($entity in $entities)
   #**##foreach ($finder in $entity.getQueryOperations(true))
  -#*  *##if ($finder.useQueryCache)
  +#*  *##if ($finder.useQueryCache && !$entity.useDefaultCacheRegion)
   
           <!-- The ${entity.name} ${finder.name} query cache -->
  -        <region name="/${entity.fullyQualifiedNamePath}/${finder.name}">
  +        <region name="/${entity.fullyQualifiedNamePath}_${finder.name}">
             <attribute name="maxNodes">1000</attribute>
             <attribute name="timeToLiveSeconds">5000</attribute>
           </region>