Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-21 17:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

update changed name in maven indexer

Browse Source 
add more rest service to update managed repository

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1160252 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-08-22 13:03:54 +00:00
parent 468d33012d
commit 0c7626a137
5 changed files with 243 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java
View File

@ -24,7 +24,7 @@
import org.apache.maven.index.creator.MavenArchetypeArtifactInfoIndexCreator;
import org.apache.maven.index.creator.MavenPluginArtifactInfoIndexCreator;
import org.apache.maven.index.creator.MinimalArtifactInfoIndexCreator;
import org.apache.maven.index.creator.OSGIArtifactIndexCreator;
import org.apache.maven.index.creator.OsgiArtifactIndexCreator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@ -59,7 +59,7 @@ public MavenIndexerUtils( PlexusSisuBridge plexusSisuBridge )
log.warn( "using lookupList from sisu plexus failed so build indexCreator manually" );
allIndexCreators =
Arrays.asList( plexusSisuBridge.lookup( IndexCreator.class, OSGIArtifactIndexCreator.ID ),
Arrays.asList( plexusSisuBridge.lookup( IndexCreator.class, OsgiArtifactIndexCreator.ID ),
plexusSisuBridge.lookup( IndexCreator.class, MavenArchetypeArtifactInfoIndexCreator.ID ),
plexusSisuBridge.lookup( IndexCreator.class, MinimalArtifactInfoIndexCreator.ID ),
plexusSisuBridge.lookup( IndexCreator.class, JarFileContentsIndexCreator.ID ),

8
archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java
View File

@ -70,6 +70,14 @@ Boolean addManagedRepository( ManagedRepository managedRepository )
throws Exception;
@Path( "updateManagedRepository" )
@POST
@Consumes( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
@RedbackAuthorization( permission = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
Boolean updateManagedRepository( ManagedRepository managedRepository )
throws Exception;
@Path( "getRemoteRepositories" )
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )

4
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
View File

@ -37,6 +37,10 @@
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-security</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>audit</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository</artifactId>

252
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultRepositoriesService.java
View File

@ -1,6 +1,9 @@
package org.apache.archiva.rest.services;
import org.apache.archiva.audit.AuditEvent;
import org.apache.archiva.audit.AuditListener;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
@ -18,11 +21,15 @@
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.users.User;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.codehaus.redback.components.scheduler.CronExpressionValidator;
import org.codehaus.redback.components.scheduler.Scheduler;
import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@ -54,6 +61,12 @@ public class DefaultRepositoriesService
private static final String REPOSITORY_LOCATION_VALID_EXPRESSION = "^[-a-zA-Z0-9._/~:?!&amp;=\\\\]+$";
// TODO move this field to an abstract class
@Inject
private List<AuditListener> auditListeners = new ArrayList<AuditListener>();
@Inject
protected RoleManager roleManager;
@Inject
protected ArchivaConfiguration archivaConfiguration;
@ -144,6 +157,7 @@ public Boolean deleteManagedRepository( String repoId )
throw new Exception( "Error saving configuration for delete action" + e.getMessage() );
}
// TODO could be async ? as directory can be huge
File dir = new File( repository.getLocation() );
if ( !FileUtils.deleteQuietly( dir ) )
{
@ -193,60 +207,21 @@ public List<RemoteRepository> getRemoteRepositories()
return remoteRepos;
}
public Boolean scanRepository( String repositoryId, boolean fullScan )
{
if ( repositoryTaskScheduler.isProcessingRepositoryTask( repositoryId ) )
{
log.info( "scanning of repository with id {} already scheduled" );
}
RepositoryTask task = new RepositoryTask();
task.setRepositoryId( repositoryId );
task.setScanAll( fullScan );
try
{
repositoryTaskScheduler.queueTask( task );
}
catch ( TaskQueueException e )
{
log.error( "failed to schedule scanning of repo with id {}", repositoryId, e );
return false;
}
return true;
}
public Boolean alreadyScanning( String repositoryId )
{
return repositoryTaskScheduler.isProcessingRepositoryTask( repositoryId );
}
public Boolean removeScanningTaskFromQueue( @PathParam( "repositoryId" ) String repositoryId )
{
RepositoryTask task = new RepositoryTask();
task.setRepositoryId( repositoryId );
try
{
return repositoryTaskScheduler.unQueueTask( task );
}
catch ( TaskQueueException e )
{
log.error( "failed to unschedule scanning of repo with id {}", repositoryId, e );
return false;
}
}
public Boolean addManagedRepository( ManagedRepository managedRepository )
throws Exception
{
return addManagedRepository( managedRepository.getId(), managedRepository.getLayout(),
managedRepository.getName(), managedRepository.getUrl(),
managedRepository.isBlockRedeployments(), managedRepository.isReleases(),
managedRepository.isSnapshots(), managedRepository.isStageRepoNeeded(),
managedRepository.getCronExpression() );
return
addManagedRepository( managedRepository.getId(), managedRepository.getLayout(), managedRepository.getName(),
managedRepository.getUrl(), managedRepository.isBlockRedeployments(),
managedRepository.isReleases(), managedRepository.isSnapshots(),
managedRepository.isStageRepoNeeded(), managedRepository.getCronExpression() )
!= null;
}
private Boolean addManagedRepository( String repoId, String layout, String name, String location,
boolean blockRedeployments, boolean releasesIncluded,
boolean snapshotsIncluded, boolean stageRepoNeeded, String cronExpression )
private ManagedRepositoryConfiguration addManagedRepository( String repoId, String layout, String name,
String location, boolean blockRedeployments,
boolean releasesIncluded, boolean snapshotsIncluded,
boolean stageRepoNeeded, String cronExpression )
throws Exception
{
@ -335,7 +310,145 @@ else if ( config.getRepositoryGroupsAsMap().containsKey( repoId ) )
e.getMessage() ).toString(), e );
}
return Boolean.TRUE;
return repository;
}
public Boolean updateManagedRepository( ManagedRepository repository )
throws Exception
{
// Ensure that the fields are valid.
Configuration configuration = archivaConfiguration.getConfiguration();
ManagedRepositoryConfiguration toremove = configuration.findManagedRepositoryById( repository.getId() );
if ( toremove != null )
{
configuration.removeManagedRepository( toremove );
}
// FIXME the case of the attached staging repository
/*
if ( stagingRepository != null )
{
removeRepository( stagingRepository.getId(), configuration );
}*/
// Save the repository configuration.
String result;
RepositorySession repositorySession = repositorySessionFactory.createSession();
ManagedRepositoryConfiguration managedRepositoryConfiguration =
addManagedRepository( repository.getId(), repository.getLayout(), repository.getName(), repository.getUrl(),
repository.isBlockRedeployments(), repository.isReleases(), repository.isSnapshots(),
repository.isStageRepoNeeded(), repository.getCronExpression() );
// FIXME only location has changed from previous
boolean resetStats = true;
try
{
triggerAuditEvent( repository.getId(), null, AuditEvent.MODIFY_MANAGED_REPO );
addRepositoryRoles( managedRepositoryConfiguration );
// FIXME this staging part !!
//update changes of the staging repo
/*if ( stageNeeded )
{
stagingRepository = getStageRepoConfig( configuration );
addRepository( stagingRepository, configuration );
addRepositoryRoles( stagingRepository );
}*/
//delete staging repo when we dont need it
/*
if ( !stageNeeded )
{
stagingRepository = getStageRepoConfig( configuration );
removeRepository( stagingRepository.getId(), configuration );
removeContents( stagingRepository );
removeRepositoryRoles( stagingRepository );
}*/
saveConfiguration( this.archivaConfiguration.getConfiguration() );
if ( resetStats )
{
repositoryStatisticsManager.deleteStatistics( repositorySession.getRepository(), repository.getId() );
repositorySession.save();
}
//MRM-1342 Repository statistics report doesn't appear to be working correctly
//scan repository when modification of repository is successful
// olamy : IMHO we are fine to ignore issue with scheduling scanning
// as here the repo has been updated
scanRepository( repository.getId(), true );
// FIXME staging !!
/*
if ( stageNeeded )
{
executeRepositoryScanner( stagingRepository.getId() );
}*/
}
catch ( IOException e )
{
throw e;
}
catch ( RoleManagerException e )
{
throw e;
}
catch ( MetadataRepositoryException e )
{
throw e;
}
finally
{
repositorySession.close();
}
return true;
}
public Boolean scanRepository( String repositoryId, boolean fullScan )
{
if ( repositoryTaskScheduler.isProcessingRepositoryTask( repositoryId ) )
{
log.info( "scanning of repository with id {} already scheduled" );
}
RepositoryTask task = new RepositoryTask();
task.setRepositoryId( repositoryId );
task.setScanAll( fullScan );
try
{
repositoryTaskScheduler.queueTask( task );
}
catch ( TaskQueueException e )
{
log.error( "failed to schedule scanning of repo with id {}", repositoryId, e );
return false;
}
return true;
}
public Boolean alreadyScanning( String repositoryId )
{
return repositoryTaskScheduler.isProcessingRepositoryTask( repositoryId );
}
public Boolean removeScanningTaskFromQueue( @PathParam( "repositoryId" ) String repositoryId )
{
RepositoryTask task = new RepositoryTask();
task.setRepositoryId( repositoryId );
try
{
return repositoryTaskScheduler.unQueueTask( task );
}
catch ( TaskQueueException e )
{
log.error( "failed to unschedule scanning of repo with id {}", repositoryId, e );
return false;
}
}
//-----------------------------------------------
@ -344,6 +457,43 @@ else if ( config.getRepositoryGroupsAsMap().containsKey( repoId ) )
// olamt move those in common utility classes
//-----------------------------------------------
protected void triggerAuditEvent( String repositoryId, String resource, String action )
{
User user = RedbackAuthenticationThreadLocal.get();
if ( user == null )
{
log.warn( "no user found in Redback ThreadLocal" );
AuditEvent event =
new AuditEvent( repositoryId, user == null ? "null" : user.getUsername(), resource, action );
// FIXME use a thread local through cxf interceptors to store this
//event.setRemoteIP( getRemoteAddr() );
for ( AuditListener listener : auditListeners )
{
listener.auditEvent( event );
}
}
}
protected void addRepositoryRoles( ManagedRepositoryConfiguration newRepository )
throws RoleManagerException
{
String repoId = newRepository.getId();
// TODO: double check these are configured on start up
// TODO: belongs in the business logic
if ( !roleManager.templatedRoleExists( ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, repoId ) )
{
roleManager.createTemplatedRole( ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, repoId );
}
if ( !roleManager.templatedRoleExists( ArchivaRoleConstants.TEMPLATE_REPOSITORY_MANAGER, repoId ) )
{
roleManager.createTemplatedRole( ArchivaRoleConstants.TEMPLATE_REPOSITORY_MANAGER, repoId );
}
}
public Boolean executeRepositoryScanner( String repoId )
throws Exception
{

28
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
View File

@ -123,6 +123,34 @@ public void addManagedRepo()
assertNotNull( service.getManagedRepository( repo.getId() ) );
}
@Test
public void updateManagedRepo()
throws Exception
{
RepositoriesService service = getRepositoriesService();
WebClient.client( service ).header( "Authorization", authorizationHeader );
WebClient.getConfig( service ).getHttpConduit().getClient().setReceiveTimeout( 300000 );
ManagedRepository repo = getTestManagedRepository();
if ( service.getManagedRepository( repo.getId() ) != null )
{
service.deleteManagedRepository( repo.getId() );
assertNull( service.getManagedRepository( repo.getId() ) );
}
service.addManagedRepository( repo );
repo = service.getManagedRepository( repo.getId() );
assertNotNull( repo );
assertEquals( "foo", repo.getName() );
// toto is foo in French :-)
repo.setName( "toto" );
service.updateManagedRepository( repo );
repo = service.getManagedRepository( repo.getId() );
assertNotNull( repo );
assertEquals( "toto", repo.getName() );
}
private ManagedRepository getTestManagedRepository()
{