svn commit: r1808376 - in /manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis: ./ connector/src/main/java/org/apache/manifoldcf/agents/output/cmisoutput/ connector/src/test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/

[piergiorgio]

Author: piergiorgio
Date: Thu Sep 14 18:33:40 2017
New Revision: 1808376

URL: http://svn.apache.org/viewvc?rev=1808376&view=rev
Log:
updated integration test and building scripts for CMIS Output Connector 
(CONNECTORS-1356)

Modified:
    manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/build.xml
    
manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/agents/output/cmisoutput/CmisOutputConnector.java
    
manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/APISanityHSQLDBIT.java

Modified: manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/build.xml
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/build.xml?rev=1808376&r1=1808375&r2=1808376&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/build.xml 
(original)
+++ manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/build.xml Thu Sep 
14 18:33:40 2017
@@ -30,7 +30,7 @@
 
     <import file="${mcf-dist}/connector-build.xml"/>
     
-    <property name="chemistry.version" value="0.13.0"/>
+    <property name="chemistry.version" value="1.1.0"/>
     
     <target name="download-dependencies">
         <property name="chemistry-package" 
value="org/apache/chemistry/opencmis"/>

Modified: 
manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/agents/output/cmisoutput/CmisOutputConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/agents/output/cmisoutput/CmisOutputConnector.java?rev=1808376&r1=1808375&r2=1808376&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/agents/output/cmisoutput/CmisOutputConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/agents/output/cmisoutput/CmisOutputConnector.java
 Thu Sep 14 18:33:40 2017
@@ -878,23 +878,6 @@ public class CmisOutputConnector extends
                }
                return false;
        }
-       
-//     private String getObjectIdFromDocumentURI(String documentURI) throws 
URISyntaxException {
-//             String objectId = StringUtils.EMPTY;
-//             URIBuilder uriBuilder = new URIBuilder(documentURI);
-//             List<NameValuePair> params = uriBuilder.getQueryParams();
-//             Iterator<NameValuePair> iteratorParams = params.iterator();
-//             while (iteratorParams.hasNext()) {
-//                     NameValuePair nameValuePair = (NameValuePair) 
iteratorParams.next();
-//                     String name = nameValuePair.getName();
-//                     if(StringUtils.equals(name, "id")
-//                                     || StringUtils.equals(name, 
PropertyIds.OBJECT_ID)) {
-//                             objectId = nameValuePair.getValue();
-//                     }
-//             }
-//             return objectId;
-//     }
-       
 
        @Override
        public int addOrReplaceDocumentWithException(String documentURI, 
VersionContext pipelineDescription,

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=1808376&r1=1808375&r2=1808376&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
 Thu Sep 14 18:33:40 2017
@@ -422,6 +422,7 @@ public class APISanityHSQLDBIT extends B
       //Job configuration
       ConfigurationNode sn = new ConfigurationNode("startpoint");
       sn.setAttribute(CmisOutputConfig.CMIS_QUERY_PARAM, 
CmisOutputConfig.CMIS_QUERY_DEFAULT_VALUE);
+      sn.setAttribute(CmisConfig.CONTENT_MIGRATION_PARAM, 
Boolean.TRUE.toString());
       
       child.addChild(child.getChildCount(),sn);
       jobObject.addChild(jobObject.getChildCount(),child);
@@ -493,7 +494,7 @@ public class APISanityHSQLDBIT extends B
       count = getJobDocumentsProcessed(jobIDString);
       if (count != 5)
         throw new ManifoldCFException("Wrong number of documents processed 
after change - expected 5, saw "+new Long(count).toString());
-      
+       
       //Tests if there are 4 documents in the target repo
       targetRepoNumberOfContents = queryTestContents(cmisTargetClientSession);
       if(targetRepoNumberOfContents != 4)