mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
20440: RM: CapabilitiesTest.testDestroyRecordsCapability (MS SQL Server build) - use non-public nodeService 20441: Include virtual tomcat in installers 20442: Change bitrock builder version to use. 20443: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: (Fixed tabs and removed 'svn:executable' and 'svn:eol-style') 20384: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX: 20271: ALF-803: Asset Service Improvements 20386: Merged V2.2 to V3.3-BUG-FIX 20385: Merged DEV/BELARUS/V2.2-2010_04_06 to V2.2 20379: V2.2-ALF-1888 AssociationQuery was corrected to filter ... 20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store) 20388: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX: 20372: ALF-897: It is impossible to create content when default value selected in ContentHeadlineBackground field for intranet_rssi_landing_template web-form (also fixes ALF-2798 & ALF-791) 20389: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX: 20374: ALF-2723: WCM - Http 500 creating content via webform 20394: Fix for ALF-2257 - It's impossible to find and add group at Records Manage Permissions page 20396: Fixed ALF-2956 "XSS attack is made when a rule is being deleted" 20397: Fix for ALF-922: Mysql does not support unique keys that contain nulls as one would expect 20402: ALF-2186 : Rules not being fired on datalist items - because it's a zero byte file? 20404: Fixed ALF-2109 "Rule doesn't apply to the files in sub-folders when 'Run rule for this folder and its subfolders' action was performed" 20406: Fix for ALF-2985 - Share document library throws error if document modifier or creator is deleted from Alfresco 20409: Improved FormServiceImplTest, added more content related tests and some edge case tests using the FDK model (this test needs to be manually enabled though as the FDK model is not available by default) 20414: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX 20401: ALF-2616: Serious Web Form layout performance issues on IE8. This fix contains: 20427: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX 20042: ALF-1523: Failed Kerberos SSO auth doesn't fail through, simply returns a blank page 20323: ALF-1523: Failed Kerberos SSO auth doesn't fail through, simply returns a blank page 20428: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX 20417: ALF-736: WebDAV Folder Renaming fails on Mac but works on Windows. 20430: Fix for ALF-2313 - Accessing a Doclib folder in Share which has a link to a deleted node fails 20431: Version Migrator (ALF-1000) - migrate 1st batch independently 20432: Fix for ALF-2327 - Can not have more than one Transfer Step in a disposal schedule 20438: ALF-479: Merged DEV/BELARUS/V3.2-2010_01_11 to DEV/V3.3-BUG-FIX 18448: ETHREEOH-4044: External Authentication Subsystem does not perform user mapping for WebDAV requests 20444: Fix for ConcurrentModificationException in file server quota manager. ALF-2970. 20445: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20413: Added clean of quickr project 20446: Changed version to 3.3.1dev 20447: Merged V3.3-BUG-FIX to V3.3 20294: Fixes: ALF-1020 & ALF-1013 for all views except agenda. 20451: Merged V2.2 to V3.3 20450: Merged DEV/BELARUS/V2.2-2010_04_06 to V2.2 20412: ALF-1887: too easy to break alfresco - one can remove the guest user and recreate it but then access to RSS is broken - PersonServiceImpl.beforeDeleteNode prohibits attempts to delete a guest user. 20452: Fix for transaction error from NFS server file expiry thread. ALF-3016. 20458: ALF-2729 - rationalise (and deprecate) VersionLabelComparator 20460: Fix for ALF-2430 - AVM nodes are not checked for exclusion - the default ACLEntryVoter will always vote for AVM - avoids embedded AVM permission checks for getType/getAspect and anything else that may be added - seems AVM read is not checked upon "lookup" for the last node in the PATH (getType should have failed too) 20466: Merged V2.2 to V3.3 20243: (RECORD ONLY) ALF-2814: Merged V3.2 to V2.2 17891: Merged DEV_TEMPORARY to V3.2 17873: ETHREEOH-3810: WCM - Recursion detector erroring 20467: Merged V3.1 to V3.3 (RECORD ONLY) 20276: Incremented version label 20275: ALF-2845: Merged V3.2 to V3.1 17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2 17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch - also causes subsequent patches to not be applied 19573: Merged V3.2 to V3.1 19539: Merged HEAD to V3.2 19538: Build fix - fix build speed 20468: Merged PATCHES/V3.2.r to V3.3 (RECORD ONLY) 20357: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r 20349: Merged V3.3 to PATCHES/V3.2.0 20346: ALF-2839: Node pre-loading generates needless resultset rows - Added missing Criteria.list() call 20339: Incremented version label 20338: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r 20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows - Split Criteria query to retrieve properties and aspects separately 20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows Merged BRANCHES/V3.2 to PATCHES/V3.2.0: 18490: Added cache for alf_content_data Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0: 20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF) 20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows 20469: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY) 20393: Eclipse classpath fix to avoid problems in JBoss 20309: ALF-2777: PrimaryChildAssocCopyBehaviour from MOB-388 corrupts cm:name attributes of copied child nodes - Folded example behaviours from previous AMP into repository - Fixed PrimaryChildAssocCopyBehaviour to back-up and set the cm:name property on copied children 20470: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY) 20465: Incremented version label 20464: ALF-3060: Merged V3.2 to PATCHES/V3.2.0 19920: Merged HEAD to BRANCHES/V3.2: 19918: Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss) 20448: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.0 20414: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX 20401: ALF-2616: Serious Web Form layout performance issues on IE8. This fix contains: a) X-UA-Compatible head tag with IE=EmulateIE7 value b) alfresco.ieVersion and alfresco.ieEngine in common.js c) recurseOnChildren in _updateDisplay d) Some performance modifications in xforms.js 20350: Increment version label 20349: Merged V3.3 to PATCHES/V3.2.0 20346: ALF-2839: Node pre-loading generates needless resultset rows - Added missing Criteria.list() call 20471: Fix for offline sync losing metadata properties, due to rename/delete of original file. ALF-575. 20478: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20477: Fix ALF-3086: CMIS checkin of a non-versionable document should make it versionable 20479: ALF-2110: Make it possible to determine which person properties are synced via LDAP and hence immutable - Added Set<QName> UserRegistrySynchronizer.getPersonMappedProperties(String username) - UI/Services Fix to follow 20481: Latest SpringSurf libs: - Fix for ALF-1518 - Added support for HTTP and HTTPS proxies for Surf application remote api calls - via the standard JVM cmd line properties such as -Dhttp.proxyHost=... 20484: ALF-2886: LDAP sync defaults display names incorrectly and can't cope with DNs containing escaped trailing whitespace. - Had to work around a JDK bug in LDAP RDN parsing 20486: Added case sensitive flag to the file state cache. Part of ALF-570. 20487: Fix for copy/rename of folders causing file exists errors in some cases. ALF-570. 20488: Fix ALF-680: Previously valid content models now fail with CMISAbstractDictionaryService$DictionaryRegistry exception 20489: Uploaded correct version of spring source jars and reunited them with 3rd-party/.classpath 20490: Fix for cannot delete folders via CIFS from Mac OSX, due to desktop actions. ALF-2553. 20491: Merged DEV/TEMPORARY to V3.3 (With corrections) 20485: ALF-2290: a HTTP GET request of a document redirects to the Home Location when using NTLM SSO The logic related to ADB-61 in NTLMAuthenticationFilter clears previous location and redirects request to default home location. NTLMAuthenticationFilter was changed to process GET requests to documents correctly. Now, fix to ADB-61 processes only “/faces” requests and GET requests to documents are processed correctly. The same fix was made to KerberosAuthenticationFilter 20492: Fix ALF-680: Previously valid content models now fail with CMISAbstractDictionaryService$DictionaryRegistry exception - missing remove directory 20493: Fix ALF-2837: ClassCastException in getProperties() 20498: Fix for ALF-2818: Failure to close index writer under certain conditions. - fix for index writer to close indexes when stopped by exceptions during FTS - fix FTS job to handle exceptions better - debug for FTS background operations 20499: ALF-3094: In ticket authenticate method in AuthenticationHelper, invalidate the current session if its cached ticket doesn't match 20500: Fix for ALF-2858 "Zero KB sized bin files will be created in the contentstore when new sites are created" (RECORD ONLY) 20503: AVMTestSuite: minor fixes to cleanup ctx usage (avoid re-loading) 20505: Merged BRANCHES/V2.2 to BRANCHES/V3.3 (record-only) 13859: (record-only) Removed dev from version label 14003: (record-only) Updated version to 2.2.5dev 14566: (record-only) ETWOTWO-1239 - remove workflow interpreter/console bootstrap 14572: (record-only) ETWOTWO-1239 - fix PersonTest to fix JBPMEngineTest (part-sourced from r13247) 14776: (record-only) Merged V3.1 to V2.2 14748: ETHREEOH-2225 - WCM upgrade (performance improvements for MySQL) 20506: NFS ReadDir/ReadDirPlus skips some folder entries. JLAN-98. 20507: Fixed issue with folder search resume id being reset to the wrong value during NFS folder search. Part of JLAN-98. 20508: Merged BRANCHES/V3.2 to BRANCHES/V3.3: 18319: Merged BRANCHES/DEV/BELARUS/V3.2-2010_01_11 to V3.2 18273: ETHREEOH-3834: WCM: An extral .xml.html file is created when editing newly created content 19182: Merged V3.1 to V3.2 18423: ETHREEOH-3850 - Content Manager unable to edit content items if there is a lock on a generated rendition 18432: (RECORD ONLY) Added FTP data port range configuration via <dataPorts>n:n</dataPorts> config value. ETHREEOH-4103. 18451: (RECORD ONLY) Fixed incorrect FTP debug level name. 18577: (RECORD ONLY) Fix for ETHREEOH-4117, based on CHK-11154 18792: Fix ETHREEOH-2729: Import of property with @ symbol in name fails with "start tag unexpected character @ " 19570: ALF-192 / ALF-1750: System Error if user trying submit web content based on web form which was deleted 19583: Merged DEV/BELARUS/V3.2-2010_03_17 to V3.2 19545: ALF-1954: Regression: same item can be submitted multiple times to workflow 19725: AVMStoreDescriptor - fix minor typo (for debugging) 19917: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2: 19880: Fix ALF-898 - WCM: Deleting a file leads to error (only if RM/DOD installed) 19920: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2: 19918: Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss) 20509: Merged BRANCHES/V3.2 to BRANCHES/V3.3 (RECORD ONLY): 19825: (RECORD ONLY) Merged PATCHES/V3.2.r to BRANCHES/V3.2: 19804: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r Merged HEAD to V3.2.0 ... 20510: Merged BRANCHES/V3.1 to BRANCHES/V3.3 (RECORD ONLY) 17482: (RECORD ONLY) Merged V3.2 to V3.1 17478: Fix ETHREEOH-3340 - WCM - Revert to snapshot failure (fix AVM getListing -> AVMSync compare -> WCM revertSnapshot) 18783: (RECORD ONLY) MT: ensure group (EMAIL_CONTRIBUTORS) bootstraps tenant admin user (when creating tenant) 20513: Added port change example for remote Alfresco server to share-config-custom.xml.sample 20518: ALF-657 Created tests to check that the 'runas' functionality works in the AlfrescoJavaScript action handler. Also modified the handler to run as the System user if no Authentication is currently set, as may occur if the action handler is being executed asynchronously. 20519: ALF-657 Created tests to check that the 'runas' functionality works in the AlfrescoJavaScript action handler. Also modified the handler to run as the System user if no Authentication is currently set, as may occur if the action handler is being executed asynchronously. 20520: Removed dev version.label 20522: ALF-3129: Map cm:organization property in LDAP as well as cm:organizationId, since cm:organization is what shows up in JSF and Share. Needed by ALF-2110. 20523: First part of fix for ALF-2110: - Appropriate Person and webframework metadata APIs now return information on immutability of Person properties (as some properties are immutable when synced to LDAP etc.) - Share client now correctly disables profile fields in User Profile and Admin User Console as appropriate based on individual user property mutability - Change Password button now correctly enabled/disabled based on account mutability 20524: VersionMigrator - option to run as scheduled job (ALF-1000) 20525: Fix for various IE6 CSS issues: ALF-3047 - It's impossible to destinate any action with data list item (IE6 specific) ALF-3049 - Incorrect layout of Manage aspects page ALF-3050 - Incorrect layout of Assign Workflow form 20526: Fix for ALF-2915 - Select > None feature for Data Lists not working across multiple pages in IE Closed ALF-2846 - DataList UI not fully I18Ned [Old prototype code] 20527: Fix for ALF-3082 - There is no Edit Offline action at Details page in Share site 20528: Fix various script errors due to typo: ALF-3088 - Script error occurs on creating duplicated record seria ALF-3012 - Incorrect behaviour on creating duplicating folders ALF-3004 - Script error when submitting an item with long data in Prioprity field 20529: Fix for ALF-3006 - Selected Items > Copy to... and Move to actions not working in Document Library 20530: Dynamic Models - fix test(s) - fix concurrency test for Oracle build (retry if txn lock cannot be acquired) - when getting deployed models, skip if invalid (eg. cannot be parsed) 20536: Remove @Override (ALF-657) 20537: Activities - (minor) fix NPE for Oracle build/test 20543: Final part of ALF-2110 - Appropriate person properties disabled for editing in Explorer Client if external mapped sync such as LDAP is used. Fixed issue with Change Password option being disabled incorrectly. 20544: Follow-up fix to r20528 20546: Fix for ALF-3151 - Freemarker causes NPE while deploying 3.3 enterprise onto WebSphere 7.0.0.7 - NOTE: will need to submit patch to freemarker.org 20552: Merged BRANCHES/V3.2 to BRANCHES/V3.3 (RECORD ONLY) 20551: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/V3.2: 20090: Dynamic models: minor improvements to DictionaryModelType 20553: Fix for escalated issue ALF-2856: Space returns to browse view after completing Add Content dialog; need a way to return to custom view (applied patch provided by customer). 20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService) 20558: Merged DEV/BELARUS/V3.3-2010_06_08 to V3.3 20550: ALF-922: Mysql does not support unique keys that contain nulls as one would expect ...... duplicates in the alf_access_control_entry table 20562: ALF-3177 - security fix. 20563: Merged BRANCHES/V3.2 to BRANCHES/V3.3: 19412: Fix for ALF-865 "WCM / Cluster: unexpected error when concurrently submitting content" ALF-862 "WCM submit execution will require locking in a clustered WCM authoring env" 20564: Merged BRANCHES/V3.1 to BRANCHES/V3.3: 20542: Fixed ALF-3152: ImporterComponent transaction retry settings can cause IllegalArgumentException 20568: Follow-up on fix ALF-3152. Fix jobLockService's retryWaitIncrementMs git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20572 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, 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);
|
|
}
|
|
}
|