manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1633202 - in /manifoldcf/trunk: connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/ connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/ connectors/wiki/connec...
Date Mon, 20 Oct 2014 19:13:02 GMT
Author: kwright
Date: Mon Oct 20 19:13:01 2014
New Revision: 1633202

URL: http://svn.apache.org/r1633202
Log:
Use actual exception name for status code.  Part of CONNECTORS-1077.

Modified:
    manifoldcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
    manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
    manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IHistoryActivity.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=1633202&r1=1633201&r2=1633202&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 Oct 20 19:13:01 2014
@@ -916,7 +916,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(
@@ -974,7 +974,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(
@@ -992,7 +992,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/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java?rev=1633202&r1=1633201&r2=1633202&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
(original)
+++ manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
Mon Oct 20 19:13:01 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;
             }

Modified: manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1633202&r1=1633201&r2=1633202&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
(original)
+++ manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
Mon Oct 20 19:13:01 2014
@@ -4113,7 +4113,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;
       }

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IHistoryActivity.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IHistoryActivity.java?rev=1633202&r1=1633201&r2=1633202&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IHistoryActivity.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IHistoryActivity.java
Mon Oct 20 19:13:01 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



Mime
View raw message