diff options
| author | Olivier Lamy <olamy@apache.org> | 2013-12-17 07:28:27 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2013-12-17 07:28:27 +0000 |
| commit | b67de4117e723519ca95277c77b983a9ca69b867 (patch) | |
| tree | 1fac8f892ebe4e3d87f4b7243e3faabee0257667 /archiva-modules/archiva-web/archiva-webdav | |
| parent | dcd4afcdb83196959206d4e2d95f114976bea848 (diff) | |
| download | archiva-b67de4117e723519ca95277c77b983a9ca69b867.tar.gz archiva-b67de4117e723519ca95277c77b983a9ca69b867.zip | |
refactoring to ease cron scheduling
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1551472 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 | 13 |
1 files changed, 7 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 b6af5e3f9..cbe1172ba 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 @@ -38,7 +38,7 @@ 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.MergedRemoteIndexesTaskJob; +import org.apache.archiva.indexer.merger.MergedRemoteIndexesTask; import org.apache.archiva.indexer.merger.TemporaryGroupIndex; import org.apache.archiva.indexer.search.RepositorySearch; import org.apache.archiva.maven2.metadata.MavenMetadataReader; @@ -72,7 +72,6 @@ import org.apache.archiva.repository.metadata.RepositoryMetadataWriter; import org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler; import org.apache.archiva.security.ServletAuthenticator; import org.apache.archiva.webdav.util.MimeTypes; -import org.apache.archiva.webdav.util.RepositoryPathUtil; import org.apache.archiva.webdav.util.TemporaryGroupIndexSessionCleaner; import org.apache.archiva.webdav.util.WebdavMethodUtil; import org.apache.archiva.xml.XMLException; @@ -1317,12 +1316,14 @@ public class ArchivaDavResourceFactory repositoryGroupConfiguration.getMergedIndexTtl() ).mergedIndexDirectory( tempRepoFile ); - MergedRemoteIndexesTaskJob job = new MergedRemoteIndexesTaskJob(); - MergedRemoteIndexesTaskJob.MergedRemoteIndexesTaskRequest taskRequest = - new MergedRemoteIndexesTaskJob.MergedRemoteIndexesTaskRequest(indexMergerRequest, indexMerger); - IndexingContext indexingContext = job.execute( taskRequest ).getIndexingContext(); + MergedRemoteIndexesTask.MergedRemoteIndexesTaskRequest taskRequest = + new MergedRemoteIndexesTask.MergedRemoteIndexesTaskRequest(indexMergerRequest, indexMerger); + + MergedRemoteIndexesTask job = new MergedRemoteIndexesTask( taskRequest ); + + IndexingContext indexingContext = job.execute().getIndexingContext(); File mergedRepoDir = indexingContext.getIndexDirectoryFile(); TemporaryGroupIndex temporaryGroupIndex = |