manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1635452 - in /manifoldcf/branches/dev_1x: ./ connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ connect...
Date Thu, 30 Oct 2014 10:19:35 GMT
Author: kwright
Date: Thu Oct 30 10:19:34 2014
New Revision: 1635452

URL: http://svn.apache.org/r1635452
Log:
Pull up more CONNECTORS-1077-related changes

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
    manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java
    manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
    manifoldcf/branches/dev_1x/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
    manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerAction.java
    manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerDelete.java
    manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerIndex.java
    manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSchema.java
    manifoldcf/branches/dev_1x/framework/   (props changed)
    manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputHistoryActivity.java
    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:r1635438

Modified: manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java?rev=1635452&r1=1635451&r2=1635452&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
(original)
+++ manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
Thu Oct 30 10:19:34 2014
@@ -53,7 +53,7 @@ public class ElasticSearchAction extends
     String error = checkJson(jsonException);
     if (getResult() == Result.OK && error == null)
       return;
-    setResult(IOutputHistoryActivity.JSON_ERROR,Result.ERROR, error);
+    setResult("JSONERROR",Result.ERROR, error);
     Logging.connectors.warn("ES: Commit failed: "+getResponse());
   }
   

Modified: manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java?rev=1635452&r1=1635451&r2=1635452&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java
(original)
+++ manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java
Thu Oct 30 10:19:34 2014
@@ -49,7 +49,7 @@ public class ElasticSearchDelete extends
         return;
       // We thought we needed to delete, but ElasticSearch disagreed.
       // Log the result as an error, but proceed anyway.
-      setResult(IOutputHistoryActivity.JSON_ERROR,Result.ERROR, error);
+      setResult("JSONERROR",Result.ERROR, error);
       Logging.connectors.warn("ES: Delete failed: "+getResponse());
   }
 }

Modified: manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java?rev=1635452&r1=1635451&r2=1635452&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
(original)
+++ manifoldcf/branches/dev_1x/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
Thu Oct 30 10:19:34 2014
@@ -282,7 +282,7 @@ public class ElasticSearchIndex extends 
     String error = checkJson(jsonException);
     if (getResult() == Result.OK && error == null)
       return true;
-    setResult(IOutputHistoryActivity.JSON_ERROR,Result.ERROR, error);
+    setResult("JSONERROR",Result.ERROR, error);
     Logging.connectors.warn("ES: Index failed: "+getResponse());
     return true;
   }

Modified: manifoldcf/branches/dev_1x/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1635452&r1=1635451&r2=1635452&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
(original)
+++ manifoldcf/branches/dev_1x/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
Thu Oct 30 10:19:34 2014
@@ -509,7 +509,7 @@ public class JDBCConnector extends org.a
             if (o == null)
             {
               Logging.connectors.debug("JDBC: Document '"+id+"' has a null url - skipping");
-              errorCode = "NULLURL";
+              errorCode = activities.NULL_URL;
               errorDesc = "Excluded because document had a null URL";
               activities.noDocument(id,version);
               continue;
@@ -532,7 +532,7 @@ public class JDBCConnector extends org.a
             if (!validURL)
             {
               Logging.connectors.debug("JDBC: Document '"+id+"' has an illegal url: '"+url+"'
- skipping");
-              errorCode = "BADURL";
+              errorCode = activities.BAD_URL;
               errorDesc = "Excluded because document had illegal URL ('"+url+"')";
               activities.noDocument(id,version);
               continue;

Modified: manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerAction.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerAction.java?rev=1635452&r1=1635451&r2=1635452&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerAction.java
(original)
+++ manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerAction.java
Thu Oct 30 10:19:34 2014
@@ -39,6 +39,6 @@ public class OpenSearchServerAction exte
     call(method);
     if ("OK".equals(checkXPath(xPathStatus)))
       return;
-    setResult(IOutputHistoryActivity.XPATH_EXCEPTION,Result.ERROR, checkXPath(xPathException));
+    setResult("XPATHEXCEPTION",Result.ERROR, checkXPath(xPathException));
   }
 }

Modified: manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerDelete.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerDelete.java?rev=1635452&r1=1635451&r2=1635452&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerDelete.java
(original)
+++ manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerDelete.java
Thu Oct 30 10:19:34 2014
@@ -36,6 +36,6 @@ public class OpenSearchServerDelete exte
     call(method);
     if ("OK".equals(checkXPath(xPathStatus)))
       return;
-    setResult(IOutputHistoryActivity.XPATH_EXCEPTION,Result.ERROR, checkXPath(xPathException));
+    setResult("XPATHEXCEPTION",Result.ERROR, checkXPath(xPathException));
   }
 }

