Return-Path: 
 <connectors-commits-return-2085-apmail-incubator-connectors-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7061674F3
	for <apmail-incubator-connectors-commits-archive@minotaur.apache.org>;
 Tue, 27 Dec 2011 14:49:10 +0000 (UTC)
Received: (qmail 4724 invoked by uid 500); 27 Dec 2011 14:49:10 -0000
Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org
Received: (qmail 4553 invoked by uid 500); 27 Dec 2011 14:49:09 -0000
Mailing-List: contact connectors-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:connectors-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:connectors-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:connectors-commits@incubator.apache.org>
List-Id: <connectors-commits.incubator.apache.org>
Reply-To: connectors-dev@incubator.apache.org
Delivered-To: mailing list connectors-commits@incubator.apache.org
Received: (qmail 4531 invoked by uid 99); 27 Dec 2011 14:49:09 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Dec 2011 14:49:09 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,WEIRD_QUOTING
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Dec 2011 14:49:05 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 218A023889ED;
	Tue, 27 Dec 2011 14:48:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1224918 [4/4] - in
 /incubator/lcf/branches/CONNECTORS-335/framework:
 core/src/main/resource/org/apache/manifoldcf/core/i18n/
 crawler-ui/src/main/resource/ crawler-ui/src/main/webapp/
Date: Tue, 27 Dec 2011 14:48:43 -0000
To: connectors-commits@incubator.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111227144845.218A023889ED@eris.apache.org>

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/resultreport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/resultreport.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/resultreport.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/resultreport.jsp Tue Dec 27 14:48:42 2011
@@ -31,7 +31,7 @@ boolean maintenanceUnderway = org.apache
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key='resultreport.ApacheManifoldCFActivityResultReport' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ApacheManifoldCFActivityResultReport")%>
 	</title>
 
 	<script type="text/javascript">
