manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1603199 [1/4] - in /manifoldcf/trunk: ./ connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/ connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/ conn...
Date Tue, 17 Jun 2014 15:17:36 GMT
Author: kwright
Date: Tue Jun 17 15:17:34 2014
New Revision: 1603199

URL: http://svn.apache.org/r1603199
Log:
Finish CONNECTORS-962.  WARNING: Schema change, REST API change!

Added:
    manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/RepositoryDocumentFactory.java
      - copied unchanged from r1603198, manifoldcf/branches/CONNECTORS-962/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/RepositoryDocumentFactory.java
Removed:
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/14773725.xml
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/19219017.xml
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/19319577.xml
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/19839654.xml
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/30955295.xml
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/get_namespaces.xml
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/get_timestamps.xml
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/get_urls.xml
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/list_full.xml
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/list_full_last.xml
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/list_one.xml
Modified:
    manifoldcf/trunk/   (props changed)
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityIT.java
    manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java
    manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityIT.java
    manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationDerbyUI.java
    manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java
    manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationDerbyUI.java
    manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/APISanityTester.java
    manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BigCrawlTester.java
    manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/ExpirationTester.java
    manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/HopcountTester.java
    manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationUITester.java
    manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTester.java
    manifoldcf/trunk/connectors/gts/connector/src/test/java/org/apache/manifoldcf/agents/output/gts/tests/NavigationDerbyUI.java
    manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationUITester.java
    manifoldcf/trunk/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationDerbyUI.java
    manifoldcf/trunk/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationDerbyUI.java
    manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationDerbyUI.java
    manifoldcf/trunk/connectors/rss/   (props changed)
    manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BigCrawlTester.java
    manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java
    manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSSimpleCrawlTester.java
    manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java
    manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java
    manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BigCrawlTester.java
    manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationDerbyUI.java
    manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionTester.java
    manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingTester.java
    manifoldcf/trunk/connectors/wiki/   (props changed)
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java
    manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java
    manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/execute.jsp
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listjobs.jsp
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/DefineJob.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ListJobs.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PipelineManager.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/PipelineSpecification.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/PipelineSpecificationBasic.java
    manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SchedulerTester.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
    manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties

Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/CONNECTORS-962:r1602683-1603198

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Jun 17 15:17:34 2014
@@ -3,6 +3,11 @@ $Id$
 
 ======================= 1.7-dev =====================
 
+CONNECTORS-962: Add support for multiple outputs for a given job.
+WARNING: Schema change!  REST API change!  Upgrade from 1.6.x
+has been added but not yet tested.
+(Karl Wright)
+
 CONNECTORS-963: SharePoint/AD authority did not generate the "true"
 token.
 (Karl Wright)

Modified: manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityIT.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityIT.java (original)
+++ manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityIT.java Tue Jun 17 15:17:34 2014
@@ -431,8 +431,17 @@ public class APISanityIT extends BaseITD
       child.setValue("Alfresco Connection");
       jobObject.addChild(jobObject.getChildCount(),child);
 
-      child = new ConfigurationNode("output_connection");
-      child.setValue("Null Connection");
+      // Revamped way of adding output connection
+      child = new ConfigurationNode("pipelinestage");
+      ConfigurationNode pipelineChild = new ConfigurationNode("stage_id");
+      pipelineChild.setValue("0");
+      child.addChild(child.getChildCount(),pipelineChild);
+      pipelineChild = new ConfigurationNode("stage_isoutput");
+      pipelineChild.setValue("true");
+      child.addChild(child.getChildCount(),pipelineChild);
+      pipelineChild = new ConfigurationNode("stage_connectionname");
+      pipelineChild.setValue("Null Connection");
+      child.addChild(child.getChildCount(),pipelineChild);
       jobObject.addChild(jobObject.getChildCount(),child);
 
       child = new ConfigurationNode("run_mode");

