cvs commit: jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/userinfo userinfo.jsp help.html

[dlestrat]

dlestrat    2004/05/30 08:10:26

  Modified:    applications/demo/src/webapp/WEB-INF/demo/userinfo
                        userinfo.jsp help.html
  Log:
  Cleaning up user info test.
  
  Revision  Changes    Path
  1.6       +43 -6     
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/userinfo/userinfo.jsp
  
  Index: userinfo.jsp
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/userinfo/userinfo.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- userinfo.jsp      29 May 2004 19:46:00 -0000      1.5
  +++ userinfo.jsp      30 May 2004 15:10:26 -0000      1.6
  @@ -14,8 +14,9 @@
   limitations under the License.
   --%>
   <[EMAIL PROTECTED] import="javax.portlet.PortletRequest" %>
  -<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
  -<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
  +<%@ taglib uri="portlet.tld" prefix='portlet'%>
  +<%@ taglib uri="c.tld" prefix="c" %>
  +<%@ taglib uri="c-rt.tld" prefix="c-rt" %>
   
   <portlet:defineObjects/>
   
  @@ -28,10 +29,46 @@
     </c:when>
   
     <c:otherwise>
  -    User: <c:out value='${renderRequest.userPrincipal.name}'/><br>
  -    
  -    <br>Render request: <%= renderRequest.getAttribute(PortletRequest.USER_INFO) %>
  -    <br>Request: <%= request.getAttribute(PortletRequest.USER_INFO) %>
  +    <b>User Attribute for user:</b> <c:out 
value='${renderRequest.userPrincipal.name}'/><br>
  +    <br>
  +
  +     <table border="1">
  +      <tr>
  +             <th colspan="2" align="center">Portlet Request</th>
  +       </tr>
  +      <tr>
  +             <th>User Attribute</th>
  +             <th>User Attribute Value</th>
  +      </tr>
  +      
  +      <c-rt:forEach var="userAttr" items="<%= 
renderRequest.getAttribute(PortletRequest.USER_INFO)%>">    
  +      <tr>
  +             <td><c:out value="${userAttr.key}"/></td>
  +             <td><c:out value="${userAttr.value}"/></td>
  +      </tr>
  +       </c-rt:forEach>
  +
  +    </table>    
  +
  +     <br>
  +     
  +     <table border="1">
  +      <tr>
  +             <th colspan="2" align="center">Servlet Request</th>
  +       </tr>
  +      <tr>
  +             <th>User Attribute</th>
  +             <th>User Attribute Value</th>
  +      </tr>
  +      
  +      <c-rt:forEach var="userAttr" items="<%= 
request.getAttribute(PortletRequest.USER_INFO)%>">    
  +      <tr>
  +             <td><c:out value="${userAttr.key}"/></td>
  +             <td><c:out value="${userAttr.value}"/></td>
  +      </tr>
  +       </c-rt:forEach>
  +
  +    </table>
         
     </c:otherwise>
   
  
  
  
  1.2       +25 -1     
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/userinfo/help.html
  
  Index: help.html
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/userinfo/help.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- help.html 22 May 2004 21:27:11 -0000      1.1
  +++ help.html 30 May 2004 15:10:26 -0000      1.2
  @@ -1,5 +1,29 @@
   <h3>Example user info</h3>
   
   <p>
  -  Help to be coming soon.
  +  To be able to test the User Info Test Portlet, log in as <code>admin/admin</code>.
  +  Test data has been populated to be able to validate user info behaviors..
  +</p>
  +
  +<p>
  +  The attribute mapping is done in portlet.xml.  The current portlet maps:<br>
  +  
  +  <pre>
  +  &lt;user-attribute&gt;
  +     &lt;description&gt;User Given Name&lt;/description&gt;
  +     &lt;name&gt;user.name.given&lt;/name&gt;
  +  &lt;/user-attribute&gt;
  +  &lt;user-attribute&gt;
  +     &lt;description&gt;User Last Name&lt;/description&gt;
  +     &lt;name&gt;user.name.family&lt;/name&gt;
  +  &lt;/user-attribute&gt;
  +  &lt;user-attribute&gt;
  +     &lt;description&gt;User eMail&lt;/description&gt;
  +     &lt;name&gt;user.home-info.online.email&lt;/name&gt;
  +  &lt;/user-attribute&gt;
  +  </pre>
  +</p>
  +
  +<p>
  +The test data currently only defines <code>user.name.given</code> and 
<code>user.name.family</code>.
   </p>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]