svn commit: r1689968 [1/14] - in /manifoldcf/branches/CONNECTORS-1196: ./ connectors/elasticsearch/ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/...

kishore Wed, 08 Jul 2015 15:02:05 -0700

Author: kishore
Date: Wed Jul  8 22:01:08 2015
New Revision: 1689968

URL: http://svn.apache.org/r1689968
Log:
Refreshed branch from trunk


Added:
    
manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/auth/
      - copied from r1689774, 
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/auth/
    
manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/AuthFactory.java
      - copied unchanged from r1689774, 
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/AuthFactory.java
    
manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IAuth.java
      - copied unchanged from r1689774, 
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IAuth.java
    
manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IAuthorizer.java
      - copied unchanged from r1689774, 
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IAuthorizer.java
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp
      - copied unchanged from r1689774, 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/unauthorized.jsp
      - copied unchanged from r1689774, 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/unauthorized.jsp
Modified:
    manifoldcf/branches/CONNECTORS-1196/   (props changed)
    manifoldcf/branches/CONNECTORS-1196/CHANGES.txt
    manifoldcf/branches/CONNECTORS-1196/build.xml
    manifoldcf/branches/CONNECTORS-1196/connectors/elasticsearch/build.xml
    
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
    
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
    
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
    
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
    
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaConfig.java
    
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
    
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_en_US.properties
    
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties
    
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties
    
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/editSpecification_FieldMapping.html
    
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/viewSpecification.html
    
manifoldcf/branches/CONNECTORS-1196/framework/api-servlet/src/main/java/org/apache/manifoldcf/apiservlet/APIServlet.java
    
manifoldcf/branches/CONNECTORS-1196/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/fuzzyml/TagParseState.java
    
manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java
    
manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/adminHeaders.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/documentstatus.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editauthority.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editconnection.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editgroup.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editjob.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editmapper.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editnotification.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/execute.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listauthorities.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listconnections.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listgroups.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listjobs.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listmappers.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listnotifications.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listoutputs.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listtransformations.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/queuestatus.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/resultreport.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/simplereport.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewauthority.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewconnection.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewgroup.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewjob.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewmapper.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewnotification.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewoutput.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewtransformation.jsp
    
manifoldcf/branches/CONNECTORS-1196/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/mapping/MappingConnectionManager.java
    
manifoldcf/branches/CONNECTORS-1196/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
    
manifoldcf/branches/CONNECTORS-1196/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
    
manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans/APIProfile.java
    
manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans/AdminProfile.java
    
manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
    
manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
    
manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties
    
manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
    
manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
    
manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/zh_CN/how-to-build-and-deploy.xml

Propchange: manifoldcf/branches/CONNECTORS-1196/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul  8 22:01:08 2015
@@ -47,6 +47,7 @@
 /manifoldcf/branches/CONNECTORS-1118:1644108-1644398
 /manifoldcf/branches/CONNECTORS-1119:1645497-1647584
 /manifoldcf/branches/CONNECTORS-1130:1648217-1648685
+/manifoldcf/branches/CONNECTORS-1131:1688002-1689229
 /manifoldcf/branches/CONNECTORS-1134:1649449-1649604
 /manifoldcf/branches/CONNECTORS-1160:1663182-1666294
 /manifoldcf/branches/CONNECTORS-1168:1666253-1668311
@@ -126,3 +127,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
+/manifoldcf/trunk:1685322-1689774

Modified: manifoldcf/branches/CONNECTORS-1196/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/CHANGES.txt?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/CHANGES.txt (original)
+++ manifoldcf/branches/CONNECTORS-1196/CHANGES.txt Wed Jul  8 22:01:08 2015
@@ -3,6 +3,38 @@ $Id$
 
 ======================= 2.2-dev =====================
 
+CONNECTORS-1221: Update documentation for properties.xml to
+include new ldap authentication properties.
+(Karl Wright)
+
+CONNECTORS-1131: Add infrastructure for controlling individual
+user access to parts of the UI and API, also allow this to be
+configured via LDAP.
+(Colin Joyce, Karl Wright)
+
+CONNECTORS-1220: User mapping prerequisite choices were broken,
+caused a hang when there were more than one.
+(Karl Wright)
+
+CONNECTORS-1218: Add lowerNames option on Tika extractor.
+(Shinichiro Abe)
+
+CONNECTORS-1217: Fix documentation for api login parameters.
+(Karl Wright)
+
+CONNECTORS-1216: Set default core/collection name
+and add required check on Solr connector.
+(Shinichiro Abe)
+
+CONNECTORS-1215: Fuzzyml parser needs to ignore "<" followed by
+whitespace, since those are technically not valid tags and some sites
+care.
+(Brad Dennis, Karl Wright)
+
+CONNECTORS-1213: Job notification information did not export/import
+correctly.
+(Cathal McGuinness, Karl Wright)
+
 CONNECTORS-1203: SharePoint connector did not consistently use
 internal metadata names throughout.
 (Dale Dreiske, Karl Wright)

Modified: manifoldcf/branches/CONNECTORS-1196/build.xml
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/build.xml?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1196/build.xml Wed Jul  8 22:01:08 2015
@@ -1481,11 +1481,18 @@ Use Apache Forrest version forrest-0.9-d
         <mkdir dir="lib/elasticsearch"/>
         <!-- Download and unpack binary artifact -->
         <mkdir dir="build/download"/>
+        <mkdir dir="lib/elasticsearch"/>
         <get 
src="https://www.apache.org/dist/manifoldcf/apache-manifoldcf-elasticsearch-plugin-2.0/apache-manifoldcf-elasticsearch-plugin-2.0-bin.zip";
 dest="build/download/apache-manifoldcf-elasticsearch-plugin-bin.zip"/>
         <unzip 
src="build/download/apache-manifoldcf-elasticsearch-plugin-bin.zip" 
dest="build/download/apache-manifoldcf-elasticsearch-plugin-bin"/>
         <copy todir="lib/elasticsearch">
             <fileset 
dir="build/download/apache-manifoldcf-elasticsearch-plugin-bin/elasticsearch-plugin-mcf-2.0"/>
         </copy>
+        <mkdir dir="lib/elasticsearch-1.5"/>
+        <get 
src="https://www.apache.org/dist/manifoldcf/apache-manifoldcf-elasticsearch-1.5-plugin-2.0/apache-manifoldcf-elasticsearch-1.5-plugin-2.0-bin.zip";
 dest="build/download/apache-manifoldcf-elasticsearch-1.5-plugin-bin.zip"/>
+        <unzip 
src="build/download/apache-manifoldcf-elasticsearch-1.5-plugin-bin.zip" 
dest="build/download/apache-manifoldcf-elasticsearch-1.5-plugin-bin"/>
+        <copy todir="lib/elasticsearch-1.5">
+            <fileset 
dir="build/download/apache-manifoldcf-elasticsearch-1.5-plugin-bin/elasticsearch-1.5-plugin-mcf-2.0"/>
+        </copy>
     </target>
 
    <target name="download-dropbox-client">

