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

Added two new fields to VersionRoot (the version record), a short description,

Browse Source 
and a long description.  Adjusted signature of createSnapshot(), and update()
to match, and thus actions and tests that needed to be fixed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4290 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-11-05 23:41:55 +00:00
parent 2355b9e00f
commit f501073de5
24 changed files with 314 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
View File

@@ -280,10 +280,12 @@ public class AVMSyncServiceImpl implements AVMSyncService
* @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
* @param tag Short update blurb.
* @param description Full update blurb.
* in which the source is older than the destination and overwrite the destination.
*/
public void update(List<AVMDifference> diffList, boolean ignoreConflicts, boolean ignoreOlder,
boolean overrideConflicts, boolean overrideOlder)
boolean overrideConflicts, boolean overrideOlder, String tag, String description)
{
Map<String, Integer> storeVersions = new HashMap<String, Integer>();
Set<String> destStores = new HashSet<String>();
@@ -310,7 +312,7 @@ public class AVMSyncServiceImpl implements AVMSyncService
}
else
{
version = fAVMService.createSnapshot(storeName);
version = fAVMService.createSnapshot(storeName, "Snapshotted for submit.", null);
}
}
AVMNodeDescriptor srcDesc = fAVMService.lookup(version,
@@ -401,7 +403,7 @@ public class AVMSyncServiceImpl implements AVMSyncService
}
for (String storeName : destStores)
{
fAVMService.createSnapshot(storeName);
fAVMService.createSnapshot(storeName, tag, description);
}
}