Author: kwright
Date: Mon Oct 27 21:15:34 2014
New Revision: 1634689
URL: http://svn.apache.org/r1634689
Log:
Pull up fix for CONNECTORS-1087 from trunk
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/CHANGES.txt
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnectorTest.java
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1634688
Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1634689&r1=1634688&r2=1634689&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Mon Oct 27 21:15:34 2014
@@ -3,6 +3,9 @@ $Id$
======================= 1.8-dev =====================
+CONNECTORS-1087: Fix failing alfresco-webscript unit test.
+(Karl Wright)
+
CONNECTORS-1083: Add support for MariaDB.
(Markus Schuch)
Modified:
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java?rev=1634689&r1=1634688&r2=1634689&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
(original)
+++
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
Mon Oct 27 21:15:34 2014
@@ -184,8 +184,6 @@ public class AlfrescoConnector extends B
if (Logging.connectors != null && Logging.connectors.isDebugEnabled())
Logging.connectors.debug(MessageFormat.format("Fetched and added {0}
seed documents", new Object[]{new Integer(count)}));
- System.out.println(MessageFormat.format("!!! Fetched and added {0}
seed documents", new Object[]{new Integer(count)}));
-
transactionIdsProcessed = response.getLastTransactionId() -
lastTransactionId;
aclChangesetsProcessed = response.getLastAclChangesetId() -
lastAclChangesetId;
Modified:
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnectorTest.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnectorTest.java?rev=1634689&r1=1634688&r2=1634689&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnectorTest.java
(original)
+++
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnectorTest.java
Mon Oct 27 21:15:34 2014
@@ -132,6 +132,8 @@ public class AlfrescoConnectorTest {
.thenReturn(true);
when(activities.checkDateIndexable((Date)anyObject()))
.thenReturn(true);
+ when(activities.checkURLIndexable(anyString()))
+ .thenReturn(true);
IExistingVersions statuses = mock(IExistingVersions.class);
when(client.fetchNode(anyString()))