Modified: manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java Tue Jun 17 15:17:34 2014
@@ -160,8 +160,14 @@ public class NavigationDerbyUI extends B
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Modified: manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityIT.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityIT.java (original)
+++ manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityIT.java Tue Jun 17 15:17:34 2014
@@ -325,8 +325,17 @@ public class APISanityIT extends BaseITD
       child.setValue("CMIS Connection");
       jobObject.addChild(jobObject.getChildCount(),child);
 
-      child = new ConfigurationNode("output_connection");
-      child.setValue("Null Connection");
+      // Revamped way of adding output connection
+      child = new ConfigurationNode("pipelinestage");
+      ConfigurationNode pipelineChild = new ConfigurationNode("stage_id");
+      pipelineChild.setValue("0");
+      child.addChild(child.getChildCount(),pipelineChild);
+      pipelineChild = new ConfigurationNode("stage_isoutput");
+      pipelineChild.setValue("true");
+      child.addChild(child.getChildCount(),pipelineChild);
+      pipelineChild = new ConfigurationNode("stage_connectionname");
+      pipelineChild.setValue("Null Connection");
+      child.addChild(child.getChildCount(),pipelineChild);
       jobObject.addChild(jobObject.getChildCount(),child);
 
       child = new ConfigurationNode("run_mode");

Modified: manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationDerbyUI.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/trunk/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationDerbyUI.java Tue Jun 17 15:17:34 2014
@@ -194,8 +194,14 @@ public class NavigationDerbyUI extends B
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java (original)
+++ manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java Tue Jun 17 15:17:34 2014
@@ -168,8 +168,17 @@ public class APISanityDerbyIT extends Ba
       child.setValue("Test Connection");
       jobObject.addChild(jobObject.getChildCount(),child);
 
-      child = new ConfigurationNode("output_connection");
-      child.setValue("ElasticSearch");
+      // Revamped way of adding output connection
+      child = new ConfigurationNode("pipelinestage");
+      ConfigurationNode pipelineChild = new ConfigurationNode("stage_id");
+      pipelineChild.setValue("0");
+      child.addChild(child.getChildCount(),pipelineChild);
+      pipelineChild = new ConfigurationNode("stage_isoutput");
+      pipelineChild.setValue("true");
+      child.addChild(child.getChildCount(),pipelineChild);
+      pipelineChild = new ConfigurationNode("stage_connectionname");
+      pipelineChild.setValue("ElasticSearch");
+      child.addChild(child.getChildCount(),pipelineChild);
       jobObject.addChild(jobObject.getChildCount(),child);
 
       child = new ConfigurationNode("run_mode");

Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationDerbyUI.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/trunk/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationDerbyUI.java Tue Jun 17 15:17:34 2014
@@ -151,8 +151,14 @@ public class NavigationDerbyUI extends B
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Modified: manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/APISanityTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/APISanityTester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/APISanityTester.java (original)
+++ manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/APISanityTester.java Tue Jun 17 15:17:34 2014
@@ -138,8 +138,17 @@ public class APISanityTester
     child.setValue("File Connection");
     jobObject.addChild(jobObject.getChildCount(),child);
 
-    child = new ConfigurationNode("output_connection");
-    child.setValue("Null Connection");
+    // Revamped way of adding output connection
+    child = new ConfigurationNode("pipelinestage");
+    ConfigurationNode pipelineChild = new ConfigurationNode("stage_id");
+    pipelineChild.setValue("0");
+    child.addChild(child.getChildCount(),pipelineChild);
+    pipelineChild = new ConfigurationNode("stage_isoutput");
+    pipelineChild.setValue("true");
+    child.addChild(child.getChildCount(),pipelineChild);
+    pipelineChild = new ConfigurationNode("stage_connectionname");
+    pipelineChild.setValue("Null Connection");
+    child.addChild(child.getChildCount(),pipelineChild);
     jobObject.addChild(jobObject.getChildCount(),child);
 
     child = new ConfigurationNode("run_mode");

Modified: manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BigCrawlTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BigCrawlTester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BigCrawlTester.java (original)
+++ manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BigCrawlTester.java Tue Jun 17 15:17:34 2014
@@ -122,7 +122,7 @@ public class BigCrawlTester
     IJobDescription job = jobManager.createJob();
     job.setDescription("Test Job");
     job.setConnectionName("File Connection");
