import org.apache.archiva.admin.model.beans.RepositoryGroup;
import org.apache.archiva.admin.model.group.RepositoryGroupAdmin;
import org.apache.archiva.scheduler.MergedRemoteIndexesScheduler;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.TaskScheduler;
@Named( value = "taskScheduler#mergeRemoteIndexes" )
private TaskScheduler taskScheduler;
- @Inject
- private RepositoryGroupAdmin repositoryGroupAdmin;
-
@Inject
private IndexMerger indexMerger;
private Map<String, ScheduledFuture> scheduledFutureMap = new ConcurrentHashMap<String, ScheduledFuture>();
@Override
- public void schedule( RepositoryGroup repositoryGroup )
+ public void schedule( RepositoryGroup repositoryGroup, File directory )
{
- if ( repositoryGroup.getCronExpression() == null )
+ if ( StringUtils.isEmpty( repositoryGroup.getCronExpression() ) )
{
return;
}
CronTrigger cronTrigger = new CronTrigger( repositoryGroup.getCronExpression() );
- File directory = repositoryGroupAdmin.getMergedIndexDirectory( repositoryGroup.getId() );
-
List<String> repositories = repositoryGroup.getRepositories();
IndexMergerRequest indexMergerRequest =
MergedRemoteIndexesTaskRequest taskRequest =
new MergedRemoteIndexesTaskRequest( indexMergerRequest, indexMerger );
+ logger.info( "schedule merge remote index for group {} with cron {}", repositoryGroup.getId(),
+ repositoryGroup.getCronExpression() );
+
ScheduledFuture scheduledFuture =
taskScheduler.schedule( new MergedRemoteIndexesTask( taskRequest ), cronTrigger );
scheduledFutureMap.put( repositoryGroup.getId(), scheduledFuture );
this.cronExpression = cronExpression;
}
- public RepositoryGroup mergedIndexCronExpression( String mergedIndexCronExpression )
+ public RepositoryGroup cronExpression( String mergedIndexCronExpression )
{
this.cronExpression = mergedIndexCronExpression;
return this;
{
for ( RepositoryGroup repositoryGroup : getRepositoriesGroups() )
{
- mergedRemoteIndexesScheduler.schedule( repositoryGroup );
+ mergedRemoteIndexesScheduler.schedule( repositoryGroup, getMergedIndexDirectory( repositoryGroup.getId() ) );
}
}
catch ( RepositoryAdminException e )
repositoriesGroups.add( new RepositoryGroup( repositoryGroupConfiguration.getId(), new ArrayList<String>(
repositoryGroupConfiguration.getRepositories() ) ).mergedIndexPath(
repositoryGroupConfiguration.getMergedIndexPath() ).mergedIndexTtl(
- repositoryGroupConfiguration.getMergedIndexTtl() ) );
+ repositoryGroupConfiguration.getMergedIndexTtl() ).cronExpression(
+ repositoryGroupConfiguration.getCronExpression() ) );
}
return repositoriesGroups;
configuration.addRepositoryGroup( repositoryGroupConfiguration );
saveConfiguration( configuration );
triggerAuditEvent( repositoryGroup.getId(), null, AuditEvent.ADD_REPO_GROUP, auditInformation );
- mergedRemoteIndexesScheduler.schedule( repositoryGroup );
+ mergedRemoteIndexesScheduler.schedule( repositoryGroup, getMergedIndexDirectory( repositoryGroup.getId() ) );
return Boolean.TRUE;
}
triggerAuditEvent( repositoryGroup.getId(), null, AuditEvent.MODIFY_REPO_GROUP, auditInformation );
}
mergedRemoteIndexesScheduler.unschedule( repositoryGroup );
- mergedRemoteIndexesScheduler.schedule( repositoryGroup );
+ mergedRemoteIndexesScheduler.schedule( repositoryGroup, getMergedIndexDirectory( repositoryGroup.getId() ) );
return Boolean.TRUE;
}
import org.apache.archiva.admin.model.beans.RepositoryGroup;
+import java.io.File;
+
/**
* @author Olivier Lamy
* @since 2.0.0
* remote indexes
* @param repositoryGroup
*/
- void schedule( RepositoryGroup repositoryGroup );
+ void schedule( RepositoryGroup repositoryGroup, File directory );
void unschedule( RepositoryGroup repositoryGroup );
/**
* @author Olivier Lamy
*/
-@Service( "repositoryGroupService#rest" )
+@Service("repositoryGroupService#rest")
public class DefaultRepositoryGroupService
extends AbstractRestService
implements RepositoryGroupService
for ( org.apache.archiva.admin.model.beans.RepositoryGroup repoGroup : repositoryGroupAdmin.getRepositoriesGroups() )
{
repositoriesGroups.add( new RepositoryGroup( repoGroup.getId(), new ArrayList<String>(
- repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() )
- .mergedIndexTtl( repoGroup.getMergedIndexTtl() ) );
+ repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() ).mergedIndexTtl(
+ repoGroup.getMergedIndexTtl() ).cronExpression( repoGroup.getCronExpression() ) );
}
return repositoriesGroups;
}
{
return repositoryGroupAdmin.addRepositoryGroup(
new org.apache.archiva.admin.model.beans.RepositoryGroup( repoGroup.getId(), new ArrayList<String>(
- repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() )
- .mergedIndexTtl( repoGroup.getMergedIndexTtl() ), getAuditInformation() );
+ repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() ).mergedIndexTtl(
+ repoGroup.getMergedIndexTtl() ).cronExpression( repoGroup.getCronExpression() ),
+ getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
{
return repositoryGroupAdmin.updateRepositoryGroup(
new org.apache.archiva.admin.model.beans.RepositoryGroup( repoGroup.getId(), new ArrayList<String>(
- repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() )
- .mergedIndexTtl( repoGroup.getMergedIndexTtl() ), getAuditInformation() );
+ repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() ).mergedIndexTtl(
+ repoGroup.getMergedIndexTtl() ).cronExpression( repoGroup.getCronExpression() ),
+ getAuditInformation() );
}
catch ( RepositoryAdminException e )
{