Modified: manifoldcf/branches/CONNECTORS-1196/connectors/elasticsearch/build.xml
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/elasticsearch/build.xml?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/connectors/elasticsearch/build.xml 
(original)
+++ manifoldcf/branches/CONNECTORS-1196/connectors/elasticsearch/build.xml Wed 
Jul  8 22:01:08 2015
@@ -68,6 +68,10 @@
         <copy todir="dist/integration/elasticsearch">
           <fileset dir="../../lib/elasticsearch"/>
         </copy>
+        <mkdir dir="dist/integration/elasticsearch-1.5"/>
+        <copy todir="dist/integration/elasticsearch-1.5">
+          <fileset dir="../../lib/elasticsearch-1.5"/>
+        </copy>
     </target>
 
     <target name="calculate-testcode-condition">

Modified: 
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 Wed Jul  8 22:01:08 2015
@@ -340,7 +340,7 @@ public class SolrConnector extends org.a
 
         String core = params.getParameter(SolrConfig.PARAM_CORE);
         if (core != null && core.length() == 0)
-          core = null;
+          core = "collection1";
 
         // Pick up timeouts
         String socketTimeoutString = 
params.getParameter(SolrConfig.PARAM_SOCKET_TIMEOUT);
@@ -784,6 +784,12 @@ public class SolrConnector extends org.a
 "    editconnection.webappname.focus();\n"+
 "    return false;\n"+
 "  }\n"+
+"  if (editconnection.core.value == \"\")\n"+
+"  {\n"+
+"    
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.PleaseSupplySolrCoreName")+"\");\n"+
+"    editconnection.core.focus();\n"+
+"    return false;\n"+
+"  }\n"+
 "  if (editconnection.core.value != \"\" && 
