mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.3-BUG-FIX to HEAD
22215: Fix compilation error
22240: ALF-4207: Download servlets show error page with permissions error rather than login page when non-guest user has insufficient permissions
22241: ALF-4469: External Access Servlet should also show status 403 errors to non-guest users, as in ALF-4207
22244: ALF-4599: CIFS access to alfresco with Kerberos authentication creates wrong users with domain suffix
ALF-4395: recognize Kerberos machine accounts with lower case names
22247: ALF-4397: Properly handle null values in SortableSelectItem.compareTo()
22248: Merged DEV/TEMPORARY to V3.3-BUG-FIX
21963: ALF-4390: ModuleManagementTool is not returning error code in case of failure
Error code constants and appropriate System.exit(code) invokations were added.
22260: ALF-4597: InviteContentUsersWizard was caching permissions in a non-type-specific cache
- removed the cache - didn't allow for dynamic model updates either
22269: Merged V3.3 to V3.3-BUG-FIX (RECORD ONLY)
22268: Merged V3.3-BUG-FIX to V3.3
- Merged across all differences from V3.3-BUG-FIX
22270: Incremented revision number
22467: Merge from V3.3 to V3.3BUG-FIX. Fix for ALF-4741.
V3.3: 22466 Merge from V3.2 to V3.3. Fix for ALF-4741.
V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry.
22667: Merged DEV/TEMPORARY to V3.3-BUG-FIX
22665: ALF-4825: Unlocking checked out content cause both original & working copy un-usable.
Do not include unlock in the actions list when a node has a working copy.
22691: Add missing "logAbandoned" (= false) prop to config - follow on to r15133 (related to ALF-4020 / ETWOTWO-562)
22710: ALF-3948 - from time to time we have exception "Failed to init dictionaryRegistry"
22718: Merge from V3.3 to V3.3-BUG-FIX
r 22715 Merge from V3.2 to V3.3
r 22713 Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued.
22722: Merged V3.3 to V3.3-BUG-FIX
22271: ALF-3712: Merged HEAD to V3.3
22249: Bin contents were not being packaged.
22272: Merged DEV/TEMPORARY to V3.3
22067: ALF-4479: when using webdav inline edit on webdav + MS Word 2003 +IE6, one gets: Unable to check in Content Node due to system error. Access Denied. You do not have the appropriate permissions to perform this operation.
- Do not unlock a working copy.
22273: Merged DEV/TEMPORARY to V3.3
21729: ALF-3112: Property parameterTemplates not resolved correctly for SimpleTemplateActionDefinition
The temporary fix for unconfigurable valueSeparator property.
https://jira.springframework.org/browse/SPR-7429
22274: Merged DEV/TEMPORARY to V3.3
21993: ALF-4396: webdav "supportedlock" propfind request returns malformed response
WebDAV supported lock elements were wrapped by “lockentry” elements according to the WebDAV specification.
22276: ALF-3890: FTP Change Working Directory (CWD) command works with root-relative paths with more than one component
22277: Merged DEV/TEMPORARY to V3.3
22076: ALF-3579: Open the Details Page URL removes the header, navigation bar etc
The identifiers for modify action tag and details' actions tag should be different in the details pages. For documents:
in the filelink-details.jsp and document-details.jsp. For spaces: in the space-details.jsp and spacelink-details.jsp.
22285: Merged HEAD to V3.3
22284: Fix for ALF-3063 "Incorrect behaviour on filtering by tag in Repository". Labels updated to more accurately reflect behaviour.
22299: Fix for ALF-3893: lucene.indexer.mergerTargetIndexCount is redundant
- this property is now used to control the merging of indexes as was intended
22309: Merged DEV/TEMPORARY to V3.3 (Approved by Roy)
21035: ALF-2588: RM: Export and import of file plan causes disposition errors
When content is imported from acp the actionId that points to the action NodeRef is old in the imported content and NullPointerExcepption appears.
To avoid this we changed DispositionScheduleImpl. Now it stores the action that has different name and ID (when action is create it name equals id) in a separate map. And when getDispositionActionDefinition(String id) method is called it tries to retrieve the action from this map, if it hasn’t been found earlier.
22325: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr
- unit test pass
22334: Merged HEAD to V3.3
22331: Fixes: ALF-3558: Input and variable encoding issues in Share Calendar & API JSON data.
22355: ALF-4489: Special Characters Create Stack Overflow Exception in the Group Admin Console for Share in Internet Explorer.
Fixed missing encoding and also added guard code to prevent stack overflow problem in case of future error.
22356: Fix for ALF-4384 - missing JSP page directive
22360: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr
- unit test pass
- no abstain allowed
22365: Merged DEV/TEMPORARY to V3.3
21874: ALF-2641: WebDav Permission Issues - MAC OSX Finder
The createExclusive field was introduced instead of m_scope. New algorithm of lockscope determination was added.
Also ALF-4008 compliant fix provided with this.
21812: ALF-4008: save a MS Word change over webdav after a 2-3 minutes delay causes the error 'XXX.doc is currently in use. Please try again later.'
Modified LOCK method, it gets a scope from NodeRef property if m_scope field is not defined.
22367: Merged DEV/TEMPORARY to V3.3
21442: ALF-2587: WEBDAV error in Windows 7
- variant generateLockDiscoveryXML methods were factored into a single one capable of generating a namespaced LOCK response compatible with Windows 7 when its user agent header is detected.
22368: Merged DEV/TEMPORARY to V3.3
20919: ALF-2834: All day events created in Outlook not appearing in Meeting Workspace
Different date format is used by Outlook when creating all day meeting request and meeting request specifying date and time. The code was changed to handle both situations accordingly.
22369: Merged DEV/TEMPORARY to V3.3 (With simplifications)
21470: ALF-3796: Locale is not always set/reset on every request thread
- A GlobalLocalizationFilter sits in front of ALL requests and sets a default fallback locale on I18NUtil
- Moved BaseServlet.setLanguageFromRequestHeader into this filter and made sure it always falls back to a default locale
- Subsequent filters / servlets in faces chain may override this with user preferred locale after authentication
22370: ALF-3868: Fix for compatibility with Sun Directory Server
22371: Merged DEV/TEMPORARY to V3.3
21811: ALF-4067: Display Value for Action Constraint breaking a java eval in Share
When a node doesn't have a ContentModel.PROP_TITLE property it is added to AllowableValues with PROP_NAME value.
21795: ALF-4067: Display Value for Action Constraint breaking a java eval in Share
The fix introduces the code which doesn't add a node to AllowableValues if it doesn't have a ContentModel.PROP_TITLE property.
22378: ALF-3796: Fixed compilation error - BaseServlet.setLanguageFromRequestHeader replaced by global filter
22380: ALF-3761: War bundles + extension samples now include alfresco-global.properties in correct position in hierarchy
22386: ALF-3887: Two versions of geronimo-activation are shipped
- Removed the older version
22402: WCM - add more debug logging only
22405: Change notification handler not enabled by the server configuration bean. ALF-4715.
22407: Merged DEV/TEMPORARY to V3.3
22231: ALF-4096: Share point module is causing file descriptor leaks.
The following changes were added to VtiIfHeaderAction and GetDocumentMethod:
- code that copies data between streams was replaced by org.apache.commons.io.IOUtils.copy()
- correct stream closing was added for all cases including exceptions while copying
22411: Merged DEV/TEMPORARY to V3.3
21864: ALF-4371: Error occurs if user try to find event from meeting place
Replaced incorrect NamespaceService.CONTENT_MODEL_PREFIX with NamespaceService.CONTENT_MODEL_1_0_URI in QName creation.
22412: Merged DEV/TEMPORARY to V3.3
22018: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching.
People searches in Alfresco and share are restricted by “cm:person” type.
21988: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching.
People searches in Alfresco and share are restricted by “cm:person” type.
22418: ALF-4578: Avoid ConcurrentModificationException in AVMDeploymentTarget
22420: Fixed ALF-958: Target associations aren't copied
- Added CopyBehaviourCallback. getAssociationCopyAction
- Default behaviour:
- Remove existing associations of same type when copying OVER an existing node (e.g. check-in)
- Copy the association using a new target if the target is copied in the same call
- Copy the association to the original target if the target is not copied in the same call
- Abstract behaviour (for those that have implemented a CopyBehaviourCallback):
- Remove existing associations of same type when copying OVER an existing node (e.g. check-in)
- Only copy the association to a new target if the original target is copied
22421: ALF-4641: Strip ticket parameter on login page redirect to avoid endless redirect loop
22422: Merged DEV/TEMPORARY to V3.3
21201: ALF-1804: Passthru server check gets confused when a server goes offline
22423: Merged DEV/TEMPORARY to V3.3
21891: ALF-3356: Error changing own user role from coordinator to consumer
When a user changes the Roles, all Permissions are immediately deleted and new selected permissions are created. If all permissions are deleted then the user doesn't have access for permissions creation.
If the user currently has permission change permission the currently set of permissions is cleared and new permissions are added from a System User authority.
22424: Merged DEV/TEMPORARY to V3.3
21182: ALF-1786: Remote Opensearch request mimetype missing
SearchProxy was changed to provide original User-Agent header. HTTPProxy was extended to set request headers. New overridable method setRequestHeaders was added to provide ability of setting headers.
22425: Merged DEV/TEMPORARY to V3.3
22165: ALF-197: When returning to the first step of Advanced Workflow creation from second or third steps it's always Adhoc Task chosen there
The selectedWorkflow variable was reseting every time on "Choose Workflow" step
22426:Merged DEV/TEMPORARY to V3.3
21323: ALF-687: Error when invoking webservices via SSL repository location url.
Add a new overload of ContentUtils.putContent() method with the isSSL argument at the end.
If this parameter value is true then SSLSocket is used and Socket otherwise.
22428: ALF-3490: Unfriendly error messages from WebDAV when content doesn't exist
- Generalized ALF-4207 solution so that the error page instead displays a status 404 message
22429: Merged DEV/TEMPORARY to V3.3
21325: ALF-3502: Logging in FacesHelper.getManagedBean on failure to create bean
Detailed logging of the EvaluationException for ValueBinding was added.
22430: Merged DEV/TEMPORARY to V3.3
20974: ALF-2695: mimetypes-extension-context.xml.sample does not use the correct classes
Changed the type of the bean id="mimetypeConfigService" from “"org.alfresco.config.xml.XMLConfigService” to “org.springframework.extensions.config.xml.XMLConfigService”
Renamed mimetypes-extension-context.xml.sample file to file mimetypes-extension.xml.sample. The file mimetypes-extension-context.xml.sample was interpreted like spring context file. It wasn’t correct.
22431: Merged DEV/TEMPORARY to V3.3
21099: ALF-3046: UI - Import feature not available to contributor user
The fix also covers related bug ALF-2802.
Permission ‘Write’ was replaced by ‘CreateChildren’ for import action because contributor has ‘AddChildren’ (not ‘Write’) permission.
22432: Merged DEV/TEMPORARY to V3.3
20973: ALF-3244: alfresco-sample-website.war does not deploy to bundled Tomcat
The cause of the corrupted alfresco-sample-website.war deployment is the usage of the SSIFilter in the application.
Only Contexts which are marked as privileged may use SSI features. For this reason, the context has been marked as privileged in META-INF/context.xml
22433: Merged DEV/TEMPORARY to V3.3
21190: ALF-3751: Unintentional copy/remove of 'Web Forms' space removes form associations in Web Projects
Parent validation before deleting was added. Now deleted web form is removed from Web Project only if this form is located in original Web Form folder.
22434: Merged DEV/TEMPORARY to V3.3
21490: ALF-4099: Customer concern about String comparison operators == vs equals
Comparison operator was replaced by equals/EqualsHelper.nullSafeEquals in the ContentFilterLanguagesMap DocumentNavigator UIAjaxTagPicker Presence classes.
DocumentNavigator.getAttributeName() method was changed because the previous method's logic always returned escapedLocalName in any case.
22436: Merged DEV/TEMPORARY to V3.3
22063: ALF-4494 : Share show error if versionable document has no version history.
1. evaluator.lib.js was modified to prevent NPE if no version history exists for document.
2. Result was manually tested.
22437: ALF-2796: java.naming.referral is set to "follow" in the LDAP contexts to avoid PartialResultExceptions on LDAP sync
22466: Merge from V3.2 to V3.3. Fix for ALF-4741.
V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry.
22469: Fix for CIFS long directory path results in duplicate folder displays. ALF-3938.
Removed (hopefully) last of the hardcoded buffer length limits.
22472: Fixed ALF-4670: XAM retainUntil value does not propagate down the space hierarchy
22473: Fixed ALF-4656: Deleted Content Backup should ignore unrecognised URLs
- Also fixes ALF-4657: Content stored on XAM is not cleaned up correctly
- Errors in the listeners are logged only
- ContentStoreCleanerListener checks and warns if the URL is unsupported
22474: Fix to web.xml to correctly validate and therefore deploy on JBoss5.1.0
22485: Fix for NFS losing contents during edit or copy. ALF-4737.
22492: ALF-4652 XAM bug fixes and improvements: Respect 0 'retentionPeriodDays'
22501: Fixed ALF-4763 XAM-enabled nodes must not go to the archive://SpacesStore
22504: Fix for MS Word mimetype is changed when editing via CIFS. ALF-3772.
22520: ALF-4768: WCM (w/ virt svr) - submit (no need to virtualize direct submit workflows)
22526: Externalised setting of BINARIES, plus added bin with jars and dlls
22561: ALF-4792: WCM virt svr - add experimental option for lazy deployment (defer startup of dependent webapps until accessed)
22611: Fixed ALF-1893: Windows 7 SSP Read-only.
Note: Relies on the patched Excel and PowerPoint mimetypes, but also falls back to file exension.
22612: Merged HEAD to BRANCHES/V3.3:
22609: Resolve ALF4822, ALF4818
22628: ALF-3239: Added encoding elements to mysql db url
22656: Fix for Solaris/Gedit problem, keep a mapping for the original file handle to the new path after a rename. ALF-4843.
22673: ALF-4845: Person and Group member deletion performance fix
- Don't batch load all a group's members when trying to delete one of them!
- Can result in infeasibly large hibernate sessions when trying to delete a person / LDAP sync in a repository with very large groups
- Switched off batch loading in NodeService.removeChild()
- Avoided unnecessary use of removeAuthority in PersonService.deletePerson()
22674: Merged DEV/TEMPORARY to V3.3
22653: ALF-661: There is no way to determine the protocol, hostname and port from a javascript kicked off by JBPM
These variables are now available for use in workflow and action javascript and they are wired to the corresponding parameters that already exist in the sysAdmin subsystem.
urls.alfresco.protocol
urls.alfresco.host
urls.alfresco.port
urls.alfresco.context
urls.share.protocol
urls.share.host
urls.share.port
urls.share.context
See bug for example usage
22676: Merged HEAD to V3.3:
20306: Google Doc integration fixes:
- Fixed up inconsistancies in powerpoint and excel mimetypes set throughout the code
- Unit tests failures for excel sheets fixed
- Able to now create and checkout docs, sheets and presentations successfullly
- Docs, sheets and presentations downloadable and viewable
- Fixed ALF-2700
(See ALF-4827)
22715: Merge from V3.2 to V3.3.
r. 22713. Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
@@ -31,12 +31,16 @@ import java.util.Set;
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.repo.action.ActionServiceImpl;
|
||||
import org.alfresco.repo.copy.CopyBehaviourCallback.AssocCopySourceAction;
|
||||
import org.alfresco.repo.copy.CopyBehaviourCallback.AssocCopyTargetAction;
|
||||
import org.alfresco.repo.copy.CopyBehaviourCallback.ChildAssocCopyAction;
|
||||
import org.alfresco.repo.copy.CopyBehaviourCallback.ChildAssocRecurseAction;
|
||||
import org.alfresco.repo.copy.CopyBehaviourCallback.CopyAssociationDetails;
|
||||
import org.alfresco.repo.copy.CopyBehaviourCallback.CopyChildAssociationDetails;
|
||||
import org.alfresco.repo.policy.ClassPolicyDelegate;
|
||||
import org.alfresco.repo.policy.JavaBehaviour;
|
||||
import org.alfresco.repo.policy.PolicyComponent;
|
||||
import org.alfresco.repo.transaction.TransactionalResourceHelper;
|
||||
import org.alfresco.service.cmr.dictionary.AspectDefinition;
|
||||
import org.alfresco.service.cmr.dictionary.AssociationDefinition;
|
||||
import org.alfresco.service.cmr.dictionary.ChildAssociationDefinition;
|
||||
@@ -44,6 +48,7 @@ import org.alfresco.service.cmr.dictionary.ClassDefinition;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
|
||||
import org.alfresco.service.cmr.dictionary.TypeDefinition;
|
||||
import org.alfresco.service.cmr.repository.AssociationRef;
|
||||
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
||||
import org.alfresco.service.cmr.repository.CopyService;
|
||||
import org.alfresco.service.cmr.repository.CopyServiceException;
|
||||
@@ -52,21 +57,21 @@ import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.rule.RuleService;
|
||||
import org.alfresco.service.cmr.search.ResultSet;
|
||||
import org.alfresco.service.cmr.search.SearchService;
|
||||
import org.alfresco.service.cmr.security.AuthenticationService;
|
||||
import org.alfresco.service.cmr.security.PermissionService;
|
||||
import org.alfresco.service.namespace.NamespaceService;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.service.namespace.RegexQNamePattern;
|
||||
import org.alfresco.util.GUID;
|
||||
import org.alfresco.util.Pair;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.springframework.extensions.surf.util.I18NUtil;
|
||||
import org.springframework.extensions.surf.util.ParameterCheck;
|
||||
|
||||
/**
|
||||
* Node operations service implmentation.
|
||||
* Service implementation of copy operations.
|
||||
*
|
||||
* @author Roy Wetherall
|
||||
* @author Derek Hulley
|
||||
*/
|
||||
public class CopyServiceImpl implements CopyService
|
||||
{
|
||||
@@ -84,21 +89,12 @@ public class CopyServiceImpl implements CopyService
|
||||
|
||||
/** The dictionary service*/
|
||||
private DictionaryService dictionaryService;
|
||||
|
||||
/** The search service */
|
||||
private SearchService searchService;
|
||||
|
||||
/** Policy component */
|
||||
private PolicyComponent policyComponent;
|
||||
|
||||
/** Rule service */
|
||||
private RuleService ruleService;
|
||||
|
||||
/** Permission service */
|
||||
private PermissionService permissionService;
|
||||
|
||||
/** Authentication service */
|
||||
private AuthenticationService authenticationService;
|
||||
|
||||
/** Policy delegates */
|
||||
private ClassPolicyDelegate<CopyServicePolicies.OnCopyNodePolicy> onCopyNodeDelegate;
|
||||
@@ -165,26 +161,6 @@ public class CopyServiceImpl implements CopyService
|
||||
this.ruleService = ruleService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the permission service
|
||||
*
|
||||
* @param permissionService the permission service
|
||||
*/
|
||||
public void setPermissionService(PermissionService permissionService)
|
||||
{
|
||||
this.permissionService = permissionService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the authentication service
|
||||
*
|
||||
* @param authenticationService the authentication service
|
||||
*/
|
||||
public void setAuthenticationService(AuthenticationService authenticationService)
|
||||
{
|
||||
this.authenticationService = authenticationService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialise method
|
||||
*/
|
||||
@@ -231,6 +207,9 @@ public class CopyServiceImpl implements CopyService
|
||||
throw new UnsupportedOperationException("Copying nodes across stores is not currently supported.");
|
||||
}
|
||||
|
||||
// Clear out any record of copied associations
|
||||
TransactionalResourceHelper.getList(KEY_POST_COPY_ASSOCS).clear();
|
||||
|
||||
// Keep track of copied children
|
||||
Map<NodeRef, NodeRef> copiesByOriginals = new HashMap<NodeRef, NodeRef>(17);
|
||||
Set<NodeRef> copies = new HashSet<NodeRef>(17);
|
||||
@@ -250,6 +229,9 @@ public class CopyServiceImpl implements CopyService
|
||||
" " + copyDetails);
|
||||
}
|
||||
|
||||
// Copy an associations that were left until now
|
||||
copyPendingAssociations(copiesByOriginals);
|
||||
|
||||
// Foreach of the newly created copies call the copy complete policy
|
||||
for (Map.Entry<NodeRef, NodeRef> entry : copiesByOriginals.entrySet())
|
||||
{
|
||||
@@ -348,6 +330,9 @@ public class CopyServiceImpl implements CopyService
|
||||
// invoke the before copy policy
|
||||
invokeBeforeCopy(sourceNodeRef, targetNodeRef);
|
||||
|
||||
// Clear out any record of copied associations
|
||||
TransactionalResourceHelper.getList(KEY_POST_COPY_ASSOCS).clear();
|
||||
|
||||
// Copy
|
||||
copyProperties(copyDetails, targetNodeRef, sourceNodeTypeQName, callbacks);
|
||||
copyAspects(copyDetails, targetNodeRef, Collections.<QName>emptySet(), callbacks);
|
||||
@@ -356,6 +341,7 @@ public class CopyServiceImpl implements CopyService
|
||||
// invoke the copy complete policy
|
||||
Map<NodeRef, NodeRef> copiedNodeRefs = new HashMap<NodeRef, NodeRef>(1);
|
||||
copiedNodeRefs.put(sourceNodeRef, targetNodeRef);
|
||||
copyPendingAssociations(copiedNodeRefs); // Copy an associations that were left until now
|
||||
invokeCopyComplete(sourceNodeRef, targetNodeRef, false, copiedNodeRefs);
|
||||
}
|
||||
|
||||
@@ -522,13 +508,13 @@ public class CopyServiceImpl implements CopyService
|
||||
assocQName,
|
||||
sourceNodeTypeQName,
|
||||
targetNodeProperties);
|
||||
NodeRef targetNodeRef = targetChildAssocRef.getChildRef();
|
||||
NodeRef copyTarget = targetChildAssocRef.getChildRef();
|
||||
// Save the mapping for later
|
||||
copiesByOriginal.put(sourceNodeRef, targetNodeRef);
|
||||
copies.add(targetNodeRef);
|
||||
copiesByOriginal.put(sourceNodeRef, copyTarget);
|
||||
copies.add(copyTarget);
|
||||
|
||||
// We now have a node, so fire the BeforeCopyPolicy
|
||||
invokeBeforeCopy(sourceNodeRef, targetNodeRef);
|
||||
invokeBeforeCopy(sourceNodeRef, copyTarget);
|
||||
|
||||
// Work out which aspects still need copying. The source aspects less the default aspects
|
||||
// will give this set.
|
||||
@@ -536,29 +522,29 @@ public class CopyServiceImpl implements CopyService
|
||||
remainingAspectQNames.removeAll(defaultAspectQNames);
|
||||
|
||||
// Prevent any rules being fired on the new destination node
|
||||
this.ruleService.disableRules(targetNodeRef);
|
||||
this.ruleService.disableRules(copyTarget);
|
||||
try
|
||||
{
|
||||
// Apply the remaining aspects and properties
|
||||
for (QName remainingAspectQName : remainingAspectQNames)
|
||||
{
|
||||
copyProperties(copyDetails, targetNodeRef, remainingAspectQName, callbacks);
|
||||
copyProperties(copyDetails, copyTarget, remainingAspectQName, callbacks);
|
||||
}
|
||||
|
||||
// Copy residual properties
|
||||
copyResidualProperties(copyDetails, targetNodeRef);
|
||||
copyResidualProperties(copyDetails, copyTarget);
|
||||
|
||||
// Apply the copy aspect to the new node
|
||||
Map<QName, Serializable> copyProperties = new HashMap<QName, Serializable>();
|
||||
copyProperties.put(ContentModel.PROP_COPY_REFERENCE, sourceNodeRef);
|
||||
internalNodeService.addAspect(targetNodeRef, ContentModel.ASPECT_COPIEDFROM, copyProperties);
|
||||
internalNodeService.addAspect(copyTarget, ContentModel.ASPECT_COPIEDFROM, copyProperties);
|
||||
|
||||
// Do not copy permissions
|
||||
|
||||
// We present the recursion option regardless of what the client chooses
|
||||
copyChildren(
|
||||
copyDetails,
|
||||
targetNodeRef,
|
||||
copyTarget,
|
||||
true, // We know that the node has been created
|
||||
copyChildren,
|
||||
copiesByOriginal,
|
||||
@@ -567,10 +553,10 @@ public class CopyServiceImpl implements CopyService
|
||||
}
|
||||
finally
|
||||
{
|
||||
this.ruleService.enableRules(targetNodeRef);
|
||||
this.ruleService.enableRules(copyTarget);
|
||||
}
|
||||
|
||||
return targetNodeRef;
|
||||
return copyTarget;
|
||||
}
|
||||
|
||||
private Set<QName> getDefaultAspects(QName sourceNodeTypeQName)
|
||||
@@ -715,6 +701,57 @@ public class CopyServiceImpl implements CopyService
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Copy any remaining associations that could not be copied or ignored during the copy process.
|
||||
* See <a href=http://issues.alfresco.com/jira/browse/ALF-958>ALF-958: Target associations aren't copied</a>.
|
||||
*/
|
||||
private void copyPendingAssociations(Map<NodeRef, NodeRef> copiedNodeRefs)
|
||||
{
|
||||
// Prepare storage for post-copy association handling
|
||||
List<Pair<AssociationRef, AssocCopyTargetAction>> postCopyAssocs =
|
||||
TransactionalResourceHelper.getList(KEY_POST_COPY_ASSOCS);
|
||||
for (Pair<AssociationRef, AssocCopyTargetAction> pair : postCopyAssocs)
|
||||
{
|
||||
AssociationRef assocRef = pair.getFirst();
|
||||
AssocCopyTargetAction action = pair.getSecond();
|
||||
// Was the original target copied?
|
||||
NodeRef newSourceForAssoc = copiedNodeRefs.get(assocRef.getSourceRef());
|
||||
if (newSourceForAssoc == null)
|
||||
{
|
||||
// Developer #fail
|
||||
throw new IllegalStateException("Post-copy association has a source that was NOT copied.");
|
||||
}
|
||||
NodeRef oldTargetForAssoc = assocRef.getTargetRef();
|
||||
NodeRef newTargetForAssoc = copiedNodeRefs.get(oldTargetForAssoc); // May be null
|
||||
QName assocTypeQName = assocRef.getTypeQName();
|
||||
switch (action)
|
||||
{
|
||||
case USE_ORIGINAL_TARGET:
|
||||
internalNodeService.createAssociation(newSourceForAssoc, oldTargetForAssoc, assocTypeQName);
|
||||
break;
|
||||
case USE_COPIED_TARGET:
|
||||
// Do nothing if the target was not copied
|
||||
if (newTargetForAssoc != null)
|
||||
{
|
||||
internalNodeService.createAssociation(newSourceForAssoc, newTargetForAssoc, assocTypeQName);
|
||||
}
|
||||
break;
|
||||
case USE_COPIED_OTHERWISE_ORIGINAL_TARGET:
|
||||
if (newTargetForAssoc == null)
|
||||
{
|
||||
internalNodeService.createAssociation(newSourceForAssoc, oldTargetForAssoc, assocTypeQName);
|
||||
}
|
||||
else
|
||||
{
|
||||
internalNodeService.createAssociation(newSourceForAssoc, newTargetForAssoc, assocTypeQName);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("Unknown association action: " + action);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the copy details. This calls the appropriate policies that have been registered
|
||||
@@ -951,8 +988,8 @@ public class CopyServiceImpl implements CopyService
|
||||
*/
|
||||
private void copyChildren(
|
||||
CopyDetails copyDetails,
|
||||
NodeRef targetNodeRef,
|
||||
boolean targetNodeIsNew,
|
||||
NodeRef copyTarget,
|
||||
boolean copyTargetIsNew,
|
||||
boolean copyChildren,
|
||||
Map<NodeRef, NodeRef> copiesByOriginals,
|
||||
Set<NodeRef> copies,
|
||||
@@ -964,8 +1001,8 @@ public class CopyServiceImpl implements CopyService
|
||||
copyChildren(
|
||||
copyDetails,
|
||||
sourceNodeTypeQName,
|
||||
targetNodeRef,
|
||||
targetNodeIsNew,
|
||||
copyTarget,
|
||||
copyTargetIsNew,
|
||||
copyChildren,
|
||||
copiesByOriginals,
|
||||
copies,
|
||||
@@ -981,8 +1018,8 @@ public class CopyServiceImpl implements CopyService
|
||||
copyChildren(
|
||||
copyDetails,
|
||||
aspectQName,
|
||||
targetNodeRef,
|
||||
targetNodeIsNew,
|
||||
copyTarget,
|
||||
copyTargetIsNew,
|
||||
copyChildren,
|
||||
copiesByOriginals,
|
||||
copies,
|
||||
@@ -990,14 +1027,15 @@ public class CopyServiceImpl implements CopyService
|
||||
}
|
||||
}
|
||||
|
||||
private static final String KEY_POST_COPY_ASSOCS = "CopyServiceImpl.postCopyAssocs";
|
||||
/**
|
||||
* @param copyChildren <tt>false</tt> if the client selected not to recurse
|
||||
*/
|
||||
private void copyChildren(
|
||||
CopyDetails copyDetails,
|
||||
QName classQName,
|
||||
NodeRef targetNodeRef,
|
||||
boolean targetNodeIsNew,
|
||||
NodeRef copyTarget,
|
||||
boolean copyTargetIsNew,
|
||||
boolean copyChildren,
|
||||
Map<NodeRef, NodeRef> copiesByOriginals,
|
||||
Set<NodeRef> copies,
|
||||
@@ -1017,17 +1055,84 @@ public class CopyServiceImpl implements CopyService
|
||||
{
|
||||
throw new IllegalStateException("Source node class has no callback: " + classQName);
|
||||
}
|
||||
for (Map.Entry<QName, ChildAssociationDefinition> entry : classDef.getChildAssociations().entrySet())
|
||||
|
||||
// Prepare storage for post-copy association handling
|
||||
List<Pair<AssociationRef, AssocCopyTargetAction>> postCopyAssocs =
|
||||
TransactionalResourceHelper.getList(KEY_POST_COPY_ASSOCS);
|
||||
|
||||
// Handle peer associations.
|
||||
for (Map.Entry<QName, AssociationDefinition> entry : classDef.getAssociations().entrySet())
|
||||
{
|
||||
QName assocTypeQName = entry.getKey();
|
||||
ChildAssociationDefinition assocDef = entry.getValue();
|
||||
if (!assocDef.isChild())
|
||||
AssociationDefinition assocDef = entry.getValue();
|
||||
if (assocDef.isChild())
|
||||
{
|
||||
continue; // Ignore child assocs
|
||||
}
|
||||
boolean haveRemovedFromCopyTarget = false;
|
||||
// Get the associations
|
||||
List<AssociationRef> assocRefs = nodeService.getTargetAssocs(sourceNodeRef, assocTypeQName);
|
||||
for (AssociationRef assocRef : assocRefs)
|
||||
{
|
||||
// Get the copy action for the association instance
|
||||
CopyAssociationDetails assocCopyDetails = new CopyAssociationDetails(
|
||||
assocRef,
|
||||
copyTarget,
|
||||
copyTargetIsNew);
|
||||
Pair<AssocCopySourceAction, AssocCopyTargetAction> assocCopyAction = callback.getAssociationCopyAction(
|
||||
classQName,
|
||||
copyDetails,
|
||||
assocCopyDetails);
|
||||
|
||||
// Consider the source side first
|
||||
switch (assocCopyAction.getFirst())
|
||||
{
|
||||
case IGNORE:
|
||||
continue; // Do nothing
|
||||
case COPY_REMOVE_EXISTING:
|
||||
if (!copyTargetIsNew && !haveRemovedFromCopyTarget)
|
||||
{
|
||||
// Only do this if we are copying over an existing node and we have NOT
|
||||
// already cleaned up for this association type
|
||||
haveRemovedFromCopyTarget = true;
|
||||
for (AssociationRef assocToRemoveRef : internalNodeService.getTargetAssocs(copyTarget, assocTypeQName))
|
||||
{
|
||||
internalNodeService.removeAssociation(assocToRemoveRef.getSourceRef(), assocToRemoveRef.getTargetRef(), assocTypeQName);
|
||||
}
|
||||
}
|
||||
// Fall through to copy
|
||||
case COPY:
|
||||
// Record the type of target behaviour that is expected
|
||||
switch (assocCopyAction.getSecond())
|
||||
{
|
||||
case USE_ORIGINAL_TARGET:
|
||||
case USE_COPIED_TARGET:
|
||||
case USE_COPIED_OTHERWISE_ORIGINAL_TARGET:
|
||||
// Have to save for later to see if the target node is copied, too
|
||||
postCopyAssocs.add(new Pair<AssociationRef, AssocCopyTargetAction>(assocRef, assocCopyAction.getSecond()));
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("Unknown association target copy action: " + assocCopyAction);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("Unknown association source copy action: " + assocCopyAction);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Handle child associations. These need special attention due to their recursive nature.
|
||||
for (Map.Entry<QName, ChildAssociationDefinition> childEntry : classDef.getChildAssociations().entrySet())
|
||||
{
|
||||
QName childAssocTypeQName = childEntry.getKey();
|
||||
ChildAssociationDefinition childAssocDef = childEntry.getValue();
|
||||
if (!childAssocDef.isChild())
|
||||
{
|
||||
continue; // Ignore non-child assocs
|
||||
}
|
||||
// Get the child associations
|
||||
List<ChildAssociationRef> childAssocRefs = nodeService.getChildAssocs(
|
||||
sourceNodeRef, assocTypeQName, RegexQNamePattern.MATCH_ALL);
|
||||
sourceNodeRef, childAssocTypeQName, RegexQNamePattern.MATCH_ALL);
|
||||
for (ChildAssociationRef childAssocRef : childAssocRefs)
|
||||
{
|
||||
NodeRef childNodeRef = childAssocRef.getChildRef();
|
||||
@@ -1035,8 +1140,8 @@ public class CopyServiceImpl implements CopyService
|
||||
|
||||
CopyChildAssociationDetails childAssocCopyDetails = new CopyChildAssociationDetails(
|
||||
childAssocRef,
|
||||
targetNodeRef,
|
||||
targetNodeIsNew,
|
||||
copyTarget,
|
||||
copyTargetIsNew,
|
||||
copyChildren);
|
||||
|
||||
// Handle nested copies
|
||||
@@ -1054,7 +1159,7 @@ public class CopyServiceImpl implements CopyService
|
||||
// of the same type. This is ignorable.
|
||||
continue;
|
||||
}
|
||||
// Check the callbacks
|
||||
// Get the copy action for the association instance
|
||||
ChildAssocCopyAction childAssocCopyAction = callback.getChildAssociationCopyAction(
|
||||
classQName,
|
||||
copyDetails,
|
||||
@@ -1064,7 +1169,7 @@ public class CopyServiceImpl implements CopyService
|
||||
case IGNORE:
|
||||
break;
|
||||
case COPY_ASSOC:
|
||||
nodeService.addChild(targetNodeRef, childNodeRef, assocTypeQName, assocQName);
|
||||
nodeService.addChild(copyTarget, childNodeRef, childAssocTypeQName, assocQName);
|
||||
break;
|
||||
case COPY_CHILD:
|
||||
// Handle potentially cyclic relationships
|
||||
@@ -1073,7 +1178,7 @@ public class CopyServiceImpl implements CopyService
|
||||
// This is either a cyclic relationship or there are multiple different
|
||||
// types of associations between the same parent and child.
|
||||
// Just hook the child up with the association.
|
||||
nodeService.addChild(targetNodeRef, childNodeRef, assocTypeQName, assocQName);
|
||||
nodeService.addChild(copyTarget, childNodeRef, childAssocTypeQName, assocQName);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1096,8 +1201,8 @@ public class CopyServiceImpl implements CopyService
|
||||
}
|
||||
// This copy may fail silently
|
||||
copyImpl(
|
||||
childNodeRef, targetNodeRef,
|
||||
assocTypeQName, assocQName,
|
||||
childNodeRef, copyTarget,
|
||||
childAssocTypeQName, assocQName,
|
||||
copyChildren, false, // Keep child names for deep copies
|
||||
copiesByOriginals, copies);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user