diff options
| author | Maria Odea B. Ching <oching@apache.org> | 2010-09-28 09:09:32 +0000 |
|---|---|---|
| committer | Maria Odea B. Ching <oching@apache.org> | 2010-09-28 09:09:32 +0000 |
| commit | e82ce0f0b50f2db74e998c02384c8f7cfa1ee4a4 (patch) | |
| tree | 039e39cc54ae6fcbfa442930a69c01e1a1825e55 /archiva-modules/plugins/audit | |
| parent | 9baf9de1ce12d6347588583c7011b55c32810f12 (diff) | |
| download | archiva-e82ce0f0b50f2db74e998c02384c8f7cfa1ee4a4.tar.gz archiva-e82ce0f0b50f2db74e998c02384c8f7cfa1ee4a4.zip | |
merged MRM-980 branch to trunk
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1002059 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/plugins/audit')
2 files changed, 4 insertions, 1 deletions
diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java index 4712520a9..bf84c90ab 100644 --- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java +++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java @@ -69,6 +69,8 @@ public class AuditEvent public static final String REMOVE_SCANNED = "Removed in Filesystem"; + public static final String MERGING_REPOSITORIES = "Merged Artifact"; + // configuration events public static final String ADD_MANAGED_REPO = "Added Managed Repository"; diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java index 6a67960b2..66383892e 100644 --- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java +++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java @@ -33,7 +33,8 @@ public class MetadataAuditListener public void auditEvent( AuditEvent event ) { // for now we only log upload events, some of the others are quite noisy - if ( event.getAction().equals( AuditEvent.CREATE_FILE ) || event.getAction().equals( AuditEvent.UPLOAD_FILE ) ) + if ( event.getAction().equals( AuditEvent.CREATE_FILE ) || event.getAction().equals( AuditEvent.UPLOAD_FILE ) || + event.getAction().equals( AuditEvent.MERGING_REPOSITORIES ) ) { auditManager.addAuditEvent( event ); } |