Author: kwright
Date: Mon Sep 15 23:42:59 2014
New Revision: 1625187
URL: http://svn.apache.org/r1625187
Log:
Remove DocumentSpecification. Part of CONNECTORS-977.
Removed:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/DocumentSpecification.java
Modified:
manifoldcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.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/SanityTester.java
manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
manifoldcf/trunk/connectors/gridfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/gridfs/GridFSRepositoryConnector.java
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/GetSeedList.java
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/SetSeedList.java
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/RSSSimpleCrawlTester.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/SessionTester.java
manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingTester.java
manifoldcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.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/system/ManifoldCF.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
Modified:
manifoldcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
(original)
+++
manifoldcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
Mon Sep 15 23:42:59 2014
@@ -56,7 +56,6 @@ import org.apache.manifoldcf.crawler.con
import org.apache.manifoldcf.crawler.interfaces.IProcessActivity;
import org.apache.manifoldcf.crawler.interfaces.ISeedingActivity;
import org.apache.manifoldcf.crawler.interfaces.IExistingVersions;
-import org.apache.manifoldcf.crawler.interfaces.DocumentSpecification;
import org.apache.manifoldcf.crawler.system.Logging;
public class AlfrescoRepositoryConnector extends BaseRepositoryConnector {
Modified:
manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
(original)
+++
manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
Mon Sep 15 23:42:59 2014
@@ -65,7 +65,6 @@ import org.apache.manifoldcf.core.interf
import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
import org.apache.manifoldcf.core.interfaces.SpecificationNode;
import org.apache.manifoldcf.crawler.connectors.BaseRepositoryConnector;
-import org.apache.manifoldcf.crawler.interfaces.DocumentSpecification;
import org.apache.manifoldcf.crawler.interfaces.IProcessActivity;
import org.apache.manifoldcf.crawler.interfaces.ISeedingActivity;
import org.apache.manifoldcf.crawler.interfaces.IExistingVersions;
Modified:
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
(original)
+++
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
Mon Sep 15 23:42:59 2014
@@ -48,7 +48,6 @@ import org.apache.manifoldcf.core.interf
import org.apache.manifoldcf.core.interfaces.IPostParameters;
import org.apache.manifoldcf.core.interfaces.IThreadContext;
import org.apache.manifoldcf.core.interfaces.SpecificationNode;
-import org.apache.manifoldcf.crawler.interfaces.DocumentSpecification;
import org.apache.manifoldcf.crawler.interfaces.IProcessActivity;
import org.apache.manifoldcf.crawler.interfaces.ISeedingActivity;
import org.apache.manifoldcf.crawler.interfaces.IExistingVersions;
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=1625187&r1=1625186&r2=1625187&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
Mon Sep 15 23:42:59 2014
@@ -128,7 +128,7 @@ public class BigCrawlTester
job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
// Now, set up the document specification.
- DocumentSpecification ds = job.getSpecification();
+ Specification ds = job.getSpecification();
// Crawl everything underneath the 'testdata' area
File testDataFile = new File("testdata").getCanonicalFile();
if (!testDataFile.exists())
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=1625187&r1=1625186&r2=1625187&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
Mon Sep 15 23:42:59 2014
@@ -95,7 +95,7 @@ public class ExpirationTester
job.setType(IJobDescription.TYPE_CONTINUOUS);
// Now, set up the document specification.
- DocumentSpecification ds = job.getSpecification();
+ Specification ds = job.getSpecification();
// Crawl everything underneath the 'testdata' area
File testDataFile = new File("testdata").getCanonicalFile();
if (!testDataFile.exists())
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=1625187&r1=1625186&r2=1625187&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
Mon Sep 15 23:42:59 2014
@@ -90,7 +90,7 @@ public class HopcountTester
job.addHopCountFilter("child",new Long(2));
// Now, set up the document specification.
- DocumentSpecification ds = job.getSpecification();
+ Specification ds = job.getSpecification();
// Crawl everything underneath the 'testdata' area
File testDataFile = new File("testdata").getCanonicalFile();
if (!testDataFile.exists())
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=1625187&r1=1625186&r2=1625187&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
Mon Sep 15 23:42:59 2014
@@ -89,7 +89,7 @@ public class SanityTester
job.setHopcountMode(job.HOPCOUNT_ACCURATE);
// Now, set up the document specification.
- DocumentSpecification ds = job.getSpecification();
+ Specification ds = job.getSpecification();
// Crawl everything underneath the 'testdata' area
File testDataFile = new File("testdata").getCanonicalFile();
if (!testDataFile.exists())
Modified:
manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
(original)
+++
manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
Mon Sep 15 23:42:59 2014
@@ -47,9 +47,8 @@ import org.apache.manifoldcf.core.interf
import org.apache.manifoldcf.core.interfaces.IPostParameters;
import org.apache.manifoldcf.core.interfaces.IThreadContext;
import org.apache.manifoldcf.core.interfaces.SpecificationNode;
-import org.apache.manifoldcf.crawler.interfaces.DocumentSpecification;
-import org.apache.manifoldcf.crawler.interfaces.IProcessActivity;
import org.apache.manifoldcf.crawler.interfaces.ISeedingActivity;
+import org.apache.manifoldcf.crawler.interfaces.IProcessActivity;
import org.apache.manifoldcf.crawler.interfaces.IExistingVersions;
import org.apache.log4j.Logger;
Modified:
manifoldcf/trunk/connectors/gridfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/gridfs/GridFSRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/gridfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/gridfs/GridFSRepositoryConnector.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/gridfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/gridfs/GridFSRepositoryConnector.java
(original)
+++
manifoldcf/trunk/connectors/gridfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/gridfs/GridFSRepositoryConnector.java
Mon Sep 15 23:42:59 2014
@@ -46,7 +46,6 @@ import org.apache.manifoldcf.core.interf
import org.apache.manifoldcf.core.interfaces.IThreadContext;
import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
import org.apache.manifoldcf.crawler.connectors.BaseRepositoryConnector;
-import org.apache.manifoldcf.crawler.interfaces.DocumentSpecification;
import org.apache.manifoldcf.crawler.interfaces.IProcessActivity;
import org.apache.manifoldcf.crawler.interfaces.ISeedingActivity;
import org.apache.manifoldcf.crawler.interfaces.IExistingVersions;
Modified:
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
(original)
+++
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
Mon Sep 15 23:42:59 2014
@@ -1642,34 +1642,6 @@ public class JDBCConnector extends org.a
}
}
- /** Grab forced acl out of document specification.
- *@param spec is the document specification.
- *@return the acls.
- */
- protected static String[] getAcls(DocumentSpecification spec)
- {
- HashMap map = new HashMap();
- int i = 0;
- while (i < spec.getChildCount())
- {
- SpecificationNode sn = spec.getChild(i++);
- if (sn.getType().equals("access"))
- {
- String token = sn.getAttributeValue("token");
- map.put(token,token);
- }
- }
-
- String[] rval = new String[map.size()];
- Iterator iter = map.keySet().iterator();
- i = 0;
- while (iter.hasNext())
- {
- rval[i++] = (String)iter.next();
- }
- return rval;
- }
-
/** Create an entity identifier from a querystring and a parameter list.
*/
protected static String createQueryString(String queryText, ArrayList
paramList)
Modified:
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
(original)
+++
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
Mon Sep 15 23:42:59 2014
@@ -48,7 +48,6 @@ import org.apache.manifoldcf.core.interf
import org.apache.manifoldcf.core.interfaces.IPostParameters;
import org.apache.manifoldcf.core.interfaces.IThreadContext;
import org.apache.manifoldcf.core.interfaces.SpecificationNode;
-import org.apache.manifoldcf.crawler.interfaces.DocumentSpecification;
import org.apache.manifoldcf.crawler.interfaces.IProcessActivity;
import org.apache.manifoldcf.crawler.interfaces.ISeedingActivity;
import org.apache.manifoldcf.crawler.interfaces.IExistingVersions;
Modified:
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/GetSeedList.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/GetSeedList.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/GetSeedList.java
(original)
+++
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/GetSeedList.java
Mon Sep 15 23:42:59 2014
@@ -53,7 +53,7 @@ public class GetSeedList
IJobDescription desc = jobManager.load(new Long(jobString));
// Edit the job specification
- DocumentSpecification ds = desc.getSpecification();
+ Specification ds = desc.getSpecification();
// Delete all url specs first
int i = 0;
Modified:
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/SetSeedList.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/SetSeedList.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/SetSeedList.java
(original)
+++
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/SetSeedList.java
Mon Sep 15 23:42:59 2014
@@ -53,7 +53,7 @@ public class SetSeedList
IJobDescription desc = jobManager.load(new Long(jobString));
// Edit the job specification
- DocumentSpecification ds = desc.getSpecification();
+ Specification ds = desc.getSpecification();
// Delete all url specs first
int i = 0;
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=1625187&r1=1625186&r2=1625187&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
Mon Sep 15 23:42:59 2014
@@ -82,7 +82,7 @@ public class BigCrawlTester
job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
// Now, set up the document specification.
- DocumentSpecification ds = job.getSpecification();
+ Specification ds = job.getSpecification();
// For 100000 documents, set up 10000 seeds
for (int i = 0 ; i < 10000 ; i++)
{
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=1625187&r1=1625186&r2=1625187&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
Mon Sep 15 23:42:59 2014
@@ -89,7 +89,7 @@ public class RSSSimpleCrawlTester
job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
// Now, set up the document specification.
- DocumentSpecification ds = job.getSpecification();
+ Specification ds = job.getSpecification();
// For 100 documents, set up 10 seeds
for (int i = 0 ; i < 10 ; i++)
{
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=1625187&r1=1625186&r2=1625187&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
Mon Sep 15 23:42:59 2014
@@ -86,7 +86,7 @@ public class SolrTester
job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
// Now, set up the document specification.
- DocumentSpecification ds = job.getSpecification();
+ Specification ds = job.getSpecification();
SpecificationNode sn = new SpecificationNode("documentcount");
sn.setAttribute("count","111");
ds.addChild(ds.getChildCount(),sn);
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=1625187&r1=1625186&r2=1625187&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
Mon Sep 15 23:42:59 2014
@@ -85,7 +85,7 @@ public class BigCrawlTester
//job.addHopCountFilter("redirect",new Long(2));
// Now, set up the document specification.
- DocumentSpecification ds = job.getSpecification();
+ Specification ds = job.getSpecification();
// For 100000 documents, set up 10 seeds
SpecificationNode sn = new SpecificationNode(WebcrawlerConfig.NODE_SEEDS);
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=1625187&r1=1625186&r2=1625187&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
Mon Sep 15 23:42:59 2014
@@ -135,7 +135,7 @@ public class SessionTester
job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
// Now, set up the document specification.
- DocumentSpecification ds = job.getSpecification();
+ Specification ds = job.getSpecification();
// Set up the seed
SpecificationNode sn = new SpecificationNode(WebcrawlerConfig.NODE_SEEDS);
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=1625187&r1=1625186&r2=1625187&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
Mon Sep 15 23:42:59 2014
@@ -100,7 +100,7 @@ public class ThrottlingTester
job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
// Now, set up the document specification.
- DocumentSpecification ds = job.getSpecification();
+ Specification ds = job.getSpecification();
// Set up 100 seeds
SpecificationNode sn = new SpecificationNode(WebcrawlerConfig.NODE_SEEDS);
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=1625187&r1=1625186&r2=1625187&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
Mon Sep 15 23:42:59 2014
@@ -170,7 +170,7 @@ public class SanityDerbyIT extends BaseI
// Now, set up the document specification.
// Right now we don't need any...
- DocumentSpecification ds = job.getSpecification();
+ Specification ds = job.getSpecification();
// Save the job.
jobManager.save(job);
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp Mon Sep
15 23:42:59 2014
@@ -80,7 +80,7 @@
String connectionName = "";
String description = "";
int type = IJobDescription.TYPE_SPECIFIED;
- DocumentSpecification documentSpecification = new
DocumentSpecification();
+ Specification documentSpecification = new Specification();
// Pipeline data
String[] pipelineConnectionNames = new String[0];
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
Mon Sep 15 23:42:59 2014
@@ -175,264 +175,6 @@ public abstract class BaseRepositoryConn
IProcessActivity activities, int jobMode, boolean usesDefaultAuthority)
throws ManifoldCFException, ServiceInterruption
{
- // The backwards-compatible base implementation does the following:
- // (1) Uses the deprecated methods to obtain a set of version information
- // (2) Based on the provided version information, determines whether
processing is required
- // (3) Uses deprecated methods to process documents
- // (4) Releases document versions
-
- // We need to get the old version strings together in order to use the
deprecated methods
- String[] oldVersions = new String[documentIdentifiers.length];
- for (int i = 0; i < oldVersions.length; i++)
- {
- oldVersions[i] =
statuses.getIndexedVersionString(documentIdentifiers[i]);
- }
- DocumentVersions dv = new DocumentVersions();
-
getDocumentVersions(dv,documentIdentifiers,oldVersions,activities,spec,jobMode,usesDefaultAuthority);
- try
- {
- // Next, we determine what part of the set of documents were unchanged,
and what part we need to refetch.
- Set<String> fetchDocuments = new HashSet<String>();
- Set<String> scanDocuments = new HashSet<String>();
- for (int i = 0; i < documentIdentifiers.length; i++)
- {
- String documentIdentifier = documentIdentifiers[i];
- VersionContext vc = dv.getDocumentVersion(documentIdentifier);
- if (vc != null)
- {
- if (dv.isAlwaysRefetch(documentIdentifier) ||
activities.checkDocumentNeedsReindexing(documentIdentifier,vc.getVersionString()))
- {
- // These documents need reprocessing
- fetchDocuments.add(documentIdentifier);
- }
- else
- {
- // Document is unchanged. We leave it up to the framework to
decide what that means.
- }
- scanDocuments.add(documentIdentifier);
- }
- else
- {
- // These documents must go away permanently
- activities.deleteDocument(documentIdentifier);
- }
- }
-
- // Construct the appropriate data to call processDocuments() with
- String[] processIDs = new String[scanDocuments.size()];
- boolean[] scanOnly = new boolean[scanDocuments.size()];
- int index = 0;
- for (int i = 0; i < documentIdentifiers.length; i++)
- {
- String documentIdentifier = documentIdentifiers[i];
- if (scanDocuments.contains(documentIdentifier))
- {
- processIDs[index] = documentIdentifier;
- scanOnly[index] = !fetchDocuments.contains(documentIdentifier);
- index++;
- }
- }
- processDocuments(processIDs,dv,activities,scanOnly,jobMode);
-
- }
- finally
- {
- // Release document versions
- releaseDocumentVersions(documentIdentifiers,dv);
- }
- }
-
- /** Get document versions given an array of document identifiers.
- * This method is called for EVERY document that is considered. It is
therefore important to perform
- * as little work as possible here.
- * The connector will be connected before this method can be called.
- *@param documentVersions is the versions object, to be filled in by this
method.
- *@param documentIdentifiers is the array of local document identifiers, as
understood by this connector.
- *@param oldVersions is the corresponding array of version strings that have
been saved for the document identifiers.
- * A null value indicates that this is a first-time fetch, while an empty
string indicates that the previous document
- * had an empty version string.
- *@param activities is the interface this method should use to perform
whatever framework actions are desired.
- *@param spec is the current document specification for the current job. If
there is a dependency on this
- * specification, then the version string should include the pertinent data,
so that reingestion will occur
- * when the specification changes. This is primarily useful for metadata.
- *@param jobMode is an integer describing how the job is being run, whether
continuous or once-only.
- *@param usesDefaultAuthority will be true only if the authority in use for
these documents is the default one.
- */
- public void getDocumentVersions(
- DocumentVersions documentVersions,
- String[] documentIdentifiers, String[] oldVersions,
- IVersionActivity activities,
- Specification spec, int jobMode, boolean usesDefaultAuthority)
- throws ManifoldCFException, ServiceInterruption
- {
- String[] rval =
getDocumentVersions(documentIdentifiers,oldVersions,activities,
- spec,jobMode,usesDefaultAuthority);
- for (int i = 0; i < rval.length; i++)
- {
- if (rval[i] != null)
- {
- documentVersions.setDocumentVersion(documentIdentifiers[i],new
VersionContext(rval[i],params,spec));
- if (rval[i].length() == 0)
- documentVersions.alwaysRefetch(documentIdentifiers[i]);
- }
- }
- }
-
- /** Get document versions given an array of document identifiers.
- * This method is called for EVERY document that is considered. It is
- * therefore important to perform as little work as possible here.
- *@param documentIdentifiers is the array of local document identifiers, as
understood by this connector.
- *@param oldVersions is the corresponding array of version strings that have
been saved for the document identifiers.
- * A null value indicates that this is a first-time fetch, while an empty
string indicates that the previous document
- * had an empty version string.
- *@param activities is the interface this method should use to perform
whatever framework actions are desired.
- *@param spec is the current document specification for the current job. If
there is a dependency on this
- * specification, then the version string should include the pertinent data,
so that reingestion will occur
- * when the specification changes. This is primarily useful for metadata.
- *@param jobMode is an integer describing how the job is being run, whether
continuous or once-only.
- *@param usesDefaultAuthority will be true only if the authority in use for
these documents is the default one.
- *@return the corresponding version strings, with null in the places where
the document no longer exists.
- * Empty version strings indicate that there is no versioning ability for the
corresponding document, and the document
- * will always be processed.
- */
- public String[] getDocumentVersions(String[] documentIdentifiers, String[]
oldVersions, IVersionActivity activities,
- Specification spec, int jobMode, boolean usesDefaultAuthority)
- throws ManifoldCFException, ServiceInterruption
- {
- return
getDocumentVersions(documentIdentifiers,oldVersions,activities,(DocumentSpecification)spec,jobMode,usesDefaultAuthority);
- }
-
- public String[] getDocumentVersions(String[] documentIdentifiers, String[]
oldVersions, IVersionActivity activities,
- DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
- throws ManifoldCFException, ServiceInterruption
- {
- return
getDocumentVersions(documentIdentifiers,oldVersions,activities,spec,jobMode);
- }
-
- /** Get document versions given an array of document identifiers.
- * This method is called for EVERY document that is considered. It is
- * therefore important to perform as little work as possible here.
- *@param documentIdentifiers is the array of local document identifiers, as
understood by this connector.
- *@param oldVersions is the corresponding array of version strings that have
been saved for the document identifiers.
- * A null value indicates that this is a first-time fetch, while an empty
string indicates that the previous document
- * had an empty version string.
- *@param activities is the interface this method should use to perform
whatever framework actions are desired.
- *@param spec is the current document specification for the current job. If
there is a dependency on this
- * specification, then the version string should include the pertinent data,
so that reingestion will occur
- * when the specification changes. This is primarily useful for metadata.
- *@param jobMode is an integer describing how the job is being run, whether
continuous or once-only.
- *@return the corresponding version strings, with null in the places where
the document no longer exists.
- * Empty version strings indicate that there is no versioning ability for the
corresponding document, and the document
- * will always be processed.
- */
- public String[] getDocumentVersions(String[] documentIdentifiers, String[]
oldVersions, IVersionActivity activities,
- DocumentSpecification spec, int jobMode)
- throws ManifoldCFException, ServiceInterruption
- {
- return
getDocumentVersions(documentIdentifiers,oldVersions,activities,spec);
- }
-
- /** Get document versions given an array of document identifiers.
- * This method is called for EVERY document that is considered. It is
- * therefore important to perform as little work as possible here.
- *@param documentIdentifiers is the array of local document identifiers, as
understood by this connector.
- *@param oldVersions is the corresponding array of version strings that have
been saved for the document identifiers.
- * A null value indicates that this is a first-time fetch, while an empty
string indicates that the previous document
- * had an empty version string.
- *@param activities is the interface this method should use to perform
whatever framework actions are desired.
- *@param spec is the current document specification for the current job. If
there is a dependency on this
- * specification, then the version string should include the pertinent data,
so that reingestion will occur
- * when the specification changes. This is primarily useful for metadata.
- *@return the corresponding version strings, with null in the places where
the document no longer exists.
- * Empty version strings indicate that there is no versioning ability for the
corresponding document, and the document
- * will always be processed.
- */
- public String[] getDocumentVersions(String[] documentIdentifiers, String[]
oldVersions, IVersionActivity activities, DocumentSpecification spec)
- throws ManifoldCFException, ServiceInterruption
- {
- return getDocumentVersions(documentIdentifiers,activities,spec);
- }
-
- /** The long version of getDocumentIdentifiers.
- * Get document versions given an array of document identifiers.
- * This method is called for EVERY document that is considered. It is
- * therefore important to perform as little work as possible here.
- *@param documentIdentifiers is the array of local document identifiers, as
understood by this connector.
- *@param activities is the interface this method should use to perform
whatever framework actions are desired.
- *@param spec is the current document specification for the current job. If
there is a dependency on this
- * specification, then the version string should include the pertinent data,
so that reingestion will occur
- * when the specification changes. This is primarily useful for metadata.
- *@return the corresponding version strings, with null in the places where
the document no longer exists.
- * Empty version strings indicate that there is no versioning ability for the
corresponding document, and the document
- * will always be processed.
- */
- public String[] getDocumentVersions(String[] documentIdentifiers,
IVersionActivity activities, DocumentSpecification spec)
- throws ManifoldCFException, ServiceInterruption
- {
- return getDocumentVersions(documentIdentifiers,spec);
- }
-
- /** The short version of getDocumentVersions.
- * Get document versions given an array of document identifiers.
- * This method is called for EVERY document that is considered. It is
- * therefore important to perform as little work as possible here.
- *@param documentIdentifiers is the array of local document identifiers, as
understood by this connector.
- *@param spec is the current document specification for the current job. If
there is a dependency on this
- * specification, then the version string should include the pertinent data,
so that reingestion will occur
- * when the specification changes. This is primarily useful for metadata.
- *@return the corresponding version strings, with null in the places where
the document no longer exists.
- * Empty version strings indicate that there is no versioning ability for the
corresponding document, and the document
- * will always be processed.
- */
- public String[] getDocumentVersions(String[] documentIdentifiers,
DocumentSpecification spec)
- throws ManifoldCFException, ServiceInterruption
- {
- // Return unknown versions
- String[] rval = new String[documentIdentifiers.length];
- int i = 0;
- while (i < rval.length)
- {
- rval[i++] = "";
- }
- return rval;
- }
-
- /** Free a set of documents. This method is called for all documents whose
versions have been fetched using
- * the getDocumentVersions() method, including those that returned null
versions. It may be used to free resources
- * committed during the getDocumentVersions() method. It is guaranteed to be
called AFTER any calls to
- * processDocuments() for the documents in question.
- * The connector will be connected before this method can be called.
- *@param documentIdentifiers is the set of document identifiers.
- *@param versions is the corresponding set of version strings (individual
identifiers may have no version).
- */
- public void releaseDocumentVersions(String[] documentIdentifiers,
DocumentVersions versions)
- throws ManifoldCFException
- {
- String[] versionStrings = new String[documentIdentifiers.length];
- for (int i = 0; i < versionStrings.length; i++)
- {
- VersionContext vc = versions.getDocumentVersion(documentIdentifiers[i]);
- boolean alwaysFetch = versions.isAlwaysRefetch(documentIdentifiers[i]);
- if (alwaysFetch)
- versionStrings[i] = "";
- else if (vc == null)
- versionStrings[i] = null;
- else
- versionStrings[i] = vc.getVersionString();
- }
- releaseDocumentVersions(documentIdentifiers,versionStrings);
- }
-
- /** Free a set of documents. This method is called for all documents whose
versions have been fetched using
- * the getDocumentVersions() method, including those that returned null
versions. It may be used to free resources
- * committed during the getDocumentVersions() method. It is guaranteed to be
called AFTER any calls to
- * processDocuments() for the documents in question.
- *@param documentIdentifiers is the set of document identifiers.
- *@param versions is the corresponding set of version identifiers (individual
identifiers may be null).
- */
- public void releaseDocumentVersions(String[] documentIdentifiers, String[]
versions)
- throws ManifoldCFException
- {
// Base implementation does nothing
}
@@ -446,90 +188,6 @@ public abstract class BaseRepositoryConn
return 1;
}
- /** Process a set of documents.
- * This is the method that should cause each document to be fetched,
processed, and the results either added
- * to the queue of documents for the current job, and/or entered into the
incremental ingestion manager.
- * The document specification allows this class to filter what is done based
on the job.
- * The connector will be connected before this method can be called.
- *@param documentIdentifiers is the set of document identifiers to process.
- *@param versions are the version strings returned by getDocumentVersions()
above.
- *@param activities is the interface this method should use to queue up new
document references
- * and ingest documents.
- *@param scanOnly is an array corresponding to the document identifiers. It
is set to true to indicate when the processing
- * should only find other references, and should not actually call the
ingestion methods.
- *@param jobMode is an integer describing how the job is being run, whether
continuous or once-only.
- */
- public void processDocuments(String[] documentIdentifiers, DocumentVersions
versions, IProcessActivity activities,
- boolean[] scanOnly, int jobMode)
- throws ManifoldCFException, ServiceInterruption
- {
- Specification spec = null;
- String[] versionStrings = new String[documentIdentifiers.length];
- for (int i = 0; i < versionStrings.length; i++)
- {
- VersionContext vc = versions.getDocumentVersion(documentIdentifiers[i]);
- if (vc != null)
- spec = vc.getSpecification();
- boolean alwaysFetch = versions.isAlwaysRefetch(documentIdentifiers[i]);
- if (alwaysFetch)
- versionStrings[i] = "";
- else if (vc == null)
- versionStrings[i] = null;
- else
- versionStrings[i] = vc.getVersionString();
- }
- if (spec != null)
-
processDocuments(documentIdentifiers,versionStrings,activities,spec,scanOnly,jobMode);
- }
-
- /** Process a set of documents.
- * This is the method that should cause each document to be fetched,
processed, and the results either added
- * to the queue of documents for the current job, and/or entered into the
incremental ingestion manager.
- * The document specification allows this class to filter what is done based
on the job.
- *@param documentIdentifiers is the set of document identifiers to process.
- *@param versions is the corresponding document versions to process, as
returned by getDocumentVersions() above.
- * The implementation may choose to ignore this parameter and always
process the current version.
- *@param activities is the interface this method should use to queue up new
document references
- * and ingest documents.
- *@param spec is the document specification.
- *@param scanOnly is an array corresponding to the document identifiers. It
is set to true to indicate when the processing
- * should only find other references, and should not actually call the
ingestion methods.
- *@param jobMode is an integer describing how the job is being run, whether
continuous or once-only.
- */
- public void processDocuments(String[] documentIdentifiers, String[]
versions, IProcessActivity activities,
- Specification spec, boolean[] scanOnly, int jobMode)
- throws ManifoldCFException, ServiceInterruption
- {
-
processDocuments(documentIdentifiers,versions,activities,(DocumentSpecification)spec,scanOnly,jobMode);
- }
-
- public void processDocuments(String[] documentIdentifiers, String[]
versions, IProcessActivity activities,
- DocumentSpecification spec, boolean[] scanOnly, int jobMode)
- throws ManifoldCFException, ServiceInterruption
- {
- processDocuments(documentIdentifiers,versions,activities,spec,scanOnly);
- }
-
- /** Process a set of documents.
- * This is the method that should cause each document to be fetched,
processed, and the results either added
- * to the queue of documents for the current job, and/or entered into the
incremental ingestion manager.
- * The document specification allows this class to filter what is done based
on the job.
- *@param documentIdentifiers is the set of document identifiers to process.
- *@param versions is the corresponding document versions to process, as
returned by getDocumentVersions() above.
- * The implementation may choose to ignore this parameter and always
process the current version.
- *@param activities is the interface this method should use to queue up new
document references
- * and ingest documents.
- *@param spec is the document specification.
- *@param scanOnly is an array corresponding to the document identifiers. It
is set to true to indicate when the processing
- * should only find other references, and should not actually call the
ingestion methods.
- */
- public void processDocuments(String[] documentIdentifiers, String[]
versions, IProcessActivity activities,
- DocumentSpecification spec, boolean[] scanOnly)
- throws ManifoldCFException, ServiceInterruption
- {
- // Does nothing; override to make something happen
- }
-
// UI support methods.
//
// These support methods come in two varieties. The first bunch is involved
in setting up connection configuration information. The second bunch
@@ -542,6 +200,7 @@ public abstract class BaseRepositoryConn
*@param connectionSequenceNumber is the unique number of this connection
within the job.
*@return the name of the form check javascript method.
*/
+ @Override
public String getFormCheckJavascriptMethodName(int connectionSequenceNumber)
{
return "s"+connectionSequenceNumber+"_checkSpecification";
@@ -552,6 +211,7 @@ public abstract class BaseRepositoryConn
*@param connectionSequenceNumber is the unique number of this connection
within the job.
*@return the name of the form presave check javascript method.
*/
+ @Override
public String getFormPresaveCheckJavascriptMethodName(int
connectionSequenceNumber)
{
return "s"+connectionSequenceNumber+"_checkSpecificationForSave";
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java
Mon Sep 15 23:42:59 2014
@@ -240,7 +240,7 @@ public interface IJobDescription
/** Get the document specification (which can be modified).
*@return the specification.
*/
- public DocumentSpecification getSpecification();
+ public Specification getSpecification();
// Priority
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java
Mon Sep 15 23:42:59 2014
@@ -67,7 +67,7 @@ public class JobDescription implements I
protected Long reseedInterval = new Long(60L * 60L * 1000L); // 1 hour is
the default
// Document specification
- protected DocumentSpecification documentSpecification = new
DocumentSpecification();
+ protected Specification documentSpecification = new Specification();
// Hop count filters.
protected HashMap hopCountFilters = new HashMap();
@@ -525,7 +525,7 @@ public class JobDescription implements I
*@return the document specification object.
*/
@Override
- public DocumentSpecification getSpecification()
+ public Specification getSpecification()
{
return documentSpecification;
}
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
Mon Sep 15 23:42:59 2014
@@ -3946,7 +3946,7 @@ public class ManifoldCF extends org.apac
else if (childType.equals(JOBNODE_DOCUMENTSPECIFICATION))
{
// Get the job's document specification, clear out the children, and
copy new ones from the child.
- DocumentSpecification ds = jobDescription.getSpecification();
+ Specification ds = jobDescription.getSpecification();
ds.clearChildren();
for (int j = 0; j < child.getChildCount(); j++)
{
@@ -4180,7 +4180,7 @@ public class ManifoldCF extends org.apac
}
// Document specification
- DocumentSpecification ds = job.getSpecification();
+ Specification ds = job.getSpecification();
child = new ConfigurationNode(JOBNODE_DOCUMENTSPECIFICATION);
for (int j = 0; j < ds.getChildCount(); j++)
{
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java?rev=1625187&r1=1625186&r2=1625187&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
Mon Sep 15 23:42:59 2014
@@ -146,7 +146,7 @@ public class WorkerThread extends Thread
// Universal job data we'll need later
String connectionName = job.getConnectionName();
- DocumentSpecification spec = job.getSpecification();
+ Specification spec = job.getSpecification();
int jobType = job.getType();
IRepositoryConnection connection = qds.getConnection();
