Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more cleanup of direct use of archiva-configuration 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1170510 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-09-14 10:21:16 +00:00
parent ebac483742
commit da35eac6b5
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
View File

@ -21,6 +21,9 @@ package org.apache.maven.archiva.web.action;
import com.opensymphony.xwork2.Preparable; import com.opensymphony.xwork2.Preparable;
import com.opensymphony.xwork2.Validateable; import com.opensymphony.xwork2.Validateable;
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.audit.AuditEvent; import org.apache.archiva.audit.AuditEvent;
import org.apache.archiva.audit.Auditable; import org.apache.archiva.audit.Auditable;
import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.ArtifactMetadata;
@ -31,18 +34,17 @@ import org.apache.archiva.metadata.repository.filter.IncludesFilter;
import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
import org.apache.archiva.scheduler.repository.RepositoryTask; import org.apache.archiva.scheduler.repository.RepositoryTask;
import org.apache.archiva.stagerepository.merge.Maven2RepositoryMerger; import org.apache.archiva.stagerepository.merge.Maven2RepositoryMerger;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.codehaus.plexus.taskqueue.TaskQueueException; import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
/** /**
* *
@ -60,13 +62,13 @@ public class MergeAction
private Maven2RepositoryMerger repositoryMerger; private Maven2RepositoryMerger repositoryMerger;
@Inject @Inject
protected ArchivaConfiguration archivaConfiguration; protected ManagedRepositoryAdmin managedRepositoryAdmin;
@Inject @Inject
@Named( value = "archivaTaskScheduler#repository" ) @Named( value = "archivaTaskScheduler#repository" )
private RepositoryArchivaTaskScheduler repositoryTaskScheduler; private RepositoryArchivaTaskScheduler repositoryTaskScheduler;
private ManagedRepositoryConfiguration repository; private ManagedRepository repository;
private String repoid; private String repoid;
@ -82,17 +84,23 @@ public class MergeAction
public String getConflicts() public String getConflicts()
{ {
sourceRepoId = repoid + "-stage"; try
Configuration config = archivaConfiguration.getConfiguration();
ManagedRepositoryConfiguration targetRepoConfig = config.findManagedRepositoryById( sourceRepoId );
if ( targetRepoConfig != null )
{ {
return hasConflicts; sourceRepoId = repoid + "-stage";
ManagedRepository targetRepoConfig = managedRepositoryAdmin.getManagedRepository( sourceRepoId );
if ( targetRepoConfig != null )
{
return hasConflicts;
}
else
{
return ERROR;
}
} }
else catch ( RepositoryAdminException e )
{ {
addActionError( "RepositoryAdminException " + e.getMessage() );
return ERROR; return ERROR;
} }
} }
@ -205,12 +213,12 @@ public class MergeAction
return SUCCESS; return SUCCESS;
} }
public ManagedRepositoryConfiguration getRepository() public ManagedRepository getRepository()
{ {
return repository; return repository;
} }
public void setRepository( ManagedRepositoryConfiguration repository ) public void setRepository( ManagedRepository repository )
{ {
this.repository = repository; this.repository = repository;
} }
@ -230,8 +238,7 @@ public class MergeAction
repositorySession.close(); repositorySession.close();
} }
Configuration config = archivaConfiguration.getConfiguration(); this.repository = managedRepositoryAdmin.getManagedRepository( repoid );
this.repository = config.findManagedRepositoryById( repoid );
setConflictSourceArtifactsToBeDisplayed( conflictSourceArtifacts ); setConflictSourceArtifactsToBeDisplayed( conflictSourceArtifacts );
} }
@ -332,4 +339,14 @@ public class MergeAction
} }
} }
} }
public ManagedRepositoryAdmin getManagedRepositoryAdmin()
{
return managedRepositoryAdmin;
}
public void setManagedRepositoryAdmin( ManagedRepositoryAdmin managedRepositoryAdmin )
{
this.managedRepositoryAdmin = managedRepositoryAdmin;
}
} }