-    job.setOutputConnectionName("Null Connection");
+    job.addPipelineStage(-1,true,"Null Connection","");
     job.setType(job.TYPE_SPECIFIED);
     job.setStartMethod(job.START_DISABLE);
     job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
@@ -147,10 +147,6 @@ public class BigCrawlTester
     sn.addChild(sn.getChildCount(),n);
     ds.addChild(ds.getChildCount(),sn);
       
-    // Set up the output specification.
-    OutputSpecification os = job.getOutputSpecification();
-    // Null output connections have no output specification, so this is a no-op.
-      
     // Save the job.
     jobManager.save(job);
 

Modified: manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/ExpirationTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/ExpirationTester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/ExpirationTester.java (original)
+++ manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/ExpirationTester.java Tue Jun 17 15:17:34 2014
@@ -83,7 +83,7 @@ public class ExpirationTester
     IJobDescription job = jobManager.createJob();
     job.setDescription("Test Job");
     job.setConnectionName("File Connection");
-    job.setOutputConnectionName("Null Connection");
+    job.addPipelineStage(-1,true,"Null Connection","");
     job.setType(job.TYPE_SPECIFIED);
     job.setStartMethod(job.START_DISABLE);
     job.setHopcountMode(job.HOPCOUNT_ACCURATE);
@@ -114,10 +114,6 @@ public class ExpirationTester
     sn.addChild(sn.getChildCount(),n);
     ds.addChild(ds.getChildCount(),sn);
       
-    // Set up the output specification.
-    OutputSpecification os = job.getOutputSpecification();
-    // Null output connections have no output specification, so this is a no-op.
-      
     // Save the job.
     jobManager.save(job);
 

Modified: manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/HopcountTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/HopcountTester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/HopcountTester.java (original)
+++ manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/HopcountTester.java Tue Jun 17 15:17:34 2014
@@ -83,7 +83,7 @@ public class HopcountTester
     IJobDescription job = jobManager.createJob();
     job.setDescription("Test Job");
     job.setConnectionName("File Connection");
-    job.setOutputConnectionName("Null Connection");
+    job.addPipelineStage(-1,true,"Null Connection","");
     job.setType(job.TYPE_SPECIFIED);
     job.setStartMethod(job.START_DISABLE);
     job.setHopcountMode(job.HOPCOUNT_ACCURATE);
@@ -109,10 +109,6 @@ public class HopcountTester
     sn.addChild(sn.getChildCount(),n);
     ds.addChild(ds.getChildCount(),sn);
       
-    // Set up the output specification.
-    OutputSpecification os = job.getOutputSpecification();
-    // Null output connections have no output specification, so this is a no-op.
-      
     // Save the job.
     jobManager.save(job);
 

Modified: manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationUITester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationUITester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationUITester.java (original)
+++ manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationUITester.java Tue Jun 17 15:17:34 2014
@@ -152,8 +152,14 @@ public class NavigationUITester
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Modified: manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTester.java (original)
+++ manifoldcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTester.java Tue Jun 17 15:17:34 2014
@@ -83,7 +83,7 @@ public class SanityTester
     IJobDescription job = jobManager.createJob();
     job.setDescription("Test Job");
     job.setConnectionName("File Connection");
-    job.setOutputConnectionName("Null Connection");
+    job.addPipelineStage(-1,true,"Null Connection","");
     job.setType(job.TYPE_SPECIFIED);
     job.setStartMethod(job.START_DISABLE);
     job.setHopcountMode(job.HOPCOUNT_ACCURATE);
@@ -108,10 +108,6 @@ public class SanityTester
     sn.addChild(sn.getChildCount(),n);
     ds.addChild(ds.getChildCount(),sn);
       
-    // Set up the output specification.
-    OutputSpecification os = job.getOutputSpecification();
-    // Null output connections have no output specification, so this is a no-op.
-      
     // Save the job.
     jobManager.save(job);
 