@@ -195,7 +195,7 @@ boolean maintenanceUnderway = org.apache
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key='resultreport.ActivityResultReport' /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ActivityResultReport")%></p>
 <%
 if (maintenanceUnderway == false)
 {
@@ -429,9 +429,9 @@ if (maintenanceUnderway == false)
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><fmt:message key='resultreport.Connection' /></td><td class="value" colspan="1">
+				<td class="description" colspan="1"><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.Connection")%></td><td class="value" colspan="1">
 					<select name="reportconnection" size="3">
-						<option <%=(reportConnection.length()==0)?"selected=\"selected\"":""%> value="">-- <fmt:message key='resultreport.NotSpecified' /> --</option>
+						<option <%=(reportConnection.length()==0)?"selected=\"selected\"":""%> value="">-- <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
 <%
 	int i = 0;
 	while (i < connList.length)
@@ -452,7 +452,7 @@ if (maintenanceUnderway == false)
 	if (reportConnection.length() > 0)
 	{
 %>
-				<td class="description" colspan="1"><fmt:message key='resultreport.Activities' /></td><td class="value" colspan="1">
+				<td class="description" colspan="1"><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.Activities")%></td><td class="value" colspan="1">
 					<input type="hidden" name="reportactivities_posted" value="true"/>
 					<select multiple="true" name="reportactivities" size="3">
 <%
@@ -482,10 +482,10 @@ if (maintenanceUnderway == false)
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><fmt:message key='resultreport.StartTime' /></td>
+				<td class="description"><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.StartTime")%></td>
 				<td class="value" colspan="3">
 				    <select class="schedulepulldown" name='reportstarthour' size="3">
-					<option value="" <%=(startHour.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='resultreport.NotSpecified' /> --</option>
+					<option value="" <%=(startHour.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
 <%
 					k = 0;
 					while (k < 24)
@@ -510,7 +510,7 @@ if (maintenanceUnderway == false)
 %>
 				    </select><nobr/>:<nobr/> 
 				    <select class="schedulepulldown" name='reportstartminute' size="3">
-					<option value="" <%=(startMinute.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='resultreport.NotSpecified' /> --</option>
+					<option value="" <%=(startMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
 <%
 					k = 0;
 					while (k < 60)
@@ -521,24 +521,24 @@ if (maintenanceUnderway == false)
 						k++;
 					}
 %>
-				    </select> <fmt:message key='resultreport.on' /> 
+				    </select> <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.on")%> 
 				    <select class="schedulepulldown" name='reportstartmonth' size="3">
-					<option value="" <%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='resultreport.NotSpecified' /> --</option>
-					<option value="0" <%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.January' /></option>
-					<option value="1" <%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.February' /></option>
-					<option value="2" <%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.March' /></option>
-					<option value="3" <%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.April' /></option>
-					<option value="4" <%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.May' /></option>
-					<option value="5" <%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.June' /></option>
-					<option value="6" <%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.July' /></option>
-					<option value="7" <%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.August' /></option>
-					<option value="8" <%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.September' /></option>
-					<option value="9" <%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.October' /></option>
-					<option value="10" <%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.November' /></option>
-					<option value="11" <%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.December' /></option>
+					<option value="" <%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+					<option value="0" <%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.January")%></option>
+					<option value="1" <%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.February")%></option>
+					<option value="2" <%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.March")%></option>
+					<option value="3" <%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.April")%></option>
+					<option value="4" <%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.May")%></option>
+					<option value="5" <%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.June")%></option>
+					<option value="6" <%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.July")%></option>
+					<option value="7" <%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.August")%></option>
+					<option value="8" <%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.September")%></option>
+					<option value="9" <%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.October")%></option>
+					<option value="10" <%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.November")%></option>
+					<option value="11" <%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.December")%></option>
 				    </select><nobr/>
 				    <select class="schedulepulldown" name='reportstartday' size="3">
-					<option value="" <%=(startDay.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='resultreport.NotSpecified' /> --</option>
+					<option value="" <%=(startDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
 <%
 					k = 0;
 					while (k < 31)
@@ -561,7 +561,7 @@ if (maintenanceUnderway == false)
 %>
 				    </select><nobr/>,<nobr/>
 				    <select class="schedulepulldown" name='reportstartyear' size="3">
-					<option value="" <%=(startYear.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='resultreport.NotSpecified' /> --</option>
+					<option value="" <%=(startYear.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
 					<option value="2005" <%=(startYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
 					<option value="2006" <%=(startYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
 					<option value="2007" <%=(startYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
@@ -577,10 +577,10 @@ if (maintenanceUnderway == false)
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><fmt:message key='resultreport.EndTime' /></td>
+				<td class="description"><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.EndTime")%></td>
 				<td class="value" colspan="3">
 				    <select class="schedulepulldown" name='reportendhour' size="3">
-					<option value="" <%=(endHour.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='resultreport.NotSpecified' /> --</option>
+					<option value="" <%=(endHour.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
 <%
 					k = 0;
 					while (k < 24)
@@ -605,7 +605,7 @@ if (maintenanceUnderway == false)
 %>
 				    </select><nobr/>:<nobr/> 
 				    <select class="schedulepulldown" name='reportendminute' size="3">
-					<option value="" <%=(endMinute.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='resultreport.NotSpecified' /> --</option>
+					<option value="" <%=(endMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
 <%
 					k = 0;
 					while (k < 60)
@@ -616,24 +616,24 @@ if (maintenanceUnderway == false)
 						k++;
 					}
 %>
-				    </select> <fmt:message key='resultreport.on' /> 
+				    </select> <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.on")%> 
 				    <select class="schedulepulldown" name='reportendmonth' size="3">
-					<option value="" <%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='resultreport.NotSpecified' /> --</option>
-					<option value="0" <%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.January' /></option>
-					<option value="1" <%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.February' /></option>
-					<option value="2" <%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.March' /></option>
-					<option value="3" <%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.April' /></option>
-					<option value="4" <%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.May' /></option>
-					<option value="5" <%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.June' /></option>
-					<option value="6" <%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.July' /></option>
-					<option value="7" <%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.August' /></option>
-					<option value="8" <%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.September' /></option>
-					<option value="9" <%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.October' /></option>
-					<option value="10" <%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.November' /></option>
-					<option value="11" <%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><fmt:message key='resultreport.December' /></option>
+					<option value="" <%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+					<option value="0" <%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.January")%></option>
+					<option value="1" <%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.February")%></option>
+					<option value="2" <%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.March")%></option>
+					<option value="3" <%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.April")%></option>
+					<option value="4" <%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.May")%></option>
+					<option value="5" <%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.June")%></option>
+					<option value="6" <%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.July")%></option>
+					<option value="7" <%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.August")%></option>
+					<option value="8" <%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.September")%></option>
+					<option value="9" <%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.October")%></option>
+					<option value="10" <%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.November")%></option>
+					<option value="11" <%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.December")%></option>
 				    </select><nobr/>
 				    <select class="schedulepulldown" name='reportendday' size="3">
-					<option value="" <%=(endDay.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='resultreport.NotSpecified' /> --</option>
+					<option value="" <%=(endDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
 <%
 					k = 0;
 					while (k < 31)
@@ -656,7 +656,7 @@ if (maintenanceUnderway == false)
 %>
 				    </select><nobr/>,<nobr/>
 				    <select class="schedulepulldown" name='reportendyear' size="3">
-					<option value="" <%=(endYear.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='resultreport.NotSpecified' /> --</option>
+					<option value="" <%=(endYear.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
 					<option value="2005" <%=(endYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
 					<option value="2006" <%=(endYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
 					<option value="2007" <%=(endYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
@@ -675,9 +675,9 @@ if (maintenanceUnderway == false)
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='resultreport.EntityMatch' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.EntityMatch")%></nobr></td>
 				<td class="value"><input type="text" name="reportentitymatch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(entityMatch)%>'/></td>
-				<td class="description"><nobr><fmt:message key='resultreport.ResultCodeMatch' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatch")%></nobr></td>
 				<td class="value"><input type="text" name="reportresultcodematch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(resultCodeMatch)%>'/></td>
 			</tr>
 			<tr>
@@ -685,9 +685,9 @@ if (maintenanceUnderway == false)
 			</tr>
 
 			<tr>
-				<td class="description"><nobr><fmt:message key='resultreport.IdentifierClassDescription' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescription")%></nobr></td>
 				<td class="value"><input type="text" name="reportbucketdesc" size="20" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(reportBucketDesc)%>'/></td>
-				<td class="description"><nobr><fmt:message key='resultreport.ResultCodeClassDescription' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeClassDescription")%></nobr></td>
 				<td class="value"><input type="text" name="reportresultdesc" size="20" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(reportResultDesc)%>'/></td>
 			</tr>
 			<tr>
@@ -698,13 +698,13 @@ if (maintenanceUnderway == false)
 	if (reportConnection.length() > 0)
 	{
 %>
-					<a name="MainButton"><input type="button" value="<fmt:message key='resultreport.Go' />" onClick="javascript:Go()" alt="<fmt:message key='resultreport.ExecuteThisQuery' />"/></a>
+					<a name="MainButton"><input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.Go")%>" onClick="javascript:Go()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ExecuteThisQuery")%>"/></a>
 <%
 	}
 	else
 	{
 %>
-					<a name="MainButton"><input type="button" value="<fmt:message key='resultreport.Continue' />" onClick="javascript:Continue()" alt="<fmt:message key='resultreport.Continue' />"/></a>
+					<a name="MainButton"><input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>"/></a>
 <%
 	}
 %>
@@ -772,9 +772,9 @@ if (maintenanceUnderway == false)
 
 		<table class="displaytable">
 		    <tr class="headerrow">
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("idbucket");'><nobr><fmt:message key='resultreport.IdentifierClass' /></nobr></a></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("resultcodebucket");'><nobr><fmt:message key='resultreport.ResultClass' /></nobr></a></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("eventcount");'><nobr><fmt:message key='resultreport.EventCount' /></nobr></a></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("idbucket");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClass")%></nobr></a></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("resultcodebucket");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ResultClass")%></nobr></a></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("eventcount");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.EventCount")%></nobr></a></td>
 		    </tr>
 <%
 		zz = 0;
@@ -817,13 +817,13 @@ if (maintenanceUnderway == false)
 		if (startRow == 0)
 		{
 %>
-				<fmt:message key='resultreport.Previous' />
+				<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.Previous")%>
 <%
 		}
 		else
 		{
 %>
-				<a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="<fmt:message key='resultreport.PreviousPage' />"><fmt:message key='resultreport.Previous' /></a>
+				<a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.PreviousPage")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.Previous")%></a>
 <%
 		}
 %>
@@ -832,20 +832,20 @@ if (maintenanceUnderway == false)
 		if (hasMoreRows == false)
 		{
 %>
-				<fmt:message key='resultreport.Next' />
+				<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.Next")%>
 <%
 		}
 		else
 		{
 %>
-				<a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="<fmt:message key='resultreport.NextPage' />"><fmt:message key='resultreport.Next' /></a>
+				<a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.NextPage")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.Next")%></a>
 <%
 		}
 %>
 				</nobr>
 			</td>
-			<td class="description"><nobr><fmt:message key='resultreport.Rows' /></nobr></td><td class="value"><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></td>
-			<td class="description"><nobr><fmt:message key='resultreport.RowsPerPage' /></nobr></td>
+			<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.Rows")%></nobr></td><td class="value"><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></td>
+			<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.RowsPerPage")%></nobr></td>
 			<td class="value">
 				<input type="text" name="rowcount" size="5" value='<%=Integer.toString(rowCount)%>'/>
 			</td>
@@ -860,7 +860,7 @@ if (maintenanceUnderway == false)
 	else
 	{
 %>
-		<table class="displaytable"><tr><td class="message"><fmt:message key='resultreport.PleaseSelectAConnection' /></td></tr></table>
+		<table class="displaytable"><tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.PleaseSelectAConnection")%></td></tr></table>
 <%
 	}
 %>
@@ -872,7 +872,7 @@ else
 %>
 		<table class="displaytable">
 			<tr><td class="separator" colspan="1"><hr/></td></tr>
-			<tr><td class="message"><fmt:message key='resultreport.PleaseTryAgainLater' /></td></tr>
+			<tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.PleaseTryAgainLater")%></td></tr>
 		</table>
 <%
 }

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/showjobstatus.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/showjobstatus.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/showjobstatus.jsp Tue Dec 27 14:48:42 2011
@@ -31,7 +31,7 @@ boolean maintenanceUnderway = org.apache
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key='showjobstatus.ApacheManifoldCFStatusOfAllJobs' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.ApacheManifoldCFStatusOfAllJobs")%>
 	</title>
 
 	<script type="text/javascript">
@@ -83,7 +83,7 @@ boolean maintenanceUnderway = org.apache
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key='showjobstatus.StatusOfJobs' /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.StatusOfJobs")%></p>
 <%
 if (maintenanceUnderway == false)
 {
@@ -105,7 +105,7 @@ if (maintenanceUnderway == false)
 				<td class="separator" colspan="8"><hr/></td>
 			</tr>
 			<tr class="headerrow">
-				<td class="columnheader"></td><td class="columnheader"><fmt:message key='showjobstatus.Name' /></td><td class="columnheader"><fmt:message key='showjobstatus.Status' /></td><td class="columnheader"><fmt:message key='showjobstatus.StartTime' /></td><td class="columnheader"><fmt:message key='showjobstatus.EndTime' /></td><td class="columnheader"><fmt:message key='showjobstatus.Documents' /></td><td class="columnheader"><fmt:message key='showjobstatus.Active' /></td><td class="columnheader"><fmt:message key='showjobstatus.Processed' /></td>
+				<td class="columnheader"></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%></td>
 			</tr>
 <%
 	int i = 0;
@@ -246,7 +246,7 @@ if (maintenanceUnderway == false)
 			<tr>
 				<td class="separator" colspan="8"><hr/></td>
 			</tr>
-		<tr><td class="message" colspan="8"><a href="showjobstatus.jsp" alt="<fmt:message key='showjobstatus.RefreshStatus' />"><fmt:message key='showjobstatus.Refresh' /></a></td></tr>
+		<tr><td class="message" colspan="8"><a href="showjobstatus.jsp" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.RefreshStatus")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%></a></td></tr>
 		</table>
 
 <%
@@ -266,7 +266,7 @@ else
 %>
 		<table class="displaytable">
 			<tr><td class="separator" colspan="1"><hr/></td></tr>
-			<tr><td class="message"><fmt:message key='showjobstatus.PleaseTryAgainLater' /></td></tr>
+			<tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.PleaseTryAgainLater")%></td></tr>
 		</table>
 <%
 }

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/simplereport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/simplereport.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/simplereport.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/simplereport.jsp Tue Dec 27 14:48:42 2011
@@ -32,7 +32,7 @@ boolean maintenanceUnderway = org.apache
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key='simplereport.ApacheManifoldCFSimpleHistoryReport' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.ApacheManifoldCFSimpleHistoryReport")%>
 	</title>
 
 	<script type="text/javascript">
@@ -130,7 +130,7 @@ boolean maintenanceUnderway = org.apache
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key='simplereport.SimpleHistoryReport' /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.SimpleHistoryReport")%></p>
 <%
 if (maintenanceUnderway == false)
 {
@@ -358,9 +358,9 @@ if (maintenanceUnderway == false)
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><fmt:message key='simplereport.Connection' /></td><td class="value" colspan="1">
+				<td class="description" colspan="1"><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Connection")%></td><td class="value" colspan="1">
 					<select name="reportconnection" size="3">
-						<option <%=(reportConnection.length()==0)?"selected=\"selected\"":""%> value="">-- <fmt:message key='simplereport.NotSpecified' /> --</option>
+						<option <%=(reportConnection.length()==0)?"selected=\"selected\"":""%> value="">-- <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%> --</option>
 <%
 	int i = 0;
 	while (i < connList.length)
@@ -381,7 +381,7 @@ if (maintenanceUnderway == false)
 	if (reportConnection.length() > 0)
 	{
 %>
-				<td class="description" colspan="1"><fmt:message key='simplereport.Activities' /></td><td class="value" colspan="1">
+				<td class="description" colspan="1"><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Activities")%></td><td class="value" colspan="1">
 					<input type="hidden" name="reportactivities_posted" value="true"/>
 					<select multiple="true" name="reportactivities" size="3">
 <%
@@ -411,10 +411,10 @@ if (maintenanceUnderway == false)
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><fmt:message key='simplereport.StartTime' /></td>
+				<td class="description"><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.StartTime")%></td>
 				<td class="value" colspan="3">
 				    <select class="schedulepulldown" name='reportstarthour' size="3">
-					<option value="" <%=(startHour.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='simplereport.NotSpecified' /> --</option>
+					<option value="" <%=(startHour.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%> --</option>
 <%
 					k = 0;
 					while (k < 24)
@@ -439,7 +439,7 @@ if (maintenanceUnderway == false)
 %>
 				    </select><nobr/>:<nobr/> 
 				    <select class="schedulepulldown" name='reportstartminute' size="3">
-					<option value="" <%=(startMinute.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='simplereport.NotSpecified' /> --</option>
+					<option value="" <%=(startMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%> --</option>
 <%
 					k = 0;
 					while (k < 60)
@@ -450,24 +450,24 @@ if (maintenanceUnderway == false)
 						k++;
 					}
 %>
-				    </select><fmt:message key='simplereport.on' />
+				    </select><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.on")%>
 				    <select class="schedulepulldown" name='reportstartmonth' size="3">
-					<option value="" <%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='simplereport.NotSpecified' /> --</option>
-					<option value="0" <%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.January' /></option>
-					<option value="1" <%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.February' /></option>
-					<option value="2" <%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.March' /></option>
-					<option value="3" <%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.April' /></option>
-					<option value="4" <%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.May' /></option>
-					<option value="5" <%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.June' /></option>
-					<option value="6" <%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.July' /></option>
-					<option value="7" <%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.August' /></option>
-					<option value="8" <%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.September' /></option>
-					<option value="9" <%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.October' /></option>
-					<option value="10" <%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.November' /></option>
-					<option value="11" <%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.December' /></option>
+					<option value="" <%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%> --</option>
+					<option value="0" <%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.January")%></option>
+					<option value="1" <%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.February")%></option>
+					<option value="2" <%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.March")%></option>
+					<option value="3" <%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.April")%></option>
+					<option value="4" <%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.May")%></option>
+					<option value="5" <%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.June")%></option>
+					<option value="6" <%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.July")%></option>
+					<option value="7" <%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.August")%></option>
+					<option value="8" <%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.September")%></option>
+					<option value="9" <%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.October")%></option>
+					<option value="10" <%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.November")%></option>
+					<option value="11" <%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.December")%></option>
 				    </select><nobr/>
 				    <select class="schedulepulldown" name='reportstartday' size="3">
-					<option value="" <%=(startDay.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='simplereport.NotSpecified' /> --</option>
+					<option value="" <%=(startDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%> --</option>
 <%
 					k = 0;
 					while (k < 31)
@@ -490,7 +490,7 @@ if (maintenanceUnderway == false)
 %>
 				    </select><nobr/>,<nobr/>
 				    <select class="schedulepulldown" name='reportstartyear' size="3">
-					<option value="" <%=(startYear.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='simplereport.NotSpecified' /> --</option>
+					<option value="" <%=(startYear.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%> --</option>
 					<option value="2005" <%=(startYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
 					<option value="2006" <%=(startYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
 					<option value="2007" <%=(startYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
@@ -506,10 +506,10 @@ if (maintenanceUnderway == false)
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><fmt:message key='simplereport.EndTime' /></td>
+				<td class="description"><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.EndTime")%></td>
 				<td class="value" colspan="3">
 				    <select class="schedulepulldown" name='reportendhour' size="3">
-					<option value="" <%=(endHour.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='simplereport.NotSpecified' /> --</option>
+					<option value="" <%=(endHour.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%> --</option>
 <%
 					k = 0;
 					while (k < 24)
@@ -534,7 +534,7 @@ if (maintenanceUnderway == false)
 %>
 				    </select><nobr/>:<nobr/> 
 				    <select class="schedulepulldown" name='reportendminute' size="3">
-					<option value="" <%=(endMinute.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='simplereport.NotSpecified' /> --</option>
+					<option value="" <%=(endMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%> --</option>
 <%
 					k = 0;
 					while (k < 60)
@@ -545,24 +545,24 @@ if (maintenanceUnderway == false)
 						k++;
 					}
 %>
-				    </select><fmt:message key='simplereport.on' />
+				    </select><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.on")%>
 				    <select class="schedulepulldown" name='reportendmonth' size="3">
-					<option value="" <%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='simplereport.NotSpecified' /> --</option>
-					<option value="0" <%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.January' /></option>
-					<option value="1" <%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.February' /></option>
-					<option value="2" <%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.March' /></option>
-					<option value="3" <%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.April' /></option>
-					<option value="4" <%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.May' /></option>
-					<option value="5" <%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.June' /></option>
-					<option value="6" <%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.July' /></option>
-					<option value="7" <%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.August' /></option>
-					<option value="8" <%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.September' /></option>
-					<option value="9" <%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.October' /></option>
-					<option value="10" <%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.November' /></option>
-					<option value="11" <%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><fmt:message key='simplereport.December' /></option>
+					<option value="" <%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%> --</option>
+					<option value="0" <%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.January")%></option>
+					<option value="1" <%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.February")%></option>
+					<option value="2" <%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.March")%></option>
+					<option value="3" <%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.April")%></option>
+					<option value="4" <%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.May")%></option>
+					<option value="5" <%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.June")%></option>
+					<option value="6" <%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.July")%></option>
+					<option value="7" <%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.August")%></option>
+					<option value="8" <%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.September")%></option>
+					<option value="9" <%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.October")%></option>
+					<option value="10" <%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.November")%></option>
+					<option value="11" <%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.December")%></option>
 				    </select><nobr/>
 				    <select class="schedulepulldown" name='reportendday' size="3">
-					<option value="" <%=(endDay.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='simplereport.NotSpecified' /> --</option>
+					<option value="" <%=(endDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%> --</option>
 <%
 					k = 0;
 					while (k < 31)
@@ -585,7 +585,7 @@ if (maintenanceUnderway == false)
 %>
 				    </select><nobr/>,<nobr/>
 				    <select class="schedulepulldown" name='reportendyear' size="3">
-					<option value="" <%=(endYear.length()==0)?"selected=\"selected\"":""%>>-- <fmt:message key='simplereport.NotSpecified' /> --</option>
+					<option value="" <%=(endYear.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%> --</option>
 					<option value="2005" <%=(endYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
 					<option value="2006" <%=(endYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
 					<option value="2007" <%=(endYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
@@ -604,9 +604,9 @@ if (maintenanceUnderway == false)
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='simplereport.EntityMatch' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.EntityMatch")%></nobr></td>
 				<td class="value"><input type="text" name="reportentitymatch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(entityMatch)%>'/></td>
-				<td class="description"><nobr><fmt:message key='simplereport.ResultCodeMatch' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.ResultCodeMatch")%></nobr></td>
 				<td class="value"><input type="text" name="reportresultcodematch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(resultCodeMatch)%>'/></td>
 			</tr>
 			<tr>
@@ -617,13 +617,13 @@ if (maintenanceUnderway == false)
 	if (reportConnection.length() > 0)
 	{
 %>
-					<a name="MainButton"><input type="button" value="<fmt:message key='simplereport.Go' />" onClick="javascript:Go()" alt="<fmt:message key='simplereport.ExecuteThisQuery' />"/></a>
+					<a name="MainButton"><input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Go")%>" onClick="javascript:Go()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.ExecuteThisQuery")%>"/></a>
 <%
 	}
 	else
 	{
 %>
-					<a name="MainButton"><input type="button" value="<fmt:message key='simplereport.Continue' />" onClick="javascript:Continue()" alt="<fmt:message key='simplereport.Continue' />"/></a>
+					<a name="MainButton"><input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Continue")%>"/></a>
 <%
 	}
 %>
@@ -688,13 +688,13 @@ if (maintenanceUnderway == false)
 
 		<table class="displaytable">
 		    <tr class="headerrow">
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("starttime");'><nobr><fmt:message key='simplereport.StartTime' /></nobr></a></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("activity");'><nobr><fmt:message key='simplereport.Activity' /></nobr></a></td>
-			<td class="reportcolumnheader"><nobr><fmt:message key='simplereport.Identifier' /></nobr></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("resultcode");'><nobr><fmt:message key='simplereport.ResultCode' /></nobr></a></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("bytes");'><nobr><fmt:message key='simplereport.Bytes' /></nobr></a></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("elapsedtime");'><nobr><fmt:message key='simplereport.Time' /></nobr></a></td>
-			<td class="reportcolumnheader"><nobr><fmt:message key='simplereport.ResultDescription' /></nobr></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("starttime");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.StartTime")%></nobr></a></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("activity");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Activity")%></nobr></a></td>
+			<td class="reportcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Identifier")%></nobr></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("resultcode");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.ResultCode")%></nobr></a></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("bytes");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Bytes")%></nobr></a></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("elapsedtime");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Time")%></nobr></a></td>
+			<td class="reportcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.ResultDescription")%></nobr></td>
 		    </tr>
 <%
 		zz = 0;
@@ -751,13 +751,13 @@ if (maintenanceUnderway == false)
 		if (startRow == 0)
 		{
 %>
-				<fmt:message key='simplereport.Previous' />
+				<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Previous")%>
 <%
 		}
 		else
 		{
 %>
-				<a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="<fmt:message key='simplereport.PreviousPage' />"><fmt:message key='simplereport.Previous' /></a>
+				<a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.PreviousPage")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Previous")%></a>
 <%
 		}
 %>
@@ -766,20 +766,20 @@ if (maintenanceUnderway == false)
 		if (hasMoreRows == false)
 		{
 %>
-				<fmt:message key='simplereport.Next' />
+				<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Next")%>
 <%
 		}
 		else
 		{
 %>
-				<a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="<fmt:message key='simplereport.NextPage' />"><fmt:message key='simplereport.Next' /></a>
+				<a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.NextPage")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Next")%></a>
 <%
 		}
 %>
 				</nobr>
 			</td>
 			<td class="description"><nobr>Rows:</nobr></td><td class="value"><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></td>
-			<td class="description"><nobr><fmt:message key='simplereport.RowsPerPage' /></nobr></td>
+			<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.RowsPerPage")%></nobr></td>
 			<td class="value">
 				<input type="text" name="rowcount" size="5" value='<%=Integer.toString(rowCount)%>'/>
 			</td>
@@ -794,7 +794,7 @@ if (maintenanceUnderway == false)
 	else
 	{
 %>
-		<table class="displaytable"><tr><td class="message"><fmt:message key='simplereport.PleaseSelectAConnection' /></td></tr></table>
+		<table class="displaytable"><tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.PleaseSelectAConnection")%></td></tr></table>
 <%
 	}
 %>
@@ -806,7 +806,7 @@ else
 %>
 		<table class="displaytable">
 			<tr><td class="separator" colspan="1"><hr/></td></tr>
-			<tr><td class="message"><fmt:message key='simplereport.PleaseTryAgainLater' /></td></tr>
+			<tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.PleaseTryAgainLater")%></td></tr>
 		</table>
 <%
 }

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewauthority.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewauthority.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewauthority.jsp Tue Dec 27 14:48:42 2011
@@ -56,7 +56,7 @@
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key='viewauthority.ViewAuthorityConnectionStatus' /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.ViewAuthorityConnectionStatus")%></p>
 	<form class="standardform" name="viewconnection" action="execute.jsp" method="POST">
 		<input type="hidden" name="op" value="Continue"/>
 		<input type="hidden" name="type" value="authority"/>
@@ -120,15 +120,15 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewauthority.Name' /></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewauthority.Description' /></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.Name")%></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.Description")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewauthority.AuthorityType' /></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewauthority.MaxConnections' /></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.AuthorityType")%></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.MaxConnections")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
@@ -145,12 +145,12 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewauthority.ConnectionStatus' /></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.ConnectionStatus")%></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
-		<tr><td class="message" colspan="4"><a href='<%="viewauthority.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<fmt:message key='viewauthority.Refresh' />"><fmt:message key='viewauthority.Refresh' /></a>&nbsp;<a href='<%="editauthority.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<fmt:message key='viewauthority.EditThisAuthorityConnection' />"><fmt:message key='viewauthority.Edit' /></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<fmt:message key='viewauthority.DeleteThisAuthorityConnection' />"><fmt:message key='viewauthority.Delete' /></a>
+		<tr><td class="message" colspan="4"><a href='<%="viewauthority.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%></a>&nbsp;<a href='<%="editauthority.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.EditThisAuthorityConnection")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.Edit")%></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.DeleteThisAuthorityConnection")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.Delete")%></a>
 		</td></tr>
 		</table>
 

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewconnection.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewconnection.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewconnection.jsp Tue Dec 27 14:48:42 2011
@@ -29,7 +29,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key='viewconnection.ApacheManifoldCFViewRepositoryConnectionStatus' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.ApacheManifoldCFViewRepositoryConnectionStatus")%>
 	</title>
 
 	<script type="text/javascript">
@@ -37,7 +37,7 @@
 
 	function Delete(connectionName)
 	{
-		if (confirm("<fmt:message key='viewconnection.DeleteConnection' /> '"+connectionName+"'?"))
+		if (confirm("<%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.DeleteConnection")%> '"+connectionName+"'?"))
 		{
 			document.viewconnection.op.value="Delete";
 			document.viewconnection.connname.value=connectionName;
@@ -56,7 +56,7 @@
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key='viewconnection.ViewRepositoryConnectionStatus' /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.ViewRepositoryConnectionStatus")%></p>
 	<form class="standardform" name="viewconnection" action="execute.jsp" method="POST">
 		<input type="hidden" name="op" value="Continue"/>
 		<input type="hidden" name="type" value="connection"/>
@@ -123,24 +123,24 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewconnection.Name' /></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewconnection.Description' /></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Name")%></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Description")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewconnection.ConnectionType' /></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewconnection.MaxConnections' /></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.ConnectionType")%></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.MaxConnections")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewconnection.Authority' /></nobr></td><td class="value" colspan="3"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Authority")%></nobr></td><td class="value" colspan="3"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName)%></nobr></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewconnection.Throttling' /></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Throttling")%></nobr></td>
 				<td class="boxcell" colspan="3">
 					<table class="formtable">
 						<tr class="formheaderrow">
@@ -178,7 +178,7 @@
 		if (j == 0)
 		{
 %>
-						<tr class="formrow"><td colspan="3" class="formmessage"><nobr><fmt:message key='viewconnection.NoThrottles' /></nobr></td></tr>
+						<tr class="formrow"><td colspan="3" class="formmessage"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.NoThrottles")%></nobr></td></tr>
 <%
 		}
 %>
@@ -199,12 +199,12 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewconnection.ConnectionStatus' /></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.ConnectionStatus")%></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
-		<tr><td class="message" colspan="4"><a href='<%="viewconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="Refresh"><fmt:message key='viewconnection.Refresh' /></a>&nbsp;<a href='<%="editconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<fmt:message key='viewconnection.EditThisConnection' />"><fmt:message key='viewconnection.Edit' /></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="Delete this connection"><fmt:message key='viewconnection.Delete' /></a>
+		<tr><td class="message" colspan="4"><a href='<%="viewconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="Refresh"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%></a>&nbsp;<a href='<%="editconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.EditThisConnection")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Edit")%></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="Delete this connection"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Delete")%></a>
 		</td></tr>
 		</table>
 

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewjob.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewjob.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewjob.jsp Tue Dec 27 14:48:42 2011
@@ -29,7 +29,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key='viewjob.ApacheManifoldCFViewJob' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.ApacheManifoldCFViewJob")%>
 	</title>
 
 	<script type="text/javascript">
@@ -56,7 +56,7 @@
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key='viewjob.ViewAJob' /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.ViewAJob")%></p>
 
 	<form class="standardform" name="viewjob" action="execute.jsp" method="POST">
 		<input type="hidden" name="op" value="Continue"/>
@@ -135,23 +135,23 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewjob.Name' /></nobr></td><td class="value" colspan="3" ><%="<!--jobid="+jobID+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getDescription())%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.Name")%></nobr></td><td class="value" colspan="3" ><%="<!--jobid="+jobID+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getDescription())%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='viewjob.OutputConnection' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.OutputConnection")%></nobr></td>
 				<td class="value"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getOutputConnectionName())%></td>
-				<td class="description"><nobr><fmt:message key='viewjob.RepositoryConnection' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.RepositoryConnection")%></nobr></td>
 				<td class="value"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getConnectionName())%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='viewjob.Priority' /></nobr></td><td class="value"><%=priority%></td>
-				<td class="description"><nobr><fmt:message key='viewjob.StartMethod' /></nobr></td><td class="value"><%=startMethod%></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.Priority")%></nobr></td><td class="value"><%=priority%></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.StartMethod")%></nobr></td><td class="value"><%=startMethod%></td>
 			</tr>
 <%
 		if (model != -1 && model != IRepositoryConnector.MODEL_ADD_CHANGE_DELETE)
@@ -161,13 +161,13 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='viewjob.ScheduleType' /></nobr></td><td class="value"><nobr><%=jobType%></nobr></td>
-				<td class="description"><nobr><fmt:message key='viewjob.MinimumRecrawlInterval' /></nobr></td><td class="value"><nobr><%=intervalString%></nobr>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.ScheduleType")%></nobr></td><td class="value"><nobr><%=jobType%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.MinimumRecrawlInterval")%></nobr></td><td class="value"><nobr><%=intervalString%></nobr>
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='viewjob.ExpirationInterval' /></nobr></td><td class="value"><nobr><%=expirationIntervalString%></nobr></td>
-				<td class="description"><nobr><fmt:message key='viewjob.ReseedInterval' /></nobr></td><td class="value"><nobr><%=reseedIntervalString%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.ExpirationInterval")%></nobr></td><td class="value"><nobr><%=expirationIntervalString%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.ReseedInterval")%></nobr></td><td class="value"><nobr><%=reseedIntervalString%></nobr></td>
 			</tr>
 <%
 		}
@@ -180,7 +180,7 @@
 		if (job.getScheduleRecordCount() == 0)
 		{
 %>
-			<tr><td class="message" colspan="4"><fmt:message key='viewjob.NoScheduledRunTimes' /></td></tr>
+			<tr><td class="message" colspan="4"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.NoScheduledRunTimes")%></td></tr>
 <%
 		}
 		else
@@ -208,7 +208,7 @@
 				}
 %>
 			<tr>
-				<td class="description"><nobr><fmt:message key='viewjob.ScheduledTime' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.ScheduledTime")%></nobr></td>
 				<td class="value" colspan="3">
 <%
 					if (srDayOfWeek == null)
@@ -490,7 +490,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><fmt:message key='viewjob.MaximumRunTime' /></td><td class="value" colspan="3">
+				<td class="description"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.MaximumRunTime")%></td><td class="value" colspan="3">
 <%
 					if (srDuration == null)
 						out.println("No limit");
@@ -519,7 +519,7 @@
 				Long value = (Long)hopCountFilters.get(relationshipType);
 %>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewjob.MaximumHopCountForLinkType' /> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(relationshipType)%>':</nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.MaximumHopCountForLinkType")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(relationshipType)%>':</nobr></td>
 				<td class="value" colspan="3"><%=((value==null)?"Unlimited":value.toString())%></td>
 			</tr>
 			
@@ -530,7 +530,7 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewjob.HopCountMode' /></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.HopCountMode")%></nobr></td>
 				<td class="value" colspan="3"><nobr><%=(hopcountMode==IJobDescription.HOPCOUNT_ACCURATE)?"Delete unreachable documents":""%><%=(hopcountMode==IJobDescription.HOPCOUNT_NODELETE)?"No deletes, for now":""%><%=(hopcountMode==IJobDescription.HOPCOUNT_NEVERDELETE)?"No deletes, forever":""%></nobr></td>
 			</tr>
 <%
@@ -592,8 +592,8 @@
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
-		<tr><td class="message" colspan="4"><a href='<%="editjob.jsp?jobid="+jobID%>' alt="<fmt:message key='viewjob.EditThisJob' />"><fmt:message key='viewjob.Edit' /></a>
-		&nbsp;<a href='<%="javascript:Delete(\""+jobID+"\")"%>' alt="<fmt:message key='viewjob.DeleteThisJob' />"><fmt:message key='viewjob.Delete' /></a>&nbsp;<a href='<%="editjob.jsp?origjobid="+jobID%>' alt="<fmt:message key='viewjob.CopyThisJob' />"><fmt:message key='viewjob.Copy' /></a></td>
+		<tr><td class="message" colspan="4"><a href='<%="editjob.jsp?jobid="+jobID%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.EditThisJob")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.Edit")%></a>
+		&nbsp;<a href='<%="javascript:Delete(\""+jobID+"\")"%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.DeleteThisJob")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.Delete")%></a>&nbsp;<a href='<%="editjob.jsp?origjobid="+jobID%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.CopyThisJob")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.Copy")%></a></td>
 		</tr>
 		</table>
 

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewoutput.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewoutput.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewoutput.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewoutput.jsp Tue Dec 27 14:48:42 2011
@@ -29,7 +29,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key='viewoutput.ApacheManifoldCFViewOutputConnectionStatus' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.ApacheManifoldCFViewOutputConnectionStatus")%>
 	</title>
 
 	<script type="text/javascript">
@@ -66,7 +66,7 @@
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key='viewoutput.ViewOutputConnectionStatus' /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.ViewOutputConnectionStatus")%></p>
 	<form class="standardform" name="viewconnection" action="execute.jsp" method="POST">
 		<input type="hidden" name="op" value="Continue"/>
 		<input type="hidden" name="type" value="output"/>
@@ -129,15 +129,15 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewoutput.Name' /></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewoutput.Description' /></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.Name")%></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.Description")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewoutput.ConnectionType' /></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewoutput.MaxConnections' /></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.ConnectionType")%></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.MaxConnections")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
@@ -153,15 +153,15 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='viewoutput.ConnectionStatus' /></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.ConnectionStatus")%></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 		<tr>
 			<td class="message" colspan="4">
-				<nobr><a href='<%="viewoutput.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<fmt:message key='viewoutput.Refresh' />"><fmt:message key='viewoutput.Refresh' /></a>&nbsp;<a href='<%="editoutput.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<fmt:message key='viewoutput.EditThisOutputConnection' />"><fmt:message key='viewoutput.Edit' /></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<fmt:message key='viewoutput.DeleteThisOutputConnection' />"><fmt:message key='viewoutput.Delete' /></a></nobr><br/>
-				<nobr><a href="javascript:void()" onclick='<%="javascript:ReingestAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<fmt:message key='viewoutput.ReIngestAllDocumentsAssociatedWithThisOutputConnection' />"><fmt:message key='viewoutput.ReIngestAllAssociatedDocuments' /></a></nobr>
+				<nobr><a href='<%="viewoutput.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.Refresh")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.Refresh")%></a>&nbsp;<a href='<%="editoutput.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.EditThisOutputConnection")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.Edit")%></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.DeleteThisOutputConnection")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.Delete")%></a></nobr><br/>
+				<nobr><a href="javascript:void()" onclick='<%="javascript:ReingestAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.ReIngestAllDocumentsAssociatedWithThisOutputConnection")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.ReIngestAllAssociatedDocuments")%></a></nobr>
 			</td>
 		</tr>
 		</table>