You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sh...@apache.org on 2004/09/10 00:08:17 UTC
cvs commit: jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/userinfo userinfo.jsp
shinsuke 2004/09/09 15:08:17
Modified: applications/demo/src/webapp/WEB-INF hello.jsp
applications/demo/src/webapp/WEB-INF/demo/customerInfo
Page1.jsp Page1Edit.jsp Page2.jsp Page2Edit.jsp
Page3.jsp Page3Edit.jsp
applications/demo/src/webapp/WEB-INF/demo/preference
pref-view.jsp
applications/demo/src/webapp/WEB-INF/demo/security roles.jsp
applications/demo/src/webapp/WEB-INF/demo/simple
AttributeScope.jsp AttributeScopeHelp.jsp
DisplayRequest.jsp DisplayRequestHelp.jsp
applications/demo/src/webapp/WEB-INF/demo/userinfo
userinfo.jsp
Log:
moved English messages to the resource bundle
Revision Changes Path
1.14 +11 -5 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/hello.jsp
Index: hello.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/hello.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- hello.jsp 20 Aug 2004 00:19:07 -0000 1.13
+++ hello.jsp 9 Sep 2004 22:08:17 -0000 1.14
@@ -15,12 +15,18 @@
--%>
<%@ page session="false"%>
<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.portlet.helloworld.resources.HelloWorldResources" />
<portlet:defineObjects/>
-<p>This is a test line</P>
-<b><portlet:namespace/>test@pluto.org</b>
+<p><fmt:message key="hello.label.ThisIsATestLine"/></P>
+<b><portlet:namespace/><fmt:message key="hello.label.TestAtPlutoOrg"/></b>
-<h2>Hello World -- we need to do something better here...</h2>
+<h2><fmt:message key="hello.label.WeNeedToDoSomething"/></h2>
<p>
-Portlet Mode is <b><%= renderRequest.getPortletMode().toString() %></b> <br/>
-Window State is <b><%= renderRequest.getWindowState().toString() %></b> <br/>
+<fmt:message key="hello.label.PortletModeIs">
+ <fmt:param><%= renderRequest.getPortletMode().toString() %></fmt:param>
+</fmt:message>
+<fmt:message key="hello.label.WindowStateIs">
+ <fmt:param><%= renderRequest.getWindowState().toString() %></fmt:param>
+</fmt:message> <br/>
</p>
1.6 +7 -6 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page1.jsp
Index: Page1.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page1.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Page1.jsp 5 Apr 2004 17:44:45 -0000 1.5
+++ Page1.jsp 9 Sep 2004 22:08:17 -0000 1.6
@@ -22,14 +22,15 @@
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<fmt:setBundle basename="org.apache.jetspeed.demo.customerInfo.resources.CustomerListResources" />
<portlet:defineObjects/>
<div>
- Hello from Page 1 with Taglib<br>
+ <fmt:message key="page1.label.HelloFromPage1WithTaglib"/><br>
<table width="100%">
<tr bgcolor="lightgray">
- <th>Customer Name</th>
- <th>Date of Last Order</th>
+ <th><fmt:message key="page1.label.CustomerName"/></th>
+ <th><fmt:message key="page1.label.DateOfLastOrder"/></th>
</tr>
<c:forEach items="${CustomerList}" var="Customer">
<tr>
@@ -39,7 +40,7 @@
</tr>
</c:forEach>
<tr>
- <td colspan="2" align="center">** End of List in request **</td>
+ <td colspan="2" align="center"><fmt:message key="page1.label.EndOfListInRequest"/></td>
</tr>
<%
List customerList = (List) renderRequest.getAttribute("CustomerList");
@@ -57,10 +58,10 @@
}
%>
<tr>
- <td colspan="2" align="center">** End of List in renderRequest **</td>
+ <td colspan="2" align="center"><fmt:message key="page1.label.EndOfListInRenderRequest"/></td>
</tr>
</table>
<p>
- <strong>NOTE:</strong> The above list should match!
+ <fmt:message key="page1.label.NoteTheAboveListShouldMatch"/>
</p>
</div>
1.2 +2 -1 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page1Edit.jsp
Index: Page1Edit.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page1Edit.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Page1Edit.jsp 2 Jun 2004 05:05:38 -0000 1.1
+++ Page1Edit.jsp 9 Sep 2004 22:08:17 -0000 1.2
@@ -18,7 +18,8 @@
%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.demo.customerInfo.resources.CustomerListResources" />
<div>
-This will be Edit mode for the Customer List Portlet<br>
+<fmt:message key="page1Edit.label.ThisWillBeEditMode"/><br>
</div>
1.3 +8 -7 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page2.jsp
Index: Page2.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page2.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Page2.jsp 18 Mar 2004 16:51:27 -0000 1.2
+++ Page2.jsp 9 Sep 2004 22:08:17 -0000 1.3
@@ -18,30 +18,31 @@
%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.demo.customerInfo.resources.CustomerInfoResources" />
<div>
- Hello from Page 2<br>
+ <fmt:message key="page2.label.HelloFromPage2"/><br>
<c:if test="${empty CurrentCustomer}">
<c:set var="CurrentCustomer" value="${CustomerList[0]}"/>
</c:if>
<table>
<tr>
- <td>CustomerName</td>
- <td>:</td>
+ <td><fmt:message key="page2.label.CustomerName"/></td>
+ <td><fmt:message key="page2.label.sepa"/></td>
<td><c:out value="${CurrentCustomer.name}" /></td>
</tr>
<tr>
- <td>Last Ordered</td>
- <td>:</td>
+ <td><fmt:message key="page2.label.LastOrdered"/></td>
+ <td><fmt:message key="page2.label.sepa"/></td>
<td><fmt:formatDate value="${CurrentCustomer.lastOrderedAsDate}" /></td>
</tr>
</table>
<ul>
<c:if test="${CurrentCustomer.billingAddress != null}">
- <li>Show Billing Address in CustomerDetail window</li>
+ <li><fmt:message key="page2.label.ShowBillingAddressInCustomerDetailWindow"/></li>
</c:if>
<c:if test="${CurrentCustomer.shippingAddress != null}">
- <li>Show Shipping Address in CustomerDetail window</li>
+ <li><fmt:message key="page2.label.ShowShippingAddressInCustomerDetailWindow"/></li>
</c:if>
</ul>
</div>
1.2 +2 -1 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page2Edit.jsp
Index: Page2Edit.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page2Edit.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Page2Edit.jsp 2 Jun 2004 05:05:38 -0000 1.1
+++ Page2Edit.jsp 9 Sep 2004 22:08:17 -0000 1.2
@@ -18,7 +18,8 @@
%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.demo.customerInfo.resources.CustomerInfoResources" />
<div>
-This will be Edit mode for the Customer Info Portlet<br>
+<fmt:message key="page2Edit.label.ThisWillBeEditModeForTheCustomerInfoPortlet"/><br>
</div>
1.3 +3 -3 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page3.jsp
Index: Page3.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page3.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Page3.jsp 18 Mar 2004 16:51:27 -0000 1.2
+++ Page3.jsp 9 Sep 2004 22:08:17 -0000 1.3
@@ -18,10 +18,10 @@
%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.demo.customerInfo.resources.CustomerDetailResources" />
<div>
- Hello from Page 3<br>
+ <fmt:message key="page3.label.HelloFromPage3"/><br>
- This page should forwarded to the correct detail page, like address
- or order history...
+ <fmt:message key="page3.label.ThisPageShouldForwardedToTheCorrectDetailPage"/>
</div>
1.2 +2 -1 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page3Edit.jsp
Index: Page3Edit.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page3Edit.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Page3Edit.jsp 2 Jun 2004 05:05:38 -0000 1.1
+++ Page3Edit.jsp 9 Sep 2004 22:08:17 -0000 1.2
@@ -18,7 +18,8 @@
%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.demo.customerInfo.resources.CustomerDetailResources" />
<div>
-This will be Edit mode for the Customer Detail Portlet<br>
+<fmt:message key="page3Edit.label.ThisWillBeEditModeForTheCustomerDetailPortlet"/><br>
</div>
1.6 +11 -8 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/preference/pref-view.jsp
Index: pref-view.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/preference/pref-view.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pref-view.jsp 18 Mar 2004 16:51:21 -0000 1.5
+++ pref-view.jsp 9 Sep 2004 22:08:17 -0000 1.6
@@ -17,29 +17,32 @@
<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
<%@ taglib uri='/WEB-INF/veltag.tld' prefix='vel'%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.demo.preferences.resources.PreferenceResources" />
<portlet:defineObjects/>
-<h3>Preference List</h3>
+<h3><fmt:message key="prefview.label.PreferenceList"/></h3>
<p>
-<portlet:renderURL windowState="normal" portletMode="view" var="viewLink">
- <portlet:param name="invokeMessage" value="No action just render" />
-</portlet:renderURL>
+<portlet:renderURL windowState="normal" portletMode="view" var="baseViewLink"/>
+<c:url value="${baseViewLink}" var="viewLink">
+ <c:param name="invokeMessage"><fmt:message key="prefview.label.noactionjustrender"/></c:param>
+</c:url>
-<a href="<c:out value="${viewLink}" />">View Me!!!</a>
+<a href="<c:out value="${viewLink}" />"><fmt:message key="prefview.label.ViewMe"/></a>
</p>
<p>
-<a href="<portlet:actionURL windowState="normal" portletMode="view" />">Invoke My Action!!!</a>
+<a href="<portlet:actionURL windowState="normal" portletMode="view" />"><fmt:message key="prefview.label.InvokeMyAction"/></a>
</p>
<vel:velocity>
$renderRequest.getAttribute("viewMessage")
<br>
#foreach($paramName in $renderRequest.ParameterNames)
-Parameter: $paramName
+<fmt:message key="prefview.label.Parameter"/> $paramName
<br />
#end
@@ -54,7 +57,7 @@
${prefName} <br/>
#foreach($prefValue in $preferences.getValues($prefName, null))
- value $velocityCount = ${prefValue} <br/>
+ <fmt:message key="prefview.label.value"/> $velocityCount = ${prefValue} <br/>
#end
#end
1.5 +17 -15 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/security/roles.jsp
Index: roles.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/security/roles.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- roles.jsp 22 May 2004 21:26:49 -0000 1.4
+++ roles.jsp 9 Sep 2004 22:08:17 -0000 1.5
@@ -16,43 +16,45 @@
<%@page import="javax.portlet.PortletRequest" %>
<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.demo.security.resources.RoleResources" />
<portlet:defineObjects/>
-<h3>User roles</h3>
+<h3><fmt:message key="roles.label.UserRoles"/></h3>
<c:choose>
<c:when test="${empty renderRequest.userPrincipal}">
- Login to see the roles you've been assigned
+ <fmt:message key="roles.label.LoginToSeeTheRoles"/>
</c:when>
<c:otherwise>
- User: <c:out value='${renderRequest.userPrincipal.name}'/><br>
+ <fmt:message key="roles.label.UserColon"/> <c:out value='${renderRequest.userPrincipal.name}'/><br>
<br>
- isUserInRole:<br>
+ <fmt:message key="roles.label.isUserInRole"/><br>
<table border="1">
<tr>
- <th>Role Ref Name</th>
- <th>Role Name</th>
- <th>PortletRequest</th>
- <th>ServletRequest</th>
+ <th><fmt:message key="roles.label.RoleRefName"/></th>
+ <th><fmt:message key="roles.label.RoleName"/></th>
+ <th><fmt:message key="roles.label.PortletRequest"/></th>
+ <th><fmt:message key="roles.label.ServletRequest"/></th>
</tr>
<tr>
- <td>Administrator</td>
- <td>admin</td>
+ <td><fmt:message key="roles.label.Administrator"/></td>
+ <td><fmt:message key="roles.label.admin"/></td>
<td><%= renderRequest.isUserInRole("Administrator") %></td>
<td><%= request.isUserInRole("Administrator") %></td>
</tr>
<tr>
- <td>Manager</td>
- <td>manager</td>
+ <td><fmt:message key="roles.label.Manager"/></td>
+ <td><fmt:message key="roles.label.manager"/></td>
<td><%= renderRequest.isUserInRole("Manager") %></td>
<td><%= request.isUserInRole("Manager") %></td>
</tr>
<tr>
- <td>User</td>
- <td>user</td>
+ <td><fmt:message key="roles.label.User"/></td>
+ <td><fmt:message key="roles.label.user"/></td>
<td><%= renderRequest.isUserInRole("User") %></td>
<td><%= request.isUserInRole("User") %></td>
</tr>
@@ -61,4 +63,4 @@
</c:choose>
<br>
-For help on role configuration select the help icon.
+<fmt:message key="roles.label.ForHelpOnRoleConfig"/>
1.3 +16 -13 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/AttributeScope.jsp
Index: AttributeScope.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/AttributeScope.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AttributeScope.jsp 18 Mar 2004 19:35:02 -0000 1.2
+++ AttributeScope.jsp 9 Sep 2004 22:08:17 -0000 1.3
@@ -17,23 +17,26 @@
<%@ page import="java.util.*" %>
<%@ page import="javax.portlet.*" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portletAPI'%>
+<fmt:setBundle basename="org.apache.jetspeed.demo.simple.resources.AttributeScopeResources" />
-<portletAPI:init/>
+<portletAPI:defineObjects/>
<div>
- Portlet Name = <c:out value="${portletConfig.portletName}"/><br/>
+<fmt:message key="attributescope.label.PortletName"/> = <c:out value="${portletConfig.portletName}"/><br/>
+<fmt:message key="attributescope.label.SessionID"/>
<%
{
- PortletSession portletSession = portletRequest.getPortletSession();
- out.println( "Session ID = " + portletSession.getId() + "<br/>");
+ PortletSession portletSession = renderRequest.getPortletSession(true);
+ out.println( " = " + portletSession.getId() + "<br/>");
}
%>
- <h2>Application Scope Attributes</h2>
+ <h2><fmt:message key="attributescope.label.ApplicationScopeAttributes"/></h2>
<%
{
Object attribute = null;
- PortletSession portletSession = portletRequest.getPortletSession();
+ PortletSession portletSession = renderRequest.getPortletSession(true);
Enumeration attributes = portletSession.getAttributeNames(PortletSession.APPLICATION_SCOPE);
while (attributes.hasMoreElements())
{
@@ -46,11 +49,11 @@
}
}
%>
- <h2>Portlet Scope Attributes</h2>
+ <h2><fmt:message key="attributescope.label.PortletScopeAttributes"/></h2>
<%
{
Object attribute = null;
- PortletSession portletSession = portletRequest.getPortletSession();
+ PortletSession portletSession = renderRequest.getPortletSession(true);
Enumeration attributes = portletSession.getAttributeNames(PortletSession.PORTLET_SCOPE);
while (attributes.hasMoreElements())
{
@@ -63,15 +66,15 @@
}
}
%>
- <h2>Request Scope Attributes</h2>
+ <h2><fmt:message key="attributescope.label.RequestScopeAttributes"/></h2>
<%
{
Object attribute = null;
- Enumeration attributes = portletRequest.getAttributeNames();
+ Enumeration attributes = renderRequest.getAttributeNames();
while (attributes.hasMoreElements())
{
String name = (String)attributes.nextElement();
- attribute = portletRequest.getAttribute(name);
+ attribute = renderRequest.getAttribute(name);
if (attribute!=null)
{
out.print(name + " = " + attribute + "<br/>");
@@ -80,7 +83,7 @@
}
%>
<br/>
- <form action="<%= portletResponse.createActionURL() %>" method="POST">
- <input type="submit" value="Increment Counters">
+ <form action="<%= renderResponse.createActionURL() %>" method="POST">
+ <input type="submit" value="<fmt:message key="attributescope.label.IncrementCounters"/>">
</form>
</div>
1.3 +3 -1 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/AttributeScopeHelp.jsp
Index: AttributeScopeHelp.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/AttributeScopeHelp.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AttributeScopeHelp.jsp 18 Mar 2004 19:35:02 -0000 1.2
+++ AttributeScopeHelp.jsp 9 Sep 2004 22:08:17 -0000 1.3
@@ -13,7 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.demo.simple.resources.AttributeScopeResources" />
<p>
- This is the Help Jsp for the AttributeScope demo portlet
+ <fmt:message key="attributescopehelp.label.ThisIsHelp"/>
</p>
1.3 +39 -37 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/DisplayRequest.jsp
Index: DisplayRequest.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/DisplayRequest.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DisplayRequest.jsp 18 Mar 2004 19:35:02 -0000 1.2
+++ DisplayRequest.jsp 9 Sep 2004 22:08:17 -0000 1.3
@@ -17,7 +17,9 @@
session="false"
%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
<%@ taglib uri="http://jakarta.apache.org/taglibs/request-1.0" prefix="req" %>
+<fmt:setBundle basename="org.apache.jetspeed.demo.simple.resources.DisplayRequestResources" />
<!--
Copyright (c) 2001 The Apache Software Foundation. All rights
@@ -31,111 +33,111 @@
@author <a href="mailto:paulsp@apache.org">Paul Spencer</a>
-->
<div>
- <center><h1>HTTP Request Header</h1></center>
+ <center><h1><fmt:message key="displayrequest.label.HTTPRequestHeader"/></h1></center>
<table>
<tr>
- <th>Name</th>
- <th>Returned Value</th>
+ <th><fmt:message key="displayrequest.label.Name"/></th>
+ <th><fmt:message key="displayrequest.label.ReturnedValue"/></th>
</tr>
<tr>
- <td>Auth Type</td>
+ <td><fmt:message key="displayrequest.label.AuthType"/></td>
<td><c:out value="${pageContext.request.authType}"/></td>
</tr>
<tr>
- <td>Character Encoding</td>
+ <td><fmt:message key="displayrequest.label.CharacterEncoding"/></td>
<td><c:out value="${pageContext.request.characterEncoding}"/></td>
</tr>
<tr>
- <td>Content Length</td>
+ <td><fmt:message key="displayrequest.label.ContentLength"/></td>
<td><c:out value="${pageContext.request.contentLength}"/></td>
</tr>
<tr>
- <td>Content Type</td>
+ <td><fmt:message key="displayrequest.label.ContentType"/></td>
<td><c:out value="${pageContext.request.contentType}"/></td>
</tr>
<tr>
- <td>Context Path</td>
+ <td><fmt:message key="displayrequest.label.ContextPath"/></td>
<td><c:out value="${pageContext.request.contextPath}"/></td>
</tr>
<tr>
- <td>Method</td>
+ <td><fmt:message key="displayrequest.label.Method"/></td>
<td><c:out value="${pageContext.request.method}"/></td>
</tr>
<tr>
- <td>Path Info</td>
+ <td><fmt:message key="displayrequest.label.PathInfo"/></td>
<td><c:out value="${pageContext.request.pathInfo}"/></td>
</tr>
<tr>
- <td>Path Translated</td>
+ <td><fmt:message key="displayrequest.label.PathTranslated"/></td>
<td><c:out value="${pageContext.request.pathTranslated}"/></td>
</tr>
<tr>
- <td>Protocol</td>
+ <td><fmt:message key="displayrequest.label.Protocol"/></td>
<td><c:out value="${pageContext.request.protocol}"/></td>
</tr>
<tr>
- <td>Query String</td>
+ <td><fmt:message key="displayrequest.label.QueryString"/></td>
<td><c:out value="${pageContext.request.queryString}"/></td>
</tr>
<tr>
- <td>Remote Address</td>
+ <td><fmt:message key="displayrequest.label.RemoteAddress"/></td>
<td><c:out value="${pageContext.request.remoteAddr}"/></td>
</tr>
<tr>
- <td>Remote Host</td>
+ <td><fmt:message key="displayrequest.label.RemoteHost"/></td>
<td><c:out value="${pageContext.request.remoteHost}"/></td>
</tr>
<tr>
- <td>Remote User</td>
+ <td><fmt:message key="displayrequest.label.RemoteUser"/></td>
<td><c:out value="${pageContext.request.remoteUser}"/></td>
</tr>
<tr>
- <td>Requested Session Id</td>
+ <td><fmt:message key="displayrequest.label.RequestedSessionID"/></td>
<td><c:out value="${pageContext.request.requestedSessionId}"/></td>
</tr>
<tr>
- <td>Requested Session Id from Cookie</td>
+ <td><fmt:message key="displayrequest.label.RequestedSessionIDFromcCookie"/></td>
<td><c:out value="${pageContext.request.requestedSessionIdFromCookie}"/></td>
</tr>
<tr>
- <td>Requested Session Id from URL</td>
+ <td><fmt:message key="displayrequest.label.RequestedSessionIDFromURL"/></td>
<td><c:out value="${pageContext.request.requestedSessionIdFromURL}"/></td>
</tr>
<tr>
- <td>Request URI</td>
+ <td><fmt:message key="displayrequest.label.RequestURI"/></td>
<td><c:out value="${pageContext.request.requestURI}"/></td>
</tr>
<tr>
- <td>Request URL</td>
+ <td><fmt:message key="displayrequest.label.RequestURL"/></td>
<td><c:out value="${pageContext.request.requestURL}"/></td>
</tr>
<tr>
- <td>Scheme</td>
+ <td><fmt:message key="displayrequest.label.Scheme"/></td>
<td><c:out value="${pageContext.request.scheme}"/></td>
</tr>
<tr>
- <td>Secure</td>
+ <td><fmt:message key="displayrequest.label.Secure"/></td>
<td><c:out value="${pageContext.request.secure}"/></td>
</tr>
<tr>
- <td>Server Name</td>
+ <td><fmt:message key="displayrequest.label.ServerName"/></td>
<td><c:out value="${pageContext.request.serverName}"/></td>
</tr>
<tr>
- <td>Server Port</td>
+ <td><fmt:message key="displayrequest.label.ServerPort"/></td>
<td><c:out value="${pageContext.request.serverPort}"/></td>
</tr>
<tr>
- <td>Servlet Path</td>
+ <td><fmt:message key="displayrequest.label.ServletPath"/></td>
<td><c:out value="${pageContext.request.servletPath}"/></td>
</tr>
</table>
- <center><h2>HTTP Headers (via JSTL)</h2></center>
+ <center><h2><fmt:message key="displayrequest.label.HTTPHeadersViaJSTL"/></h2></center>
<table>
<tr>
- <th>Name</th>
- <th>Value</th>
+ <th><fmt:message key="displayrequest.label.Name"/></th>
+ <th><fmt:message key="displayrequest.label.Value"/></th>
</tr>
<c:forEach items="${headerValues}" var="headerValue">
<tr>
@@ -146,10 +148,10 @@
</c:forEach>
</table>
- <center><h2>Attributes</h2></center>
+ <center><h2><fmt:message key="displayrequest.label.Attributes"/></h2></center>
<table>
<tr>
- <th>Name</th>
+ <th><fmt:message key="displayrequest.label.Name"/></th>
</tr>
<req:attributes id="loop">
<tr>
@@ -158,11 +160,11 @@
</req:attributes>
</table>
- <center><h2>Parameters</h2></center>
+ <center><h2><fmt:message key="displayrequest.label.Parameters"/></h2></center>
<table>
<tr>
- <th>Name</th>
- <th>Value</th>
+ <th><fmt:message key="displayrequest.label.Name"/></th>
+ <th><fmt:message key="displayrequest.label.Value"/></th>
</tr>
<req:parameters id="loop">
<tr>
@@ -171,11 +173,11 @@
</tr>
</req:parameters>
</table>
- <center><h2>Cookies</h2></center>
+ <center><h2><fmt:message key="displayrequest.label.Cookies"/></h2></center>
<table>
<tr>
- <th>Name</th>
- <th>Value</th>
+ <th><fmt:message key="displayrequest.label.Name"/></th>
+ <th><fmt:message key="displayrequest.label.Value"/></th>
</tr>
<req:cookies id="loop">
<tr>
1.3 +3 -1 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/DisplayRequestHelp.jsp
Index: DisplayRequestHelp.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/DisplayRequestHelp.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DisplayRequestHelp.jsp 18 Mar 2004 19:35:02 -0000 1.2
+++ DisplayRequestHelp.jsp 9 Sep 2004 22:08:17 -0000 1.3
@@ -13,7 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.demo.simple.resources.DisplayRequestResources" />
<p>
- This is the Help Jsp for the DisplayRequest demo portlet
+ <fmt:message key="displayrequesthelp.label.ThisIsHelp"/>
</p>
1.7 +12 -10 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- userinfo.jsp 30 May 2004 15:10:26 -0000 1.6
+++ userinfo.jsp 9 Sep 2004 22:08:17 -0000 1.7
@@ -17,28 +17,30 @@
<%@ taglib uri="portlet.tld" prefix='portlet'%>
<%@ taglib uri="c.tld" prefix="c" %>
<%@ taglib uri="c-rt.tld" prefix="c-rt" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.demo.userinfo.resources.UserInfoResources" />
<portlet:defineObjects/>
-<h3>User attributes</h3>
+<h3><fmt:message key="userinfo.label.UserAttributes"/></h3>
<c:choose>
<c:when test="${empty renderRequest.userPrincipal}">
- Login to see the user attributes available.
+ <fmt:message key="userinfo.label.LoginToSeeTheUserAttributesAvailable"/>
</c:when>
<c:otherwise>
- <b>User Attribute for user:</b> <c:out value='${renderRequest.userPrincipal.name}'/><br>
+ <b><fmt:message key="userinfo.label.UserAttributeForUser"/></b> <c:out value='${renderRequest.userPrincipal.name}'/><br>
<br>
<table border="1">
<tr>
- <th colspan="2" align="center">Portlet Request</th>
+ <th colspan="2" align="center"><fmt:message key="userinfo.label.PortletRequest"/></th>
</tr>
<tr>
- <th>User Attribute</th>
- <th>User Attribute Value</th>
+ <th><fmt:message key="userinfo.label.UserAttribute"/></th>
+ <th><fmt:message key="userinfo.label.UserAttributeValue"/></th>
</tr>
<c-rt:forEach var="userAttr" items="<%= renderRequest.getAttribute(PortletRequest.USER_INFO)%>">
@@ -54,11 +56,11 @@
<table border="1">
<tr>
- <th colspan="2" align="center">Servlet Request</th>
+ <th colspan="2" align="center"><fmt:message key="userinfo.label.ServletRequest"/></th>
</tr>
<tr>
- <th>User Attribute</th>
- <th>User Attribute Value</th>
+ <th><fmt:message key="userinfo.label.UserAttribute"/></th>
+ <th><fmt:message key="userinfo.label.UserAttributeValue"/></th>
</tr>
<c-rt:forEach var="userAttr" items="<%= request.getAttribute(PortletRequest.USER_INFO)%>">
@@ -74,4 +76,4 @@
</c:choose>
<br>
-For help on user attributes configuration select the help icon.
+<fmt:message key="userinfo.label.ForHelpOnUserAttributesConfigurationSelectTheHelpIcon"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org