diff options
| author | Olivier Lamy <olamy@apache.org> | 2013-02-07 14:57:55 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2013-02-07 14:57:55 +0000 |
| commit | cde16b4a260af25c44a5e349db580f5e224fce07 (patch) | |
| tree | 7acbdc5a95a0b486fdd1501a6ab272cb6ee2d801 /archiva-modules/archiva-web/archiva-webdav | |
| parent | e0ecff38ea3e9d4f6c9b3bf4f93843e572e38bd1 (diff) | |
| download | archiva-cde16b4a260af25c44a5e349db580f5e224fce07.tar.gz archiva-cde16b4a260af25c44a5e349db580f5e224fce07.zip | |
use a bean class for request to ease future enhancements
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1443527 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webdav')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java index a2b7efec0..7078cadca 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java @@ -33,6 +33,7 @@ import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.RepositoryGroupConfiguration; import org.apache.archiva.indexer.merger.IndexMerger; import org.apache.archiva.indexer.merger.IndexMergerException; +import org.apache.archiva.indexer.merger.IndexMergerRequest; import org.apache.archiva.indexer.merger.TemporaryGroupIndex; import org.apache.archiva.indexer.search.RepositorySearch; import org.apache.archiva.maven2.metadata.MavenMetadataReader; @@ -109,7 +110,7 @@ import java.util.Set; /** * */ -@Service("davResourceFactory#archiva") +@Service( "davResourceFactory#archiva" ) public class ArchivaDavResourceFactory implements DavResourceFactory, Auditable { @@ -140,7 +141,7 @@ public class ArchivaDavResourceFactory * */ @Inject - @Named(value = "repositoryProxyConnectors#default") + @Named( value = "repositoryProxyConnectors#default" ) private RepositoryProxyConnectors connectors; /** @@ -170,7 +171,7 @@ public class ArchivaDavResourceFactory * */ @Inject - @Named(value = "httpAuthenticator#basic") + @Named( value = "httpAuthenticator#basic" ) private HttpAuthenticator httpAuth; @Inject @@ -206,7 +207,7 @@ public class ArchivaDavResourceFactory * */ @Inject - @Named(value = "archivaTaskScheduler#repository") + @Named( value = "archivaTaskScheduler#repository" ) private RepositoryArchivaTaskScheduler scheduler; private ApplicationContext applicationContext; @@ -1216,10 +1217,11 @@ public class ArchivaDavResourceFactory } log.info( "generate temporary merged index for repository group '{}' for repositories '{}'", groupId, authzRepos ); - IndexingContext indexingContext = indexMerger.buildMergedIndex( authzRepos, true ); + IndexingContext indexingContext = + indexMerger.buildMergedIndex( new IndexMergerRequest( authzRepos, true, groupId ) ); File mergedRepoDir = indexingContext.getIndexDirectoryFile(); TemporaryGroupIndex temporaryGroupIndex = - new TemporaryGroupIndex( mergedRepoDir, indexingContext.getId() ).setCreationTime( + new TemporaryGroupIndex( mergedRepoDir, indexingContext.getId(), groupId ).setCreationTime( new Date().getTime() ); temporaryGroupIndexMap.put( groupId, temporaryGroupIndex ); session.setAttribute( TemporaryGroupIndexSessionCleaner.TEMPORARY_INDEX_SESSION_KEY, |