svn commit: r1372452 - in /manifoldcf/trunk: ./ framework/crawler-ui/src/main/webapp/ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ framework/ui-core/...

kwright Mon, 13 Aug 2012 07:51:33 -0700

Author: kwright
Date: Mon Aug 13 14:50:45 2012
New Revision: 1372452

URL: http://svn.apache.org/viewvc?rev=1372452&view=rev
Log:
Fix for CONNECTORS-503.


Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp
    
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
    
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
    
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
    
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1372452&r1=1372451&r2=1372452&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Aug 13 14:50:45 2012
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 0.7-dev =====================
 
+CONNECTORS-503: Add support in status reports for hopcount exceeded
+status.
+(Karl Wright)
+
 CONNECTORS-501: Fix hopcount logic to return a deterministic
 number of documents.  A number of race conditions were discovered
 and corrected.

Modified: 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp?rev=1372452&r1=1372451&r2=1372452&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp 
Mon Aug 13 14:50:45 2012
@@ -210,7 +210,8 @@ if (maintenanceUnderway == false)
        int[] matchingStates;
        if (documentStateTypes == null)
        {
-               matchingStates = new 
int[]{IJobManager.DOCSTATE_NEVERPROCESSED,IJobManager.DOCSTATE_PREVIOUSLYPROCESSED};
+               matchingStates = new 
int[]{IJobManager.DOCSTATE_NEVERPROCESSED,IJobManager.DOCSTATE_PREVIOUSLYPROCESSED,
+                       IJobManager.DOCSTATE_OUTOFSCOPE};
        }
        else
        {
@@ -236,7 +237,8 @@ if (maintenanceUnderway == false)
        {
                matchingStatuses = new 
int[]{IJobManager.DOCSTATUS_INACTIVE,IJobManager.DOCSTATUS_PROCESSING,IJobManager.DOCSTATUS_EXPIRING,
                        
IJobManager.DOCSTATUS_DELETING,IJobManager.DOCSTATUS_READYFORPROCESSING,IJobManager.DOCSTATUS_READYFOREXPIRATION,
-                       
IJobManager.DOCSTATUS_WAITINGFORPROCESSING,IJobManager.DOCSTATUS_WAITINGFOREXPIRATION,IJobManager.DOCSTATUS_WAITINGFOREVER};
+                       
IJobManager.DOCSTATUS_WAITINGFORPROCESSING,IJobManager.DOCSTATUS_WAITINGFOREXPIRATION,IJobManager.DOCSTATUS_WAITINGFOREVER,
+                       IJobManager.DOCSTATUS_HOPCOUNTEXCEEDED};
        }
        else
        {
@@ -331,6 +333,7 @@ if (maintenanceUnderway == false)
                                        <select name="statusdocumentstates" 
multiple="true" size="3">
                                                <option 
<%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_NEVERPROCESSED))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATE_NEVERPROCESSED)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsThatHaveNeverBeenProcessed")%></option>
                                                <option 
<%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsProcessedAtLeastOnce")%></option>
+                                               <option 
<%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_OUTOFSCOPE))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATE_OUTOFSCOPE)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsOutOfScope")%></option>
                                        </select>
                                </td>
                        </tr>
@@ -348,6 +351,7 @@ if (maintenanceUnderway == false)
                                                <option 
<%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_WAITINGFORPROCESSING))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFORPROCESSING)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsNotYetProcessable")%></option>
                                                <option 
<%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_WAITINGFOREXPIRATION))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFOREXPIRATION)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsNotYetExpirable")%></option>
                                                <option 