Modified: manifoldcf/trunk/connectors/gts/connector/src/test/java/org/apache/manifoldcf/agents/output/gts/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/gts/connector/src/test/java/org/apache/manifoldcf/agents/output/gts/tests/NavigationDerbyUI.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/gts/connector/src/test/java/org/apache/manifoldcf/agents/output/gts/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/trunk/connectors/gts/connector/src/test/java/org/apache/manifoldcf/agents/output/gts/tests/NavigationDerbyUI.java Tue Jun 17 15:17:34 2014
@@ -148,8 +148,14 @@ public class NavigationDerbyUI extends B
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Modified: manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationUITester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationUITester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationUITester.java (original)
+++ manifoldcf/trunk/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationUITester.java Tue Jun 17 15:17:34 2014
@@ -160,8 +160,14 @@ public class NavigationUITester
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Modified: manifoldcf/trunk/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationDerbyUI.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/trunk/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationDerbyUI.java Tue Jun 17 15:17:34 2014
@@ -151,8 +151,14 @@ public class NavigationDerbyUI extends B
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Modified: manifoldcf/trunk/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationDerbyUI.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/trunk/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationDerbyUI.java Tue Jun 17 15:17:34 2014
@@ -159,8 +159,14 @@ public class NavigationDerbyUI extends B
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Modified: manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationDerbyUI.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationDerbyUI.java Tue Jun 17 15:17:34 2014
@@ -148,8 +148,14 @@ public class NavigationDerbyUI extends B
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Propchange: manifoldcf/trunk/connectors/rss/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/CONNECTORS-962/connectors/rss:r1602683-1603198

Modified: manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BigCrawlTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BigCrawlTester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BigCrawlTester.java (original)
+++ manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BigCrawlTester.java Tue Jun 17 15:17:34 2014
@@ -76,7 +76,7 @@ public class BigCrawlTester
     IJobDescription job = jobManager.createJob();
     job.setDescription("Test Job");
     job.setConnectionName("RSS Connection");
-    job.setOutputConnectionName("Null Connection");
+    job.addPipelineStage(-1,true,"Null Connection","");
     job.setType(job.TYPE_SPECIFIED);
     job.setStartMethod(job.START_DISABLE);
     job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
@@ -91,10 +91,6 @@ public class BigCrawlTester
       ds.addChild(ds.getChildCount(),sn);
     }
       
-    // Set up the output specification.
-    OutputSpecification os = job.getOutputSpecification();
-    // Null output connections have no output specification, so this is a no-op.
-    
     // Save the job.
     jobManager.save(job);
 

Modified: manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java Tue Jun 17 15:17:34 2014
@@ -169,8 +169,14 @@ public class NavigationDerbyUI extends B
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Modified: manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSSimpleCrawlTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSSimpleCrawlTester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSSimpleCrawlTester.java (original)
+++ manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSSimpleCrawlTester.java Tue Jun 17 15:17:34 2014
@@ -83,7 +83,7 @@ public class RSSSimpleCrawlTester
     IJobDescription job = jobManager.createJob();
     job.setDescription("Test Job");
     job.setConnectionName("RSS Connection");
-    job.setOutputConnectionName("Null Connection");
+    job.addPipelineStage(-1,true,"Null Connection","");
     job.setType(job.TYPE_SPECIFIED);
     job.setStartMethod(job.START_DISABLE);
     job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
@@ -98,10 +98,6 @@ public class RSSSimpleCrawlTester
       ds.addChild(ds.getChildCount(),sn);
     }
       
-    // Set up the output specification.
-    OutputSpecification os = job.getOutputSpecification();
-    // Null output connections have no output specification, so this is a no-op.
-    
     // Save the job.
     jobManager.save(job);
 

Modified: manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java Tue Jun 17 15:17:34 2014
@@ -172,8 +172,14 @@ public class NavigationDerbyUI extends B
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Modified: manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java Tue Jun 17 15:17:34 2014
@@ -80,7 +80,7 @@ public class SolrTester
     IJobDescription job = jobManager.createJob();
     job.setDescription("Test Job");
     job.setConnectionName("Test Connection");
