mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-07 18:25:23 +00:00
34397: ALF-13064: Updated document lib WebScript to protect against access errors dealing with permissions of locked documents 34406: ALF-13069: Fix flash upload file selection page title corruption 34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode) 34439: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX 34438: Fix to issue where new Hazelcast based Share clustering was broken by a recent SpringSurf change to ServletRequestContextFactory bean config in libs rev 1028 or higher. 34443: ALF-11433: IE8 specific fix to ensure that document-picker panel is hidden before documents selected event is fired and for TinyMCE to set focus on editor so that content is added correctly 34457: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 34354: ALF-12995 - IMAP: File is modified when received as a message in IMAP account 34444: ALF-12169: Guest/guest/gUest username is now normalized to corresponding person's user ID during authentication, solving problems with synchronization with Active Directory's Guest account 34454: Java 1.6.0_31 for 3.4.9 and 4.0.2 34458: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 34392: ALF-13146: Merged V4.0-BUG-FIX to V3.4-BUG-FIX 33813: ALF-12736: Stack specific: 'Getting updates failed' notification appears when non-admin user creats DWS - From Pavel: "Some users from ldap don't have lastName. That is why NPE occurs." 34459: Merged V4.0 to V4.0-BUG-FIX 34391: Merged DEV to V4.0 (with corrections) 34390: ALF-13013 : It's impossible to change Activities Feed properties on Websphere Now the Schedule subtree in JMX is set to the correct MBeanServer. 34407: Merged HEAD-2011_12_06 to V4.0 (4.0.1) Updated copyrights 32813: ALF-4098: WCM: Assets in in-flight worflow are allowed to be edited. Ability of editing assets submitted to 'in-flight' workflow has been removed: - .AVMSyncService. service interface was expanded with new method .List<AVMDifference> compare(int srcVersion, String srcPath, int dstVersion, String dstPath, NameMatcher excluder, boolean expandDirs). to introduce ability of collecting all created/modified items in created/modified folder; - all .AVMSyncService. implementations were expanded in accordance with changes in interface; - new tests for newly created items, items in modified folder and for deleted items in modified folder were added 34414: ALF-11607: Bootstrap fails against database 'DB2/LINUXX8664' - Patched hibernate jar to recognize DB2 64 bit Linux 34416: ALF-12992: Updated weblogic DD for SOLR git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
95 lines
4.1 KiB
Java
95 lines
4.1 KiB
Java
/*
|
|
* Copyright (C) 2005-2012 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
package org.alfresco.service.cmr.avmsync;
|
|
|
|
import java.util.List;
|
|
|
|
import org.alfresco.util.NameMatcher;
|
|
|
|
/**
|
|
* This service handles comparisons and synchronizations between
|
|
* corresponding avm node trees.
|
|
* @author britt
|
|
*/
|
|
public interface AVMSyncService
|
|
{
|
|
/**
|
|
* Get a difference list between two corresponding node trees.
|
|
* @param srcVersion The version id for the source tree.
|
|
* @param srcPath The avm path to the source tree.
|
|
* @param dstVersion The version id for the destination tree.
|
|
* @param dstPath The avm path to the destination tree.
|
|
* @param excluder A NameMatcher used to exclude files from consideration.
|
|
* @return A List of AVMDifference structs which can be used for
|
|
* the update operation.
|
|
*/
|
|
public List<AVMDifference> compare(int srcVersion, String srcPath,
|
|
int dstVersion, String dstPath,
|
|
NameMatcher excluder);
|
|
|
|
/**
|
|
* Get a difference list between two corresponding node trees
|
|
*
|
|
* Note: new/modified directories can be optionally expanded to include new/modified children
|
|
*/
|
|
public List<AVMDifference> compare(int srcVersion, String srcPath,
|
|
int dstVersion, String dstPath,
|
|
NameMatcher excluder,
|
|
boolean expandDirs);
|
|
|
|
/**
|
|
* Updates the destination nodes in the AVMDifferences
|
|
* with the source nodes. Normally any conflicts or cases in
|
|
* which the source of an AVMDifference is older than the destination
|
|
* will cause the transaction to roll back.
|
|
* @param diffList A List of AVMDifference structs.
|
|
* @param ignoreConflicts If this is true the update will skip those
|
|
* AVMDifferences which are in conflict with
|
|
* the destination.
|
|
* @param ignoreOlder If this is true the update will skip those
|
|
* AVMDifferences which have the source older than the destination.
|
|
* @param overrideConflicts If this is true the update will override conflicting
|
|
* AVMDifferences and replace the destination with the conflicting source.
|
|
* @param overrideOlder If this is true the update will override AVMDifferences
|
|
* in which the source is older than the destination and overwrite the destination.
|
|
* @param tag Short comment.
|
|
* @param description Full update blurb.
|
|
*/
|
|
public void update(List<AVMDifference> diffList, NameMatcher excluder, boolean ignoreConflicts, boolean ignoreOlder,
|
|
boolean overrideConflicts, boolean overrideOlder, String tag, String description);
|
|
|
|
/**
|
|
* Flattens a layer so that all all nodes under and including
|
|
* <code>layerPath</code> become translucent to any nodes in the
|
|
* corresponding location under and including <code>underlyingPath</code>
|
|
* that are the same version.
|
|
* @param layerPath The overlying layer path.
|
|
* @param underlyingPath The underlying path.
|
|
*/
|
|
public void flatten(String layerPath, String underlyingPath);
|
|
|
|
/**
|
|
* Takes a layer, deletes it and recreates it pointing at the same underlying
|
|
* node. Any changes in the layer are lost (except to history if the layer has been
|
|
* snapshotted.)
|
|
* @param layerPath
|
|
*/
|
|
public void resetLayer(String layerPath);
|
|
}
|