svn commit: r981152 - /archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java

[oching]

Author: oching
Date: Sun Aug  1 05:09:02 2010
New Revision: 981152

URL: http://svn.apache.org/viewvc?rev=981152&view=rev
Log:
[MRM-1400] schedule repo scan after merging so metadata gets fixed
submitted by Patti Arachchige Eshan Sudharaka

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

Modified: 
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java?rev=981152&r1=981151&r2=981152&view=diff
==============================================================================
--- 
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
 (original)
+++ 
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
 Sun Aug  1 05:09:02 2010
@@ -31,6 +31,7 @@ import org.apache.archiva.metadata.repos
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.web.action.admin.SchedulerAction;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -60,6 +61,11 @@ public class MergeAction
      */
     private MetadataRepository metadataRepository;
 
+    /**
+     * @plexus.requirement role="com.opensymphony.xwork2.Action" 
role-hint="schedulerAction"
+     */
+    private SchedulerAction scheduler;
+
     private ManagedRepositoryConfiguration repository;
 
     private String repoid;
@@ -100,7 +106,7 @@ public class MergeAction
         {
             List<ArtifactMetadata> sourceArtifacts = 
metadataRepository.getArtifacts( sourceRepoId );
             repositoryMerger.merge( sourceRepoId, repoid );
-            triggerAuditEvent( sourceRepoId, "file-eshan", 
AuditEvent.MERGING_REPOSITORIES );
+            scheduler.scanRepository();
 
             for ( ArtifactMetadata metadata : sourceArtifacts )
             {
@@ -127,6 +133,7 @@ public class MergeAction
             Filter<ArtifactMetadata> artifactsWithOutConflicts =
                 new IncludesFilter<ArtifactMetadata>( sourceArtifacts );
             repositoryMerger.merge( sourceRepoId, repoid, 
artifactsWithOutConflicts );
+            scheduler.scanRepository();
 
             for ( ArtifactMetadata metadata : sourceArtifacts )
             {
@@ -179,6 +186,7 @@ public class MergeAction
     {
         sourceRepoId = repoid + "-stage";
         conflictSourceArtifacts = repositoryMerger.getConflictsartifacts( 
sourceRepoId, repoid );
+        this.scheduler.setRepoid( repoid );
         this.repository = new ManagedRepositoryConfiguration();
         setConflictSourceArtifactsToBeDisplayed( conflictSourceArtifacts );
     }