-    job.setOutputConnectionName("Solr Connection");
+    job.addPipelineStage(-1,true,"Solr Connection","");
     job.setType(job.TYPE_SPECIFIED);
     job.setStartMethod(job.START_DISABLE);
     job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
@@ -91,10 +91,6 @@ public class SolrTester
     sn.setAttribute("count","111");
     ds.addChild(ds.getChildCount(),sn);
       
-    // Set up the output specification.
-    OutputSpecification os = job.getOutputSpecification();
-    // Solr output specification is not needed
-      
     // Save the job.
     jobManager.save(job);
 

Modified: manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BigCrawlTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BigCrawlTester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BigCrawlTester.java (original)
+++ manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BigCrawlTester.java Tue Jun 17 15:17:34 2014
@@ -76,7 +76,7 @@ public class BigCrawlTester
     IJobDescription job = jobManager.createJob();
     job.setDescription("Test Job");
     job.setConnectionName("Web Connection");
-    job.setOutputConnectionName("Null Connection");
+    job.addPipelineStage(-1,true,"Null Connection","");
     job.setType(job.TYPE_SPECIFIED);
     job.setStartMethod(job.START_DISABLE);
     job.setHopcountMode(job.HOPCOUNT_ACCURATE);
@@ -105,10 +105,6 @@ public class BigCrawlTester
     sn.setValue(".*\n");
     ds.addChild(ds.getChildCount(),sn);
 
-    // Set up the output specification.
-    OutputSpecification os = job.getOutputSpecification();
-    // Null output connections have no output specification, so this is a no-op.
-    
     // Save the job.
     jobManager.save(job);
 

Modified: manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationDerbyUI.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationDerbyUI.java Tue Jun 17 15:17:34 2014
@@ -180,8 +180,14 @@ public class NavigationDerbyUI extends B
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Modified: manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionTester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionTester.java (original)
+++ manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionTester.java Tue Jun 17 15:17:34 2014
@@ -129,7 +129,7 @@ public class SessionTester
     IJobDescription job = jobManager.createJob();
     job.setDescription("Test Job");
     job.setConnectionName("Web Connection");
-    job.setOutputConnectionName("Null Connection");
+    job.addPipelineStage(-1,true,"Null Connection","");
     job.setType(job.TYPE_SPECIFIED);
     job.setStartMethod(job.START_DISABLE);
     job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
@@ -150,10 +150,6 @@ public class SessionTester
     sn.setValue(".*\n");
     ds.addChild(ds.getChildCount(),sn);
 
-    // Set up the output specification.
-    OutputSpecification os = job.getOutputSpecification();
-    // Null output connections have no output specification, so this is a no-op.
-    
     // Save the job.
     jobManager.save(job);
 

Modified: manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingTester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingTester.java (original)
+++ manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingTester.java Tue Jun 17 15:17:34 2014
@@ -94,7 +94,7 @@ public class ThrottlingTester
     IJobDescription job = jobManager.createJob();
     job.setDescription("Test Job");
     job.setConnectionName("Web Connection");
-    job.setOutputConnectionName("Null Connection");
+    job.addPipelineStage(-1,true,"Null Connection","");
     job.setType(job.TYPE_SPECIFIED);
     job.setStartMethod(job.START_DISABLE);
     job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
@@ -120,10 +120,6 @@ public class ThrottlingTester
     sn.setValue(".*\n");
     ds.addChild(ds.getChildCount(),sn);
 
-    // Set up the output specification.
-    OutputSpecification os = job.getOutputSpecification();
-    // Null output connections have no output specification, so this is a no-op.
-    
     // Save the job.
     jobManager.save(job);
 

Propchange: manifoldcf/trunk/connectors/wiki/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/CONNECTORS-962/connectors/wiki:r1602683-1603198

