mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-22 15:12:38 +00:00
20678: DAO5 branch: Preparation for merge back to HEAD
20689: Merged DAO4 to DAO5
- Removed all 'dbscripts/create/3.x/SomeDialect' and replaced with 'dbscripts/create/SomeDialect'
DB create scripts are taken from latest DAO4
- TODO: FixAuthoritiesCrcValuesPatch needs query implementation in PatchDAO
Merged DAO3 to DAO4
- Reapplied fixes for ALF-713 (race condition on Usages)
19350: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-2 to BRANCHES/DEV/V3.3-DAO-REFACTOR-3:
18939: SAIL-4 :2nd stage branch for DAO refactor off HEAD rev 18898
18948: Merged V3.3-DAO-REFACTOR to V3.3-DAO-REFACTOR-2
18202: Dev branch for DAO refactor
18252: SAIL-233: QName.hbm.xml
18295: Added missing CREATE TABLE statements for QName-related code
18324: SAIL-234: Node.hbm.xml: Node aspects initial integration
18355: Added 'setValue' method to manually update the cached value
18356: MV property stressing lowered to speed test up
18357: SAIL-234: Node.hbm.xml
18376: Pulled all Alfresco-related create SQL into script
18389: SAIL-234: Permissions DAO refactor - initial checkpoint
18390: Formatting only (line-endings)
18400: SAIL-234: Node.hbm.xml
18418: SAIL-234: Node.hbm.xml: 'alf_node_assoc' CRUD
18429: SAIL-234: Node.hbm.xml: Cleaned out all Hibernate references to NodeAssocImpl
18457: SAIL-234: Permissions DAO refactor
18959: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
18479: SAIL-234: Node.hbm.xml - fix updateNode (missing id when saving oldDummyNode)
18482: SAIL-235: remove Permissions.hbm.xml
18517: SAIL-235: Permissions DAO refactor
18523: SAIL-234: Node.hbm.xml
18524: SAIL-235: Permissions DAO refactor
18960: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
18533: Flipped back to Windows line endings
18535: Formatting-only (eol)
18540: Formatting-only (eol)
18541: SAIL-235: Permissions DAO refactor
18543: SAIL-234: Node.hbm.xml: Start alf_store changes
18567: SAIL-235: Permissions DAO refactor
18596: SAIL-305: Alfresco DDL - formatted/rationalized and added missing indexes & fk constraints
18603: SAIL-311: Minor cleanup for schema upgrade scripts (V3.3)
18604: SAIL-311: Remove empty dirs
18619: SAIL-274: Locale.hbm.xml
18621: Added method to create default ACL
18622: SAIL-234: Node.hbm.xml: Store, Transaction, Server and some node
18624: Formatting only (eol)
18631: SAIL-235: Permissions DAO refactor
18633: SAIL-235: Permissions DAO refactor - do not expose CRUD for AceContext (or AuthorityAlias) since currently unused
18639: getLocale(Locale) should return null if it doesn't exist
18640: SAIL-234 NodeDAO: More replacement of node queries and updates
18648: SAIL-310: Create SQL script for core repo tables (All DB ports)
18651: SAIL-234 NodeDAO: Moves across stores handle presence of target deleted nodes
18961: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
18658: SAIL-274 Locale DAO: Missing getValueKey() method
18662: SAIL-235: Permissions DAO refactor - further cleanup (of DbAccessControlList usage, including copyACLs)
18664: DB scripts porting for PostgreSQL finished.
18668: SAIL-234 Node DAO: Note in case Transaction Change ID is dropped from indexes
18669: SAIL-234 Node DAO: deleteNode and archive (store move) fixes
18672: DB scripts porting for Oracle finished.
18675: SAIL-235: Permissions DAO refactor
18677: DB scripts porting for DB2 finished.
18964: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
18687: Execute a callback with retries
18688: SAIL-234 Node DAO: Child association creation
18690: SAIL-234 Node DAO: Comment out raw creation of stores as it breaks subsequent bootstrap checks
18691: SAIL-234 Node DAO: More replacement of alf_child_assoc handling
18713: Commented about needing a more efficient removeChildAssociation method
18714: SAIL-234 Node DAO: Replaced queries on alf_child_assoc
18715: SAIL-234 Node DAO: More alf_child_assoc query replacement
18727: SAIL-234 Node DAO: alf_child_assoc queries complete
18737: SAIL-234 Node DAO: Tweaks to newNode and implemented prependPaths
18741: SAIL-234 and SAIL-334: Moved UsageDelta Hibernate code and queries over to UsageDeltaDAO
18748: SAIL-234 Node DAO: fix NPE (EditionServiceImplTest)
18769: SAIL-234 Node DAO: alf_node_properties ground work
18786: SAIL-234 Node DAO: alf_node_properties and cm:auditable properties
18810: Added EqualsHelper.getMapComparison
18813: TransactionalCache propagates cache clears and removals during rollback
18826: SAIL-234 Node DAO: Moved over sundry references to NodeDaoService to NodeDAO
18849: SAIL-237: UsageDelta.hbm.xml - eol formatting only (including removal of unwanted svn:eol-style=native property)
18869: SAIL-234 NodeDAO: Fixed more references to 'nodeDaoService'
18895: SAIL-234 NodeDAO: Queries for alf_transaction
18899: SAIL-234 Node DAO: Fixed bean fetching for 'nodeDAO'
18909: SAIL-234 NodeDAO: Fixes to getNodeRefStatus and various txn queries
18916: SAIL-234 NodeDAO: Fixed moveNode alf_child_assoc updates
18922: SAIL-235: DAO refactoring: Permission.hbm.xml
18930: SAIL-235: DAO refactoring: Permission.hbm.xml
18932: SAIL-234 NodeDAO: Fixing up gotchas, javadocs and some naming
18933: SAIL-234 NodeDAO: Minor neatening
18935: SAIL-234 Node DAO: Caches for ID to NodeRef and StoreRef
18936: EHCache config files line endings
18938: SAIL-237: Usage DAO refactor - initial checkpoint
18945: SAIL-235: DAO refactoring: Permission.hbm.xml. Move Node.
18975: Fix for move-node ACL jiggery-pokery
19067: SAIL-4: fix VersionHistoryImpl.getSuccessors (causing VersionServiceImplTest.testGetVersionHistorySameWorkspace failure)
19068: SAIL-234: fix VersionMigratorTest.testMigrateOneVersion
19074: SAIL-237: Usage DAO - update to common iBatis mapping pattern(s) to ease DB porting
19076: SAIL-231: Activities DAO - update to common iBatis mapping pattern(s)
19077: SAIL-232: AppliedPatch DAO - minor cleanup (comments & formatting only)
19092: Merging HEAD to DEV/V3.3-DAO-REFACTOR-2
18973: Temporarily comment out AVMTestSuite and run AVM tests individually
19056: AVM unit test improvements
19097: SAIL-235: DAO refactoring: Permission.hbm.xml: Additional index to support queries to find the id and acl id for the primary children of a node.
19185: SAIL-238: Permissions DAO - (minor) update to common iBatis mapping pattern
19289: SAIL-234 NodeDAO: Node cache replaces NodeRef cache
19302: SAIL-234 Node DAO: Added cache for node properties
19318: SAIL-4: AVM DAO - (minor) update to common iBatis mapping pattern
20690: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5:
20063: (RECORD ONLY) DAO refactor branch V4
20146: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
19401: SAIL-234 Node DAO: Fix permission service tests (setPrimaryChildrenSharedAclId needs to invalidate nodesCache)
19428: Fixed TransactionalCache issue with null and NullValueMarker
19429: Took empty cm:content creation out of FileFolderService#createImpl
19430: SAIL-234 Node DAO: Tweaks around caching and cm:auditable
19431: SAIL-4 DAO Refactor: Exception thrown when attempting writes in read-only txn have changed
19436: SAIL-234 Node DAO: Fix NPE during cm:auditable update
19475: Allow debugging of code without stepping into trivial stuff
19476: Follow-up on 19429 by ensuring CIFS/FTP set a mimetype on the ContentWriter
19477: SAIL-234 Node DAO: Leverage DAO better for NodeService.addProperties
19478: SAIL-234 NodeDAO: Added toString() for ParentAssocsInfo (cache value for parent assocs)
19479: SAIL-234 Node DAO: Fixed for parent association and property caches
19480: Made TransactionAwareSingleton bind-key a GUID
19481: SAIL-234 Node DAO: Reinstated 100K collection property tests
19482: SAIL-234 Node DAO: Node and property cache fixes highlighted by unit tests
19483: SAIL-234 Node DAO: Start on NodeBulkLoader implementation
19595: SAIL-234 Node DAO: Fix moveNode to detect cyclic relationship prior to updating ACLs for moved tree FileFolderServiceImplTest.testETHREEOH_3088_MoveIntoSelf)
20147: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
19602: (RECORD ONLY) Reintegrated with HEAD up to rev 19433
19621: (RECORD ONLY) SAIL-347
19683: (RECORD ONLY) Reverse-merged 19621 for SAIL-347
19722: (RECORD ONLY) Merged /alfresco/HEAD:r19434-19721
20150: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
19741: Merged DEV\V3.3-DAO-REFACTOR-2 to DEV\V3.3-DAO-REFACTOR-3
19739: Extended "move" tests
19743: Fix AuditableAspectTest.testAddAspect (to allow for node modified date tolerance)
19748: Remaining part of merge from HEAD to V3.3-DAO-REFACTOR-3
19367: Merged BRANCHES/V3.2 to HEAD:
19286: Fix for ALF-626 "Using 'null' as an authority argument in clearPermissions() cause a java.lang.NullPointerException"
19755: SAIL-234 Node DAO: Fix RepoAdminServiceImplTest.testConcurrentDynamicModelDelete (handle InvalidNodeRefException after getChildAssocs)
20692: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5:
- Retired all 1.3 and 1.4 upgrade scripts ... R.I.P.
- Fixed CRC patch for Authorities (only tested on MySQL)
- Fixed SQL patch revision numbers and bumped version schema number up
20158: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
19773: SQL mappings and scripts: SAIL-310, SAIL-304, SAIL-303 and SAIL-347
19774: Futher fix for SAIL-310: Sequence patch must take into account sequences created for 3.3
19851: SAIL-371 (SAIL-294) NodeDAO fallout: Fix QName and Namespace read/write handling and bean name in unit test
20183: Merged DAO3 to DAO4
19852: SAIL-370: Remove LinkValidation
19853: SAIL-239 (SAIL-294) Attributes.hbm.xml: Added ability to attach arbitrary property to unique context
19857: SAIL-373 Fallout from Permissions DAO refactor (SAIL-235)
19864: SAIL-239 (SAIL-294): Removed AttributeService RMI API
19865: More SAIL-239 (SAIL-294): Removed AttributeService RMI API
20208: DAO-refactor implementation of ALF-2712 query improvements
20209: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
20060: Removal of AttributeService for SAIL-239 (SAIL-294)
20348: SAIL-371 (SAIL-294): Protect collection properties during map insert and retrieval
20547: SAIL-371 (SAIL-294) Attributes.hbm.xml: implement getAttributes + fixes
20573: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests and other fallout
20597: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip)
20598: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip) - fix AssetServiceImplTest.testSimpleLockFile NPE
20600: Fix PropertyValueDAOTest.testPropertyValue_Enum (follow-on to r20060 for SAIL-239 - which introduces ENUM prop vals)
20601: Fix UsageDAOTest.testCreateAndDeleteUsageDeltas NPE (would also affect ContentStoreCleanerScalabilityRunner)
20603: Fix CMISPropertyServiceTest.* (fallout from r20146 <- r19429 <- Took empty cm:content creation out of FileFolderService#createImpl)
20604: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - TransferServiceImplTest.*
20618: SAIL-371 (SAIL-294): NodeDAO: AuditableAspectTest (fix testCreateNodeWithAuditableProperties_ALF_2565 + add remove aspect test)
20624: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - UserUsageTest.*
20626: Fixed random keys for RuleTrigger NodeRef tracking
20635: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - PersonTest.testSplitDuplicates
20642: SAIL-371 (SAIL-294) DAO: Fixed CacheTest
20643: Removed must of the 'distribute' target's dependencies. Not for HEAD
20645: Follow-on to r20643 (Removed most of the 'distribute' target's dependencies. Not for HEAD)
20654: SAIL-371 (SAIL-294): NodeDAO: DMDeploymentTargetTest.* (do not try to remove mandatory aspects)
20655: SAIL-371 (SAIL-294): NodeDAO: Initial fix for TaggingServiceImplTest.testTagScopeUpdateViaNodePolicies (+ minor test cleanup)
20657: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - VersionMigratorTest.testMigrateOneVersion (cm:accessed not returned if null)
20658: Merged (back merge only - no merge info) BRANCHES/V3.3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
20090: Dynamic models: minor improvements to DictionaryModelType
20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService)
20662: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - RecordsManagementAuditServiceImplTest.* (we now ignore attempt to update 'cm:modifier' prop so update 'cm:title' prop instead)
20666: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - ADMLuceneTest.*
20668: SAIL-239 (SAIL-294) - delete WCM locks + tests (follow-on to r20060)
20674: SAIL-371 (SAIL-294) NodeDAO fallout: Cleaner and additional checks for ContentStoreCleaner
20675: SAIL-371 (SAIL-294) NodeDAO fallout: Fixed handling of ContentData
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20693 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));
|
|
}
|
|
|
|
// note: since 3.4, "cm:accessed" is not returned/migrated if null
|
|
int expectedPropCount = oldVersionProps.size();
|
|
|
|
if (oldVersionProps.get(ContentModel.PROP_ACCESSED) == null)
|
|
{
|
|
expectedPropCount--;
|
|
}
|
|
|
|
assertEquals(expectedPropCount, newVersionProps.size());
|
|
for (QName key : oldVersionProps.keySet())
|
|
{
|
|
if (! (key.equals(ContentModel.PROP_ACCESSED) && (oldVersionProps.get(key) == null)))
|
|
{
|
|
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, 1, -1, false, null, 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);
|
|
}
|
|
}
|