editconnection.core.value.indexOf(\"/\") != -1)\n"+
 "  {\n"+
 "    
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.CoreNameCannotHaveCharacters")+"\");\n"+
@@ -974,7 +980,7 @@ public class SolrConnector extends org.a
 
     String core = parameters.getParameter(SolrConfig.PARAM_CORE);
     if (core == null)
-      core = "";
+      core = "collection1";
 
     String znodePath = 
parameters.getParameter(SolrConfig.PARAM_ZOOKEEPER_ZNODE_PATH);
     if (znodePath == null)

Modified: 
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 Wed Jul  8 22:01:08 2015
@@ -86,6 +86,7 @@ SolrConnector.ZnodePathMustStartWithACha
 SolrConnector.PleaseSupplyAValidSolrServerName=Please supply a valid Solr 
server name
 SolrConnector.SolrServerPortMustBeAValidInteger=Solr server port must be a 
valid integer
 SolrConnector.WebApplicationNameCannotHaveCharacters=Web application name 
cannot have '/' characters
+SolrConnector.PleaseSupplySolrCoreName=Please supply Solr core name
 SolrConnector.CoreNameCannotHaveCharacters=Core name cannot have '/' characters
 SolrConnector.WebApplicationMustBeSpecifiedIfCoreIsSpecified=Web application 
must be specified if core is specified
 SolrConnector.ConnectionTimeoutMustBeInteger=Connection timeout must be an 
integer

Modified: 
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 Wed Jul  8 22:01:08 2015
@@ -86,6 +86,7 @@ SolrConnector.ZnodePathMustStartWithACha
 SolrConnector.PleaseSupplyAValidSolrServerName=æ£ããSolrãµã¼ãåãå
¥åãã¦ãã ãã
 
SolrConnector.SolrServerPortMustBeAValidInteger=Solrãµã¼ããã¼ãçªå·ã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
 
SolrConnector.WebApplicationNameCannotHaveCharacters=Webã¢ããªã±ã¼ã·ã§ã³åã«ã¯æåã/ãã¯ä½¿ãã¾ãã
+SolrConnector.PleaseSupplySolrCoreName=ã³ã¢åãå¥åãã¦ãã ãã
 
SolrConnector.CoreNameCannotHaveCharacters=ã³ã¢åã«ã¯æåã/ãã¯ä½¿ãã¾ãã
 
SolrConnector.WebApplicationMustBeSpecifiedIfCoreIsSpecified=ã³ã¢ãæå®ããå
 ´åã¯Webã¢ããªã±ã¼ã·ã§ã³ãæå®ãã¦ãã ãã
 SolrConnector.ConnectionTimeoutMustBeInteger=ã³ãã¯ã·ã§ã³ã¿ã¤ã 
ã¢ã¦ãã«ã¯æ´æ°ãå¥åãã¦ãã ãã

Modified: 
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
 Wed Jul  8 22:01:08 2015
@@ -86,6 +86,7 @@ SolrConnector.ZnodePathMustStartWithACha
 SolrConnector.PleaseSupplyAValidSolrServerName=è¯·è¾å
¥ææçSolræå¡å¨å
 SolrConnector.SolrServerPortMustBeAValidInteger=Solræå¡å¨ç«¯å£å¿
é¡»ä¸ºææçæ´æ°
 
SolrConnector.WebApplicationNameCannotHaveCharacters=Webåºç¨ç¨åºåä¸è½å
å«åç¬¦â/â
+SolrConnector.PleaseSupplySolrCoreName==è¯·è¾å¥SolrCoreå
 SolrConnector.CoreNameCannotHaveCharacters=Coreåä¸è½åå«åç¬¦â/â
 
SolrConnector.WebApplicationMustBeSpecifiedIfCoreIsSpecified=å¦Coreå·²æå®åéæå®Webåºç¨ç¨åº
 SolrConnector.ConnectionTimeoutMustBeInteger=è¿æ¥è¶æ¶å¼å¿é¡»ä¸ºæ´æ°

Modified: 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaConfig.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaConfig.java?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaConfig.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaConfig.java
 Wed Jul  8 22:01:08 2015
@@ -29,6 +29,7 @@ public class TikaConfig {
   // Specification nodes and values
   public static final String NODE_FIELDMAP = "fieldmap";
   public static final String NODE_KEEPMETADATA = "keepAllMetadata";
+  public static final String NODE_LOWERNAMES = "lowerNames";
   public static final String NODE_IGNORETIKAEXCEPTION = "ignoreException";
   public static final String NODE_BOILERPLATEPROCESSOR = 
"boilerplateprocessor";
   public static final String ATTRIBUTE_SOURCE = "source";

Modified: 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
 Wed Jul  8 22:01:08 2015
@@ -33,7 +33,9 @@ import org.apache.tika.parser.AutoDetect
 import org.apache.tika.sax.BodyContentHandler;
 import org.apache.tika.metadata.TikaMetadataKeys;
 import org.apache.tika.parser.html.BoilerpipeContentHandler;
+
 import de.l3s.boilerpipe.BoilerpipeExtractor;
+
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
@@ -306,6 +308,17 @@ public class TikaExtractor extends org.a
         String[] metaNames = metadata.names();
         for(String mName : metaNames){
           String value = metadata.get(mName);
+          if (sp.lowerNames())
+          {
+            StringBuilder sb = new StringBuilder();
+            for (int i=0; i<mName.length(); i++) {
+              char ch = mName.charAt(i);
+              if (!Character.isLetterOrDigit(ch)) ch='_';
+              else ch=Character.toLowerCase(ch);
+              sb.append(ch);
+            }
+            mName = sb.toString();
+          }
           String target = sp.getMapping(mName);
           if(target!=null)
           {
@@ -443,7 +456,9 @@ public class TikaExtractor extends org.a
       while (i < os.getChildCount())
       {
         SpecificationNode node = os.getChild(i);
-        if (node.getType().equals(TikaConfig.NODE_FIELDMAP) || 
node.getType().equals(TikaConfig.NODE_KEEPMETADATA))
+        if (node.getType().equals(TikaConfig.NODE_FIELDMAP)
+          || node.getType().equals(TikaConfig.NODE_KEEPMETADATA)
+          || node.getType().equals(TikaConfig.NODE_LOWERNAMES))
           os.removeChild(i);
         else
           i++;
@@ -496,6 +511,18 @@ public class TikaExtractor extends org.a
       }
       // Add the new keepallmetadata config parameter 
       os.addChild(os.getChildCount(), node);
+      
+      SpecificationNode node2 = new 
SpecificationNode(TikaConfig.NODE_LOWERNAMES);
+      String lower = variableContext.getParameter(seqPrefix+"lowernames");
+      if (lower != null)
+      {
+        node2.setAttribute(TikaConfig.ATTRIBUTE_VALUE, lower);
+      }
+      else
+      {
+        node2.setAttribute(TikaConfig.ATTRIBUTE_VALUE, "false");
+      }
+      os.addChild(os.getChildCount(), node2);
     }
     
     if (variableContext.getParameter(seqPrefix+"ignoretikaexceptions_present") 
!= null)
@@ -574,6 +601,7 @@ public class TikaExtractor extends org.a
     // Prep for field mappings
     List<Map<String,String>> fieldMappings = new 
ArrayList<Map<String,String>>();
     String keepAllMetadataValue = "true";
+    String lowernamesValue = "false";
     for (int i = 0; i < os.getChildCount(); i++)
     {
       SpecificationNode sn = os.getChild(i);
@@ -598,9 +626,14 @@ public class TikaExtractor extends org.a
       {
         keepAllMetadataValue = 
sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
       }
+      else if (sn.getType().equals(TikaConfig.NODE_LOWERNAMES))
+      {
+        lowernamesValue = sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
+      }
     }
     paramMap.put("FIELDMAPPINGS",fieldMappings);
     paramMap.put("KEEPALLMETADATA",keepAllMetadataValue);
+    paramMap.put("LOWERNAMES",lowernamesValue);
   }
 
   protected static void fillInExceptionsSpecificationMap(Map<String,Object> 
paramMap, Specification os)
@@ -798,11 +831,13 @@ public class TikaExtractor extends org.a
     
     private final Map<String,String> sourceTargets = new 
HashMap<String,String>();
     private final boolean keepAllMetadata;
+    private final boolean lowerNames;
     private final boolean ignoreTikaException;
     private final String extractorClassName;
     
     public SpecPacker(Specification os) {
       boolean keepAllMetadata = true;
+      boolean lowerNames = false;
       boolean ignoreTikaException = true;
       String extractorClassName = null;
       for (int i = 0; i < os.getChildCount(); i++) {
@@ -811,6 +846,9 @@ public class TikaExtractor extends org.a
         if(sn.getType().equals(TikaConfig.NODE_KEEPMETADATA)) {
           String value = sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
           keepAllMetadata = Boolean.parseBoolean(value);
+        } else if(sn.getType().equals(TikaConfig.NODE_LOWERNAMES)) {
+          String value = sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
+          lowerNames = Boolean.parseBoolean(value);
         } else if (sn.getType().equals(TikaConfig.NODE_FIELDMAP)) {
           String source = sn.getAttributeValue(TikaConfig.ATTRIBUTE_SOURCE);
           String target = sn.getAttributeValue(TikaConfig.ATTRIBUTE_TARGET);
@@ -827,6 +865,7 @@ public class TikaExtractor extends org.a
         }
       }
       this.keepAllMetadata = keepAllMetadata;
+      this.lowerNames = lowerNames;
       this.ignoreTikaException = ignoreTikaException;
       this.extractorClassName = extractorClassName;
     }
@@ -860,7 +899,10 @@ public class TikaExtractor extends org.a
         sb.append('+');
       else
         sb.append('-');
-      
+      if (lowerNames)
+          sb.append('+');
+        else
+          sb.append('-');
       if (ignoreTikaException)
         sb.append('+');
       else
@@ -885,6 +927,10 @@ public class TikaExtractor extends org.a
       return keepAllMetadata;
     }
     
+    public boolean lowerNames() {
+      return lowerNames;
+    }
+    
     public boolean ignoreTikaException() {
       return ignoreTikaException;
     }

Modified: 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_en_US.properties?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_en_US.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_en_US.properties
 Wed Jul  8 22:01:08 2015
@@ -29,6 +29,7 @@ TikaExtractor.MetadataFieldName=Metadata
 TikaExtractor.FinalFieldName=Final field name
 TikaExtractor.NoFieldMappingSpecified=No field mapping specified
 TikaExtractor.KeepAllMetadata=Keep all metadata:
+TikaExtractor.LowerNames=Lower names:
 TikaExtractor.Add=Add
 TikaExtractor.AddFieldMapping=Add field mapping
 TikaExtractor.Delete=Delete

Modified: 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties
 Wed Jul  8 22:01:08 2015
@@ -29,6 +29,7 @@ TikaExtractor.MetadataFieldName=ã¡ã
 TikaExtractor.FinalFieldName=æå¾ã®ãã£ã¼ã«ãå
 
TikaExtractor.NoFieldMappingSpecified=ãã£ã¼ã«ããããã³ã°ãæå®ãã¦ãã
 ãã
 TikaExtractor.KeepAllMetadata=å¨ã¡ã¿ãã¼ã¿ãä¿å:
+TikaExtractor.LowerNames=å°æåå:
 TikaExtractor.Add=è¿½å 
 TikaExtractor.AddFieldMapping=ãã£ã¼ã«ããããã³ã°ãè¿½å 
 TikaExtractor.Delete=åé¤

Modified: 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties
 Wed Jul  8 22:01:08 2015
@@ -29,6 +29,7 @@ TikaExtractor.MetadataFieldName=åæ
 TikaExtractor.FinalFieldName=æç»åæ®µå
 TikaExtractor.NoFieldMappingSpecified=æªæå®åæ®µæ å°
 TikaExtractor.KeepAllMetadata=ä¿åææåæ°æ®:
+TikaExtractor.LowerNames=å°å:
 TikaExtractor.Add=æ·»å 
 TikaExtractor.AddFieldMapping=æ·»å åæ®µæ å°
 TikaExtractor.Delete=å é¤

Modified: 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/editSpecification_FieldMapping.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/editSpecification_FieldMapping.html?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/editSpecification_FieldMapping.html
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/editSpecification_FieldMapping.html
 Wed Jul  8 22:01:08 2015
@@ -91,6 +91,17 @@
   #end
     </td>
   </tr>
+
+  <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.LowerNames'))</nobr></td>
+    <td class="value">
+  #if($LOWERNAMES == 'true')
+       <input type="checkbox" checked="true" name="s${SEQNUM}_lowernames" 
value="true"/>
+  #else
+       <input type="checkbox" name="s${SEQNUM}_lowernames" value="true"/>
+  #end
+    </td>
+  </tr>
 </table>
       
 #else
@@ -103,5 +114,6 @@
   #end
 <input type="hidden" name="s${SEQNUM}_fieldmapping_count" 
value="$fieldcounter"/>
 <input type="hidden" name="s${SEQNUM}_keepallmetadata" 
value="$Encoder.bodyEscape($KEEPALLMETADATA)"/>
+<input type="hidden" name="s${SEQNUM}_lowernames" 
value="$Encoder.bodyEscape($LOWERNAMES)"/>
 
 #end
\ No newline at end of file

Modified: 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/viewSpecification.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/viewSpecification.html?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/viewSpecification.html
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/viewSpecification.html
 Wed Jul  8 22:01:08 2015
@@ -53,6 +53,11 @@
   </tr>
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
+    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.LowerNames'))</nobr></td>
+    <td class="value"><nobr>$Encoder.bodyEscape($LOWERNAMES)</nobr></td>
+  </tr>
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
     <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.IgnoreTikaExceptions'))</nobr></td>
     <td 
class="value"><nobr>$Encoder.bodyEscape($IGNORETIKAEXCEPTIONS)</nobr></td>
   </tr>

Modified: 
manifoldcf/branches/CONNECTORS-1196/framework/api-servlet/src/main/java/org/apache/manifoldcf/apiservlet/APIServlet.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/api-servlet/src/main/java/org/apache/manifoldcf/apiservlet/APIServlet.java?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/framework/api-servlet/src/main/java/org/apache/manifoldcf/apiservlet/APIServlet.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/framework/api-servlet/src/main/java/org/apache/manifoldcf/apiservlet/APIServlet.java
 Wed Jul  8 22:01:08 2015
@@ -289,7 +289,7 @@ public class APIServlet extends HttpServ
     
     // There the only response distinction we have here is between exception 
and no exception.
     Configuration output = new Configuration();
-    int readResult = 
ManifoldCF.executeReadCommand(tc,output,command,queryParameters);
+    int readResult = 
ManifoldCF.executeReadCommand(tc,output,command,queryParameters,ap);
 
     // Output
     
@@ -319,6 +319,8 @@ public class APIServlet extends HttpServ
 
     if (readResult == ManifoldCF.READRESULT_NOTFOUND)
       response.setStatus(response.SC_NOT_FOUND);
+    else if (readResult == ManifoldCF.READRESULT_NOTALLOWED)
+      response.setStatus(response.SC_UNAUTHORIZED);
 
     byte[] responseValue = outputText.getBytes(StandardCharsets.UTF_8);
 
@@ -406,7 +408,7 @@ public class APIServlet extends HttpServ
     // Exception vs. no exception
     // OK vs CREATE (both with json response packets)
     Configuration output = new Configuration();
-    int writeResult = ManifoldCF.executeWriteCommand(tc,output,command,input);
+    int writeResult = 
ManifoldCF.executeWriteCommand(tc,output,command,input,ap);
     
     // Output
     
@@ -440,6 +442,8 @@ public class APIServlet extends HttpServ
       response.setStatus(response.SC_CREATED);
     else if (writeResult == ManifoldCF.WRITERESULT_NOTFOUND)
       response.setStatus(response.SC_NOT_FOUND);
+    else if (writeResult == ManifoldCF.WRITERESULT_NOTALLOWED)
+      response.setStatus(response.SC_UNAUTHORIZED);
     
     byte[] responseValue = outputText.getBytes(StandardCharsets.UTF_8);
 
@@ -569,7 +573,7 @@ public class APIServlet extends HttpServ
 
     
     Configuration output = new Configuration();
-    int writeResult = ManifoldCF.executePostCommand(tc,output,command,input);
+    int writeResult = 
ManifoldCF.executePostCommand(tc,output,command,input,ap);
     
     // Output
     
@@ -603,7 +607,9 @@ public class APIServlet extends HttpServ
       response.setStatus(response.SC_CREATED);
     else if (writeResult == ManifoldCF.POSTRESULT_NOTFOUND)
       response.setStatus(response.SC_NOT_FOUND);
-    
+    else if (writeResult == ManifoldCF.POSTRESULT_NOTALLOWED)
+      response.setStatus(response.SC_UNAUTHORIZED);
+
     byte[] responseValue = outputText.getBytes(StandardCharsets.UTF_8);
 
     // Set response mime type
@@ -657,7 +663,7 @@ public class APIServlet extends HttpServ
     
     // There the only response distinction we have here is between exception 
and no exception.
     Configuration output = new Configuration();
-    int result = ManifoldCF.executeDeleteCommand(tc,output,command);
+    int result = ManifoldCF.executeDeleteCommand(tc,output,command,ap);
     
     // Output
     String outputText = null;
@@ -686,6 +692,9 @@ public class APIServlet extends HttpServ
     
     if (result == ManifoldCF.DELETERESULT_NOTFOUND)
       response.setStatus(response.SC_NOT_FOUND);
+    else if (result == ManifoldCF.DELETERESULT_NOTALLOWED)
+      response.setStatus(response.SC_UNAUTHORIZED);
+
     
     byte[] responseValue = outputText.getBytes(StandardCharsets.UTF_8);
 

Modified: 
manifoldcf/branches/CONNECTORS-1196/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/fuzzyml/TagParseState.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/fuzzyml/TagParseState.java?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/fuzzyml/TagParseState.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/fuzzyml/TagParseState.java
 Wed Jul  8 22:01:08 2015
@@ -282,10 +282,21 @@ public class TagParseState extends Singl
       }
       else if (bTagDepth == 0)
       {
-        currentState = TAGPARSESTATE_IN_TAG_NAME;
-        currentTagNameBuffer = newBuffer();
-        if (!isWhitespace(thisChar))
+        if (isWhitespace(thisChar))
+        {
+          // Not a tag.
+          currentState = TAGPARSESTATE_NORMAL;
+          if (noteNormalCharacter('<'))
+            return true;
+          if (noteNormalCharacter(thisChar))
+            return true;
+        }
+        else
+        {
+          currentState = TAGPARSESTATE_IN_TAG_NAME;
+          currentTagNameBuffer = newBuffer();
           currentTagNameBuffer.append(thisChar);
+        }
       }
       else
       {

Modified: 
manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java
 Wed Jul  8 22:01:08 2015
@@ -163,8 +163,17 @@ public class ConnectionPool
         // it into the pool.
         if (rval != null)
         {
+          // We have a handle, so just free it and leave activeConnections 
alone
           release(rval);
         }
+        else
+        {
+          // We didn't manage to create the handle, so decrement active 
connections.
+          synchronized (this)
+          {
+            activeConnections--;
+          }
+        }
       }
     }
   }

