You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by pi...@apache.org on 2018/04/11 08:18:46 UTC
svn commit: r1828875 - in
/manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src:
main/java/org/apache/manifoldcf/crawler/connectors/cmis/
test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/
test/java/org/apache/manifoldcf...
Author: piergiorgio
Date: Wed Apr 11 08:18:46 2018
New Revision: 1828875
URL: http://svn.apache.org/viewvc?rev=1828875&view=rev
Log:
final fix for CMIS integration tests: disabled the OpenCMIS client cache in the CMIS Repository Connector (CONNECTORS-1356)
Modified:
manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/APISanityHSQLDBIT.java
manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityHSQLDBIT.java
Modified: manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java?rev=1828875&r1=1828874&r2=1828875&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java Wed Apr 11 08:18:46 2018
@@ -216,7 +216,6 @@ public class CmisRepositoryConnector ext
// create session
if (StringUtils.isEmpty(repositoryId)) {
-
// get a session from the first CMIS repository exposed by
// the endpoint
List<Repository> repos = null;
@@ -242,6 +241,10 @@ public class CmisRepositoryConnector ext
}
}
+
+ if(session != null) {
+ session.getDefaultContext().setCacheEnabled(false);
+ }
} catch (Throwable e) {
this.exception = e;
@@ -1276,9 +1279,9 @@ public class CmisRepositoryConnector ext
//Append the new parameters in the query string
String documentDownloadURL = CmisRepositoryConnectorUtils.getDocumentURL(currentDocument, session);
if(StringUtils.contains(documentDownloadURL, '?')){
- documentURI = documentDownloadURL + "&"+CONTENT_PATH_PARAM+"=" + fullContentPath;
+ documentURI = documentDownloadURL + "&" +CONTENT_PATH_PARAM+"=" + fullContentPath;
} else {
- documentURI = documentDownloadURL + "?"+CONTENT_PATH_PARAM+"=" + fullContentPath;
+ documentURI = documentDownloadURL + "?" +CONTENT_PATH_PARAM+"=" + fullContentPath;
}
}
} else if(StringUtils.equals(currentBaseTypeId, BaseTypeId.CMIS_FOLDER.value())) {
Modified: manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/APISanityHSQLDBIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/APISanityHSQLDBIT.java?rev=1828875&r1=1828874&r2=1828875&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/APISanityHSQLDBIT.java (original)
+++ manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/APISanityHSQLDBIT.java Wed Apr 11 08:18:46 2018
@@ -507,7 +507,7 @@ public class APISanityHSQLDBIT extends B
//Tests if there are 4 documents in the target repo
// Delete a content and recrawl
- removeDocument(cmisSourceClientSession, "testdata2.txt");
+ removeDocument(cmisSourceClientSession, "testdata1.txt");
// Now, start the job, and wait until it completes.
startJob(jobIDString);
Modified: manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityHSQLDBIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityHSQLDBIT.java?rev=1828875&r1=1828874&r2=1828875&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityHSQLDBIT.java (original)
+++ manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityHSQLDBIT.java Wed Apr 11 08:18:46 2018
@@ -418,7 +418,7 @@ public class APISanityHSQLDBIT extends B
// MHL
//System.out.println("Starting delete...");
// Delete a file, and recrawl
- removeDocument(cmisClientSession, "testdata2.txt");
+ removeDocument(cmisClientSession, "testdata3.txt");
// Now, start the job, and wait until it completes.
startJob(jobIDString);