[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout head.xhtml.vsl layout.xhtml.vsl

[Leif J. <le...@us...>]

  User: leifj   
  Date: 07/02/23 13:19:38

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
                        head.xhtml.vsl layout.xhtml.vsl
  Log:
  reach request via the ExternalContext
  
  Revision  Changes    Path
  1.3       +1 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/head.xhtml.vsl
  
  Index: head.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/head.xhtml.vsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- head.xhtml.vsl	30 Dec 2006 20:10:22 -0000	1.2
  +++ head.xhtml.vsl	23 Feb 2007 21:19:38 -0000	1.3
  @@ -9,7 +9,7 @@
       <meta HTTP-EQUIV="Content-Type" CONTENT="text/html;charset=UTF-8"/>
       <title>#{messages['application.name']}<c:if test="${!empty viewTitle}"> ~ ${viewTitle}</c:if></title>
   #if ($outputCustomResources)
  -    <link rel="stylesheet" type="text/css" href="/css/custom.css" />
  +    <link rel="stylesheet" type="text/css" href="${facesContext.externalContext.request.contextPath}/css/custom.css" />
   #end
       <trh:script source="/js/common.js"/>
       <trh:script source="/js/key-events.js"/>
  
  
  
  1.5       +1 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl
  
  Index: layout.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- layout.xhtml.vsl	18 Jan 2007 10:11:07 -0000	1.4
  +++ layout.xhtml.vsl	23 Feb 2007 21:19:38 -0000	1.5
  @@ -11,7 +11,7 @@
       <ui:insert name="head">
           <ui:include src="head.xhtml"/>  
       </ui:insert>
  -    <c:set var="remoteUser" value="${pageContext.request.remoteUser}" scope="request"/>
  +    <c:set var="remoteUser" value="${facesContext.externalContext.request.userPrincipal.name}" scope="request"/>
       <trh:body>
         <tr:form> 
           <ui:insert name="title"/>