<%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_WAITINGFOREVER))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFOREVER)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsWaitingForever")%></option>
+                                               <option 
<%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_HOPCOUNTEXCEEDED))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_HOPCOUNTEXCEEDED)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsHopcountExceeded")%></option>
                                        </select>
                                </td>
                        </tr>

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp?rev=1372452&r1=1372451&r2=1372452&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp Mon 
Aug 13 14:50:45 2012
@@ -249,7 +249,7 @@ if (maintenanceUnderway == false)
        int[] matchingStates;
        if (documentStateTypes == null)
        {
-               matchingStates = new 
int[]{IJobManager.DOCSTATE_NEVERPROCESSED,IJobManager.DOCSTATE_PREVIOUSLYPROCESSED};
+               matchingStates = new 
int[]{IJobManager.DOCSTATE_NEVERPROCESSED,IJobManager.DOCSTATE_PREVIOUSLYPROCESSED,IJobManager.DOCSTATE_OUTOFSCOPE};
        }
        else
        {
@@ -275,7 +275,8 @@ if (maintenanceUnderway == false)
        {
                matchingStatuses = new 
int[]{IJobManager.DOCSTATUS_INACTIVE,IJobManager.DOCSTATUS_PROCESSING,IJobManager.DOCSTATUS_EXPIRING,
                        
IJobManager.DOCSTATUS_DELETING,IJobManager.DOCSTATUS_READYFORPROCESSING,IJobManager.DOCSTATUS_READYFOREXPIRATION,
-                       
IJobManager.DOCSTATUS_WAITINGFORPROCESSING,IJobManager.DOCSTATUS_WAITINGFOREXPIRATION,IJobManager.DOCSTATUS_WAITINGFOREVER};
+                       
IJobManager.DOCSTATUS_WAITINGFORPROCESSING,IJobManager.DOCSTATUS_WAITINGFOREXPIRATION,IJobManager.DOCSTATUS_WAITINGFOREVER,
+                       IJobManager.DOCSTATUS_HOPCOUNTEXCEEDED};
        }
        else
        {
@@ -370,6 +371,7 @@ if (maintenanceUnderway == false)
                                        <select name="statusdocumentstates" 
multiple="true" size="3">
                                                <option 
<%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_NEVERPROCESSED))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATE_NEVERPROCESSED)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsThatHaveNeverBeenProcessed")%></option>
                                                <option 
<%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsProcessedAtLeastOnce")%></option>
+                                               <option 
<%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_OUTOFSCOPE))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATE_OUTOFSCOPE)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsOutOfScope")%></option>
                                        </select>
                                </td>
                        </tr>
@@ -387,6 +389,7 @@ if (maintenanceUnderway == false)
                                                <option 
<%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_WAITINGFORPROCESSING))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFORPROCESSING)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsNotYetProcessable")%></option>
                                                <option 
<%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_WAITINGFOREXPIRATION))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFOREXPIRATION)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsNotYetExpirable")%></option>
                                                <option 
<%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_WAITINGFOREVER))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFOREVER)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsWaitingForever")%></option>
+                                               <option 
<%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_HOPCOUNTEXCEEDED))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_HOPCOUNTEXCEEDED)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsHopcountExceeded")%></option>
                                        </select>
                                </td>
                        </tr>
@@ -492,6 +495,7 @@ if (maintenanceUnderway == false)
                        <td class="reportcolumnheader"><a 
href="javascript:void(0);" 
onclick='javascript:ColumnClick("processwaiting");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.WaitingForProcessing")%></nobr></a></td>
                        <td class="reportcolumnheader"><a 
href="javascript:void(0);" 
onclick='javascript:ColumnClick("expirewaiting");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.WaitingForExpiration")%></nobr></a></td>
                        <td class="reportcolumnheader"><a 
href="javascript:void(0);" 
onclick='javascript:ColumnClick("waitingforever");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.WaitingForever")%></nobr></a></td>
+                       <td class="reportcolumnheader"><a 
href="javascript:void(0);" 
onclick='javascript:ColumnClick("hopcountexceeded");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.HopcountExceeded")%></nobr></a></td>
                    </tr>
 <%
                zz = 0;
