svn commit: r1163030 - in /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src: main/java/org/apache/archiva/admin/repository/managed/ test/java/org/apache/archiva/admin/repository/managed/

[olamy]

Author: olamy
Date: Mon Aug 29 21:43:33 2011
New Revision: 1163030

URL: http://svn.apache.org/viewvc?rev=1163030&view=rev
Log:
trigger audit event listeners call in repo admin api when add/delete a managed 
repo

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java?rev=1163030&r1=1163029&r2=1163030&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
 Mon Aug 29 21:43:33 2011
@@ -138,6 +138,7 @@ public class DefaultManagedRepositoryAdm
                                          AuditInformation auditInformation )
         throws RepositoryAdminException
     {
+        triggerAuditEvent( managedRepository.getId(), null, 
AuditEvent.ADD_MANAGED_REPO, auditInformation );
         return
             addManagedRepository( managedRepository.getId(), 
managedRepository.getLayout(), managedRepository.getName(),
                                   managedRepository.getLocation(), 
managedRepository.isBlockRedeployments(),
@@ -266,6 +267,8 @@ public class DefaultManagedRepositoryAdm
             throw new RepositoryAdminException( "A repository with that id 
does not exist" );
         }
 
+        triggerAuditEvent( repositoryId, null, AuditEvent.DELETE_MANAGED_REPO, 
auditInformation );
+
         RepositorySession repositorySession = 
repositorySessionFactory.createSession();
         try
         {

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java?rev=1163030&r1=1163029&r2=1163030&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
 Mon Aug 29 21:43:33 2011
@@ -20,6 +20,7 @@ package org.apache.archiva.admin.reposit
 
 import org.apache.archiva.admin.AuditInformation;
 import org.apache.archiva.admin.mock.MockAuditListener;
+import org.apache.archiva.audit.AuditEvent;
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.redback.users.User;
 import org.codehaus.plexus.redback.users.memory.SimpleUser;
@@ -97,8 +98,14 @@ public class ManagedRepositoryAdminTest
         assertNotNull( repos );
         assertEquals( initialSize, repos.size() );
 
-        assertEquals( 0, mockAuditListener.getAuditEvents().size() );
+        assertEquals( 2, mockAuditListener.getAuditEvents().size() );
 
+        assertEquals( AuditEvent.ADD_MANAGED_REPO, 
mockAuditListener.getAuditEvents().get( 0 ).getAction() );
+        assertEquals( "root", mockAuditListener.getAuditEvents().get( 0 
).getUserId() );
+        assertEquals( "archiva-localhost", 
mockAuditListener.getAuditEvents().get( 0 ).getRemoteIP() );
+
+        assertEquals( AuditEvent.DELETE_MANAGED_REPO, 
mockAuditListener.getAuditEvents().get( 1 ).getAction() );
+        assertEquals( "root", mockAuditListener.getAuditEvents().get( 0 
).getUserId() );
         mockAuditListener.clearEvents();
     }
 
@@ -137,9 +144,15 @@ public class ManagedRepositoryAdminTest
 
         managedRepositoryAdmin.deleteManagedRepository( repo.getId(), 
getFakeAuditInformation() );
 
-        assertEquals( 1, mockAuditListener.getAuditEvents().size() );
+        assertEquals( 3, mockAuditListener.getAuditEvents().size() );
+
+        assertEquals( AuditEvent.ADD_MANAGED_REPO, 
mockAuditListener.getAuditEvents().get( 0 ).getAction() );
+        assertEquals( "root", mockAuditListener.getAuditEvents().get( 0 
).getUserId() );
+        assertEquals( "archiva-localhost", 
mockAuditListener.getAuditEvents().get( 0 ).getRemoteIP() );
+
+        assertEquals( AuditEvent.MODIFY_MANAGED_REPO, 
mockAuditListener.getAuditEvents().get( 1 ).getAction() );
 
-        log.info( "audit events {}", mockAuditListener.getAuditEvents()  );
+        assertEquals( AuditEvent.DELETE_MANAGED_REPO, 
mockAuditListener.getAuditEvents().get( 2 ).getAction() );
 
         mockAuditListener.clearEvents();
     }