mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.2 to HEAD
15897: Merged V3.1 to V3.2
14485: (RECORD ONLY) ETHREEOH-1937
14915: (RECORD ONLY) Fix for ETHREEOH-2011: chaining-authentication-context.xml.sample
14954: (RECORD ONLY) Fix merge error
14966: (RECORD ONLY) Merged V2.2 to V3.1
14131: *RECORD ONLY*
14605: Merged HEAD to V2.2 (workaround for ETWOTWO-1137)
14368: Fix for ETHREEOH-1936
14607: Fixed NPE in TextMiningContentTransformer: Lead-up to fix for ETWOTWO-1174
14992: (RECORD ONLY) Updated svn:mergeinfo for V2.1-A
15080: Applied suggested fix for ETHREEOH-2252: Emailed content created in wrong space
15131: Merged V2.1-A to V3.1 (ETHREEOH-2270)
13465: Fix for ADB-161 ACT 7870 - added 'xsd' to mimetype map.
15134: Merged V2.2 to V3.1
14332: (RECORD-ONLY)
14717: (RECORD-ONLY)
14745: (RECORD-ONLY)
14746: Fixed error relating to detection and clean-up of duplicate child associations
14759: Missed check-in: Set transactionService for post-transaction duplicate child assoc cleanup
14761: (RECORD-ONLY)
14885: (RECORD-ONLY)
14893: (RECORD-ONLY)
14903: (RECORD-ONLY)
15204: Fixed ETHREEOH-2303: FixNameCrcValuesPatch throws ConstraintViolationException during upgrade ...
15214: Fixed ETHREEOH-1861: Offline synchronization updates file content without any changes
15271: Applied patch fix: Imported users don't conform to case-sensitivity switch
15352: ETHREEOH-2322
15361: ETHREEOH-1112
15369: ETHREEOH-2448
15419: ETHREEOH-2479
15431: ETHREEOH-2520 and ETHREEOH-2521
15587: (RECORD ONLY) Moved Enterprise-only scripts to correct location
15616: Fix ETHREEOH-2581 - WCM layered folder - can't submit deleted file
15675: WCM fixes (ETHREEOH-2110 & ETHREEOH-2645)
15836: Check for null username in ContentUsage service getUserUsage() method
15840: (RECORD ONLY) Merged V3.2 to V3.1
14760: Fix for ALFCOM-586 - trims and ignores leading/trailing whitespace before validation in JSF client forms.
15841: Fixes for ETHREEOH-2702 and ETHREEOH-2687
15860: (RECORD ONLY) Added Oracle and MS SQL Server config
15891: Removed unused compiler directive
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/BELARUS/ETHREEOH-2221:r14753
Merged /alfresco/BRANCHES/V2.1-A: lots
Merged /alfresco/BRANCHES/V2.2:r14131,14332,14605,14607,14717,14745-14746,14759,14761,14885,14893,14903
Merged /alfresco/BRANCHES/V3.1:r14485,14915,14954,14966,14992,15080,15131,15134,15204,15214,15271,15352,15361,15369,15419,15431,15587,15616,15675,15818,15836,15840-15841,15860,15891
Merged /alfresco/BRANCHES/V3.2:r15897
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||
* Copyright (C) 2005-2009 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
@@ -24,16 +24,20 @@
|
||||
*/
|
||||
package org.alfresco.web.bean.clipboard;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import javax.faces.context.FacesContext;
|
||||
import javax.transaction.UserTransaction;
|
||||
|
||||
import org.alfresco.model.WCMAppModel;
|
||||
import org.alfresco.repo.avm.AVMNodeConverter;
|
||||
import org.alfresco.service.cmr.avm.AVMExistsException;
|
||||
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
|
||||
import org.alfresco.service.cmr.avm.AVMService;
|
||||
import org.alfresco.service.cmr.model.FileExistsException;
|
||||
import org.alfresco.service.cmr.model.FileFolderService;
|
||||
import org.alfresco.service.cmr.repository.CrossRepositoryCopyService;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.StoreRef;
|
||||
import org.alfresco.web.app.Application;
|
||||
import org.alfresco.web.app.servlet.FacesHelper;
|
||||
import org.alfresco.web.bean.NavigationBean;
|
||||
@@ -98,8 +102,7 @@ public class AVMClipboardItem extends AbstractClipboardItem
|
||||
NodeRef destRef = AVMNodeConverter.ToNodeRef(-1, destPath);
|
||||
String sourcePath = AVMNodeConverter.ToAVMVersionPath(getNodeRef()).getSecond();
|
||||
|
||||
FileFolderService fileFolderService = getServiceRegistry().getFileFolderService();
|
||||
AVMService avmService = getServiceRegistry().getAVMLockingAwareService();
|
||||
//FileFolderService fileFolderService = getServiceRegistry().getFileFolderService();
|
||||
|
||||
// initial name to attempt the copy of the item with
|
||||
String name = getName();
|
||||
@@ -131,7 +134,11 @@ public class AVMClipboardItem extends AbstractClipboardItem
|
||||
getNodeRef(),
|
||||
destRef,
|
||||
name);*/
|
||||
avmService.copy(-1, sourcePath, destPath, name);
|
||||
getAvmService().copy(-1, sourcePath, destPath, name);
|
||||
|
||||
// ETHREEOH-2110
|
||||
AVMNodeDescriptor desc = getAvmService().lookup(-1, destPath + "/" + name);
|
||||
recursiveFormCheck(desc);
|
||||
|
||||
// if we get here without an exception, the clipboard copy operation was successful
|
||||
operationComplete = true;
|
||||
@@ -147,7 +154,7 @@ public class AVMClipboardItem extends AbstractClipboardItem
|
||||
getNodeRef(),
|
||||
destRef,
|
||||
name);*/
|
||||
avmService.rename(AVMNodeConverter.SplitBase(sourcePath)[0], getName(),
|
||||
getAvmService().rename(AVMNodeConverter.SplitBase(sourcePath)[0], getName(),
|
||||
destPath, name);
|
||||
|
||||
// if we get here without an exception, the clipboard move operation was successful
|
||||
@@ -221,6 +228,14 @@ public class AVMClipboardItem extends AbstractClipboardItem
|
||||
// inter-store copy operation
|
||||
crossRepoCopyService.copy(getNodeRef(), destRef, name);
|
||||
|
||||
if (destRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
|
||||
{
|
||||
// ETHREEOH-2110
|
||||
String destPath = AVMNodeConverter.ToAVMVersionPath(destRef).getSecond();
|
||||
AVMNodeDescriptor desc = getAvmService().lookup(-1, destPath + "/" + name);
|
||||
recursiveFormCheck(desc);
|
||||
}
|
||||
|
||||
// if we get here without an exception, the clipboard copy operation was successful
|
||||
operationComplete = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user