@@ -532,6 +536,7 @@ if (maintenanceUnderway == false)
                        <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("processwaiting").toString())%></td>
                        <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("expirewaiting").toString())%></td>
                        <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("waitingforever").toString())%></td>
+                       <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("hopcountexceeded").toString())%></td>
                    </tr>
 <%
                        zz++;

Modified: 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java?rev=1372452&r1=1372451&r2=1372452&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
 (original)
+++ 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
 Mon Aug 13 14:50:45 2012
@@ -39,6 +39,7 @@ public interface IJobManager
   // Document states, for status reports.
   public static final int DOCSTATE_NEVERPROCESSED = 0;
   public static final int DOCSTATE_PREVIOUSLYPROCESSED = 1;
+  public static final int DOCSTATE_OUTOFSCOPE = 2;
 
   // Document statuses, for status reports.
   public static final int DOCSTATUS_INACTIVE = 0;
@@ -50,6 +51,7 @@ public interface IJobManager
   public static final int DOCSTATUS_WAITINGFORPROCESSING = 6;
   public static final int DOCSTATUS_WAITINGFOREXPIRATION = 7;
   public static final int DOCSTATUS_WAITINGFOREVER = 8;
+  public static final int DOCSTATUS_HOPCOUNTEXCEEDED = 9;
 
   /** Install the job manager's tables.
   */

Modified: 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1372452&r1=1372451&r2=1372452&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
 (original)
+++ 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
 Mon Aug 13 14:50:45 2012