Modified: 
manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
 Wed Jul  8 22:01:08 2015
@@ -128,17 +128,6 @@ public class ManifoldCF
   /** Process ID - cannot exceed 16 characters */
   public static final String processIDProperty = 
"org.apache.manifoldcf.processid";
   
-  // Admin properties
-  /** UI login user name */
-  public static final String loginUserNameProperty = 
"org.apache.manifoldcf.login.name";
-  /** UI login password */
-  public static final String loginPasswordProperty = 
"org.apache.manifoldcf.login.password";
-
-  /** API login user name */
-  public static final String apiLoginUserNameProperty = 
"org.apache.manifoldcf.apilogin.name";
-  /** API login password */
-  public static final String apiLoginPasswordProperty = 
"org.apache.manifoldcf.apilogin.password";
-
   // Database access properties
   /** Database name property */
   public static final String masterDatabaseNameProperty = 
"org.apache.manifoldcf.database.name";
@@ -168,6 +157,8 @@ public class ManifoldCF
   public static final String lockManagerImplementation = 
"org.apache.manifoldcf.lockmanagerclass";
   /** Database implementation class */
   public static final String databaseImplementation = 
"org.apache.manifoldcf.databaseimplementationclass";
+  /** Auth implementation class */
+  public static final String authImplementation = 
"org.apache.manifoldcf.authimplementationclass";
   
   // The following are system integration properties
   /** Script to invoke when configuration changes, if any */
