diff options
| author | Olivier Lamy <olamy@apache.org> | 2013-12-17 07:29:31 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2013-12-17 07:29:31 +0000 |
| commit | 1e1f7cdacd0118a5fb9a707871c7b7100b7f09d2 (patch) | |
| tree | 1f1750f62f31b10b5cd1cb0b9ed96eeed848c823 /archiva-modules/archiva-web/archiva-rest | |
| parent | 3ac4f6e6624968f11d6293ac17244e1275ab1305 (diff) | |
| download | archiva-1e1f7cdacd0118a5fb9a707871c7b7100b7f09d2.tar.gz archiva-1e1f7cdacd0118a5fb9a707871c7b7100b7f09d2.zip | |
[MRM-1746] build merged index for groups with a cron schedule
fix issues
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1551475 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-rest')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java index 1b5759101..afabd6676 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java @@ -33,7 +33,7 @@ import java.util.List; /** * @author Olivier Lamy */ -@Service( "repositoryGroupService#rest" ) +@Service("repositoryGroupService#rest") public class DefaultRepositoryGroupService extends AbstractRestService implements RepositoryGroupService @@ -52,8 +52,8 @@ public class DefaultRepositoryGroupService 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; } @@ -83,8 +83,9 @@ public class DefaultRepositoryGroupService { 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 ) { @@ -99,8 +100,9 @@ public class DefaultRepositoryGroupService { 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 ) { |