[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl

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

  User: cwbrandon
  Date: 08/05/08 16:03:06

  Modified:    andromda-jsf2/src/main/resources/META-INF/andromda
                        cartridge.xml
               andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet
                        PortletPhaseListener.java.vsl
  Log:
  only include referenced roles (not all defined in the application)
  
  Revision  Changes    Path
  1.29      +0 -3      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.28
  retrieving revision 1.29
  diff -u -w -r1.28 -r1.29
  --- cartridge.xml	2 May 2008 21:21:39 -0000	1.28
  +++ cartridge.xml	8 May 2008 23:03:06 -0000	1.29
  @@ -1145,9 +1145,6 @@
               <modelElement variable="useCases">
                   <type name="org.andromda.metafacades.uml.FrontEndUseCase"/>
               </modelElement>
  -            <modelElement variable="roles">
  -                <type name="org.andromda.metafacades.uml.Role"/>
  -            </modelElement>
           </modelElements>
       </template>
   
  
  
  
  1.11      +1 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl
  
  Index: PortletPhaseListener.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -w -r1.10 -r1.11
  --- PortletPhaseListener.java.vsl	6 May 2008 18:49:48 -0000	1.10
  +++ PortletPhaseListener.java.vsl	8 May 2008 23:03:06 -0000	1.11
  @@ -20,7 +20,7 @@
           final String viewId = this.getViewId(event);
           if (viewId != null && event.getFacesContext() != null)
           {
  -#foreach ($role in $roles)
  +#foreach ($role in $useCases.iterator().next().getAllRoles())
   #set ($userIsInRoleName = "userIs${stringUtils.upperCamelCaseName($role.name.toLowerCase())}")
   #set ($specializedRoles = $role.generalizedByActors)
               final boolean $userIsInRoleName = event.getFacesContext().getExternalContext().isUserInRole("$role.name")