@@ -198,10 +189,6 @@ public class ManifoldCF
         // Clean up the system doing the same thing the shutdown thread would 
have if the process was killed
         cleanUpEnvironment(threadContext);
         processID = null;
-        loginUserName = null;
-        loginPassword = null;
-        apiLoginUserName = null;
-        apiLoginPassword = null;
         masterDatabaseName = null;
         masterDatabaseUsername = null;
         masterDatabasePassword = null;
@@ -292,12 +279,6 @@ public class ManifoldCF
           Logging.initializeLoggers();
           Logging.setLogLevels(threadContext);
 
-          loginUserName = 
LockManagerFactory.getStringProperty(threadContext,loginUserNameProperty,"admin");
-          loginPassword = 
LockManagerFactory.getPossiblyObfuscatedStringProperty(threadContext,loginPasswordProperty,"admin");
-
-          apiLoginUserName = 
LockManagerFactory.getStringProperty(threadContext,apiLoginUserNameProperty,"");
-          apiLoginPassword = 
LockManagerFactory.getPossiblyObfuscatedStringProperty(threadContext,apiLoginPasswordProperty,"");
-
           masterDatabaseName = 
LockManagerFactory.getStringProperty(threadContext,masterDatabaseNameProperty,"dbname");
           masterDatabaseUsername = 
LockManagerFactory.getStringProperty(threadContext,masterDatabaseUsernameProperty,"manifoldcf");
           masterDatabasePassword = 
LockManagerFactory.getPossiblyObfuscatedStringProperty(threadContext,masterDatabasePasswordProperty,"local_pg_passwd");
@@ -707,44 +688,6 @@ public class ManifoldCF
     }
   }
 
-  /** Verify API login.
-  */
-  public static boolean verifyAPILogin(IThreadContext threadContext, String 
userID, String userPassword)
-    throws ManifoldCFException
-  {
-    if (userID != null && userPassword != null)
-    {
-      /*
-      IDBInterface database = DBInterfaceFactory.make(threadContext,
-        ManifoldCF.getMasterDatabaseName(),
-        ManifoldCF.getMasterDatabaseUsername(),
-        ManifoldCF.getMasterDatabasePassword());
-      */
-      // MHL to use a database table, when we get that sophisticated
-      return userID.equals(apiLoginUserName) &&  
userPassword.equals(apiLoginPassword);
-    }
-    return false;
-  }
-
-  /** Verify login.
-  */
-  public static boolean verifyLogin(IThreadContext threadContext, String 
userID, String userPassword)
-    throws ManifoldCFException
-  {
-    if (userID != null && userPassword != null)
-    {
-      /*
-      IDBInterface database = DBInterfaceFactory.make(threadContext,
-        ManifoldCF.getMasterDatabaseName(),
-        ManifoldCF.getMasterDatabaseUsername(),
-        ManifoldCF.getMasterDatabasePassword());
-      */
-      // MHL to use a database table, when we get that sophisticated
-      return userID.equals(loginUserName) &&  
userPassword.equals(loginPassword);
-    }
-    return false;
-  }
-  
   protected static final int IV_LENGTH = 16;
 
   protected static String getSaltValue(IThreadContext threadContext)

Modified: 
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/adminHeaders.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/adminHeaders.jsp?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/adminHeaders.jsp
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/adminHeaders.jsp
 Wed Jul  8 22:01:08 2015
@@ -1,4 +1,5 @@
-<% response.setHeader("Pragma","No-cache");
+<%
+response.setHeader("Pragma","No-cache");
 response.setDateHeader("Expires",0);
 response.setHeader("Cache-Control", "no-cache");
 response.setDateHeader("max-age", 0);

Modified: 
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/documentstatus.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/documentstatus.jsp?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/documentstatus.jsp
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/documentstatus.jsp
 Wed Jul  8 22:01:08 2015
@@ -20,109 +20,27 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-boolean maintenanceUnderway = 
org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway();
-
 %>
 
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-  <title>
-    
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.ApacheManifoldCFDocumentStatus")%>
-  </title>
-
-  <script type="text/javascript">
-  <!--
-
-  function Go()
-  {
-    if (!isInteger(report.rowcount.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.EnterALegalNumberForRowsPerPage")%>");
-      report.rowcount.focus();
-      return;
-    }
-    if (!isRegularExpression(report.statusidentifiermatch.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.IdentifierMatchMustBeAValidRegularExpression")%>");
-      report.statusidentifiermatch.focus();
-      return;
-    }
-
-    document.report.op.value="Status";
-    document.report.action = document.report.action + "#MainButton";
-    document.report.submit();
-  }
-
-  function Continue()
-  {
-    if (!isRegularExpression(report.statusidentifiermatch.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.IdentifierMatchMustBeAValidRegularExpression")%>");
-      report.statusidentifiermatch.focus();
-      return;
-    }
-    document.report.op.value="Continue";
-    document.report.action = document.report.action + "#MainButton";
-    document.report.submit();
-  }
-
-  function ColumnClick(colname)
-  {
-    document.report.clickcolumn.value = colname;
-    Go();
-  }
-
-  function SetPosition(amt)
-  {
-    if (amt < 0)
-      amt = 0;
-    document.report.startrow.value = amt;
-    Go();
-  }
-
-  function isRegularExpression(value)
+<%
+try
+{
+  // Check if authorized
+  if 
(!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_VIEW_REPORTS))
   {
-    try
-    {
-      var foo = "teststring";
-                        foo.search(value.replace(/\(\?i\)/,""));
-      return true;
-    }
-    catch (e)
-    {
-      return false;
-    }
-
+    variableContext.setParameter("target","index.jsp");
+%>
+    <jsp:forward page="unauthorized.jsp"/>
+<%
   }
 
-  function isInteger(value)
+  if 
(org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway())
   {
-    var anum=/(^\d+$)/;
-    return anum.test(value);
-  }
-
-  //-->
-  </script>
-
-
-</head>
-
-<body class="standardbody">
-
-    <table class="page">
-      <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"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentStatus")%></p>
+%>
+    <jsp:forward page="maintenanceunderway.jsp"/>
 <%
-if (maintenanceUnderway == false)
-{
+  }
+  
   int k;
 
   // Read the document selection parameters.
@@ -259,17 +177,115 @@ if (maintenanceUnderway == false)
   }
 
 %>
-  <form class="standardform" name="report" action="execute.jsp" method="POST">
-    <input type="hidden" name="op" value="Continue"/>
-    <input type="hidden" name="type" value="documentstatus"/>
-    <table class="displaytable">
-      <tr>
-        <td class="separator" colspan="4"><hr/></td>
-      </tr>
-      <tr>
-        <td class="description" 
colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Connection")%></td><td
 class="value" colspan="1">
