You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/10/12 22:49:37 UTC
svn commit: r1631255 - in
/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src:
main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/
test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/
Author: kwright
Date: Sun Oct 12 20:49:36 2014
New Revision: 1631255
URL: http://svn.apache.org/r1631255
Log:
Bring into accordance with trunk
Modified:
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
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=1631255&r1=1631254&r2=1631255&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 Sun Oct 12 20:49:36 2014
@@ -340,7 +340,7 @@ public class AlfrescoConnector extends B
rd.setBinary(stream, length);
if (Logging.connectors != null && Logging.connectors.isDebugEnabled())
Logging.connectors.debug(MessageFormat.format("Ingesting with id: {0}, URI {1} and rd {2}", new Object[]{uuid, nodeRef, rd.getFileName()}));
- activities.ingestDocumentWithException(doc, documentVersion, nodeRef/*was uuid*/, rd);
+ activities.ingestDocumentWithException(doc, documentVersion, contentUrlPath, rd);
} catch (IOException e) {
handleIOException(e,"reading stream");
} finally {
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=1631255&r1=1631254&r2=1631255&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 Sun Oct 12 20:49:36 2014
@@ -122,6 +122,7 @@ public class AlfrescoConnectorTest {
testDocument.put("cm:modified","2014-10-02T16:15:25.124Z");
testDocument.put("size","115");
testDocument.put("mimetype","text/plain");
+ testDocument.put("contentUrlPath","http://localhost:8080/foo");
IProcessActivity activities = mock(IProcessActivity.class);
when(activities.checkDocumentNeedsReindexing(anyString(),anyString()))
.thenReturn(true);
@@ -134,12 +135,15 @@ public class AlfrescoConnectorTest {
IExistingVersions statuses = mock(IExistingVersions.class);
when(client.fetchNode(anyString()))
- .thenReturn(new AlfrescoResponse(0, 0, "", "",
+ .thenReturn(new AlfrescoResponse(0, 0, "", "",
Arrays.<Map<String, Object>>asList(testDocument)));
when(client.fetchMetadata(anyString()))
.thenReturn(testDocument);
+ when(client.fetchContent(anyString()))
+ .thenReturn(new java.io.ByteArrayInputStream(new byte[0]));
+
// processDocuments(String[] documentIdentifiers, IExistingVersions statuses, Specification spec,
// IProcessActivity activities, int jobMode, boolean usesDefaultAuthority)
connector.processDocuments(new String[]{TestDocument.uuid}, statuses, new Specification(), activities, 0, true);
@@ -155,7 +159,7 @@ public class AlfrescoConnectorTest {
.checkDateIndexable(eq(org.apache.manifoldcf.core.common.DateParser.parseISO8601Date((String)testDocument.get("cm:modified"))));
verify(activities)
.ingestDocumentWithException(eq(TestDocument.uuid), anyString(),
- eq(TestDocument.nodeRef), rd.capture());
+ eq((String)testDocument.get("contentUrlPath")), rd.capture());
Iterator<String> i = rd.getValue().getFields();
while(i.hasNext()) {