Merging BRANCHES/DEV/CMIS_10 to HEAD (phase 2 - currently up-to-date with branch):

18717: SAIL-166: Refactor CMIS to use shared services and resolve objectIds and error codes consistently
   18731: SAIL-169: CMIS REST versioning compliance
   18732: Fix failing change log test.
   18768: Add displayName and queryName attributes to rendered properties (in CMIS AtomPub binding).
   18775: Fix exception reporting when retrieving items that do not exist (in CMIS AtomPub binding).
   18784: Fix CMIS REST change logging
   18785: SAIL-174: CMIS Relationship lookup by association ID
   18812: SAIL-183: Support orderBy argument for getChildren and getCheckedOutDocs in CMIS REST and Web Service bindings
   18823: CMIS WS Bindings were moved to 1.0 cd07 schema.
   18838: Update to latest Chemistry TCK.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/web/scripts/content/ContentDelete.java

@@ -31,8 +31,8 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import org.alfresco.cmis.CMISObjectReference;
-import org.alfresco.cmis.reference.ReferenceFactory;
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.cmis.reference.ReferenceFactory;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;

source/java/org/alfresco/repo/web/scripts/content/ContentGet.java

@@ -31,8 +31,8 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import org.alfresco.cmis.CMISObjectReference;
-import org.alfresco.cmis.reference.ReferenceFactory;
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.cmis.reference.ReferenceFactory;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;

source/java/org/alfresco/repo/web/scripts/content/ContentSet.java

@@ -24,26 +24,22 @@
  */
 package org.alfresco.repo.web.scripts.content;
 
-import java.io.BufferedInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
+import org.alfresco.cmis.CMISDictionaryModel;
 import org.alfresco.cmis.CMISObjectReference;
-import org.alfresco.cmis.reference.ObjectPathReference;
-import org.alfresco.cmis.reference.ReferenceFactory;
+import org.alfresco.cmis.CMISServiceException;
+import org.alfresco.cmis.CMISServices;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.content.encoding.ContentCharsetFinder;
+import org.alfresco.repo.cmis.reference.ObjectPathReference;
+import org.alfresco.repo.cmis.reference.ReferenceFactory;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentService;
-import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
@@ -74,7 +70,7 @@ public class ContentSet extends AbstractWebScript
     private ReferenceFactory referenceFactory;
     private DictionaryService dictionaryService;
     private NamespaceService namespaceService;
-    private ContentService contentService;
+    private CMISServices cmisService;
     private MimetypeService mimetypeService;
     
     /**
@@ -102,11 +98,11 @@ public class ContentSet extends AbstractWebScript
     }
 
     /**
-     * @param contentService
+     * @param cmisServices
      */
-    public void setContentService(ContentService contentService)
+    public void setCmisService(CMISServices cmisService)
     {
-        this.contentService = contentService; 
+        this.cmisService = cmisService;
     }
 
     /**
@@ -168,22 +164,7 @@ public class ContentSet extends AbstractWebScript
         }
 
         // ensure content can be overwritten
-        // TODO: check parameter name
         String overwrite = req.getParameter("overwriteFlag");
-        if (overwrite != null && overwrite.equalsIgnoreCase("false"))
-        {
-            ContentReader reader = contentService.getReader(nodeRef, propertyQName);
-            if (reader != null)
-            {
-                // error code as per CMIS specification
-                throw new WebScriptException(HttpServletResponse.SC_CONFLICT, "Content already exists.");
-            }
-        }
-        
-        // setup content writer
-        ContentReader reader = contentService.getReader(nodeRef, propertyQName);
-        boolean isUpdate = (reader != null && reader.exists());
-        ContentWriter writer = contentService.getWriter(nodeRef, propertyQName, true);
         
         // establish mimetype
         String mimetype = req.getContentType();
@@ -194,24 +175,19 @@ public class ContentSet extends AbstractWebScript
                 mimetype = mimetypeService.guessMimetype(((ObjectPathReference)reference).getPath());
             }
         }
-        if (mimetype != null)
-        {
-            writer.setMimetype(mimetype);
-        }
-        
-        // get the input stream from the request data
-        InputStream is = req.getContent().getInputStream();
-        is = is.markSupported() ? is : new BufferedInputStream(is);
-        
-        // establish content encoding
-        ContentCharsetFinder charsetFinder = mimetypeService.getContentCharsetFinder();
-        Charset encoding = charsetFinder.getCharset(is, mimetype);
-        writer.setEncoding(encoding.name());
 
-        // write the new data
-        writer.putContent(is);
-        
-        // set status
-        res.setStatus(isUpdate ? Status.STATUS_OK : Status.STATUS_CREATED);
+        try
+        {
+            boolean isUpdate = cmisService.setContentStream((String) cmisService.getProperty(nodeRef,
+                    CMISDictionaryModel.PROP_OBJECT_ID), propertyQName, overwrite == null || overwrite.equals("true"),
+                    req.getContent().getInputStream(), mimetype);
+
+            // set status
+            res.setStatus(isUpdate ? Status.STATUS_OK : Status.STATUS_CREATED);
+        }
+        catch (CMISServiceException e)
+        {
+            throw new WebScriptException(e.getStatusCode(), e.getMessage(), e);
+        }
     }
 }