-          <select name="statusconnection" size="3">
-            <option 
<%=(statusConnection.length()==0)?"selected=\"selected\"":""%> value="">-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.NotSpecified")%>
 --</option>
+
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html>
+<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+
+<html xmlns="http://www.w3.org/1999/xhtml";>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
+  <title>
+    
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.ApacheManifoldCFDocumentStatus")%>
+  </title>
+
+  <script type="text/javascript">
+  <!--
+
+function Go()
+{
+  if (!isInteger(report.rowcount.value))
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.EnterALegalNumberForRowsPerPage")%>");
+    report.rowcount.focus();
+    return;
+  }
+  if (!isRegularExpression(report.statusidentifiermatch.value))
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.IdentifierMatchMustBeAValidRegularExpression")%>");
+    report.statusidentifiermatch.focus();
+    return;
+  }
+
+  document.report.op.value="Status";
+  document.report.action = document.report.action + "#MainButton";
+  document.report.submit();
+}
+
+function Continue()
+{
+  if (!isRegularExpression(report.statusidentifiermatch.value))
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.IdentifierMatchMustBeAValidRegularExpression")%>");
+    report.statusidentifiermatch.focus();
+    return;
+  }
+  document.report.op.value="Continue";
+  document.report.action = document.report.action + "#MainButton";
+  document.report.submit();
+}
+
+function ColumnClick(colname)
+{
+  document.report.clickcolumn.value = colname;
+  Go();
+}
+
+function SetPosition(amt)
+{
+  if (amt < 0)
+    amt = 0;
+  document.report.startrow.value = amt;
+  Go();
+}
+
+function isRegularExpression(value)
+{
+  try
+  {
+    var foo = "teststring";
+    foo.search(value.replace(/\(\?i\)/,""));
+    return true;
+  }
+  catch (e)
+  {
+    return false;
+  }
+
+}
+
+function isInteger(value)
+{
+  var anum=/(^\d+$)/;
+  return anum.test(value);
+}
+
+  //-->
+  </script>
+
+
+</head>
+
+<body class="standardbody">
+
+  <table class="page">
+    <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"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentStatus")%></p>
+        <form class="standardform" name="report" action="execute.jsp" 
method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="documentstatus"/>
+          <table class="displaytable">
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td class="description" 
colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Connection")%></td><td
 class="value" colspan="1">
+                <select name="statusconnection" size="3">
+                  <option 
<%=(statusConnection.length()==0)?"selected=\"selected\"":""%> value="">-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.NotSpecified")%>
 --</option>
 <%
   int i = 0;
   while (i < connList.length)
@@ -280,183 +296,183 @@ if (maintenanceUnderway == false)
     if (thisDescription == null || thisDescription.length() == 0)
       thisDescription = thisConnectionName;
 %>
-            <option 
<%=(thisConnectionName.equals(statusConnection))?"selected=\"selected\"":""%> 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisConnectionName)%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%></option>
+                  <option 
<%=(thisConnectionName.equals(statusConnection))?"selected=\"selected\"":""%> 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisConnectionName)%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%></option>
 <%
   }
 %>
-          </select>
-        </td>
+                </select>
+              </td>
 <%
   if (eligibleList != null)
   {
 %>
-        <td class="description" 
colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Jobs")%></td><td
 class="value" colspan="1">
-          <select multiple="true" name="statusjobs" size="3">
+              <td class="description" 
colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Jobs")%></td><td
 class="value" colspan="1">
+                <select multiple="true" name="statusjobs" size="3">
 <%
-      i = 0;
-      while (i < eligibleList.length)
-      {
-    IJobDescription job = eligibleList[i++];
-    String description = job.getDescription();
-    Long identifier = job.getID();
+    i = 0;
+    while (i < eligibleList.length)
+    {
+      IJobDescription job = eligibleList[i++];
+      String description = job.getDescription();
+      Long identifier = job.getID();
 %>
-            <option 
<%=((selectedJobs.get(identifier)==null)?"":"selected=\"selected\"")%> 
value='<%=identifier.toString()%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></option>
+                  <option 
<%=((selectedJobs.get(identifier)==null)?"":"selected=\"selected\"")%> 
value='<%=identifier.toString()%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></option>
 <%
-      }
+    }
 %>
-          </select>
-        </td>
+                </select>
+              </td>
 <%
   }
   else
   {
 %>
-        <td class="value" colspan="2"></td>
+              <td class="value" colspan="2"></td>
 <%
   }
 %>
 
