inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V4.1-BUG-FIX to HEAD

Browse Source 
47256: Merged DEV to V4.1-BUG-FIX
      47145: ALF-17877 : CLONE - The deleted via Sharepoint document is not removed from Alfresco but hidden aspect is added for it
      Setting webdav client for all webdav requests in SPP module.
   47257: ALF-17816 (Incorrect tooltip 'Locked by' icon for other user)
   47285: ALF-17635: Incorrect behavior of Move action in Update rule and Outbound rule in Share
   - Altered MoveActionExcecuter so that it doesn't fire on a working copy and will hence wait for checkin
   47287: Fixes ALF-2590: Calendar doesn't handle 401 errors properly:
      - callUtils now pass on non 200 status codes (rather than swallowing errors)
      - updates create-event template to handle missing data.
   47288: ALF-17057: SPP: Extra version is created when add new document via Document Connection on MacOS X Lion
   - Now we ignore empty content when we create the initial version
   47290: ALF-16931: Bootstrapped users with Uppercase name cannot see site they have been invited to
   - Changed the code to be conditional on association type
   47296: ALF-4565: Incorrect behaviour of Edit Online action if document's name contains wildcards
   - URLs were incorrectly being double decoded in DefaultAuthenticationHandler
   47308: Merged DEV to V4.1-BUG-FIX
      47298: ALF-17907 : specified index does not exist during upgrade to 4.1.2
         The droppping of alf_node.store_id index was marked as optional to support the upgrades from originally Alfresco 2.2 for Oracle DB.
   47314: Fixed ALF-13679 "Cannot play a movie file in Preview, which has double byte characters in the file name"
   47322: ALL LANGS: Translation updates based on EN r47138
   47325: ALL LANGS: Translation updates based on EN r47138
   47327: Removes unused TinyMCE files (as part of ALF-17451 )
   47329: FR, IT, NL: Fixes ALF-17413
   47331: Implements fix suggested in ALF-17451, updates fixes for ALF-8486, ALF-10690 and ALF-11000.
   47334: ALF-16991: Editing Rich Text files in TinyMCE loses some formatting.
   47340: Merged DEV to V4.1-BUG-FIX
      47306: ALF-17907 : specified index does not exist during upgrade to 4.1.2
      The droppping of alf_node.store_id index was marked as optional to support the upgrades from originally Alfresco 2.2 for MS SQL Server.
   47353: Merged V4.1-BUG-FIX-2012_11_26 to V4.1-BUG-FIX
      44182: ALF-15970: OpenOffice form not found
         Show error message if form definition could not be found
   47383: ALF-17222: "Protected attribute not take into account for target of associations"
   47392: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2013_02_26 to BRANCHES/DEV/V4.1-BUG-FIX:
      47313: ALF-18006 : Sending a PUT request without a Content-Type header resets the contents mimetype to application/octet-stream
   47402: ALF-18212: SOLR OOTB cache sizes are too big and require >20GB heap space
   - Reduced default cache sizes from 512 to 64
   47405: Fixes: ALF-14412 - Tag filtering in blogs
   47407: Fix failing unit tests - use public services where transactions are required
   47410: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      47293: (RECORD ONLY) Merged DEV to V3.4-BUG-FIX
         43417: ALF-14710 JUnit test for WebServiceSuiteSystemTest project fails
         - testPropertySetGet() method was updated in RepositoryServiceSystemTest class
      47311: ALF-18213 / ALF-18005: webscript guestDownload does not set Content-Dispositon HTTP header
      - Follow on from ALF-9817
      - Now it does it properly
   47414: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      47332: ALF-17640: Merged V4.1-BUG-FIX to V3.4-BUG-FIX   
         45828: Additional fix for     ALF-17153  FTS query parser FTSQueryParser is not debuggable
      47385: ALF-17935: Merged PATCHES/V4.0.2 to V3.4-BUG-FIX
         42969: Merged DEV to PATCHES/V4.0.2
            42967: MNT-158: SharePoint Protocol Opening Documents in Read-Only for Site Consumer with Collaborator Privileges
               Remove manual throwing of AccessDeniedException is user has "consumer" or "contributor" role.
               Create "links" container from system user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2013-03-01 12:32:11 +00:00
parent 0e0e165586
commit 380bd69941
20 changed files with 165 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java
View File

@@ -26,6 +26,7 @@ import java.util.Map;
import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.cmis.CMISInvalidArgumentException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.version.VersionModel;
import org.alfresco.service.cmr.lock.LockType;
import org.alfresco.service.cmr.repository.ContentData;
@@ -33,6 +34,8 @@ import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.version.Version;
import org.alfresco.service.cmr.version.VersionType;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
import org.springframework.extensions.webscripts.GUID;
public class CMISPropertyServiceTest extends BaseCMISTest
{
@@ -751,4 +754,24 @@ public class CMISPropertyServiceTest extends BaseCMISTest
assertEquals(cmisService.getProperty(folder, CMISDictionaryModel.PROP_NAME.toUpperCase()), "BaseFolder");
assertEquals(cmisService.getProperty(folder, CMISDictionaryModel.PROP_NAME.toLowerCase()), "BaseFolder");
}
public void testContentMimeTypeDetection() throws Exception
{
// create simple text plain content
NodeRef content = fileFolderService.create(rootNodeRef, "textFile" + GUID.generate(), ContentModel.TYPE_CONTENT).getNodeRef();
ContentWriter writer = serviceRegistry.getContentService().getWriter(content, ContentModel.PROP_CONTENT, true);
writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
writer.setEncoding("UTF-8");
writer.putContent("Simple text plain document");
// create content stream with undefined mimetype and file name
ContentStreamImpl contentStreamHTML = new ContentStreamImpl(null, null, "<html><head><title> Hello </title></head><body><p> Test html</p></body></html></body></html>");
String objectId = (String) cmisService.getProperty(content, CMISDictionaryModel.PROP_OBJECT_ID);
cmisService.setContentStream(objectId, null, true, contentStreamHTML.getStream(), null);
// check mimetype
String mimetype = (String) cmisService.getProperty(content, CMISDictionaryModel.PROP_CONTENT_STREAM_MIME_TYPE);
assertTrue("Mimetype is not defined correctly.", mimetype.equals(MimetypeMap.MIMETYPE_HTML));
}
}

3
source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java
View File

@@ -1971,8 +1971,9 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
throw new CMISContentAlreadyExistsException();
}
ContentWriter writer = contentService.getWriter(nodeRef, propertyQName, true);
final ContentWriter writer = contentService.getWriter(nodeRef, propertyQName, true);
writer.guessEncoding();
writer.guessMimetype(null);
writer.setMimetype(mimeType);
writer.putContent(contentStream);