svn commit: r900594 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java

[brett]

Author: brett
Date: Mon Jan 18 22:51:27 2010
New Revision: 900594

URL: http://svn.apache.org/viewvc?rev=900594&view=rev
Log:
[MRM-1315] delete artifact should log artifact audit information consistently

Modified:
    
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java

Modified: 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java?rev=900594&r1=900593&r2=900594&view=diff
==============================================================================
--- 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
 (original)
+++ 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
 Mon Jan 18 22:51:27 2010
@@ -211,7 +211,8 @@
 
             String path = repository.toMetadataPath( ref );
             int index = path.lastIndexOf( '/' );
-            File targetPath = new File( repoConfig.getLocation(), 
path.substring( 0, index ) );
+            path = path.substring( 0, index );
+            File targetPath = new File( repoConfig.getLocation(), path );
 
             if ( !targetPath.exists() )
             {
@@ -246,14 +247,14 @@
                         listener.deleteArtifact( repository.getId(), 
artifact.getNamespace(), artifact.getProject(),
                                                  artifact.getVersion(), 
artifact.getId() );
                     }
+
+                    triggerAuditEvent( repositoryId, path, 
AuditEvent.REMOVE_FILE );
                 }
             }
 
             String msg = "Artifact \'" + groupId + ":" + artifactId + ":" + 
version +
                 "\' was successfully deleted from repository \'" + 
repositoryId + "\'";
 
-            triggerAuditEvent( repositoryId, groupId + ":" + artifactId + ":" 
+ version, AuditEvent.REMOVE_FILE );
-
             addActionMessage( msg );
 
             reset();