-      </tr>
-      <tr>
-        <td class="separator" colspan="4"><hr/></td>
-      </tr>
-      <tr>
-        <td 
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.TimeOffsetFromNowMinutes")%></td>
-        <td class="value" colspan="3">
-          <input name="statusscheduleoffset" type="text" size="6" value=""/>
-        </td>
-      </tr>
-      <tr>
-        <td 
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></td>
-        <td class="value" colspan="3">
-          <input name="statusdocumentstates_posted" type="hidden" 
value="true"/>
-          <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.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsThatHaveNeverBeenProcessed")%></option>
-            <option <%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsProcessedAtLeastOnce")%></option>
-            <option <%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_OUTOFSCOPE))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATE_OUTOFSCOPE)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsOutOfScope")%></option>
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td 
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></td>
-        <td class="value" colspan="3">
-          <input name="statusdocumentstatuses_posted" type="hidden" 
value="true"/>
-          <select name="statusdocumentstatuses" multiple="true" size="3">
-            <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_INACTIVE))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATUS_INACTIVE)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsThatAreNoLongerActive")%></option>
-            <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_PROCESSING))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATUS_PROCESSING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyInProgress")%></option>
-            <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_EXPIRING))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATUS_EXPIRING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyBeingExpired")%></option>
-            <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_DELETING))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATUS_DELETING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyBeingDeleted")%></option>
-            <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_READYFORPROCESSING))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_READYFORPROCESSING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyAvailableForProcessing")%></option>
-            <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_READYFOREXPIRATION))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_READYFOREXPIRATION)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyAvailableForExpiration")%></option>
-            <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_WAITINGFORPROCESSING))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFORPROCESSING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsNotYetProcessable")%></option>
-            <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_WAITINGFOREXPIRATION))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFOREXPIRATION)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsNotYetExpirable")%></option>
-            <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_WAITINGFOREVER))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFOREVER)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsWaitingForever")%></option>
-            <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_HOPCOUNTEXCEEDED))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_HOPCOUNTEXCEEDED)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsHopcountExceeded")%></option>
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td class="separator" colspan="4"><hr/></td>
-      </tr>
-      <tr>
-        <td 
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentIdentifierMatch")%></nobr></td>
-        <td class="value" colspan="3"><input type="text" 
name="statusidentifiermatch" size="40" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(identifierMatch)%>'/></td>
-      </tr>
-      <tr>
-        <td class="separator" colspan="4"><hr/></td>
-      </tr>
-      <tr>
-        <td class="message" colspan="4">
+            </tr>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td 
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.TimeOffsetFromNowMinutes")%></td>
+              <td class="value" colspan="3">
+                <input name="statusscheduleoffset" type="text" size="6" 
value=""/>
+              </td>
+            </tr>
+            <tr>
+              <td 
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></td>
+              <td class="value" colspan="3">
+                <input name="statusdocumentstates_posted" type="hidden" 
value="true"/>
+                <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.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsThatHaveNeverBeenProcessed")%></option>
+                  <option <%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsProcessedAtLeastOnce")%></option>
+                  <option <%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_OUTOFSCOPE))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATE_OUTOFSCOPE)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsOutOfScope")%></option>
+                </select>
+              </td>
+            </tr>
+            <tr>
+              <td 
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></td>
+              <td class="value" colspan="3">
+                <input name="statusdocumentstatuses_posted" type="hidden" 
value="true"/>
+                <select name="statusdocumentstatuses" multiple="true" size="3">
+                  <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_INACTIVE))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATUS_INACTIVE)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsThatAreNoLongerActive")%></option>
+                  <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_PROCESSING))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATUS_PROCESSING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyInProgress")%></option>
+                  <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_EXPIRING))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATUS_EXPIRING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyBeingExpired")%></option>
+                  <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_DELETING))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATUS_DELETING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyBeingDeleted")%></option>
+                  <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_READYFORPROCESSING))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_READYFORPROCESSING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyAvailableForProcessing")%></option>
+                  <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_READYFOREXPIRATION))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_READYFOREXPIRATION)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyAvailableForExpiration")%></option>
+                  <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_WAITINGFORPROCESSING))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFORPROCESSING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsNotYetProcessable")%></option>
+                  <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_WAITINGFOREXPIRATION))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFOREXPIRATION)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsNotYetExpirable")%></option>
+                  <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_WAITINGFOREVER))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFOREVER)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsWaitingForever")%></option>
+                  <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_HOPCOUNTEXCEEDED))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATUS_HOPCOUNTEXCEEDED)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsHopcountExceeded")%></option>
+                </select>
+              </td>
+            </tr>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td 
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentIdentifierMatch")%></nobr></td>
+              <td class="value" colspan="3"><input type="text" 
name="statusidentifiermatch" size="40" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(identifierMatch)%>'/></td>
+            </tr>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td class="message" colspan="4">
 <%
   if (statusConnection.length() > 0 && statusJobIdentifiers.length > 0)
   {
 %>
-          <a name="MainButton"><input type="button" 
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Go")%>"
 onClick="javascript:Go()" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%>"/></a>
+                <a name="MainButton"><input type="button" 
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Go")%>"
 onClick="javascript:Go()" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%>"/></a>
 <%
   }
   else
   {
 %>
-          <a name="MainButton"><input type="button" 
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>"
 onClick="javascript:Continue()" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>"/></a>
+                <a name="MainButton"><input type="button" 
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>"
 onClick="javascript:Continue()" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>"/></a>
 <%
   }
 %>
-        </td>
-      </tr>
-      <tr>
-        <td class="separator" colspan="4"><hr/></td>
-      </tr>
+              </td>
+            </tr>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
 
-    </table>
+          </table>
 <%
   if (statusConnection.length() > 0)
   {
-      if (statusJobIdentifiers.length > 0)
-      {
-    // Run the report.
+    if (statusJobIdentifiers.length > 0)
+    {
+      // Run the report.
 
-    // First, we need to gather the sort order object.
-    String sortOrderString = variableContext.getParameter("sortorder");
-    SortOrder sortOrder;
-    if (sortOrderString == null || sortOrderString.length() == 0)
-      sortOrder = new SortOrder();
-    else
-      sortOrder = new SortOrder(sortOrderString);
+      // First, we need to gather the sort order object.
+      String sortOrderString = variableContext.getParameter("sortorder");
+      SortOrder sortOrder;
+      if (sortOrderString == null || sortOrderString.length() == 0)
+        sortOrder = new SortOrder();
+      else
+        sortOrder = new SortOrder(sortOrderString);
 
-    // Now, gather the column header that was clicked on (if any)
-    String clickedColumn = variableContext.getParameter("clickcolumn");
-    if (clickedColumn != null && clickedColumn.length() > 0)
-      sortOrder.clickColumn(clickedColumn);
-
-    // Gather the start
-    String startRowString = variableContext.getParameter("startrow");
-    int startRow = 0;
-    if (startRowString != null && startRowString.length() > 0)
-      startRow = Integer.parseInt(startRowString);
-
-    // Gather the max
-    String maxRowCountString = variableContext.getParameter("rowcount");
-    int rowCount = 20;
-    if (maxRowCountString != null && maxRowCountString.length() > 0)
-      rowCount = Integer.parseInt(maxRowCountString);
-
-    Long[] ourJobs = new Long[selectedJobs.size()];
-    Iterator iter = selectedJobs.keySet().iterator();
-    int zz = 0;
-    while (iter.hasNext())
-    {
-      ourJobs[zz++] = (Long)iter.next();
-    }
+      // Now, gather the column header that was clicked on (if any)
+      String clickedColumn = variableContext.getParameter("clickcolumn");
+      if (clickedColumn != null && clickedColumn.length() > 0)
+        sortOrder.clickColumn(clickedColumn);
+
+      // Gather the start
+      String startRowString = variableContext.getParameter("startrow");
+      int startRow = 0;
+      if (startRowString != null && startRowString.length() > 0)
+        startRow = Integer.parseInt(startRowString);
+
+      // Gather the max
+      String maxRowCountString = variableContext.getParameter("rowcount");
+      int rowCount = 20;
+      if (maxRowCountString != null && maxRowCountString.length() > 0)
+        rowCount = Integer.parseInt(maxRowCountString);
+
+      Long[] ourJobs = new Long[selectedJobs.size()];
+      Iterator iter = selectedJobs.keySet().iterator();
+      int zz = 0;
+      while (iter.hasNext())
+      {
+        ourJobs[zz++] = (Long)iter.next();
+      }
 
-    RegExpCriteria identifierMatchObject = null;
-    if (identifierMatch.length() > 0)
-      identifierMatchObject = new RegExpCriteria(identifierMatch,true);
-    StatusFilterCriteria criteria = new 
StatusFilterCriteria(ourJobs,nowTime,identifierMatchObject,matchingStates,matchingStatuses);
-
-    IResultSet set = 
jobManager.genDocumentStatus(statusConnection,criteria,sortOrder,startRow,rowCount+1);
-
-%>
-    <input type="hidden" name="clickcolumn" value=""/>
-    <input type="hidden" name="startrow" 
value='<%=Integer.toString(startRow)%>'/>
-    <input type="hidden" name="sortorder" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sortOrder.toString())%>'/>
-
-    <table class="displaytable">
-        <tr class="headerrow">
-      <td 
class="reportcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Identifier")%></nobr></td>
-      <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("job");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Job")%></nobr></a></td>
-      <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("state");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.State")%></nobr></a></td>
-      <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("status");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Status")%></nobr></a></td>
-      <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("scheduled");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Scheduled")%></nobr></a></td>
-      <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("action");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.ScheduledAction")%></nobr></a></td>
-      <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("retrycount");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.RetryCount")%></nobr></a></td>
-      <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("retrylimit");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.RetryLimit")%></nobr></a></td>
-        </tr>
-<%
-    zz = 0;
-    boolean hasMoreRows = (set.getRowCount() > rowCount);
-    int iterCount = hasMoreRows?rowCount:set.getRowCount();
-    while (zz < iterCount)
-    {
+      RegExpCriteria identifierMatchObject = null;
+      if (identifierMatch.length() > 0)
+        identifierMatchObject = new RegExpCriteria(identifierMatch,true);
+      StatusFilterCriteria criteria = new 
StatusFilterCriteria(ourJobs,nowTime,identifierMatchObject,matchingStates,matchingStatuses);
+
+      IResultSet set = 
jobManager.genDocumentStatus(statusConnection,criteria,sortOrder,startRow,rowCount+1);
+
+%>
+          <input type="hidden" name="clickcolumn" value=""/>
+          <input type="hidden" name="startrow" 
value='<%=Integer.toString(startRow)%>'/>
+          <input type="hidden" name="sortorder" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sortOrder.toString())%>'/>
+
+          <table class="displaytable">
+            <tr class="headerrow">
+              <td 
class="reportcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Identifier")%></nobr></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("job");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Job")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("state");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.State")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("status");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Status")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("scheduled");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Scheduled")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("action");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.ScheduledAction")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("retrycount");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.RetryCount")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("retrylimit");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.RetryLimit")%></nobr></a></td>
+            </tr>
+<%
+      zz = 0;
+      boolean hasMoreRows = (set.getRowCount() > rowCount);
+      int iterCount = hasMoreRows?rowCount:set.getRowCount();
+      while (zz < iterCount)
+      {
         IResultRow row = set.getRow(zz);
 
         // Translate column values into something that can be reasonably 
displayed.
@@ -467,126 +483,126 @@ if (maintenanceUnderway == false)
         Long scheduleTime = (Long)row.getValue("scheduled");
         String scheduleTimeString = "";
         if (scheduleTime != null)
-      scheduleTimeString = 
org.apache.manifoldcf.ui.util.Formatter.formatTime(scheduleTime.longValue());
+          scheduleTimeString = 
org.apache.manifoldcf.ui.util.Formatter.formatTime(scheduleTime.longValue());
         String scheduledActionString = (String)row.getValue("action");
         if (scheduledActionString == null)
-            scheduledActionString = "";
+          scheduledActionString = "";
         Long retryCount = (Long)row.getValue("retrycount");
         String retryCountString = "";
         if (retryCount != null)
-      retryCountString = retryCount.toString();
+          retryCountString = retryCount.toString();
         Long retryLimit = (Long)row.getValue("retrylimit");
         String retryLimitString = "";
         if (retryLimit != null)
-            retryLimitString = 
org.apache.manifoldcf.ui.util.Formatter.formatTime(retryLimit.longValue());
+          retryLimitString = 
org.apache.manifoldcf.ui.util.Formatter.formatTime(retryLimit.longValue());
 
 %>
-        <tr <%="class=\""+((zz%2==0)?"evendatarow":"odddatarow")+"\""%>>
-      <td class="reportcolumncell">
+            <tr <%="class=\""+((zz%2==0)?"evendatarow":"odddatarow")+"\""%>>
+              <td class="reportcolumncell">
 <%
         int q = 0;
         while (q < identifierBreakdown.length)
         {
 %>
-        
<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(identifierBreakdown[q++])%></nobr><br/>
+                
<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(identifierBreakdown[q++])%></nobr><br/>
 <%
         }
 %>
-      </td>
-      <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("job").toString())%></td>
-      <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("state").toString())%></td>
-      <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("status").toString())%></td>
-      <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(scheduleTimeString)%></td>
-      <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(scheduledActionString)%></td>
-      <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(retryCountString)%></td>
-      <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(retryLimitString)%></td>
-        </tr>
+              </td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("job").toString())%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("state").toString())%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("status").toString())%></td>
 
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(scheduleTimeString)%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(scheduledActionString)%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(retryCountString)%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(retryLimitString)%></td>
+            </tr>
 <%
