inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/DEREK/V3.4_GENERAL to HEAD:

Browse Source 
22630: ALF-4106 AuditService: Return applications in alphabetical order
   22631: ALF-4106 AuditService: 'Audit' family of web scripts
   22632: ALF-4106 AuditService: Samples for documentation
   22635: ALF-4106 AuditService: Sample fix
   22642: ALF-4106 AuditService: Neater debug logging
   22643: ALF-4106 AuditService: Another sample
   22644: Added .sample to file extensions to include in line ending checks
   22654: Removed unnecessary INFO logging
   22655: Fixed ALF-4872: AuditService: Unable to restrict results to a specific value path


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-09-30 15:14:27 +00:00
parent 0105f86127
commit 0fdf71553a
8 changed files with 136 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
source/java/org/alfresco/repo/audit/AuditComponentImpl.java
View File

@@ -448,6 +448,11 @@ public class AuditComponentImpl implements AuditComponent
ParameterCheck.mandatory("rootPath", rootPath);
AuditApplication.checkPathFormat(rootPath);
if (values == null || values.isEmpty() || !areAuditValuesRequired())
{
return Collections.emptyMap();
}
// Log inbound values
if (loggerInbound.isDebugEnabled())
{
@@ -464,11 +469,6 @@ public class AuditComponentImpl implements AuditComponent
loggerInbound.debug(sb.toString());
}
if (values == null || values.isEmpty() || !areAuditValuesRequired())
{
return Collections.emptyMap();
}
// Build the key paths using the session root path
Map<String, Serializable> pathedValues = new HashMap<String, Serializable>(values.size() * 2);
for (Map.Entry<String, Serializable> entry : values.entrySet())
@@ -642,18 +642,46 @@ public class AuditComponentImpl implements AuditComponent
{
// Persist the values
entryId = auditDAO.createAuditEntry(applicationId, time, username, auditData);
// Done
if (logger.isDebugEnabled())
{
StringBuilder sb = new StringBuilder();
sb.append(
"\nNew audit entry: \n" +
"\tApplication ID: " + applicationId + "\n" +
"\tEntry ID: " + entryId + "\n" +
"\tValues: " + "\n");
for (Map.Entry<String, Serializable> entry : values.entrySet())
{
sb.append("\t\t").append(entry).append("\n");
}
sb.append("\n\tAudit Data: \n");
for (Map.Entry<String, Serializable> entry : auditData.entrySet())
{
sb.append("\t\t").append(entry).append("\n");
}
logger.debug(sb.toString());
}
}
else
{
// Done ... nothing
if (logger.isDebugEnabled())
{
StringBuilder sb = new StringBuilder();
sb.append(
"\nNothing audited: \n" +
"\tApplication ID: " + applicationId + "\n" +
"\tEntry ID: " + entryId + "\n" +
"\tValues: " + "\n");
for (Map.Entry<String, Serializable> entry : values.entrySet())
{
sb.append("\t\t").append(entry).append("\n");
}
logger.debug(sb.toString());
}
}
// Done
if (logger.isDebugEnabled())
{
logger.debug(
"New audit entry: \n" +
" Application ID: " + applicationId + "\n" +
" Entry ID: " + entryId + "\n" +
" Values: " + values + "\n" +
" Audit Data: " + auditData);
}
return auditData;
}
@@ -720,10 +748,21 @@ public class AuditComponentImpl implements AuditComponent
// Done
if (logger.isDebugEnabled())
{
logger.debug("Extracted audit data: \n" +
" Application: " + application + "\n" +
" Raw values: " + values + "\n" +
" Extracted: " + newData);
StringBuilder sb = new StringBuilder();
sb.append(
"\nExtracted audit data: \n" +
"\tApplication: " + application + "\n" +
"\tValues: " + "\n");
for (Map.Entry<String, Serializable> entry : values.entrySet())
{
sb.append("\t\t").append(entry).append("\n");
}
sb.append("\n\tNew Data: \n");
for (Map.Entry<String, Serializable> entry : newData.entrySet())
{
sb.append("\t\t").append(entry).append("\n");
}
logger.debug(sb.toString());
}
return newData;
}