Author: kwright
Date: Tue Jul 15 14:17:06 2014
New Revision: 1610706
URL: http://svn.apache.org/r1610706
Log:
Remove new deprecation warnings
Modified:
manifoldcf/branches/CONNECTORS-990/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
manifoldcf/branches/CONNECTORS-990/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
manifoldcf/branches/CONNECTORS-990/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java
manifoldcf/branches/CONNECTORS-990/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
manifoldcf/branches/CONNECTORS-990/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
manifoldcf/branches/CONNECTORS-990/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
manifoldcf/branches/CONNECTORS-990/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
manifoldcf/branches/CONNECTORS-990/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
manifoldcf/branches/CONNECTORS-990/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
manifoldcf/branches/CONNECTORS-990/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
Modified:
manifoldcf/branches/CONNECTORS-990/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-990/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java?rev=1610706&r1=1610705&r2=1610706&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-990/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
(original)
+++
manifoldcf/branches/CONNECTORS-990/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
Tue Jul 15 14:17:06 2014
@@ -1866,7 +1866,7 @@ public class DCTM extends org.apache.man
}
if (rd == null)
- activities.deleteDocument(documentIdentifier,versionString);
+ activities.noDocument(documentIdentifier,versionString);
// Abort the retry loop and go on to the next document
break;
Modified:
manifoldcf/branches/CONNECTORS-990/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-990/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java?rev=1610706&r1=1610705&r2=1610706&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-990/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-990/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
Tue Jul 15 14:17:06 2014
@@ -1267,7 +1267,7 @@ public class FilenetConnector extends or
null,documentIdentifier,"Authorization
error",e.getMessage(),null);
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("FileNet: Removing file
'"+documentIdentifier+"' because: "+e.getMessage(),e);
-
activities.deleteDocument(documentIdentifier,documentVersion);
+ activities.noDocument(documentIdentifier,documentVersion);
i++;
continue;
}
@@ -1350,7 +1350,7 @@ public class FilenetConnector extends or
}
}
else
- activities.deleteDocument(documentIdentifier,documentVersion);
+ activities.noDocument(documentIdentifier,documentVersion);
}
finally
{
@@ -1384,7 +1384,7 @@ public class FilenetConnector extends or
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("FileNet: Removing version
'"+documentIdentifier+"' because it seems to no longer exist");
- activities.deleteDocument(documentIdentifier,documentVersion);
+ activities.noDocument(documentIdentifier,documentVersion);
i++;
continue;
}
@@ -1414,7 +1414,7 @@ public class FilenetConnector extends or
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("FileNet: Removing version
'"+documentIdentifier+"' because: "+e.getMessage(),e);
- activities.deleteDocument(documentIdentifier,documentVersion);
+ activities.noDocument(documentIdentifier,documentVersion);
i++;
continue;
}
Modified:
manifoldcf/branches/CONNECTORS-990/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-990/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java?rev=1610706&r1=1610705&r2=1610706&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-990/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-990/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java
Tue Jul 15 14:17:06 2014
@@ -409,7 +409,7 @@ public class HDFSRepositoryConnector ext
if (fileStatus == null) {
// It is no longer there , so delete right away
- activities.deleteDocument(documentIdentifier,version);
+ activities.deleteDocument(documentIdentifier);
continue;
}
@@ -421,7 +421,7 @@ public class HDFSRepositoryConnector ext
FileStatus[] fileStatuses = getChildren(fileStatus.getPath());
if (fileStatuses == null) {
// Directory was deleted, so remove
- activities.deleteDocument(documentIdentifier,version);
+ activities.deleteDocument(documentIdentifier);
continue;
}
for (int j = 0; j < fileStatuses.length; j++) {
Modified:
manifoldcf/branches/CONNECTORS-990/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-990/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1610706&r1=1610705&r2=1610706&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-990/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-990/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
Tue Jul 15 14:17:06 2014
@@ -722,7 +722,7 @@ public class JDBCConnector extends org.a
if (map.get(documentIdentifier) != null)
{
// This means we did not see it (or data for it) in the result
set. Delete it!
- activities.deleteDocument(documentIdentifier,versions[i]);
+ activities.deleteDocument(documentIdentifier);
}
}
i++;
Modified:
manifoldcf/branches/CONNECTORS-990/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-990/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java?rev=1610706&r1=1610705&r2=1610706&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-990/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-990/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
Tue Jul 15 14:17:06 2014
@@ -927,7 +927,7 @@ public class JiraRepositoryConnector ext
String issueKey = nodeId.substring(2);
JiraIssue jiraFile = getIssue(issueKey);
if (jiraFile == null) {
- activities.deleteDocument(nodeId, version);
+ activities.deleteDocument(nodeId);
continue;
}
Modified:
manifoldcf/branches/CONNECTORS-990/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-990/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1610706&r1=1610705&r2=1610706&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-990/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-990/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
Tue Jul 15 14:17:06 2014
@@ -4440,7 +4440,7 @@ public class LivelinkConnector extends o
// Since we logged in, we should fail here if the
ingestion user doesn't have access to the
// the document, but if we do, don't fail hard.
resultCode = "UNAUTHORIZED";
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
return;
case HttpStatus.SC_OK:
@@ -4533,7 +4533,7 @@ public class LivelinkConnector extends o
else
{
resultCode = "SESSIONLOGINFAILED";
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
break;
case HttpStatus.SC_BAD_REQUEST:
@@ -4731,7 +4731,7 @@ public class LivelinkConnector extends o
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Livelink: Excluding document
"+documentIdentifier+" because its length ("+dataSize+") was rejected by output
connector");
resultCode = "DOCUMENTTOOLONG";
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
@@ -4741,7 +4741,7 @@ public class LivelinkConnector extends o
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Livelink: Excluding document
"+documentIdentifier+" because its mime type ("+mimeType+") was rejected by
output connector");
resultCode = "MIMETYPEEXCLUSION";
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
@@ -4751,7 +4751,7 @@ public class LivelinkConnector extends o
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Livelink: Excluding document
"+documentIdentifier+" because its URL ("+viewHttpAddress+") was rejected by
output connector");
resultCode = "URLEXCLUSION";
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
finally
Modified:
manifoldcf/branches/CONNECTORS-990/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-990/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java?rev=1610706&r1=1610705&r2=1610706&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-990/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-990/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
Tue Jul 15 14:17:06 2014
@@ -1164,7 +1164,7 @@ public class MeridioConnector extends or
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Meridio: Could not retrieve document
data for document id '" +
new Long(docId).toString() + "' in processDocuments method -
deleting document.");
- activities.deleteDocument(documentIdentifier,docVersion);
+ activities.noDocument(documentIdentifier,docVersion);
i++;
continue;
}
@@ -1176,7 +1176,7 @@ public class MeridioConnector extends or
Logging.connectors.debug("Meridio: Could not retrieve document
owner for document id '" +
new Long(docId).toString() + "' in processDocuments method. No
information or incorrect amount " +
"of information was returned");
- activities.deleteDocument(documentIdentifier,docVersion);
+ activities.noDocument(documentIdentifier,docVersion);
i++;
continue;
}
@@ -1336,7 +1336,7 @@ public class MeridioConnector extends or
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Meridio: Failed to get content for
document '" + new Long(docId).toString() + "'");
// No document. Delete what's there
- activities.deleteDocument(documentIdentifier,docVersion);
+ activities.noDocument(documentIdentifier,docVersion);
i++;
continue;
}
@@ -1370,13 +1370,13 @@ public class MeridioConnector extends or
}
}
else
- activities.deleteDocument(documentIdentifier, docVersion);
+ activities.noDocument(documentIdentifier, docVersion);
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Meridio: Expected temporary file
was not present - skipping document '"+new Long(docId).toString() + "'");
- activities.deleteDocument(documentIdentifier, docVersion);
+ activities.deleteDocument(documentIdentifier);
}
}
finally
Modified:
manifoldcf/branches/CONNECTORS-990/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-990/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java?rev=1610706&r1=1610705&r2=1610706&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-990/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-990/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
Tue Jul 15 14:17:06 2014
@@ -1239,7 +1239,7 @@ public class RSSConnector extends org.ap
// Leave document in jobqueue, but do NOT get rid of it, or we will
wind up seeing it queued again by
// somebody else. We *do* have to signal the document to be removed
from the index, however, or it will
// stick around until the job is deleted.
- activities.deleteDocument(urlValue,version);
+ activities.noDocument(urlValue,version);
continue;
}
@@ -1528,7 +1528,7 @@ public class RSSConnector extends org.ap
}
else
{
- activities.deleteDocument(urlValue,version);
+ activities.noDocument(urlValue,version);
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("RSS: Skipping document '"+urlValue+"'
because it cannot be indexed");
Modified:
manifoldcf/branches/CONNECTORS-990/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-990/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1610706&r1=1610705&r2=1610706&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-990/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
(original)
+++
manifoldcf/branches/CONNECTORS-990/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
Tue Jul 15 14:17:06 2014
@@ -1322,28 +1322,28 @@ public class SharePointRepository extend
// Site/list no longer exists, so delete entry
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: No list found for
list '"+siteListPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.deleteDocument(documentIdentifier);
}
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Access token lookup
failed for list '"+siteListPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Field list lookup
failed for list '"+siteListPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: GUID lookup failed for
list '"+siteListPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
@@ -1413,7 +1413,7 @@ public class SharePointRepository extend
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: List
'"+decodedListPath+"' no longer exists - deleting item
'"+documentIdentifier+"'");
- activities.deleteDocument(documentIdentifier,version);
+ activities.deleteDocument(documentIdentifier);
i++;
continue;
}
@@ -1479,7 +1479,7 @@ public class SharePointRepository extend
// Item has vanished
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Item metadata
fetch failure indicated that item is gone: '"+documentIdentifier+"' -
removing");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
i++;
continue;
}
@@ -1536,7 +1536,7 @@ public class SharePointRepository extend
}
else
// Document too long (should never happen; length is 0)
- activities.deleteDocument( documentIdentifier, version );
+ activities.noDocument( documentIdentifier, version );
}
}
else
@@ -1584,7 +1584,7 @@ public class SharePointRepository extend
accessTokens, denyTokens, createdDate, modifiedDate, null,
guid, sDesc))
{
// Document not indexed for whatever reason
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
i++;
continue;
}
@@ -1593,7 +1593,7 @@ public class SharePointRepository extend
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Skipping attachment
'"+documentIdentifier+"' because no parent guid found");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
i++;
continue;
}
@@ -1664,28 +1664,28 @@ public class SharePointRepository extend
// Site/library no longer exists, so delete entry
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: No list found for
library '"+siteLibPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.deleteDocument(documentIdentifier);
}
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Access token lookup
failed for library '"+siteLibPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Field list lookup
failed for library '"+siteLibPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: GUID lookup failed for
library '"+siteLibPath+"' - deleting");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
}
}
else
@@ -1751,7 +1751,7 @@ public class SharePointRepository extend
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Library
'"+decodedLibPath+"' no longer exists - deleting document
'"+documentIdentifier+"'");
- activities.deleteDocument(documentIdentifier,version);
+ activities.deleteDocument(documentIdentifier);
i++;
continue;
}
@@ -1763,7 +1763,7 @@ public class SharePointRepository extend
// Document has vanished
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("SharePoint: Document metadata
fetch failure indicated that document is gone: '"+documentIdentifier+"' -
removing");
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
i++;
continue;
}
@@ -1774,7 +1774,7 @@ public class SharePointRepository extend
acls, denyAcls, createdDate, modifiedDate, metadataValues,
guid, sDesc))
{
// Document not indexed for whatever reason
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
i++;
continue;
}
Modified:
manifoldcf/branches/CONNECTORS-990/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-990/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java?rev=1610706&r1=1610705&r2=1610706&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-990/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-990/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
Tue Jul 15 14:17:06 2014
@@ -1331,7 +1331,7 @@ public class WebcrawlerConnector extends
// Leave document in jobqueue, but do NOT get rid of it, or we will
wind up seeing it queued again by
// somebody else. We *do* have to signal the document to be removed
from the index, however, or it will
// stick around until the job is deleted.
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
continue;
}
@@ -1465,7 +1465,7 @@ public class WebcrawlerConnector extends
// We do this by using a null url and a null repository document.
If a document with this identifier was
// previously indexed, it will be removed.
- activities.deleteDocument(documentIdentifier,version);
+ activities.noDocument(documentIdentifier,version);
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("WEB: Decided not to ingest
'"+documentIdentifier+"' because it did not match ingestability criteria");