@@ -7214,6 +7214,7 @@ public class JobManager implements IJobM
       .append(" WHEN ").append("t0.").append(jobQueue.statusField).append("=? 
THEN 'Being removed'")
       .append(" WHEN ").append("t0.").append(jobQueue.statusField).append("=? 
THEN 'Being removed'")
       .append(" WHEN ").append("t0.").append(jobQueue.statusField).append("=? 
THEN 'Being removed'")
+      .append(" WHEN ").append("t0.").append(jobQueue.statusField).append("=? 
THEN 'Out of scope'")
       .append(" ELSE 'Unknown'")
       .append(" END AS state,")
       .append("CASE")
@@ -7244,6 +7245,9 @@ public class JobManager implements IJobM
       .append("t0.").append(jobQueue.statusField).append(" IN (?,?)")
       .append(" AND ").append("t0.").append(jobQueue.checkTimeField).append(" 
IS NULL")
       .append(" THEN 'Waiting forever'")
+      .append(" WHEN ")
+      .append("t0.").append(jobQueue.statusField).append("=?")
+      .append(" THEN 'Hopcount exceeded'")
       .append(" WHEN ").append("t0.").append(jobQueue.statusField).append(" IN 
(?,?,?)")
       .append(" THEN 'Deleting'")
       .append(" WHEN ")
@@ -7279,6 +7283,7 @@ public class JobManager implements IJobM
     list.add(jobQueue.statusToString(jobQueue.STATUS_BEINGDELETED));
     list.add(jobQueue.statusToString(jobQueue.STATUS_BEINGCLEANED));
     list.add(jobQueue.statusToString(jobQueue.STATUS_ELIGIBLEFORDELETE));
+    list.add(jobQueue.statusToString(jobQueue.STATUS_HOPCOUNTREMOVED));
     
     list.add(jobQueue.statusToString(jobQueue.STATUS_COMPLETE));
     list.add(jobQueue.statusToString(jobQueue.STATUS_PURGATORY));
@@ -7302,6 +7307,8 @@ public class JobManager implements IJobM
     list.add(jobQueue.statusToString(jobQueue.STATUS_PENDING));
     list.add(jobQueue.statusToString(jobQueue.STATUS_PENDINGPURGATORY));
     
+    list.add(jobQueue.statusToString(jobQueue.STATUS_HOPCOUNTREMOVED));
+    
     list.add(jobQueue.statusToString(jobQueue.STATUS_BEINGDELETED));
     list.add(jobQueue.statusToString(jobQueue.STATUS_BEINGCLEANED));
     list.add(jobQueue.statusToString(jobQueue.STATUS_ELIGIBLEFORDELETE));
@@ -7354,7 +7361,7 @@ public class JobManager implements IJobM
     
     sb.append("t1.idbucket,SUM(t1.inactive) AS inactive,SUM(t1.processing) AS 
processing,SUM(t1.expiring) AS expiring,SUM(t1.deleting) AS deleting,")
       .append("SUM(t1.processready) AS processready,SUM(t1.expireready) AS 
expireready,SUM(t1.processwaiting) AS processwaiting,SUM(t1.expirewaiting) AS 
expirewaiting,")
-      .append("SUM(t1.waitingforever) AS waitingforever FROM (SELECT ");
+      .append("SUM(t1.waitingforever) AS 
waitingforever,SUM(t1.hopcountexceeded) AS hopcountexceeded FROM (SELECT ");
     
     addBucketExtract(sb,list,"",jobQueue.docIDField,idBucketDescription);
     
@@ -7423,7 +7430,13 @@ public class JobManager implements IJobM
       .append(" AND ").append(jobQueue.checkTimeField).append(" IS NULL")
       .append(" THEN 1 ELSE 0")
       .append(" END")
-      .append(" as waitingforever");
+      .append(" as waitingforever,")
+      .append("CASE")
+      .append(" WHEN ")
+      .append(jobQueue.statusField).append("=?")
+      .append(" THEN 1 ELSE 0")
+      .append(" END")
+      .append(" as hopcountexceeded");
     sb.append(" FROM ").append(jobQueue.getTableName());
     
     list.add(jobQueue.statusToString(jobQueue.STATUS_COMPLETE));
@@ -7463,10 +7476,12 @@ public class JobManager implements IJobM
     
     list.add(jobQueue.statusToString(jobQueue.STATUS_PENDING));
     list.add(jobQueue.statusToString(jobQueue.STATUS_PENDINGPURGATORY));
-    
+
+    list.add(jobQueue.statusToString(jobQueue.STATUS_HOPCOUNTREMOVED));
+
     addCriteria(sb,list,"",connectionName,filterCriteria,false);
     sb.append(") t1 GROUP BY idbucket");
-    addOrdering(sb,new 
String[]{"idbucket","inactive","processing","expiring","deleting","processready","expireready","processwaiting","expirewaiting","waitingforever"},sortOrder);
+    addOrdering(sb,new 
String[]{"idbucket","inactive","processing","expiring","deleting","processready","expireready","processwaiting","expirewaiting","waitingforever","hopcountexceeded"},sortOrder);
     addLimits(sb,startRow,rowCount);
     return database.performQuery(sb.toString(),list,null,null,rowCount,null);
   }
@@ -7553,6 +7568,11 @@ public class JobManager implements IJobM
             jobQueue.statusToString(jobQueue.STATUS_COMPLETE),
             jobQueue.statusToString(jobQueue.STATUS_PURGATORY)})}));
         break;
+      case DOCSTATE_OUTOFSCOPE:
+        sb.append(database.buildConjunctionClause(list,new ClauseDescription[]{
+          new MultiClause(fieldPrefix+jobQueue.statusField,new Object[]{
+            jobQueue.statusToString(jobQueue.STATUS_HOPCOUNTREMOVED)})}));
+        break;
       }
       k++;
     }
@@ -7638,6 +7658,11 @@ public class JobManager implements IJobM
             jobQueue.statusToString(jobQueue.STATUS_PENDINGPURGATORY)})}))
           .append(" AND 
").append(fieldPrefix).append(jobQueue.checkTimeField).append(" IS NULL");
         break;
+      case DOCSTATUS_HOPCOUNTEXCEEDED:
+        sb.append(database.buildConjunctionClause(list,new ClauseDescription[]{
+          new MultiClause(fieldPrefix+jobQueue.statusField,new Object[]{
+            jobQueue.statusToString(jobQueue.STATUS_HOPCOUNTREMOVED)})}));
+        break;
       }
       k++;
     }

