mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.4-BUG-FIX to HEAD
30270: ALF-9492 Can now update task properties through the Workflow JavaScript API. ALF-10087 Fixed failing Multi-tenancy tests.
30306: Fixed ALF-7384: Xam: XamArchiveCleaner can delete files before retention period has passed
- Keep the NOW upper limit to the query
- Add a double-check using Java code to precisely check (down to the ms) that the retention time has passed
30308: Merged V3.4 to V3.4-BUG-FIX
30307: ALF-10186: Fix up all code that expects it can cast a WebScriptRequest directly into a WebScriptServletRequest
30310: ALF-5830 show_audit.ftl template doesn't work any more
- Changes to support new audit api
- Works with high level content auditing
30337: Merge DEV to V3.4-BUG-FIX
30160 : ALF-9257 - Renaming web project cause no trigger of the autodeploy process
30362: ALF-10227 Add space after ''{0}'' in text
30395: Removed deep svn:mergeinfo
30433: Merged DEV/TEMPORARY to V3.4-BUG-FIX
30424: ALF-8941: WCM: Virtual server setting lazyDeployExperimentalOnly ="true" (as per si3 fix) fails to load library under WEB-INF/lib directory (for HTTP filter).
Walk up by hierarchy to the root and deploys a context if it wasn't deployed yet, through invocation of updateAllVirtualWebapps recursively.
30454: Fixed ALF-9158: Assignment of workflow task is not proper - out-of-the-box WCM workflow
30466: Merged DEV/TEMPORARY to V3.4-BUG-FIX
30460: ALF-9424 : Webform(XSD): xf:switch switch group does not work based on "complexContent with Base" element.
Schema2XForms and SchemaUtil were modified to allow correctly process elements with namespace that differ from "http://www.w3.org/2001/XMLSchema"
30476: Merged DEV to V3.4-BUG-FIX
30474: ALF-10021: Get the last node in the resultset outside the timing loop to force prefetch.
30483: Fixed ALF-9417: (pdf2swf) Share preview is blank with some pdf files.
30514: ALF-240: Unfriendly error appears when trying to view details for created discussion for multilingual content
Webdav URLs were not valid for non-ML or ML discussion items, but were only stopping the details page for the ML items from being shown. Utils.generateURL now returns null for such items.
30517: Fixed ALF-5526: Component-Generator for d:noteref and other "system" types always disabled => breaks extensibility
30519: FileFolderService moveFrom method was not supported by MLTranslationInterceptor
30527: ALF-240: added missing exception message.
30531: Fixed ALF-9599: Share forms do not allow edit of non-cm:content nodes
30541: ALF-9424: Missed change, causing compilation error
30552: Tests to accompany fix for ALF-240, ALF-10298: discussion topic webdav URLs causing error page in explorer.
30565: Fixed ALF-10336 "Drag and Drop item in Customize Site Dashboard - text of item reverts to default font style and size during drag operation"
30568: Fixed ALF-10342: ClassCastException on org.alfresco.repo.copy.AbstractCopyBehaviourCallback
30570: ALF-3332: (circa 2008) Pagination inks rewritten incorrectly by opensearch proxy
30574: ALF-9470: OwnableService cache not being updated for archived nodes - modified fix by Pavel
30579: ALF-5607: Cancelling of install. Some directories are not deleted from disk.
- Fixed provided by Bitrock for Mac and Windows
30583: Merged HEAD to V3.4-BUG-FIX (Back ported 2 fixes for included resource handling when running unit tests)
28711: Avoid a NPE on certain kinds missing included resources, and instead give a helpful error along the lines of other include issues
28716: When loading JS includes with a full classpath reference, handle the Eclipse classloader behaving slightly differently on absolute paths compared to the JVM one
30648: Fixed ALF-10401: No simple way to disable auto-versioning behaviour
- Added property: version.store.enableAutoVersioning=true
- When set to 'false', the VersionableAspect will not respond to any events;
even if the aspect is present, it will not create versions.
30657: Merged DEV/TEMPORARY to V3.4-BUG-FIX
30590: ALF-7105: pdfbox returns errors in the logs but one cannot understand what file is affected (PDFBox)
Level log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal was introduced in log4j.properties.
30669: Fixes: ALF-6470 (Updates FR translation)
30686: ALF-1017: Fixed compilation error in backport
30696: Fix for ALF-8176
30708: ALF-10040: Added missing ReferenceCountingReadOnlyIndexReaderFactory wrapper to IndexInfo.getMainIndexReferenceCountingReadOnlyIndexReader() to make it consistent with IndexInfo.getMainIndexReferenceCountingReadOnlyIndexReader(String, Set<String>, boolean) and allow SingleFieldSelectors to make it through from LeafScorer to the path caches! Affects ALL Lucene queries that run OUTSIDE of a transaction.
30722: Fixed ALF-9465: Share: We can add category in Share, but the selected value will not be shown in U.I.
30724: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_09_05 to BRANCHES/DEV/V3.4-BUG-FIX:
30603: ALF-10165: Unexpected behaviour when title duplicated between web forms
30754: Fix for ALF-9899 Huge share site migration, add group to site and user access site related performance issue.
- generic performance improvements for PATH queries ending "..../*" - specifically to improve listing calendar items for users in many share sites
30765: Fix for ALF-760 - import loses category association data
30779: Merged V3.4 to V3.4-BUG-FIX
30716: ALF-10452 It's impossible to edit existing user details
- Change for ALF-371 did not handle the simplest case - no change of home folder location
30549: Fixes ALF-9534 - Location API
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
@@ -22,15 +22,22 @@ import java.io.Serializable;
|
||||
import java.io.StringReader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.repo.admin.SysAdminParams;
|
||||
import org.alfresco.repo.admin.SysAdminParamsImpl;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
||||
import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.audit.AuditQueryParameters;
|
||||
import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.service.cmr.lock.LockStatus;
|
||||
import org.alfresco.service.cmr.repository.AssociationRef;
|
||||
@@ -528,6 +535,77 @@ public class TemplateNode extends BasePermissionsNode implements NamespacePrefix
|
||||
return new NodeSearchResultsMap(this, this.services);
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
// Audit API
|
||||
|
||||
/**
|
||||
* @return a list of AuditInfo objects describing the Audit Trail for this node instance
|
||||
*/
|
||||
public List<TemplateAuditInfo> getAuditTrail()
|
||||
{
|
||||
final List<TemplateAuditInfo> result = new ArrayList<TemplateAuditInfo>();
|
||||
|
||||
// create the callback for auditQuery method
|
||||
final AuditQueryCallback callback = new AuditQueryCallback()
|
||||
{
|
||||
public boolean valuesRequired()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean handleAuditEntryError(Long entryId, String errorMsg, Throwable error)
|
||||
{
|
||||
throw new AlfrescoRuntimeException("Failed to retrieve audit data.", error);
|
||||
}
|
||||
|
||||
public boolean handleAuditEntry(Long entryId, String applicationName, String user, long time,
|
||||
Map<String, Serializable> values)
|
||||
{
|
||||
TemplateAuditInfo auditInfo = new TemplateAuditInfo(applicationName, user, time, values);
|
||||
result.add(auditInfo);
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
// resolve the path of the node
|
||||
final String nodePath = services.getNodeService().getPath(this.nodeRef).toPrefixString(services.getNamespaceService());
|
||||
|
||||
// run as admin user to allow everyone to see audit information
|
||||
// (new 3.4 API doesn't allow this by default)
|
||||
AuthenticationUtil.runAs(new RunAsWork<Object>()
|
||||
{
|
||||
public Object doWork() throws Exception
|
||||
{
|
||||
String applicationName = "alfresco-access";
|
||||
AuditQueryParameters pathParams = new AuditQueryParameters();
|
||||
pathParams.setApplicationName(applicationName);
|
||||
pathParams.addSearchKey("/alfresco-access/transaction/path", nodePath);
|
||||
services.getAuditService().auditQuery(callback, pathParams, -1);
|
||||
|
||||
AuditQueryParameters copyFromPathParams = new AuditQueryParameters();
|
||||
copyFromPathParams.setApplicationName(applicationName);
|
||||
copyFromPathParams.addSearchKey("/alfresco-access/transaction/copy/from/path", nodePath);
|
||||
services.getAuditService().auditQuery(callback, copyFromPathParams, -1);
|
||||
|
||||
AuditQueryParameters moveFromPathParams = new AuditQueryParameters();
|
||||
moveFromPathParams.setApplicationName(applicationName);
|
||||
moveFromPathParams.addSearchKey("/alfresco-access/transaction/move/from/path", nodePath);
|
||||
services.getAuditService().auditQuery(callback, moveFromPathParams, -1);
|
||||
return null;
|
||||
}
|
||||
}, AuthenticationUtil.getAdminUserName());
|
||||
|
||||
// sort audit entries by time of generation
|
||||
Collections.sort(result, new Comparator<TemplateAuditInfo>()
|
||||
{
|
||||
public int compare(TemplateAuditInfo o1, TemplateAuditInfo o2)
|
||||
{
|
||||
return o1.getDate().compareTo(o2.getDate());
|
||||
}
|
||||
});
|
||||
return result;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
// Misc helpers
|
||||
|
||||
@@ -623,4 +701,45 @@ public class TemplateNode extends BasePermissionsNode implements NamespacePrefix
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class TemplateAuditInfo
|
||||
{
|
||||
private String applicationName;
|
||||
private String userName;
|
||||
private long time;
|
||||
private Map<String, Serializable> values;
|
||||
|
||||
public TemplateAuditInfo(String applicationName, String userName, long time, Map<String, Serializable> values)
|
||||
{
|
||||
this.applicationName = applicationName;
|
||||
this.userName = userName;
|
||||
this.time = time;
|
||||
this.values = values;
|
||||
}
|
||||
|
||||
public String getAuditApplication()
|
||||
{
|
||||
return this.applicationName;
|
||||
}
|
||||
|
||||
public String getUserIdentifier()
|
||||
{
|
||||
return this.userName;
|
||||
}
|
||||
|
||||
public Date getDate()
|
||||
{
|
||||
return new Date(time);
|
||||
}
|
||||
|
||||
public String getAuditMethod()
|
||||
{
|
||||
return this.values.get("/alfresco-access/transaction/action").toString();
|
||||
}
|
||||
|
||||
public Map<String, Serializable> getValues()
|
||||
{
|
||||
return this.values;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user