Modified: manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerIndex.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerIndex.java?rev=1635452&r1=1635451&r2=1635452&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerIndex.java
(original)
+++ manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerIndex.java
Thu Oct 30 10:19:34 2014
@@ -316,7 +316,7 @@ public class OpenSearchServerIndex exten
     if ("OK".equals(checkXPath(xPathStatus)))
       return;
     String error = checkXPath(xPathException);
-    setResult(activities.XPATH_EXCEPTION,Result.ERROR, error);
+    setResult("XPATHEXCEPTION",Result.ERROR, error);
     throw new ManifoldCFException("Error, unexpected response: " + error);
   }
 

Modified: manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSchema.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSchema.java?rev=1635452&r1=1635451&r2=1635452&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSchema.java
(original)
+++ manifoldcf/branches/dev_1x/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSchema.java
Thu Oct 30 10:19:34 2014
@@ -36,6 +36,6 @@ public class OpenSearchServerSchema exte
     call(method);
     if ("1".equals(checkXPath(xpath)))
       return;
-    setResult(IOutputHistoryActivity.INDEX_NOT_FOUND,Result.ERROR, "Index not found");
+    setResult("INDEXNOTFOUND",Result.ERROR, "Index not found");
   }
 }

Propchange: manifoldcf/branches/dev_1x/framework/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk/framework:r1635438

Modified: manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputHistoryActivity.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputHistoryActivity.java?rev=1635452&r1=1635451&r2=1635452&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputHistoryActivity.java
(original)
+++ manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputHistoryActivity.java
Thu Oct 30 10:19:34 2014
@@ -35,13 +35,14 @@ public interface IOutputHistoryActivity
   public static final String EXCLUDED_LENGTH = "EXCLUDEDLENGTH";
   public static final String EXCLUDED_MIMETYPE = "EXCLUDEDMIMETYPE";
   public static final String EXCLUDED_DATE = "EXCLUDEDDATE";
+  /**
+   * Use this result code when security info is not recognized. 
+   */
   public static final String UNKNOWN_SECURITY = "UNKNOWNSECURITY";
+  /**
+   * Use this result code when you get HTTP error from the service that you are connected.
+   */
   public static final String HTTP_ERROR = "HTTPERROR";
-  public static final String JSON_ERROR = "JSONERROR";
-  public static final String INDEX_NOT_FOUND = "INDEXNOTFOUND";
-  public static final String XPATH_EXCEPTION = "XPATHEXCEPTION";
-  public static final String BAD_URL = "BADURL";
-  public static final String NULL_URL = "NULLURL";
   /** Record time-stamped information about the activity of the output connector.
   *@param startTime is either null or the time since the start of epoch in milliseconds (Jan
1, 1970).  Every
   *       activity has an associated time; the startTime field records when the activity
began.  A null value

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=1635452&r1=1635451&r2=1635452&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
Thu Oct 30 10:19:34 2014
@@ -32,8 +32,14 @@ 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 BAD_URL = IOutputHistoryActivity.BAD_URL;
-  public static final String NULL_URL = IOutputHistoryActivity.NULL_URL;
+  /**
+   * Use this result code when you get URL value from repository and it is not valid.
+   */
+  public static final String BAD_URL = "BADURL";
+  /**
+   * Use this result code when you get URL value from repository and it is null.
+   */
+  public static final String NULL_URL = "NULLURL";
   /** 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
   *       activity has an associated time; the startTime field records when the activity
began.  A null value



Mime
View raw message