-      zz++;
-    }
+        zz++;
+      }
 %>
-    </table>
-    <table class="reportfootertable">
-        <tr class="reportfooterrow">
-      <td class="reportfootercell">
-        <nobr>
+          </table>
+          <table class="reportfootertable">
+            <tr class="reportfooterrow">
+              <td class="reportfootercell">
+                <nobr>
 <%
-    if (startRow == 0)
-    {
+      if (startRow == 0)
+      {
 %>
-          
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Previous")%>
+                  
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Previous")%>
 <%
-    }
-    else
-    {
+      }
+      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="Previous page">Previous</a>
 <%
-    }
+      }
 %>
-        </nobr>
-      </td>
-      <td class="reportfootercell">
-        <nobr>
+                </nobr>
+              </td>
+              <td class="reportfootercell">
+                <nobr>
 <%
-    if (hasMoreRows == false)
-    {
+      if (hasMoreRows == false)
+      {
 %>
-          
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Next")%>
+                  
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Next")%>
 <%
-    }
-    else
-    {
+      }
+      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="Next page">Next</a>
 <%
-    }
+      }
 %>
-        </nobr>
-      </td>
-      <td class="reportfootercell">
-        
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Rows")%></nobr>
-        
<nobr><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></nobr>
-      </td>
-      <td class="reportfootercell">
-        
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.RowsPerPage")%></nobr>
-        <nobr><input type="text" name="rowcount" size="5" 
value='<%=Integer.toString(rowCount)%>'/></nobr>
-      </td>
-        </tr>
-    </table>
+                </nobr>
+              </td>
+              <td class="reportfootercell">
+                
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Rows")%></nobr>
+                
<nobr><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></nobr>
+              </td>
+              <td class="reportfootercell">
+                
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.RowsPerPage")%></nobr>
+                <nobr><input type="text" name="rowcount" size="5" 
value='<%=Integer.toString(rowCount)%>'/></nobr>
+              </td>
+            </tr>
+          </table>
 
 <%
-      }
-      else
-      {
+    }
+    else
+    {
 %>
-    <table class="displaytable"><tr><td 
class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectAtLeastOneJob")%></td></tr></table>
+          <table class="displaytable"><tr><td 
class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectAtLeastOneJob")%></td></tr></table>
 <%
-      }
+    }
   }
   else
   {
 %>
-    <table class="displaytable"><tr><td 
class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectaConnection")%></td></tr></table>
+          <table class="displaytable"><tr><td 
class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectaConnection")%></td></tr></table>
 <%
   }
 %>
-  </form>
+        </form>
 <%
 }
-else
+catch (ManifoldCFException e)
 {
+  e.printStackTrace();
+  variableContext.setParameter("text",e.getMessage());
+  variableContext.setParameter("target","index.jsp");
 %>
-    <table class="displaytable">
-      <tr><td class="separator" colspan="1"><hr/></td></tr>
-      <tr><td 
class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseTryAgainLater")%></td></tr>
-    </table>
+  <jsp:forward page="error.jsp"/>
 <%
 }
 %>
-       </td>
-      </tr>
-    </table>
+      </td>
+    </tr>
+  </table>
 
 </body>

svn commit: r1689968 [1/14] - in /manifoldcf/branches/CONNECTORS-1196: ./ connectors/elasticsearch/ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/...

Reply via email to