Author: olamy
Date: Tue Dec 17 07:28:27 2013
New Revision: 1551472
URL: http://svn.apache.org/r1551472
Log:
refactoring to ease cron scheduling
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTask.java
(contents, props changed)
- copied, changed from r1551471,
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskJob.java
Removed:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskJob.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTask.java
(from r1551471,
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskJob.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTask.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTask.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskJob.java&r1=1551471&r2=1551472&rev=1551472&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTaskJob.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTask.java
Tue Dec 17 07:28:27 2013
@@ -32,20 +32,33 @@ import java.io.File;
* @author Olivier Lamy
* @since 2.0.0
*/
-public class MergedRemoteIndexesTaskJob
- extends AbstractJob
+public class MergedRemoteIndexesTask
+ implements Runnable
{
private Logger logger = LoggerFactory.getLogger( getClass() );
- @Override
- public void execute( JobExecutionContext context )
- throws JobExecutionException
+ private MergedRemoteIndexesTaskRequest mergedRemoteIndexesTaskRequest;
+
+ public MergedRemoteIndexesTask( MergedRemoteIndexesTaskRequest
mergedRemoteIndexesTaskRequest )
{
+ this.mergedRemoteIndexesTaskRequest = mergedRemoteIndexesTaskRequest;
+ }
+ @Override
+ public void run()
+ {
+ try
+ {
+ this.execute();
+ }
+ catch ( IndexMergerException e )
+ {
+ logger.error( e.getMessage(), e );
+ }
}
- public MergedRemoteIndexesTaskResult execute(
MergedRemoteIndexesTaskRequest mergedRemoteIndexesTaskRequest )
+ public MergedRemoteIndexesTaskResult execute( )
throws IndexMergerException
{
IndexMerger indexMerger = mergedRemoteIndexesTaskRequest.indexMerger;
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/MergedRemoteIndexesTask.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java?rev=1551472&r1=1551471&r2=1551472&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
Tue Dec 17 07:28:27 2013
@@ -38,7 +38,7 @@ import org.apache.archiva.configuration.
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.met
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 =