Modified: 
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1372452&r1=1372451&r2=1372452&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
 (original)
+++ 
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
 Mon Aug 13 14:50:45 2012
@@ -321,6 +321,7 @@ documentstatus.Rows=Rows:
 documentstatus.RowsPerPage=Rows per page:
 documentstatus.DocumentsThatHaveNeverBeenProcessed=Documents that have never 
been processed
 documentstatus.DocumentsProcessedAtLeastOnce=Documents processed at least once
+documentstatus.DocumentsOutOfScope=Documents that are out of scope
 documentstatus.DocumentsThatAreNoLongerActive=Documents that are no longer 
active
 documentstatus.DocumentsCurrentlyInProgress=Documents currently in progress
 documentstatus.DocumentsCurrentlyBeingExpired=Documents currently being expired
@@ -330,6 +331,7 @@ documentstatus.DocumentsCurrentlyAvailab
 documentstatus.DocumentsNotYetProcessable=Documents not yet processable
 documentstatus.DocumentsNotYetExpirable=Documents not yet expirable
 documentstatus.DocumentsWaitingForever=Documents waiting forever
+documentstatus.DocumentsHopcountExceeded=Documents over hopcount limit
 documentstatus.NotSpecified=Not specified
 documentstatus.Jobs=Jobs:
 documentstatus.Identifier=Identifier
@@ -360,6 +362,7 @@ queuestatus.PleaseSelectaConnection=Plea
 queuestatus.PleaseTryAgainLater=This page is unavailable due to maintenance 
operations.  Please try again later.
 queuestatus.DocumentsThatHaveNeverBeenProcessed=Documents that have never been 
processed
 queuestatus.DocumentsProcessedAtLeastOnce=Documents processed at least once
+queuestatus.DocumentsOutOfScope=Documents that are out of scope
 queuestatus.DocumentsThatAreNoLongerActive=Documents that are no longer active
 queuestatus.DocumentsCurrentlyInProgress=Documents currently in progress
 queuestatus.DocumentsCurrentlyBeingExpired=Documents currently being expired
@@ -369,6 +372,7 @@ queuestatus.DocumentsCurrentlyAvailableF
 queuestatus.DocumentsNotYetProcessable=Documents not yet processable
 queuestatus.DocumentsNotYetExpirable=Documents not yet expirable
 queuestatus.DocumentsWaitingForever=Documents waiting forever
+queuestatus.DocumentsHopcountExceeded=Documents over hopcount limit
 queuestatus.Rows=Rows:
 queuestatus.RowsPerPage=Rows per page:
 queuestatus.IdentifierClass=Identifier Class
@@ -381,6 +385,7 @@ queuestatus.AboutToExpire=About to Expir
 queuestatus.WaitingForProcessing=Waiting for Processing
 queuestatus.WaitingForExpiration=Waiting for Expiration
 queuestatus.WaitingForever=Waiting Forever
+queuestatus.HopcountExceeded=Hopcount Exceeded
 queuestatus.Previous=Previous
 queuestatus.PreviousPage=Previous page
 queuestatus.Next=Next

Modified: 
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1372452&r1=1372451&r2=1372452&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
 (original)
+++ 
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
 Mon Aug 13 14:50:45 2012
@@ -321,6 +321,7 @@ documentstatus.Rows=è¡ï¼
 documentstatus.RowsPerPage=è¡ï¼ãã¼ã¸ï¼
 
documentstatus.DocumentsThatHaveNeverBeenProcessed=å¦çãä¸åº¦ãããã¦ããªãã³ã³ãã³ã
 
