mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
20025: Created Enterprise branch V3.3 20026: ALF-2597 : IMAP : permissions on home space. - now, by default, people can't read other's mail. 20030: Merged BRANCHES/V3.2 to BRANCHES/V3.3: 19919: Merged BRANCHES/V3.1 to BRANCHES/V3.2: 19766: Fixed ALF-2351: Oracle upgrade scripts need enhancements from 2.2SP7 20027: Merged BRANCHES/V3.1 to BRANCHES/V3.2: 19983: Changes for ALF-2545: Cannot upgrade from 2.1.2a (b 209) to the 3.1.2 (.a3 458) on Oracle 20008: ALF-2351: Oracle upgrade scripts need enhancements from 2.2SP7 20032: Merged HEAD to BRANCHES/V3.3 (RECORD ONLY) 20031: Fix ALF-2626 - Share Repository browser broken 20035: Enterprise branding for Share & Explorer - DO NOT MERGE (RECORD ONLY) Also: SAIL-282: Update the Help URLs for 3.3 Enterprise 20039: Fix ALF-2393 - Alfresco Comunity 3.3 deployment error on JBoss v6 20044: Fix ALF-750 (versioning does not persist node associations) - TODO: review version migrator (if upgrading directly from Ent 2.x to Ent 3.3) 20049: Merged PATCHES/V3.2.r to BRANCHES/V3.3 20047: Fix for ALF-2640: Share: Edit Offline and Upload New Version fails with HTML uploader on FF3.5, works on IE 20054: Fix ALF-750 (versioning does not persist node associations) - update version migrator (only applies if not already run, ie. upgrading directly from Ent 2.x to Ent 3.3) 20057: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20033: Accordion example was broken when FDK is deployed as a JAR 20064: Fix for ALF-2623: Alfresco 3.3G's Share site is prone to cross site scripting attacks - Bug is actually in the wiki components 20065: Fix unreported issue (auto-versioning for metadata-only updates stops working after checkin) & additional improvements to LockService - explicitly remove lockable aspect (rather than nullifying properties) for unlock / checkin - use txn resource to track ignorable nodes (for lockable aspect behaviours) - note: currently affects Alfresco Explorer only (since Alfresco Share explicitly disables autoVersionOnUpdateProps) 20066: Increased PermGen space for tests to 256M from 128M 20071: AVM - check for circular layered directories (ALF-813 / ALF-910) 20073: Fix LockService tests - fix typo (introduced in r20065) - TODO: review LockOwnerDynamicAuthorityTest.testCheckOutCheckInAuthorities 20076: Fix LockOwnerDynamicAuthorityTest.testCheckOutCheckInAuthorities 20078: Fixed ALF-2464 "Missing i18n labels when rules fail to run" 20081: Fixed ALF-1626 "The position:absolute behaviour of the Flash preview container needs a re-think" - Now handles long file names (resize was already fixed) 20083: Fix for ALF-2708: Unmodifiable exception thrown when Web Script f/w attempts to report error (latest Spring Surf webscripts libraries) 20084: Fixed ALF-253 "Unfriendly message appears when trying to login with username which contains symbol '\'" - also fixed bug whereerror messages for illegal characters was displayed as undefined for FF on Mac 20085: Merging HEAD into BRANCHES/V3.3: 20074: ALF-959 The invitation email 'subject' can now be set as a localizable property in invitation-services.properties: 20080: Fixing failing test InvitationServiceImplTest. 20087: ALF-1498: RM web script puts Alfresco in endless loop This was a general issue with the onUpdateProperties behaviour in the versionable aspect. This code now disables the behaviour whilst it is executing to prevent the endless loop occuring. 20088: Fixed an issue when uploading 2 or more documents for a new site. - A failure occured since it asynchronously tried to create the documentLibrary container twice and the second attempt failed since it already existed. 20089: SAIL-356: Action label changes 20090: Dynamic models: minor improvements to DictionaryModelType - add (optional) concurrency locking - remove duplicate bean def - bind remaining class behaviours (onCreateNode, onRemoveAspect) based on type 20091: Fixed ALF-1046 "Leave button is displayed for admin on Site Finder page near private site where admin is not invited" 20092: Merged DEV/BELARUS/V3.2-2010_03_17 to V3.3 20043: ALF-928: Upgrade from 2.1.7 to 3.2 with lots of content items - GC overhead limit exceeded exception Call getChildAssocs(NodeRef, QNamePattern, QNamePattern, boolean) with a value of 'false' for the preload argument to avoid preloading all the child nodes 20093: Fix for ALF-2721: Upgrade clean 2.2.current + 20k users to 3.3.current fails in CalendarModelUriPatch updating URI that does not exist 20094: ALF-2630: LDAP differential sync was failing to sync group memberships of users who themselves hadn't changed - New post process deals with group associations of unprocessed users - Modified unit test to properly simulate differential sync 20095: Fix for ALF-2715: Rule creation in Alfresco Share 3.3G leads to an "Internal Server Error" failure message 20096: Fix webview and wiki dashlet titles in yellow and gdocs themes. 20097: Follow-up fix to cross-browser WebView dashlet (iframe) resizing 20098: Workaround for ALF-2211: Share - Accessing User homes from Share/JSF integration freezes the browser. - The tree control has been given a configurable maximum folder count setting for both Site and Repository working modes. By default these are "unlimited" in Site mode and 500 in Repository mode. These values can be overridden in share-config-custom.xml - see the sample configuration file for details. - The workaround is to display a "Too many sub-folders to display" message when the maximum number of folders has been reached. - To aid users to select their User Home space (or sub-folder thereof) for Copy and Move actions, a new "My User Home" button is provided on the folder picker control. 20099: Fix for ALF-2606: Manage Permissions on multiple nodes. - Toolbar action removed when in Repository Browser, as the fine-grained permissions page does not support multiple nodes. 20100: Merged Outlook Meeting Workspace integration from BRANCHES/DEV/BELARUS/V3.2-2010_01_11 20102: Fix for ALF-478: Authority CRC calculations must use UTF-8 20103: Follow up from ALF-253 (Unfriendly message appears when trying to login with username which contains symbol '\') - Making lastName mandatory in Share ui since service otherwise complains 20106: Fixed ALF-1041 "Revert action is available for SiteContributor and SiteConsumer" (and added a missing msg key for blogs) 20108: ALF-2235: Permission exception when creating non-electronic records by Power User with Read and File permssions 20109: Fix for ALF-2706 "ConcurrentModificationException in AsynchronousActionExecutionQueueImpl" 20110: Merge Dev to V3.3 ALF-1980 - Huge UIDVALIDITY giving IMAP client problems 20111: Latest webeditor JAR containing change to orientation strings in WEF 20113: Fix Share DocLib copy/move actions from recent refactor. Picker now appears with correct Site/Repository mode set upon opening. 20114: Fix for ALF-2726: 'Transform and Copy content' action causes error. 20115: Fix for ALF-2697 - File encoding is hard-coded for upload.post.js (Webscript API) 20116: Fix for ALF-1090 20119: ALF-2734 - Incorrect behaviour on creating google docs in Repository Browser 20120: Enterprise build fix for Index check tests - disable user usage updates - this should not be required 20121: ALF-959 The site name/title should now correctly appear in the invite email subject, replacing '{0}'. 20123: Merged HEAD to V3.3 (RECORD ONLY) 20122: First part of fix for ALF-2718: DOD5015 module breaks CMIS Atom DiscoveryService webscripts 20126: Fix rule rest api json so numbers are not incorrectly formatted. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
626 lines
27 KiB
Java
626 lines
27 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 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.repo.version;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
|
|
import org.alfresco.model.ContentModel;
|
|
import org.alfresco.repo.node.integrity.IntegrityChecker;
|
|
import org.alfresco.repo.policy.PolicyComponent;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
|
import org.alfresco.service.cmr.coci.CheckOutCheckInService;
|
|
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
|
import org.alfresco.service.cmr.repository.AssociationRef;
|
|
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
|
import org.alfresco.service.cmr.repository.ContentWriter;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.cmr.repository.NodeService;
|
|
import org.alfresco.service.cmr.version.Version;
|
|
import org.alfresco.service.cmr.version.VersionHistory;
|
|
import org.alfresco.service.namespace.NamespaceService;
|
|
import org.alfresco.service.namespace.QName;
|
|
import org.alfresco.service.namespace.RegexQNamePattern;
|
|
import org.alfresco.util.EqualsHelper;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
|
|
/**
|
|
* Test simple version store migration
|
|
*/
|
|
public class VersionMigratorTest extends BaseVersionStoreTest
|
|
{
|
|
private static Log logger = LogFactory.getLog(VersionMigratorTest.class);
|
|
|
|
protected VersionServiceImpl version1Service = new VersionServiceImpl();
|
|
|
|
protected Version2ServiceImpl version2Service;
|
|
protected NodeService versionNodeService;
|
|
|
|
protected VersionMigrator versionMigrator;
|
|
protected PolicyComponent policyComponent;
|
|
protected DictionaryService dictionaryService;
|
|
protected CheckOutCheckInService cociService;
|
|
protected IntegrityChecker integrityChecker;
|
|
|
|
public VersionMigratorTest()
|
|
{
|
|
//super.setDefaultRollback(false); // default is true
|
|
}
|
|
|
|
protected void onSetUpInTransaction() throws Exception
|
|
{
|
|
super.onSetUpInTransaction();
|
|
|
|
this.versionMigrator = (VersionMigrator)applicationContext.getBean("versionMigrator");
|
|
this.policyComponent = (PolicyComponent)applicationContext.getBean("policyComponent");
|
|
this.dictionaryService = (DictionaryService)applicationContext.getBean("dictionaryService");
|
|
this.version2Service = (Version2ServiceImpl)applicationContext.getBean("versionService");
|
|
this.versionNodeService = (NodeService)applicationContext.getBean("versionNodeService"); // note: auto-switches between V1 and V2
|
|
|
|
this.cociService = (CheckOutCheckInService)applicationContext.getBean("CheckoutCheckinService");
|
|
this.integrityChecker = (IntegrityChecker)applicationContext.getBean("integrityChecker");
|
|
|
|
// Version1Service is used to create the version nodes in Version1Store (workspace://lightWeightVersionStore)
|
|
version1Service.setDbNodeService(dbNodeService);
|
|
version1Service.setNodeService(dbNodeService);
|
|
version1Service.setPolicyComponent(policyComponent);
|
|
version1Service.setDictionaryService(dictionaryService);
|
|
version1Service.initialiseWithoutBind(); // TODO - temp - if use intialise, get: "More than one CalculateVersionLabelPolicy behaviour has been registered for the type {http://www.alfresco.org/model/content/1.0}content"
|
|
|
|
super.setVersionService(version1Service);
|
|
}
|
|
|
|
/**
|
|
* Test migration of a simple versioned node (one version, no children)
|
|
*/
|
|
public void testMigrateOneVersion() throws Exception
|
|
{
|
|
if (version2Service.useDeprecatedV1 == true)
|
|
{
|
|
logger.info("testMigrateOneVersion: skip");
|
|
return;
|
|
}
|
|
|
|
NodeRef versionableNode = createNewVersionableNode();
|
|
|
|
logger.info("testMigrateOneVersion: versionedNodeRef = " + versionableNode);
|
|
|
|
// Get the next version label
|
|
String nextVersionLabel = peekNextVersionLabel(versionableNode, versionProperties);
|
|
|
|
// Snap-shot the node created date-time
|
|
Date beforeVersionDate = (Date)nodeService.getProperty(versionableNode, ContentModel.PROP_CREATED);
|
|
long beforeVersionTime = beforeVersionDate.getTime();
|
|
logger.info("beforeVersion Date/Time: " + beforeVersionDate + " [" + beforeVersionTime + "]");
|
|
|
|
Version oldVersion = createVersion(versionableNode);
|
|
|
|
// get and store old version details for later comparison - versionNodeService will retrieve these from the old version store
|
|
|
|
QName oldVersionType = versionNodeService.getType(oldVersion.getFrozenStateNodeRef());
|
|
Set<QName> oldVersionAspects = versionNodeService.getAspects(oldVersion.getFrozenStateNodeRef());
|
|
Map<QName, Serializable> oldVersionProps = versionNodeService.getProperties(oldVersion.getFrozenStateNodeRef());
|
|
|
|
logger.info("oldVersion props: " + oldVersion);
|
|
logger.info("oldVersion created: " + oldVersion.getFrozenModifiedDate() + " [" + oldVersion.getFrozenModifiedDate().getTime()+"]");
|
|
|
|
logger.info("oldVersion props via versionNodeService: " + oldVersionProps);
|
|
|
|
VersionHistory vh = version1Service.getVersionHistory(versionableNode);
|
|
assertEquals(1, vh.getAllVersions().size());
|
|
|
|
NodeRef oldVHNodeRef = version1Service.getVersionHistoryNodeRef(versionableNode);
|
|
|
|
Thread.sleep(70000);
|
|
|
|
// Migrate and delete old version history !
|
|
NodeRef versionedNodeRef = versionMigrator.v1GetVersionedNodeRef(oldVHNodeRef);
|
|
NodeRef newVHNodeRef = versionMigrator.migrateVersionHistory(oldVHNodeRef, versionedNodeRef);
|
|
versionMigrator.v1DeleteVersionHistory(oldVHNodeRef);
|
|
|
|
VersionHistory vh2 = version2Service.getVersionHistory(versionableNode);
|
|
assertEquals(1, vh2.getAllVersions().size());
|
|
|
|
Version newVersion = vh2.getRootVersion();
|
|
|
|
logger.info("newVersion props: " + newVersion);
|
|
logger.info("newVersion created: " + newVersion.getFrozenModifiedDate() + " [" + newVersion.getFrozenModifiedDate().getTime()+"]");
|
|
|
|
// check new version - switch to new version service to do the check
|
|
super.setVersionService(version2Service);
|
|
checkNewVersion(beforeVersionTime, nextVersionLabel, newVersion, versionableNode);
|
|
|
|
// get and compare new version details - - versionNodeService will retrieve these from the new version store
|
|
|
|
QName newVersionType = versionNodeService.getType(newVersion.getFrozenStateNodeRef());
|
|
Set<QName> newVersionAspects = versionNodeService.getAspects(newVersion.getFrozenStateNodeRef());
|
|
Map<QName, Serializable> newVersionProps = versionNodeService.getProperties(newVersion.getFrozenStateNodeRef());
|
|
|
|
logger.info("newVersion props via versionNodeService: " + newVersionProps);
|
|
|
|
assertEquals(oldVersionType, newVersionType);
|
|
|
|
assertEquals(oldVersionAspects.size(), newVersionAspects.size());
|
|
for (QName key : oldVersionAspects)
|
|
{
|
|
assertTrue(""+key, newVersionAspects.contains(key));
|
|
}
|
|
|
|
// TODO review against latest merges
|
|
/*
|
|
assertEquals(oldVersionProps.size(), newVersionProps.size());
|
|
for (QName key : oldVersionProps.keySet())
|
|
{
|
|
assertEquals(""+key, oldVersionProps.get(key), newVersionProps.get(key));
|
|
}
|
|
*/
|
|
assertEquals(oldVersionProps.size(), newVersionProps.size()+1);
|
|
for (QName key : oldVersionProps.keySet())
|
|
{
|
|
if (! key.equals(ContentModel.PROP_ACCESSED))
|
|
{
|
|
assertEquals(""+key, oldVersionProps.get(key), newVersionProps.get(key));
|
|
}
|
|
}
|
|
|
|
// ALFCOM-2658
|
|
assertEquals(oldVersion.getFrozenStateNodeRef().getId(), newVersion.getFrozenStateNodeRef().getId());
|
|
|
|
logger.info("testMigrateOneVersion: Migrated from oldVHNodeRef = " + oldVHNodeRef + " to newVHNodeRef = " + newVHNodeRef);
|
|
}
|
|
|
|
/**
|
|
* Test migration of a multiple versioned nodes
|
|
*/
|
|
public void testMigrateMultipleVersions() throws Exception
|
|
{
|
|
if (version2Service.useDeprecatedV1 == true)
|
|
{
|
|
logger.info("testMigrateOneVersion: skip");
|
|
return;
|
|
}
|
|
|
|
NodeRef versionableNode = createNewVersionableNode();
|
|
|
|
// Get the next version label and snapshot the date-time
|
|
String nextVersionLabel1 = peekNextVersionLabel(versionableNode, versionProperties);
|
|
|
|
// Snap-shot the node created date-time
|
|
long beforeVersionTime1 = ((Date)nodeService.getProperty(versionableNode, ContentModel.PROP_CREATED)).getTime();
|
|
|
|
Version version1 = createVersion(versionableNode);
|
|
logger.info(version1);
|
|
|
|
// Get the next version label and snapshot the date-time
|
|
String nextVersionLabel2 = peekNextVersionLabel(versionableNode, versionProperties);
|
|
|
|
// Snap-shot the node created date-time
|
|
long beforeVersionTime2 = ((Date)nodeService.getProperty(versionableNode, ContentModel.PROP_CREATED)).getTime();
|
|
|
|
Version version2 = createVersion(versionableNode);
|
|
logger.info(version2);
|
|
|
|
// Get the next version label and snapshot the date-time
|
|
String nextVersionLabel3 = peekNextVersionLabel(versionableNode, versionProperties);
|
|
|
|
// Snap-shot the node created date-time
|
|
long beforeVersionTime3 = ((Date)nodeService.getProperty(versionableNode, ContentModel.PROP_CREATED)).getTime();
|
|
|
|
Version version3 = createVersion(versionableNode);
|
|
logger.info(version3);
|
|
|
|
VersionHistory vh1 = version1Service.getVersionHistory(versionableNode);
|
|
assertEquals(3, vh1.getAllVersions().size());
|
|
|
|
logger.info("testMigrateMultipleVersions: versionedNodeRef = " + versionableNode);
|
|
|
|
NodeRef oldVHNodeRef = version1Service.getVersionHistoryNodeRef(versionableNode);
|
|
|
|
// Migrate and delete old version history !
|
|
NodeRef versionedNodeRef = versionMigrator.v1GetVersionedNodeRef(oldVHNodeRef);
|
|
NodeRef newVHNodeRef = versionMigrator.migrateVersionHistory(oldVHNodeRef, versionedNodeRef);
|
|
versionMigrator.v1DeleteVersionHistory(oldVHNodeRef);
|
|
|
|
VersionHistory vh2 = version2Service.getVersionHistory(versionableNode);
|
|
assertEquals(3, vh2.getAllVersions().size());
|
|
|
|
// TODO move check version history into BaseVersionStoreTest
|
|
// check new versions - switch to new version service to do the check
|
|
super.setVersionService(version2Service);
|
|
|
|
Version[] newVersions = vh2.getAllVersions().toArray(new Version[]{});
|
|
|
|
checkVersion(beforeVersionTime1, nextVersionLabel1, newVersions[2], versionableNode);
|
|
checkVersion(beforeVersionTime2, nextVersionLabel2, newVersions[1], versionableNode);
|
|
checkNewVersion(beforeVersionTime3, nextVersionLabel3, newVersions[0], versionableNode);
|
|
|
|
// ALFCOM-2658
|
|
assertEquals(version1.getFrozenStateNodeRef().getId(), newVersions[2].getFrozenStateNodeRef().getId());
|
|
assertEquals(version2.getFrozenStateNodeRef().getId(), newVersions[1].getFrozenStateNodeRef().getId());
|
|
assertEquals(version3.getFrozenStateNodeRef().getId(), newVersions[0].getFrozenStateNodeRef().getId());
|
|
|
|
logger.info("testMigrateMultipleVersions: Migrated from oldVHNodeRef = " + oldVHNodeRef + " to newVHNodeRef = " + newVHNodeRef);
|
|
}
|
|
|
|
public void testMigrateMultipleNodesSuccessful() throws Exception
|
|
{
|
|
testMigrateMultipleNodes(false);
|
|
}
|
|
|
|
public void test_ETHREEOH_2091() throws Exception
|
|
{
|
|
// test partial migration (with skipped nodes)
|
|
testMigrateMultipleNodes(true);
|
|
}
|
|
|
|
/**
|
|
* Test migration of a multiple nodes (each with one version)
|
|
*/
|
|
private void testMigrateMultipleNodes(final boolean withSkip)
|
|
{
|
|
if (version2Service.useDeprecatedV1 == true)
|
|
{
|
|
logger.info("testMigrateOneVersion: skip");
|
|
return;
|
|
}
|
|
|
|
final int nodeCount = 5;
|
|
assert(nodeCount > 3);
|
|
|
|
final NodeRef[] versionableNodes = new NodeRef[nodeCount];
|
|
|
|
setComplete();
|
|
endTransaction();
|
|
|
|
RetryingTransactionHelper txHelper = transactionService.getRetryingTransactionHelper();
|
|
|
|
for (int i = 0; i < nodeCount; i++)
|
|
{
|
|
final int idx = i;
|
|
|
|
txHelper.doInTransaction(new RetryingTransactionCallback<NodeRef>()
|
|
{
|
|
public NodeRef execute() throws Throwable
|
|
{
|
|
NodeRef versionableNode = null;
|
|
if ((idx % 2) == 0)
|
|
{
|
|
versionableNode = createNewVersionableNode();
|
|
}
|
|
else
|
|
{
|
|
versionableNode = createNewVersionableContentNode(true);
|
|
}
|
|
createVersion(versionableNode);
|
|
versionableNodes[idx] = versionableNode;
|
|
|
|
return null;
|
|
}
|
|
});
|
|
}
|
|
|
|
setComplete();
|
|
endTransaction();
|
|
|
|
txHelper.doInTransaction(new RetryingTransactionCallback<NodeRef>()
|
|
{
|
|
public NodeRef execute() throws Throwable
|
|
{
|
|
// check old version histories
|
|
for (int i = 0; i< nodeCount; i++)
|
|
{
|
|
VersionHistory vh1 = version1Service.getVersionHistory(versionableNodes[i]);
|
|
assertNotNull(vh1);
|
|
assertEquals(1, vh1.getAllVersions().size());
|
|
}
|
|
|
|
return null;
|
|
}
|
|
});
|
|
|
|
setComplete();
|
|
endTransaction();
|
|
|
|
if (withSkip)
|
|
{
|
|
// remove test model - those nodes should fail - currently all - add separate create ...
|
|
|
|
// TODO ...
|
|
dictionaryDAO.removeModel(QName.createQName("http://www.alfresco.org/test/versionstorebasetest/1.0", "versionstorebasetestmodel"));
|
|
}
|
|
|
|
txHelper = transactionService.getRetryingTransactionHelper();
|
|
|
|
txHelper.doInTransaction(new RetryingTransactionCallback<NodeRef>()
|
|
{
|
|
public NodeRef execute() throws Throwable
|
|
{
|
|
// Migrate (and don't delete old version history) !
|
|
versionMigrator.migrateVersions(1, false);
|
|
|
|
return null;
|
|
}
|
|
});
|
|
|
|
setComplete();
|
|
endTransaction();
|
|
|
|
txHelper.doInTransaction(new RetryingTransactionCallback<NodeRef>()
|
|
{
|
|
public NodeRef execute() throws Throwable
|
|
{
|
|
// check new version histories
|
|
for (int i = 0; i < nodeCount; i++)
|
|
{
|
|
VersionHistory vh2 = version2Service.getVersionHistory(versionableNodes[i]);
|
|
|
|
if (withSkip && ((i % 2) == 0))
|
|
{
|
|
assertNull(vh2);
|
|
}
|
|
else
|
|
{
|
|
assertNotNull(vh2);
|
|
assertEquals(1, vh2.getAllVersions().size());
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
});
|
|
}
|
|
|
|
private NodeRef createNewVersionableContentNode(boolean versionable)
|
|
{
|
|
// Use this map to retrieve the versionable nodes in later tests
|
|
this.versionableNodes = new HashMap<String, NodeRef>();
|
|
|
|
// Create node (this node has some content)
|
|
NodeRef nodeRef = this.dbNodeService.createNode(
|
|
rootNodeRef,
|
|
ContentModel.ASSOC_CHILDREN,
|
|
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "myNode"),
|
|
ContentModel.TYPE_CONTENT,
|
|
this.nodeProperties).getChildRef();
|
|
|
|
if (versionable)
|
|
{
|
|
this.dbNodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, new HashMap<QName, Serializable>());
|
|
}
|
|
|
|
assertNotNull(nodeRef);
|
|
this.versionableNodes.put(nodeRef.getId(), nodeRef);
|
|
|
|
// Add the content to the node
|
|
ContentWriter contentWriter = this.contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
|
|
contentWriter.putContent(TEST_CONTENT);
|
|
|
|
// Set author
|
|
Map<QName, Serializable> authorProps = new HashMap<QName, Serializable>(1, 1.0f);
|
|
authorProps.put(ContentModel.PROP_AUTHOR, "Charles Dickens");
|
|
this.dbNodeService.addAspect(nodeRef, ContentModel.ASPECT_AUTHOR, authorProps);
|
|
|
|
return nodeRef;
|
|
}
|
|
|
|
public void test_ETHREEOH_1540() throws Exception
|
|
{
|
|
// Create the node used for tests
|
|
NodeRef nodeRef = nodeService.createNode(
|
|
rootNodeRef,
|
|
ContentModel.ASSOC_CHILDREN,
|
|
QName.createQName("{test}MyVersionableNode"),
|
|
TEST_TYPE_QNAME,
|
|
this.nodeProperties).getChildRef();
|
|
|
|
nodeService.addAspect(nodeRef, ContentModel.ASPECT_TITLED, null);
|
|
nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, "name");
|
|
|
|
// Add the initial content to the node
|
|
ContentWriter contentWriter = this.contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
|
|
contentWriter.setMimetype("text/plain");
|
|
contentWriter.setEncoding("UTF-8");
|
|
contentWriter.putContent("my content");
|
|
|
|
VersionHistory vh1 = version1Service.getVersionHistory(nodeRef);
|
|
assertNull(vh1);
|
|
|
|
version2Service.useDeprecatedV1 = true;
|
|
|
|
// Add the version aspect to the created node
|
|
nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null);
|
|
|
|
vh1 = version1Service.getVersionHistory(nodeRef);
|
|
assertNull(vh1);
|
|
|
|
NodeRef workingCopyNodeRef = cociService.checkout(nodeRef);
|
|
|
|
vh1 = version1Service.getVersionHistory(nodeRef);
|
|
assertNull(vh1);
|
|
|
|
int v1count = 3;
|
|
|
|
for (int i = 1; i <= v1count; i++)
|
|
{
|
|
Map<String, Serializable> versionProperties = new HashMap<String, Serializable>();
|
|
versionProperties.put(Version.PROP_DESCRIPTION, "This is a test checkin - " + i);
|
|
|
|
cociService.checkin(workingCopyNodeRef, versionProperties);
|
|
|
|
vh1 = version1Service.getVersionHistory(nodeRef);
|
|
assertEquals(i, vh1.getAllVersions().size());
|
|
|
|
workingCopyNodeRef = cociService.checkout(nodeRef);
|
|
|
|
vh1 = version1Service.getVersionHistory(nodeRef);
|
|
assertEquals(i, vh1.getAllVersions().size());
|
|
}
|
|
|
|
NodeRef oldVHNodeRef = version1Service.getVersionHistoryNodeRef(nodeRef);
|
|
|
|
version2Service.useDeprecatedV1 = false;
|
|
|
|
// Migrate and delete old version history !
|
|
NodeRef versionedNodeRef = versionMigrator.v1GetVersionedNodeRef(oldVHNodeRef);
|
|
|
|
//int nextVersionNumber = versionCounterService.nextVersionNumber(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, VersionModel.STORE_ID));
|
|
//versionCounterService.setVersionNumber(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, Version2Model.STORE_ID), nextVersionNumber);
|
|
|
|
// to force the error: https://issues.alfresco.com/jira/browse/ETHREEOH-1540
|
|
//versionCounterService.setVersionNumber(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, Version2Model.STORE_ID), 0);
|
|
|
|
NodeRef newVHNodeRef = versionMigrator.migrateVersionHistory(oldVHNodeRef, versionedNodeRef);
|
|
versionMigrator.v1DeleteVersionHistory(oldVHNodeRef);
|
|
|
|
VersionHistory vh2 = version2Service.getVersionHistory(nodeRef);
|
|
assertEquals(v1count, vh2.getAllVersions().size());
|
|
|
|
int v2count = 3;
|
|
|
|
for (int i = 1; i <= v2count; i++)
|
|
{
|
|
versionProperties = new HashMap<String, Serializable>();
|
|
versionProperties.put(Version.PROP_DESCRIPTION, "This is a test checkin - " + (v1count + i));
|
|
|
|
cociService.checkin(workingCopyNodeRef, versionProperties);
|
|
|
|
vh2 = version2Service.getVersionHistory(nodeRef);
|
|
assertEquals((v1count + i), vh2.getAllVersions().size());
|
|
|
|
workingCopyNodeRef = cociService.checkout(nodeRef);
|
|
|
|
vh2 = version2Service.getVersionHistory(nodeRef);
|
|
assertEquals((v1count + i), vh2.getAllVersions().size());
|
|
}
|
|
|
|
logger.info("testMigrateOneCheckoutVersion: Migrated from oldVHNodeRef = " + oldVHNodeRef + " to newVHNodeRef = " + newVHNodeRef);
|
|
}
|
|
|
|
/**
|
|
* Test migration of a single versioned node with versioned child assocs & peer assocs
|
|
*
|
|
* @since 3.3 Ent - applies only to direct upgrade from 2.x to 3.3 Ent or higher
|
|
*/
|
|
public void testMigrateVersionWithAssocs() throws Exception
|
|
{
|
|
if (version2Service.useDeprecatedV1 == true)
|
|
{
|
|
logger.info("testMigrateVersionWithAssocs: skip");
|
|
return;
|
|
}
|
|
|
|
NodeRef versionableNode = createNewVersionableNode();
|
|
NodeRef targetNode = createNewNode();
|
|
|
|
nodeService.createAssociation(versionableNode, targetNode, TEST_ASSOC);
|
|
|
|
// Get the next version label and snapshot the date-time
|
|
String nextVersionLabel1 = peekNextVersionLabel(versionableNode, versionProperties);
|
|
|
|
// Snap-shot the node created date-time
|
|
long beforeVersionTime1 = ((Date)nodeService.getProperty(versionableNode, ContentModel.PROP_CREATED)).getTime();
|
|
|
|
Version version1 = createVersion(versionableNode);
|
|
logger.info(version1);
|
|
|
|
VersionHistory vh1 = version1Service.getVersionHistory(versionableNode);
|
|
assertEquals(1, vh1.getAllVersions().size());
|
|
|
|
List<ChildAssociationRef> oldChildAssocs = nodeService.getChildAssocs(version1.getFrozenStateNodeRef());
|
|
List<AssociationRef> oldAssocs = nodeService.getTargetAssocs(version1.getFrozenStateNodeRef(), RegexQNamePattern.MATCH_ALL);
|
|
|
|
logger.info("testMigrateVersionWithAssocs: versionedNodeRef = " + versionableNode);
|
|
|
|
NodeRef oldVHNodeRef = version1Service.getVersionHistoryNodeRef(versionableNode);
|
|
|
|
// Migrate and delete old version history !
|
|
NodeRef versionedNodeRef = versionMigrator.v1GetVersionedNodeRef(oldVHNodeRef);
|
|
NodeRef newVHNodeRef = versionMigrator.migrateVersionHistory(oldVHNodeRef, versionedNodeRef);
|
|
versionMigrator.v1DeleteVersionHistory(oldVHNodeRef);
|
|
|
|
VersionHistory vh2 = version2Service.getVersionHistory(versionableNode);
|
|
assertEquals(1, vh2.getAllVersions().size());
|
|
|
|
// check new version - switch to new version service to do the check
|
|
super.setVersionService(version2Service);
|
|
|
|
Version[] newVersions = vh2.getAllVersions().toArray(new Version[]{});
|
|
|
|
Version newVersion1 = newVersions[0];
|
|
|
|
checkVersion(beforeVersionTime1, nextVersionLabel1, newVersion1, versionableNode);
|
|
|
|
List<ChildAssociationRef> newChildAssocs = nodeService.getChildAssocs(newVersion1.getFrozenStateNodeRef());
|
|
assertEquals(oldChildAssocs.size(), newChildAssocs.size());
|
|
for (ChildAssociationRef oldChildAssoc : oldChildAssocs)
|
|
{
|
|
boolean found = false;
|
|
for (ChildAssociationRef newChildAssoc : newChildAssocs)
|
|
{
|
|
if (newChildAssoc.getParentRef().getId().equals(oldChildAssoc.getParentRef().getId()) &&
|
|
newChildAssoc.getChildRef().equals(oldChildAssoc.getChildRef()) &&
|
|
newChildAssoc.getTypeQName().equals(oldChildAssoc.getTypeQName()) &&
|
|
newChildAssoc.getQName().equals(oldChildAssoc.getQName()) &&
|
|
(newChildAssoc.isPrimary() == oldChildAssoc.isPrimary()) &&
|
|
(newChildAssoc.getNthSibling() == oldChildAssoc.getNthSibling()))
|
|
{
|
|
found = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (! found)
|
|
{
|
|
fail(oldChildAssoc.toString()+ " not found");
|
|
}
|
|
}
|
|
|
|
List<AssociationRef> newAssocs = nodeService.getTargetAssocs(newVersion1.getFrozenStateNodeRef(), RegexQNamePattern.MATCH_ALL);
|
|
assertEquals(oldAssocs.size(), newAssocs.size());
|
|
for (AssociationRef oldAssoc : oldAssocs)
|
|
{
|
|
boolean found = false;
|
|
for (AssociationRef newAssoc : newAssocs)
|
|
{
|
|
if (newAssoc.getSourceRef().getId().equals(oldAssoc.getSourceRef().getId()) &&
|
|
newAssoc.getTargetRef().equals(oldAssoc.getTargetRef()) &&
|
|
newAssoc.getTypeQName().equals(oldAssoc.getTypeQName()) &&
|
|
EqualsHelper.nullSafeEquals(newAssoc.getId(), oldAssoc.getId()))
|
|
{
|
|
found = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (! found)
|
|
{
|
|
fail(oldAssoc.toString()+ " not found");
|
|
}
|
|
}
|
|
|
|
logger.info("testMigrateVersionWithAssocs: Migrated from oldVHNodeRef = " + oldVHNodeRef + " to newVHNodeRef = " + newVHNodeRef);
|
|
}
|
|
}
|