[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration web.xml.vsl

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 07/08/30 13:05:35

  Modified:    andromda-jsf2/src/main/resources/META-INF/andromda
                        cartridge.xml
               andromda-jsf2/src/main/resources/templates/jsf2/configuration
                        web.xml.vsl
  Log:
  only render UserRoleFilter references when at least one role is present (and security is enabled)
  
  Revision  Changes    Path
  1.10      +3 -0      cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
  
  Index: cartridge.xml
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -r1.9 -r1.10
  --- cartridge.xml	24 Jul 2007 18:18:09 -0000	1.9
  +++ cartridge.xml	30 Aug 2007 20:05:35 -0000	1.10
  @@ -175,6 +175,9 @@
               <modelElement variable="manageables">
                   <type name="org.andromda.cartridges.jsf2.metafacades.JSFManageableEntity"/>
               </modelElement>
  +            <modelElement variable="roles">
  +                <type name="org.andromda.metafacades.uml.Role"/>
  +            </modelElement>
           </modelElements>
       </template>
   
  
  
  
  1.10      +2 -2      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl
  
  Index: web.xml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -r1.9 -r1.10
  --- web.xml.vsl	2 Jul 2007 18:54:59 -0000	1.9
  +++ web.xml.vsl	30 Aug 2007 20:05:35 -0000	1.10
  @@ -138,7 +138,7 @@
       </context-param>
       <!-- context-param merge-point -->
       <!-- filter merge-point -->
  -#if ($securityEnabled)
  +#if ($securityEnabled && !$roles.empty)
       <filter>
           <filter-name>User Role Filter</filter-name>
           <filter-class>${managedBeansPackage}.UserRoleFilter</filter-class>
  @@ -220,7 +220,7 @@
           <filter-name>MyFaces Extensions Filter</filter-name>
           <url-pattern>/faces/myFacesExtensionResource/*</url-pattern>
       </filter-mapping>
  -#if ($securityEnabled)
  +#if ($securityEnabled && !$roles.empty)
       <filter-mapping>
           <filter-name>User Role Filter</filter-name>
           <url-pattern>*.${facesServletExtension}</url-pattern>