Author: kwright
Date: Mon Oct 20 19:14:58 2014
New Revision: 1633204
URL: http://svn.apache.org/r1633204
Log:
Pull up CONNECTORS-1077 fix for using actual exception name in repo connectors
from trunk
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
manifoldcf/branches/dev_1x/connectors/wiki/ (props changed)
manifoldcf/branches/dev_1x/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
manifoldcf/branches/dev_1x/framework/ (props changed)
manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IHistoryActivity.java
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1633202
Modified:
manifoldcf/branches/dev_1x/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java?rev=1633204&r1=1633203&r2=1633204&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
(original)
+++
manifoldcf/branches/dev_1x/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
Mon Oct 20 19:14:58 2014
@@ -940,7 +940,7 @@ public class AlfrescoRepositoryConnector
if (e instanceof java.io.InterruptedIOException && !(e instanceof
java.net.SocketTimeoutException))
errorCode = null;
else {
- errorCode = activities.IOEXCEPTION;
+ errorCode =
e.getClass().getSimpleName().toUpperCase(Locale.ROOT);
errorDesc = e.getMessage();
}
Logging.connectors.warn(
@@ -998,7 +998,7 @@ public class AlfrescoRepositoryConnector
if (e instanceof java.io.InterruptedIOException && !(e
instanceof java.net.SocketTimeoutException))
errorCode = null;
else {
- errorCode = activities.IOEXCEPTION;
+ errorCode =
e.getClass().getSimpleName().toUpperCase(Locale.ROOT);
errorDesc = e.getMessage();
}
Logging.connectors.warn(
@@ -1016,7 +1016,7 @@ public class AlfrescoRepositoryConnector
throw new ManifoldCFException(e.getMessage(), e,
ManifoldCFException.INTERRUPTED);
} catch (IOException e) {
- errorCode = activities.IOEXCEPTION;
+ errorCode =
e.getClass().getSimpleName().toUpperCase(Locale.ROOT);
errorDesc = e.getMessage();
Logging.connectors.warn(
"Alfresco: IOException closing file input stream: "
Modified:
manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java?rev=1633204&r1=1633203&r2=1633204&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
(original)
+++
manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
Mon Oct 20 19:14:58 2014
@@ -226,7 +226,7 @@ public class TikaExtractor extends org.a
{
if (sp.ignoreTikaException())
{
- resultCode = "TIKAEXCEPTION";
+ resultCode =
e.getClass().getSimpleName().toUpperCase(Locale.ROOT);
description = e.getMessage();
}
else
@@ -241,7 +241,7 @@ public class TikaExtractor extends org.a
}
catch (SAXException e)
{
- resultCode = "SAXEXCEPTION";
+ resultCode =
e.getClass().getSimpleName().toUpperCase(Locale.ROOT);
description = e.getMessage();
int rval = handleSaxException(e);
if (rval == DOCUMENTSTATUS_REJECTED)
@@ -250,7 +250,7 @@ public class TikaExtractor extends org.a
}
catch (IOException e)
{
- resultCode = activities.IOEXCEPTION;
+ resultCode =
e.getClass().getSimpleName().toUpperCase(Locale.ROOT);
description = e.getMessage();
throw e;
}
Propchange: manifoldcf/branches/dev_1x/connectors/wiki/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk/connectors/wiki:r1633202
Modified:
manifoldcf/branches/dev_1x/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1633204&r1=1633203&r2=1633204&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
(original)
+++
manifoldcf/branches/dev_1x/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
Mon Oct 20 19:14:58 2014
@@ -4135,7 +4135,7 @@ public class WikiConnector extends org.a
}
catch (Throwable e)
{
- statusCode = IProcessActivity.EXCEPTION;
+ statusCode = e.getClass().getSimpleName().toUpperCase(Locale.ROOT);
errorMessage = e.getMessage();
this.exception = e;
}
Propchange: manifoldcf/branches/dev_1x/framework/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk/framework:r1633202
Modified:
manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IHistoryActivity.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IHistoryActivity.java?rev=1633204&r1=1633203&r2=1633204&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IHistoryActivity.java
(original)
+++
manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IHistoryActivity.java
Mon Oct 20 19:14:58 2014
@@ -32,8 +32,6 @@ public interface IHistoryActivity
public static final String EXCLUDED_LENGTH =
IOutputHistoryActivity.EXCLUDED_LENGTH;
public static final String EXCLUDED_MIMETYPE =
IOutputHistoryActivity.EXCLUDED_MIMETYPE;
public static final String EXCLUDED_DATE =
IOutputHistoryActivity.EXCLUDED_DATE;
- public static final String EXCEPTION = IOutputHistoryActivity.EXCEPTION;
- public static final String IOEXCEPTION = IOutputHistoryActivity.IOEXCEPTION;
/** Record time-stamped information about the activity of the connector.
*@param startTime is either null or the time since the start of epoch in
milliseconds (Jan 1, 1970). Every
