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
482 lines
16 KiB
Java
482 lines
16 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
|
|
* This program 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 General Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
* As a special exception to the terms and conditions of version 2.0 of
|
|
* the GPL, you may redistribute this Program in connection with Free/Libre
|
|
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
|
* FLOSS exception. You should have recieved a copy of the text describing
|
|
* the FLOSS exception, and it is also available here:
|
|
* http://www.alfresco.com/legal/licensing"
|
|
*/
|
|
package org.alfresco.repo.domain.node;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
|
|
import org.alfresco.model.ContentModel;
|
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
|
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
|
import org.alfresco.service.cmr.dictionary.TypeDefinition;
|
|
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
|
|
import org.alfresco.service.namespace.QName;
|
|
|
|
/**
|
|
* Class holding properties associated with the <b>cm:auditable</b> aspect.
|
|
* This aspect is common enough to warrant direct inclusion on the <b>Node</b> entity.
|
|
*
|
|
* @author Derek Hulley
|
|
* @since 3.4
|
|
*/
|
|
public class AuditablePropertiesEntity
|
|
{
|
|
private static Set<QName> auditablePropertyQNames;
|
|
static
|
|
{
|
|
auditablePropertyQNames = new HashSet<QName>(13);
|
|
auditablePropertyQNames.add(ContentModel.PROP_CREATOR);
|
|
auditablePropertyQNames.add(ContentModel.PROP_CREATED);
|
|
auditablePropertyQNames.add(ContentModel.PROP_MODIFIER);
|
|
auditablePropertyQNames.add(ContentModel.PROP_MODIFIED);
|
|
auditablePropertyQNames.add(ContentModel.PROP_ACCESSED);
|
|
}
|
|
|
|
/**
|
|
* @return Returns the <tt>QName</tt>s of the <b>cm:auditable</b> properties
|
|
*/
|
|
public static Set<QName> getAuditablePropertyQNames()
|
|
{
|
|
return auditablePropertyQNames;
|
|
}
|
|
|
|
/**
|
|
* @return Returns <tt>true</tt> if the property belongs to the <b>cm:auditable</b> aspect
|
|
*/
|
|
public static boolean isAuditableProperty(QName qname)
|
|
{
|
|
return auditablePropertyQNames.contains(qname);
|
|
}
|
|
|
|
/**
|
|
* @param typeQName a node type
|
|
* @return <tt>true</tt> if the type given has the <b>cm:auditable</b> aspect by default
|
|
*/
|
|
public static boolean hasAuditableAspect(QName typeQName, DictionaryService dictionaryService)
|
|
{
|
|
TypeDefinition typeDef = dictionaryService.getType(typeQName);
|
|
if (typeDef == null)
|
|
{
|
|
return false;
|
|
}
|
|
return typeDef.getDefaultAspectNames().contains(ContentModel.ASPECT_AUDITABLE);
|
|
}
|
|
|
|
private String auditCreator;
|
|
private String auditCreated;
|
|
private String auditModifier;
|
|
private String auditModified;
|
|
private String auditAccessed;
|
|
|
|
// Cached value for faster comparisons when updating modification time
|
|
private long auditModifiedTime = -1L;
|
|
|
|
/**
|
|
* Default constructor with all <tt>null</tt> values.
|
|
*/
|
|
public AuditablePropertiesEntity()
|
|
{
|
|
}
|
|
|
|
@Override
|
|
public String toString()
|
|
{
|
|
StringBuilder sb = new StringBuilder(512);
|
|
sb.append("AuditablePropertiesEntity")
|
|
.append("[ auditCreator=").append(auditCreator)
|
|
.append(", auditCreated=").append(auditCreated)
|
|
.append(", auditModifier=").append(auditModifier)
|
|
.append(", auditModified=").append(auditModified)
|
|
.append("]");
|
|
return sb.toString();
|
|
}
|
|
|
|
/**
|
|
* @param qname the property name
|
|
* @return Returns the value of the <b>cm:auditable</b> property or <tt>null</tt>
|
|
*/
|
|
public Serializable getAuditableProperty(QName qname)
|
|
{
|
|
if (qname.equals(ContentModel.PROP_CREATOR))
|
|
{
|
|
return auditCreator;
|
|
}
|
|
else if (qname.equals(ContentModel.PROP_CREATED))
|
|
{
|
|
return DefaultTypeConverter.INSTANCE.convert(Date.class, auditCreated);
|
|
}
|
|
else if (qname.equals(ContentModel.PROP_MODIFIER))
|
|
{
|
|
return auditModifier == null ? auditCreator : auditModifier;
|
|
}
|
|
else if (qname.equals(ContentModel.PROP_MODIFIED))
|
|
{
|
|
String dateStr = auditModified == null ? auditCreated : auditModified;
|
|
return DefaultTypeConverter.INSTANCE.convert(Date.class, dateStr);
|
|
}
|
|
else if (qname.equals(ContentModel.PROP_ACCESSED))
|
|
{
|
|
return DefaultTypeConverter.INSTANCE.convert(Date.class, auditAccessed);
|
|
}
|
|
else
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @param qname the property name
|
|
* @param value the property value
|
|
* @return Returns <tt>true</tt> if the property was used
|
|
* @deprecated Deprecated from the start, but possibly useful code
|
|
*/
|
|
@SuppressWarnings("unused")
|
|
private boolean setAuditableProperty(QName qname, Serializable value)
|
|
{
|
|
if (qname.equals(ContentModel.PROP_CREATOR))
|
|
{
|
|
auditCreator = DefaultTypeConverter.INSTANCE.convert(String.class, value);
|
|
return true;
|
|
}
|
|
if (qname.equals(ContentModel.PROP_MODIFIER))
|
|
{
|
|
auditModifier = DefaultTypeConverter.INSTANCE.convert(String.class, value);
|
|
return true;
|
|
}
|
|
if (qname.equals(ContentModel.PROP_CREATED))
|
|
{
|
|
auditCreated = DefaultTypeConverter.INSTANCE.convert(String.class, value);
|
|
return true;
|
|
}
|
|
if (qname.equals(ContentModel.PROP_MODIFIED))
|
|
{
|
|
auditModified = DefaultTypeConverter.INSTANCE.convert(String.class, value);
|
|
return true;
|
|
}
|
|
if (qname.equals(ContentModel.PROP_ACCESSED))
|
|
{
|
|
auditAccessed = DefaultTypeConverter.INSTANCE.convert(String.class, value);
|
|
return true;
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @return Returns a <tt>Map</tt> of auditable properties
|
|
*/
|
|
public Map<QName, Serializable> getAuditableProperties()
|
|
{
|
|
Map<QName, Serializable> properties = new HashMap<QName, Serializable>(7);
|
|
properties.put(ContentModel.PROP_CREATOR, auditCreator);
|
|
properties.put(ContentModel.PROP_CREATED, DefaultTypeConverter.INSTANCE.convert(Date.class, auditCreated));
|
|
// cm:modifier - use cm:creator if not set
|
|
if (auditModifier != null)
|
|
{
|
|
properties.put(ContentModel.PROP_MODIFIER, auditModifier);
|
|
}
|
|
else
|
|
{
|
|
properties.put(ContentModel.PROP_MODIFIER, auditCreator);
|
|
}
|
|
// cm:modified - use cm:created if not set
|
|
if (auditModified != null)
|
|
{
|
|
properties.put(ContentModel.PROP_MODIFIED, DefaultTypeConverter.INSTANCE.convert(Date.class, auditModified));
|
|
}
|
|
else
|
|
{
|
|
properties.put(ContentModel.PROP_MODIFIED, DefaultTypeConverter.INSTANCE.convert(Date.class, auditCreated));
|
|
}
|
|
// Usually null
|
|
if (auditAccessed != null)
|
|
{
|
|
properties.put(ContentModel.PROP_ACCESSED, DefaultTypeConverter.INSTANCE.convert(Date.class, auditAccessed));
|
|
}
|
|
return properties;
|
|
}
|
|
|
|
/**
|
|
* Set all <b>cm:auditable</b> parameters as required. Where possible, the creation and modification data
|
|
* will be shared so as to reduce data duplication.
|
|
*
|
|
* @param user the username; <tt>null</tt> to use the
|
|
* {@link AuthenticationUtil#getFullyAuthenticatedUser() fully-authenticated user}
|
|
* @param date the creation or modification date; <tt>null</tt> to use the current system time
|
|
* @param force <tt>true</tt> to force the values to overwrite any pre-existing values
|
|
* @param modifiedDateToleranceMs the number of milliseconds' to tolerate before updating the
|
|
* modification date.
|
|
* Setting this to 1000L (say) will mean that the modification time will not be
|
|
* changed if the existing value is withing 1000 ms of the new time.
|
|
* @return Returns <tt>true</tt> if there were any changes made, otherwise <tt>false</tt>
|
|
*/
|
|
public boolean setAuditValues(String user, Date date, boolean force, long modifiedDateToleranceMs)
|
|
{
|
|
// Get a user if we need
|
|
if (user == null)
|
|
{
|
|
user = AuthenticationUtil.getFullyAuthenticatedUser();
|
|
if (user == null)
|
|
{
|
|
user = "unknown";
|
|
}
|
|
}
|
|
// Get a date if we need
|
|
if (date == null)
|
|
{
|
|
date = new Date();
|
|
}
|
|
|
|
String dateStr = DefaultTypeConverter.INSTANCE.convert(String.class, date);
|
|
long dateTime = date.getTime();
|
|
|
|
// Need to know if anything changed
|
|
boolean changed = false;
|
|
|
|
// Always set cm:creator and cm:created
|
|
if (force || auditCreator == null)
|
|
{
|
|
auditCreator = user;
|
|
changed = true;
|
|
}
|
|
if (force || auditCreated == null)
|
|
{
|
|
auditCreated = dateStr;
|
|
changed = true;
|
|
}
|
|
if (auditModifier == null || !auditModifier.equals(user))
|
|
{
|
|
auditModifier = user;
|
|
changed = true;
|
|
}
|
|
long lastModTime = getAuditModifiedTime();
|
|
if (lastModTime < 0 || (lastModTime + modifiedDateToleranceMs) < dateTime)
|
|
{
|
|
// The time has moved on enough
|
|
auditModifiedTime = dateTime;
|
|
auditModified = dateStr;
|
|
changed = true;
|
|
}
|
|
// Done
|
|
return changed;
|
|
}
|
|
|
|
/**
|
|
* Set all <b>cm:auditable</b> parameters as required, giving precedence to the supplied
|
|
* property map.
|
|
*
|
|
* @param user the username
|
|
* @param date the creation or modification date
|
|
* @param properties the properties to override the user and date
|
|
* @return Returns <tt>true</tt> if there were any changes made, otherwise <tt>false</tt>
|
|
*/
|
|
public boolean setAuditValues(String user, Date date, Map<QName, Serializable> properties)
|
|
{
|
|
// Need to know if anything changed
|
|
boolean changed = false;
|
|
|
|
if (properties.containsKey(ContentModel.PROP_CREATOR))
|
|
{
|
|
auditCreator = DefaultTypeConverter.INSTANCE.convert(
|
|
String.class,
|
|
properties.get(ContentModel.PROP_CREATOR));
|
|
changed = true;
|
|
}
|
|
if (properties.containsKey(ContentModel.PROP_MODIFIER))
|
|
{
|
|
auditModifier = DefaultTypeConverter.INSTANCE.convert(
|
|
String.class,
|
|
properties.get(ContentModel.PROP_MODIFIER));
|
|
changed = true;
|
|
}
|
|
if (properties.containsKey(ContentModel.PROP_CREATED))
|
|
{
|
|
auditCreated = DefaultTypeConverter.INSTANCE.convert(
|
|
String.class,
|
|
properties.get(ContentModel.PROP_CREATED));
|
|
changed = true;
|
|
}
|
|
if (properties.containsKey(ContentModel.PROP_MODIFIED))
|
|
{
|
|
Date auditModifiedDate = DefaultTypeConverter.INSTANCE.convert(
|
|
Date.class,
|
|
properties.get(ContentModel.PROP_MODIFIED));
|
|
auditModifiedTime = auditModifiedDate.getTime();
|
|
auditModified = DefaultTypeConverter.INSTANCE.convert(
|
|
String.class,
|
|
auditModifiedDate);
|
|
changed = true;
|
|
}
|
|
if (properties.containsKey(ContentModel.PROP_ACCESSED))
|
|
{
|
|
auditAccessed = DefaultTypeConverter.INSTANCE.convert(
|
|
String.class,
|
|
properties.get(ContentModel.PROP_ACCESSED));
|
|
changed = true;
|
|
}
|
|
|
|
if (changed)
|
|
{
|
|
// Make sure populate any missing values
|
|
// Get a user if we need
|
|
if (user == null)
|
|
{
|
|
user = AuthenticationUtil.getFullyAuthenticatedUser();
|
|
if (user == null)
|
|
{
|
|
user = "unknown";
|
|
}
|
|
}
|
|
// Get a date if we need
|
|
if (date == null)
|
|
{
|
|
date = new Date();
|
|
}
|
|
|
|
String dateStr = DefaultTypeConverter.INSTANCE.convert(String.class, date);
|
|
long dateTime = date.getTime();
|
|
|
|
if (auditCreator == null)
|
|
{
|
|
auditCreator = user;
|
|
}
|
|
if (auditModifier == null)
|
|
{
|
|
auditModifier = user;
|
|
}
|
|
if (auditCreated == null)
|
|
{
|
|
auditCreated = dateStr;
|
|
}
|
|
if (auditModified == null)
|
|
{
|
|
auditModifiedTime = dateTime;
|
|
auditModified = dateStr;
|
|
}
|
|
}
|
|
// Done
|
|
return changed;
|
|
}
|
|
|
|
/**
|
|
* For persistance use
|
|
*/
|
|
public String getAuditCreator()
|
|
{
|
|
return auditCreator;
|
|
}
|
|
|
|
/**
|
|
* For persistance use
|
|
*/
|
|
public void setAuditCreator(String auditCreator)
|
|
{
|
|
this.auditCreator = auditCreator;
|
|
}
|
|
|
|
/**
|
|
* For persistance use
|
|
*/
|
|
public String getAuditCreated()
|
|
{
|
|
return auditCreated;
|
|
}
|
|
|
|
/**
|
|
* For persistance use
|
|
*/
|
|
public void setAuditCreated(String auditCreated)
|
|
{
|
|
this.auditCreated = auditCreated;
|
|
}
|
|
|
|
/**
|
|
* For persistance use
|
|
*/
|
|
public String getAuditModifier()
|
|
{
|
|
return auditModifier;
|
|
}
|
|
|
|
/**
|
|
* For persistance use
|
|
*/
|
|
public void setAuditModifier(String auditModifier)
|
|
{
|
|
this.auditModifier = auditModifier;
|
|
}
|
|
|
|
/**
|
|
* For persistance use
|
|
*/
|
|
public String getAuditModified()
|
|
{
|
|
return auditModified;
|
|
}
|
|
|
|
/**
|
|
* For internal use. Provides access to the time (<tt>long</tt>) for the
|
|
* {@link #getAuditModified() auditModified} property.
|
|
*/
|
|
private long getAuditModifiedTime()
|
|
{
|
|
if (auditModifiedTime < 0 && auditModified != null)
|
|
{
|
|
auditModifiedTime = DefaultTypeConverter.INSTANCE.convert(Date.class, auditModified).getTime();
|
|
}
|
|
return auditModifiedTime;
|
|
}
|
|
|
|
/**
|
|
* For persistance use
|
|
*/
|
|
public void setAuditModified(String auditModified)
|
|
{
|
|
this.auditModified = auditModified;
|
|
}
|
|
|
|
/**
|
|
* For persistance use
|
|
*/
|
|
public String getAuditAccessed()
|
|
{
|
|
return auditAccessed;
|
|
}
|
|
|
|
/**
|
|
* For persistance use
|
|
*/
|
|
public void setAuditAccessed(String auditAccessed)
|
|
{
|
|
this.auditAccessed = auditAccessed;
|
|
}
|
|
}
|