documentstatus.DocumentsProcessedAtLeastOnce=ï¼åä»¥ä¸å¦çãããã³ã³ãã³ã
+documentstatus.DocumentsOutOfScope=ç¯å²å¤ã§ããææ¸
 documentstatus.DocumentsThatAreNoLongerActive=ç¡å¹ã«ãªã£ãã³ã³ãã³ã
 documentstatus.DocumentsCurrentlyInProgress=å¦çä¸ã®ã³ã³ãã³ã
 documentstatus.DocumentsCurrentlyBeingExpired=å¤±å¹ãªã³ã³ãã³ã
@@ -330,6 +331,7 @@ documentstatus.DocumentsCurrentlyAvailab
 documentstatus.DocumentsNotYetProcessable=å¦çæºåä¸ã®ã³ã³ãã³ã
 documentstatus.DocumentsNotYetExpirable=å¤±å¹ã§ããªãã³ã³ãã³ã
 documentstatus.DocumentsWaitingForever=ç¡éã«å¾ã¡ä¸ã®ã³ã³ãã³ã
+documentstatus.DocumentsHopcountExceeded=ãããã«ã¦ã³ãå¶éãè¶ãããã¥ã¡ã³ã
 documentstatus.NotSpecified=æªæå®
 documentstatus.Jobs=ã¸ã§ãï¼
 documentstatus.Identifier=ID
@@ -360,6 +362,7 @@ queuestatus.PleaseSelectaConnection=ã
 
queuestatus.PleaseTryAgainLater=ä¿å®å¦çä¸ã§ããå°ããå¾ã¡ãã ããã
 
queuestatus.DocumentsThatHaveNeverBeenProcessed=å¦çãä¸åº¦ãããã¦ããªãã³ã³ãã³ã
 
queuestatus.DocumentsProcessedAtLeastOnce=ï¼åä»¥ä¸å¦çãããã³ã³ãã³ã
+queuestatus.DocumentsOutOfScope=ç¯å²å¤ã§ããææ¸
 queuestatus.DocumentsThatAreNoLongerActive=ç¡å¹ã«ãªã£ãã³ã³ãã³ã
 queuestatus.DocumentsCurrentlyInProgress=å¦çä¸ã®ã³ã³ãã³ã
 queuestatus.DocumentsCurrentlyBeingExpired=å¤±å¹ãªã³ã³ãã³ã
@@ -369,6 +372,7 @@ queuestatus.DocumentsCurrentlyAvailableF
 queuestatus.DocumentsNotYetProcessable=å¦çæºåä¸ã®ã³ã³ãã³ã
 queuestatus.DocumentsNotYetExpirable=å¤±å¹ã§ããªãã³ã³ãã³ã
 queuestatus.DocumentsWaitingForever=ç¡éã«å¾ã¡ä¸ã®ã³ã³ãã³ã
+queuestatus.DocumentsHopcountExceeded=ãããã«ã¦ã³ãå¶éãè¶ãããã¥ã¡ã³ã
 queuestatus.Rows=è¡ï¼
 queuestatus.RowsPerPage=è¡ï¼ãã¼ã¸ï¼
 queuestatus.IdentifierClass=IDã¯ã©ã¹
@@ -381,6 +385,7 @@ queuestatus.AboutToExpire=å¤±å¹æ
 queuestatus.WaitingForProcessing=å¦çå¾ã¡ä¸
 queuestatus.WaitingForExpiration=å¤±å¹å¾ã¡ä¸
 queuestatus.WaitingForever=ç¡éå¾ã¡
+queuestatus.HopcountExceeded=ãããã«ã¦ã³ããè¶é
 queuestatus.Previous=åã¸
 queuestatus.PreviousPage=åãã¼ã¸
 queuestatus.Next=æ¬¡ã¸

svn commit: r1372452 - in /manifoldcf/trunk: ./ framework/crawler-ui/src/main/webapp/ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ framework/ui-core/...

Reply via email to