You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/12/28 01:42:25 UTC
svn commit: r1225063 [9/10] - in /incubator/lcf/trunk: ./
connectors/activedirectory/
connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/
connectors/activedirectory/connector/src/main/native...
Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp Wed Dec 28 00:42:19 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>
- Apache ManifoldCF: Activity Result Report
+ <%=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">Activity Result Report</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">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="">-- Not specified --</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">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">Start time:</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\"":""%>>-- Not specified --</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\"":""%>>-- Not specified --</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> on
+ </select> <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.on")%>
<select class="schedulepulldown" name='reportstartmonth' size="3">
- <option value="" <%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- Not specified --</option>
- <option value="0" <%=(startMonth.equals("0"))?"selected=\"selected\"":""%>>January</option>
- <option value="1" <%=(startMonth.equals("1"))?"selected=\"selected\"":""%>>February</option>
- <option value="2" <%=(startMonth.equals("2"))?"selected=\"selected\"":""%>>March</option>
- <option value="3" <%=(startMonth.equals("3"))?"selected=\"selected\"":""%>>April</option>
- <option value="4" <%=(startMonth.equals("4"))?"selected=\"selected\"":""%>>May</option>
- <option value="5" <%=(startMonth.equals("5"))?"selected=\"selected\"":""%>>June</option>
- <option value="6" <%=(startMonth.equals("6"))?"selected=\"selected\"":""%>>July</option>
- <option value="7" <%=(startMonth.equals("7"))?"selected=\"selected\"":""%>>August</option>
- <option value="8" <%=(startMonth.equals("8"))?"selected=\"selected\"":""%>>September</option>
- <option value="9" <%=(startMonth.equals("9"))?"selected=\"selected\"":""%>>October</option>
- <option value="10" <%=(startMonth.equals("10"))?"selected=\"selected\"":""%>>November</option>
- <option value="11" <%=(startMonth.equals("11"))?"selected=\"selected\"":""%>>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\"":""%>>-- Not specified --</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\"":""%>>-- Not specified --</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">End time:</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\"":""%>>-- Not specified --</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\"":""%>>-- Not specified --</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> on
+ </select> <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.on")%>
<select class="schedulepulldown" name='reportendmonth' size="3">
- <option value="" <%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- Not specified --</option>
- <option value="0" <%=(endMonth.equals("0"))?"selected=\"selected\"":""%>>January</option>
- <option value="1" <%=(endMonth.equals("1"))?"selected=\"selected\"":""%>>February</option>
- <option value="2" <%=(endMonth.equals("2"))?"selected=\"selected\"":""%>>March</option>
- <option value="3" <%=(endMonth.equals("3"))?"selected=\"selected\"":""%>>April</option>
- <option value="4" <%=(endMonth.equals("4"))?"selected=\"selected\"":""%>>May</option>
- <option value="5" <%=(endMonth.equals("5"))?"selected=\"selected\"":""%>>June</option>
- <option value="6" <%=(endMonth.equals("6"))?"selected=\"selected\"":""%>>July</option>
- <option value="7" <%=(endMonth.equals("7"))?"selected=\"selected\"":""%>>August</option>
- <option value="8" <%=(endMonth.equals("8"))?"selected=\"selected\"":""%>>September</option>
- <option value="9" <%=(endMonth.equals("9"))?"selected=\"selected\"":""%>>October</option>
- <option value="10" <%=(endMonth.equals("10"))?"selected=\"selected\"":""%>>November</option>
- <option value="11" <%=(endMonth.equals("11"))?"selected=\"selected\"":""%>>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\"":""%>>-- Not specified --</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\"":""%>>-- Not specified --</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>Entity match:</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>Result code match:</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>Identifier class description:</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>Result code class description:</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="Go" onClick="javascript:Go()" alt="Execute this query"/></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="Continue" onClick="javascript:Continue()" alt="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>Identifier Class</nobr></a></td>
- <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("resultcodebucket");'><nobr>Result Class</nobr></a></td>
- <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("eventcount");'><nobr>Event Count</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)
{
%>
- Previous
+ <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.Previous")%>
<%
}
else
{
%>
- <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="Previous page">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)
{
%>
- Next
+ <%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.Next")%>
<%
}
else
{
%>
- <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="Next page">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>Rows:</nobr></td><td class="value"><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></td>
- <td class="description"><nobr>Rows per page:</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">Please select a connection</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">This page is unavailable due to maintenance operations. Please try again later.</td></tr>
+ <tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.PleaseTryAgainLater")%></td></tr>
</table>
<%
}
Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/showjobstatus.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/showjobstatus.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/showjobstatus.jsp Wed Dec 28 00:42:19 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>
- Apache ManifoldCF: Status of all jobs
+ <%=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">Status of Jobs</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">Name</td><td class="columnheader">Status</td><td class="columnheader">Start Time</td><td class="columnheader">End Time</td><td class="columnheader">Documents</td><td class="columnheader">Active</td><td class="columnheader">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="Refresh status">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>
<%
@@ -254,6 +254,7 @@ if (maintenanceUnderway == false)
catch (ManifoldCFException e)
{
out.println("Error: "+e.getMessage());
+
e.printStackTrace();
}
%>
@@ -265,7 +266,7 @@ else
%>
<table class="displaytable">
<tr><td class="separator" colspan="1"><hr/></td></tr>
- <tr><td class="message">This page is unavailable due to maintenance operations. Please try again later.</td></tr>
+ <tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"showjobstatus.PleaseTryAgainLater")%></td></tr>
</table>
<%
}
@@ -274,6 +275,7 @@ else
</tr>
</table>
+
</body>
</html>
Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp Wed Dec 28 00:42:19 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>
- Apache ManifoldCF: Simple History Report
+ <%=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">Simple History Report</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">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="">-- Not specified --</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">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">Start time:</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\"":""%>>-- Not specified --</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\"":""%>>-- Not specified --</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> on
+ </select><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.on")%>
<select class="schedulepulldown" name='reportstartmonth' size="3">
- <option value="" <%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- Not specified --</option>
- <option value="0" <%=(startMonth.equals("0"))?"selected=\"selected\"":""%>>January</option>
- <option value="1" <%=(startMonth.equals("1"))?"selected=\"selected\"":""%>>February</option>
- <option value="2" <%=(startMonth.equals("2"))?"selected=\"selected\"":""%>>March</option>
- <option value="3" <%=(startMonth.equals("3"))?"selected=\"selected\"":""%>>April</option>
- <option value="4" <%=(startMonth.equals("4"))?"selected=\"selected\"":""%>>May</option>
- <option value="5" <%=(startMonth.equals("5"))?"selected=\"selected\"":""%>>June</option>
- <option value="6" <%=(startMonth.equals("6"))?"selected=\"selected\"":""%>>July</option>
- <option value="7" <%=(startMonth.equals("7"))?"selected=\"selected\"":""%>>August</option>
- <option value="8" <%=(startMonth.equals("8"))?"selected=\"selected\"":""%>>September</option>
- <option value="9" <%=(startMonth.equals("9"))?"selected=\"selected\"":""%>>October</option>
- <option value="10" <%=(startMonth.equals("10"))?"selected=\"selected\"":""%>>November</option>
- <option value="11" <%=(startMonth.equals("11"))?"selected=\"selected\"":""%>>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\"":""%>>-- Not specified --</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\"":""%>>-- Not specified --</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">End time:</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\"":""%>>-- Not specified --</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\"":""%>>-- Not specified --</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> on
+ </select><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.on")%>
<select class="schedulepulldown" name='reportendmonth' size="3">
- <option value="" <%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- Not specified --</option>
- <option value="0" <%=(endMonth.equals("0"))?"selected=\"selected\"":""%>>January</option>
- <option value="1" <%=(endMonth.equals("1"))?"selected=\"selected\"":""%>>February</option>
- <option value="2" <%=(endMonth.equals("2"))?"selected=\"selected\"":""%>>March</option>
- <option value="3" <%=(endMonth.equals("3"))?"selected=\"selected\"":""%>>April</option>
- <option value="4" <%=(endMonth.equals("4"))?"selected=\"selected\"":""%>>May</option>
- <option value="5" <%=(endMonth.equals("5"))?"selected=\"selected\"":""%>>June</option>
- <option value="6" <%=(endMonth.equals("6"))?"selected=\"selected\"":""%>>July</option>
- <option value="7" <%=(endMonth.equals("7"))?"selected=\"selected\"":""%>>August</option>
- <option value="8" <%=(endMonth.equals("8"))?"selected=\"selected\"":""%>>September</option>
- <option value="9" <%=(endMonth.equals("9"))?"selected=\"selected\"":""%>>October</option>
- <option value="10" <%=(endMonth.equals("10"))?"selected=\"selected\"":""%>>November</option>
- <option value="11" <%=(endMonth.equals("11"))?"selected=\"selected\"":""%>>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\"":""%>>-- Not specified --</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\"":""%>>-- Not specified --</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>Entity match:</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>Result code match:</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="Go" onClick="javascript:Go()" alt="Execute this query"/></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="Continue" onClick="javascript:Continue()" alt="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,16 +688,17 @@ if (maintenanceUnderway == false)
<table class="displaytable">
<tr class="headerrow">
- <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("starttime");'><nobr>Start Time</nobr></a></td>
- <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("activity");'><nobr>Activity</nobr></a></td>
- <td class="reportcolumnheader"><nobr>Identifier</nobr></td>
- <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("resultcode");'><nobr>Result Code</nobr></a></td>
- <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("bytes");'><nobr>Bytes</nobr></a></td>
- <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("elapsedtime");'><nobr>Time</nobr></a></td>
- <td class="reportcolumnheader"><nobr>Result Description</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;
+
boolean hasMoreRows = (set.getRowCount() > rowCount);
int iterCount = hasMoreRows?rowCount:set.getRowCount();
while (zz < iterCount)
@@ -710,6 +711,7 @@ if (maintenanceUnderway == false)
resultCode = resultCodeObject.toString();
String resultDescription = "";
Object resultDescriptionObject = row.getValue("resultdesc");
+ resultDescriptionObject = row.getValue("resultdesc");
if (resultDescriptionObject != null)
resultDescription = resultDescriptionObject.toString();
String[] identifierBreakdown = org.apache.manifoldcf.ui.util.Formatter.formatString(row.getValue("identifier").toString(),64,true,true);
@@ -749,13 +751,13 @@ if (maintenanceUnderway == false)
if (startRow == 0)
{
%>
- Previous
+ <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Previous")%>
<%
}
else
{
%>
- <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="Previous page">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>
<%
}
%>
@@ -764,20 +766,20 @@ if (maintenanceUnderway == false)
if (hasMoreRows == false)
{
%>
- Next
+ <%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.Next")%>
<%
}
else
{
%>
- <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="Next page">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>Rows per page:</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>
@@ -792,7 +794,7 @@ if (maintenanceUnderway == false)
else
{
%>
- <table class="displaytable"><tr><td class="message">Please select a connection</td></tr></table>
+ <table class="displaytable"><tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.PleaseSelectAConnection")%></td></tr></table>
<%
}
%>
@@ -804,7 +806,7 @@ else
%>
<table class="displaytable">
<tr><td class="separator" colspan="1"><hr/></td></tr>
- <tr><td class="message">This page is unavailable due to maintenance operations. Please try again later.</td></tr>
+ <tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.PleaseTryAgainLater")%></td></tr>
</table>
<%
}
Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp Wed Dec 28 00:42:19 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">View Authority Connection Status</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>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>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>Authority type:</nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
- <td class="description" colspan="1"><nobr>Max connections:</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>
@@ -136,7 +136,7 @@
<tr>
<td colspan="4">
<%
- AuthorityConnectorFactory.viewConfiguration(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),parameters);
+ AuthorityConnectorFactory.viewConfiguration(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),pageContext.getRequest().getLocale(),parameters);
%>
</td>
@@ -145,12 +145,12 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Connection status:</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="Refresh">Refresh</a> <a href='<%="editauthority.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="Edit this authority connection">Edit</a> <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="Delete this authority connection">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> <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> <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/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp Wed Dec 28 00:42:19 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>
- Apache ManifoldCF: View Repository Connection Status
+ <%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.ApacheManifoldCFViewRepositoryConnectionStatus")%>
</title>
<script type="text/javascript">
@@ -37,7 +37,7 @@
function Delete(connectionName)
{
- if (confirm("Delete connection '"+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">View Repository Connection Status</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"/>
@@ -85,7 +85,7 @@
connectorName = className + "(uninstalled)";
String authorityName = connection.getACLAuthority();
if (authorityName == null)
- authorityName = "None (global authority)";
+ authorityName = Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.NoneGlobalAuthority");
int maxCount = connection.getMaxConnections();
String[] throttles = connection.getThrottles();
ConfigParams parameters = connection.getConfigParams();
@@ -123,24 +123,24 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>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>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>Connection type:</nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
- <td class="description" colspan="1"><nobr>Max connections:</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>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>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>No throttles</nobr></td></tr>
+ <tr class="formrow"><td colspan="3" class="formmessage"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.NoThrottles")%></nobr></td></tr>
<%
}
%>
@@ -191,7 +191,7 @@
<tr>
<td colspan="4">
<%
- RepositoryConnectorFactory.viewConfiguration(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),parameters);
+ RepositoryConnectorFactory.viewConfiguration(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),pageContext.getRequest().getLocale(),parameters);
%>
</td>
</tr>
@@ -199,12 +199,12 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Connection status:</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">Refresh</a> <a href='<%="editconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="Edit this connection">Edit</a> <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="Delete this connection">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> <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> <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/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp Wed Dec 28 00:42:19 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>
- Apache ManifoldCF: View Job
+ <%=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">View a Job</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>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>Output connection:</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>Repository connection:</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>Priority:</nobr></td><td class="value"><%=priority%></td>
- <td class="description"><nobr>Start method:</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>Schedule type:</nobr></td><td class="value"><nobr><%=jobType%></nobr></td>
- <td class="description"><nobr>Minimum recrawl interval:</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>Expiration interval:</nobr></td><td class="value"><nobr><%=expirationIntervalString%></nobr></td>
- <td class="description"><nobr>Reseed interval:</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">No scheduled run times</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>Scheduled time:</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">Maximum run time:</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>Maximum hop count for link type '<%=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>Hop count mode:</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>
<%
@@ -552,7 +552,7 @@
{
try
{
- outputConnector.viewSpecification(new org.apache.manifoldcf.ui.jsp.JspWrapper(out),job.getOutputSpecification());
+ outputConnector.viewSpecification(new org.apache.manifoldcf.ui.jsp.JspWrapper(out),pageContext.getRequest().getLocale(),job.getOutputSpecification());
}
finally
{
@@ -572,12 +572,13 @@
if (connection != null)
{
IRepositoryConnector repositoryConnector = RepositoryConnectorFactory.grab(threadContext,connection.getClassName(),connection.getConfigParams(),
+
connection.getMaxConnections());
if (repositoryConnector != null)
{
try
{
- repositoryConnector.viewSpecification(new org.apache.manifoldcf.ui.jsp.JspWrapper(out),job.getSpecification());
+ repositoryConnector.viewSpecification(new org.apache.manifoldcf.ui.jsp.JspWrapper(out),pageContext.getRequest().getLocale(),job.getSpecification());
}
finally
{
@@ -591,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="Edit this job">Edit</a>
- <a href='<%="javascript:Delete(\""+jobID+"\")"%>' alt="Delete this job">Delete</a> <a href='<%="editjob.jsp?origjobid="+jobID%>' alt="Copy this job">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>
+ <a href='<%="javascript:Delete(\""+jobID+"\")"%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.DeleteThisJob")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.Delete")%></a> <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/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp Wed Dec 28 00:42:19 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>
- Apache ManifoldCF: View Output Connection Status
+ <%=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">View Output Connection Status</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>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>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>Connection type:</nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
- <td class="description" colspan="1"><nobr>Max connections:</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>
@@ -145,7 +145,7 @@
<tr>
<td colspan="4">
<%
- OutputConnectorFactory.viewConfiguration(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),parameters);
+ OutputConnectorFactory.viewConfiguration(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),pageContext.getRequest().getLocale(),parameters);
%>
</td>
</tr>
@@ -153,15 +153,15 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Connection status:</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="Refresh">Refresh</a> <a href='<%="editoutput.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="Edit this output connection">Edit</a> <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="Delete this output connection">Delete</a></nobr><br/>
- <nobr><a href="javascript:void()" onclick='<%="javascript:ReingestAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="Re-ingest all documents associated with this output connection">Re-ingest all associated documents</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> <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> <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>
Modified: incubator/lcf/trunk/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/jetty-runner/pom.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/jetty-runner/pom.xml (original)
+++ incubator/lcf/trunk/framework/jetty-runner/pom.xml Wed Dec 28 00:42:19 2011
@@ -261,6 +261,12 @@
<!-- runtime dependencies -->
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
Modified: incubator/lcf/trunk/framework/pull-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/pom.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/pom.xml (original)
+++ incubator/lcf/trunk/framework/pull-agent/pom.xml Wed Dec 28 00:42:19 2011
@@ -48,6 +48,7 @@
<excludes>
<exclude>**/*Postgresql*.java</exclude>
<exclude>**/*HSQLDBext*.java</exclude>
+ <exclude>**/*MySQL*.java</exclude>
</excludes>
<forkMode>always</forkMode>
<workingDirectory>target/test-output</workingDirectory>
Modified: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java Wed Dec 28 00:42:19 2011
@@ -69,47 +69,47 @@ public class AuthorityConnectorFactory
/** Output the configuration header section.
*/
- public static void outputConfigurationHeader(IThreadContext threadContext, String className, IHTTPOutput out, ConfigParams parameters, ArrayList tabsArray)
+ public static void outputConfigurationHeader(IThreadContext threadContext, String className, IHTTPOutput out, Locale locale, ConfigParams parameters, ArrayList tabsArray)
throws ManifoldCFException, IOException
{
IAuthorityConnector connector = getConnector(threadContext, className);
if (connector == null)
return;
- connector.outputConfigurationHeader(threadContext,out,parameters,tabsArray);
+ connector.outputConfigurationHeader(threadContext,out,locale,parameters,tabsArray);
}
/** Output the configuration body section.
*/
- public static void outputConfigurationBody(IThreadContext threadContext, String className, IHTTPOutput out, ConfigParams parameters, String tabName)
+ public static void outputConfigurationBody(IThreadContext threadContext, String className, IHTTPOutput out, Locale locale, ConfigParams parameters, String tabName)
throws ManifoldCFException, IOException
{
IAuthorityConnector connector = getConnector(threadContext, className);
if (connector == null)
return;
- connector.outputConfigurationBody(threadContext,out,parameters,tabName);
+ connector.outputConfigurationBody(threadContext,out,locale,parameters,tabName);
}
/** Process configuration post data for a connector.
*/
- public static String processConfigurationPost(IThreadContext threadContext, String className, IPostParameters variableContext, ConfigParams configParams)
+ public static String processConfigurationPost(IThreadContext threadContext, String className, IPostParameters variableContext, Locale locale, ConfigParams configParams)
throws ManifoldCFException
{
IAuthorityConnector connector = getConnector(threadContext, className);
if (connector == null)
return null;
- return connector.processConfigurationPost(threadContext,variableContext,configParams);
+ return connector.processConfigurationPost(threadContext,variableContext,locale,configParams);
}
/** View connector configuration.
*/
- public static void viewConfiguration(IThreadContext threadContext, String className, IHTTPOutput out, ConfigParams configParams)
+ public static void viewConfiguration(IThreadContext threadContext, String className, IHTTPOutput out, Locale locale, ConfigParams configParams)
throws ManifoldCFException, IOException
{
IAuthorityConnector connector = getConnector(threadContext, className);
// We want to be able to view connections even if they have unregistered connectors.
if (connector == null)
return;
- connector.viewConfiguration(threadContext,out,configParams);
+ connector.viewConfiguration(threadContext,out,locale,configParams);
}
/** Get a repository connector instance, but do NOT check if class is installed first!
Modified: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java Wed Dec 28 00:42:19 2011
@@ -450,7 +450,23 @@ public abstract class BaseRepositoryConn
// in that the first bunch cannot assume that the current connector object is connected, while the second bunch can. That is why the first bunch
// receives a thread context argument for all UI methods, while the second bunch does not need one (since it has already been applied via the connect()
// method, above).
-
+
+ /** Output the specification header section.
+ * This method is called in the head section of a job page which has selected a repository connection of the
+ * current type. Its purpose is to add the required tabs to the list, and to output any javascript methods
+ * that might be needed by the job editing HTML.
+ * The connector will be connected before this method can be called.
+ *@param out is the output to which any HTML should be sent.
+ *@param locale is the locale the output is preferred to be in.
+ *@param ds is the current document specification for this job.
+ *@param tabsArray is an array of tab names. Add to this array any tab names that are specific to the connector.
+ */
+ public void outputSpecificationHeader(IHTTPOutput out, Locale locale, DocumentSpecification ds, List<String> tabsArray)
+ throws ManifoldCFException, IOException
+ {
+ outputSpecificationHeader(out,ds,tabsArray);
+ }
+
/** Output the specification header section.
* This method is called in the head section of a job page which has selected a repository connection of the current type. Its purpose is to add the required tabs
* to the list, and to output any javascript methods that might be needed by the job editing HTML.
@@ -474,7 +490,24 @@ public abstract class BaseRepositoryConn
throws ManifoldCFException, IOException
{
}
-
+
+ /** Output the specification body section.
+ * This method is called in the body section of a job page which has selected a repository connection of the
+ * current type. Its purpose is to present the required form elements for editing.
+ * The coder can presume that the HTML that is output from this configuration will be within appropriate
+ * <html>, <body>, and <form> tags. The name of the form is always "editjob".
+ * The connector will be connected before this method can be called.
+ *@param out is the output to which any HTML should be sent.
+ *@param locale is the locale the output is preferred to be in.
+ *@param ds is the current document specification for this job.
+ *@param tabName is the current tab name.
+ */
+ public void outputSpecificationBody(IHTTPOutput out, Locale locale, DocumentSpecification ds, String tabName)
+ throws ManifoldCFException, IOException
+ {
+ outputSpecificationBody(out,ds,tabName);
+ }
+
/** Output the specification body section.
* This method is called in the body section of a job page which has selected a repository connection of the current type. Its purpose is to present the required form elements for editing.
* The coder can presume that the HTML that is output from this configuration will be within appropriate <html>, <body>, and <form> tags. The name of the
@@ -489,6 +522,23 @@ public abstract class BaseRepositoryConn
}
/** Process a specification post.
+ * This method is called at the start of job's edit or view page, whenever there is a possibility that form
+ * data for a connection has been posted. Its purpose is to gather form information and modify the
+ * document specification accordingly. The name of the posted form is always "editjob".
+ * The connector will be connected before this method can be called.
+ *@param variableContext contains the post data, including binary file-upload information.
+ *@param locale is the locale the output is preferred to be in.
+ *@param ds is the current document specification for this job.
+ *@return null if all is well, or a string error message if there is an error that should prevent saving of
+ * the job (and cause a redirection to an error page).
+ */
+ public String processSpecificationPost(IPostParameters variableContext, Locale locale, DocumentSpecification ds)
+ throws ManifoldCFException
+ {
+ return processSpecificationPost(variableContext,ds);
+ }
+
+ /** Process a specification post.
* This method is called at the start of job's edit or view page, whenever there is a possibility that form data for a connection has been
* posted. Its purpose is to gather form information and modify the document specification accordingly.
* The name of the posted form is "editjob".
@@ -501,7 +551,22 @@ public abstract class BaseRepositoryConn
{
return null;
}
-
+
+ /** View specification.
+ * This method is called in the body section of a job's view page. Its purpose is to present the document
+ * specification information to the user. The coder can presume that the HTML that is output from
+ * this configuration will be within appropriate <html> and <body> tags.
+ * The connector will be connected before this method can be called.
+ *@param out is the output to which any HTML should be sent.
+ *@param locale is the locale the output is preferred to be in.
+ *@param ds is the current document specification for this job.
+ */
+ public void viewSpecification(IHTTPOutput out, Locale locale, DocumentSpecification ds)
+ throws ManifoldCFException, IOException
+ {
+ viewSpecification(out,ds);
+ }
+
/** View specification.
* This method is called in the body section of a job's view page. Its purpose is to present the document specification information to the user.
* The coder can presume that the HTML that is output from this configuration will be within appropriate <html> and <body> tags.