Author: kwright
Date: Tue Jun 17 13:12:36 2014
New Revision: 1603158
URL: http://svn.apache.org/r1603158
Log:
More debugging, and get the filesystem connector tests running
Modified:
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/APISanityTester.java
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BigCrawlTester.java
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/ExpirationTester.java
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/HopcountTester.java
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationUITester.java
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTester.java
manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/editjob.jsp
manifoldcf/branches/CONNECTORS-962/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
Modified:
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/APISanityTester.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/APISanityTester.java?rev=1603158&r1=1603157&r2=1603158&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/APISanityTester.java
(original)
+++
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/APISanityTester.java
Tue Jun 17 13:12:36 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/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BigCrawlTester.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BigCrawlTester.java?rev=1603158&r1=1603157&r2=1603158&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BigCrawlTester.java
(original)
+++
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BigCrawlTester.java
Tue Jun 17 13:12:36 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/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/ExpirationTester.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/ExpirationTester.java?rev=1603158&r1=1603157&r2=1603158&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/ExpirationTester.java
(original)
+++
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/ExpirationTester.java
Tue Jun 17 13:12:36 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/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/HopcountTester.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/HopcountTester.java?rev=1603158&r1=1603157&r2=1603158&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/HopcountTester.java
(original)
+++
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/HopcountTester.java
Tue Jun 17 13:12:36 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/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationUITester.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationUITester.java?rev=1603158&r1=1603157&r2=1603158&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationUITester.java
(original)
+++
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/NavigationUITester.java
Tue Jun 17 13:12:36 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/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTester.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTester.java?rev=1603158&r1=1603157&r2=1603158&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTester.java
(original)
+++
manifoldcf/branches/CONNECTORS-962/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTester.java
Tue Jun 17 13:12:36 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/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/editjob.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1603158&r1=1603157&r2=1603158&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/editjob.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-962/framework/crawler-ui/src/main/webapp/editjob.jsp
Tue Jun 17 13:12:36 2014
@@ -1182,7 +1182,7 @@
for (Integer pre : precedents)
{
%>
- <option
value="<%=pre%>"><%=(pre.intValue()+1)%></option>
+ <option
value="<%=pre%>"><%=(pre.intValue()+2)%></option>
<%
}
%>
Modified:
manifoldcf/branches/CONNECTORS-962/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java?rev=1603158&r1=1603157&r2=1603158&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-962/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
(original)
+++
manifoldcf/branches/CONNECTORS-962/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
Tue Jun 17 13:12:36 2014
@@ -4121,10 +4121,13 @@ public class ManifoldCF extends org.apac
int prerequisite = (ps.prerequisite ==
null)?-1:pipelineStages.get(ps.prerequisite).ordinal;
OutputSpecification os =
jobDescription.addPipelineStage(prerequisite,ps.isOutput,ps.connectionName,ps.description);
os.clearChildren();
- for (int j = 0; j < ps.specification.getChildCount(); j++)
+ if (ps.specification != null)
{
- ConfigurationNode cn = ps.specification.findChild(j);
- os.addChild(os.getChildCount(),new SpecificationNode(cn));
+ for (int j = 0; j < ps.specification.getChildCount(); j++)
+ {
+ ConfigurationNode cn = ps.specification.findChild(j);
+ os.addChild(os.getChildCount(),new SpecificationNode(cn));
+ }
}
}
}
@@ -4136,7 +4139,7 @@ public class ManifoldCF extends org.apac
if (keysSeen.contains(stageName))
return;
PipelineStage ps = pipelineStages.get(stageName);
- if (ps != null)
+ if (ps == null)
throw new ManifoldCFException("Stage reference error: '"+stageName+"' is
unknown");
if (ps.prerequisite != null)
addStage(ps.prerequisite,orderedStageNames,keysSeen,pipelineStages);