Modified: manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java Tue Jun 17 15:17:34 2014
@@ -195,8 +195,14 @@ public class NavigationDerbyUI extends B
     // Select the connections
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editjob"));
-    selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
+    selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent"));
+    selectbox.selectValue(testerInstance.createStringDescription("-1"));
+    button = window.findButton(testerInstance.createStringDescription("Add an output"));
+    button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname"));
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));

Modified: manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java (original)
+++ manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java Tue Jun 17 15:17:34 2014
@@ -163,7 +163,7 @@ public class SanityDerbyIT extends BaseI
       IJobDescription job = jobManager.createJob();
       job.setDescription("Test Job");
       job.setConnectionName("Wiki Connection");
-      job.setOutputConnectionName("Null Connection");
+      job.addPipelineStage(-1,true,"Null Connection","");
       job.setType(job.TYPE_SPECIFIED);
       job.setStartMethod(job.START_DISABLE);
       job.setHopcountMode(job.HOPCOUNT_ACCURATE);
@@ -172,10 +172,6 @@ public class SanityDerbyIT extends BaseI
       // Right now we don't need any...
       DocumentSpecification ds = job.getSpecification();
       
-      // Set up the output specification.
-      OutputSpecification os = job.getOutputSpecification();
-      // Null output connections have no output specification, so this is a no-op.
-      
       // Save the job.
       jobManager.save(job);
 

Modified: manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java?rev=1603199&r1=1603198&r2=1603199&view=diff
==============================================================================
--- manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java (original)
+++ manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java Tue Jun 17 15:17:34 2014
@@ -3215,19 +3215,48 @@ public class IncrementalIngester extends
     public int sendDocument(String documentURI, RepositoryDocument document, String authorityNameString)
       throws ManifoldCFException, ServiceInterruption, IOException
     {
-      // MHL to clone document if there are multiple targets!!
-      if (entryPoints.length > 1)
-        throw new RuntimeException("Cannot handle fanouts yet");
-      // If any of them accept the document, we return "accept".
-      int rval = IPipelineConnector.DOCUMENTSTATUS_REJECTED;
+      // First, count the number of active entry points.
+      int activeCount = 0;
       for (PipelineAddEntryPoint p : entryPoints)
       {
-        if (!p.isActive())
-          continue;
-        if (p.addOrReplaceDocumentWithException(documentURI,document,authorityNameString) == IPipelineConnector.DOCUMENTSTATUS_ACCEPTED)
-          rval = IPipelineConnector.DOCUMENTSTATUS_ACCEPTED;
+        if (p.isActive())
+          activeCount++;
+      }
+      if (activeCount <= 1)
+      {
+        // No need to copy anything.
+        int rval = IPipelineConnector.DOCUMENTSTATUS_REJECTED;
+        for (PipelineAddEntryPoint p : entryPoints)
+        {
+          if (!p.isActive())
+            continue;
+          if (p.addOrReplaceDocumentWithException(documentURI,document,authorityNameString) == IPipelineConnector.DOCUMENTSTATUS_ACCEPTED)
+            rval = IPipelineConnector.DOCUMENTSTATUS_ACCEPTED;
+        }
+        return rval;
+      }
+      else
+      {
+        // Create a RepositoryDocumentFactory, which we'll need to clean up at the end.
+        RepositoryDocumentFactory factory = new RepositoryDocumentFactory(document);
+        try
+        {
+          // If any of them accept the document, we return "accept".
+          int rval = IPipelineConnector.DOCUMENTSTATUS_REJECTED;
+          for (PipelineAddEntryPoint p : entryPoints)
+          {
+            if (!p.isActive())
+              continue;
+            if (p.addOrReplaceDocumentWithException(documentURI,factory.createDocument(),authorityNameString) == IPipelineConnector.DOCUMENTSTATUS_ACCEPTED)
+              rval = IPipelineConnector.DOCUMENTSTATUS_ACCEPTED;
+          }
+          return rval;
+        }
+        finally
+        {
+          factory.close();
+        }
       }
-      return rval;
     }
 
     /** Qualify an access token appropriately, to match access tokens as returned by mod_aa.  This method



Mime
View raw message