You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jm...@apache.org on 2007/04/11 19:38:48 UTC
svn commit: r527585 - in
/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled:
./ src/main/java/org/apache/maven/archiva/scheduled/
src/main/java/org/apache/maven/archiva/scheduled/executors/
src/main/java/org/apache/ma...
Author: jmcconnell
Date: Wed Apr 11 10:38:45 2007
New Revision: 527585
URL: http://svn.apache.org/viewvc?view=rev&rev=527585
Log:
database and repository teasks with a single task queue for processing
Added:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java
- copied, changed from r526890, maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskScheduler.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DatabaseTaskJob.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
- copied, changed from r526890, maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultRepositoryTaskScheduler.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/ArchivaTask.java
- copied, changed from r526939, maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/RepositoryTask.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/DatabaseTask.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/resources/
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/resources/META-INF/
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/resources/META-INF/plexus/
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml
Removed:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultRepositoryTaskScheduler.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskScheduler.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/DataRefreshConsumers.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/DataRefreshExecutor.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/DataRefreshTask.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/RepositoryTask.java
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/pom.xml
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskJob.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/DataRefreshExecutorTest.java
Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/pom.xml?view=diff&rev=527585&r1=527584&r2=527585
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/pom.xml (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/pom.xml Wed Apr 11 10:38:45 2007
@@ -34,6 +34,10 @@
<artifactId>archiva-configuration</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven.archiva</groupId>
+ <artifactId>archiva-database</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-taskqueue</artifactId>
<version>1.0-alpha-6</version>
@@ -61,6 +65,20 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>merge</id>
+ <goals>
+ <goal>merge-descriptors</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
+ <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Copied: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java (from r526890, maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskScheduler.java)
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java?view=diff&rev=527585&p1=maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskScheduler.java&r1=526890&p2=maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java&r2=527585
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskScheduler.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java Wed Apr 11 10:38:45 2007
@@ -26,14 +26,17 @@
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public interface RepositoryTaskScheduler
+public interface ArchivaTaskScheduler
{
/**
* The Plexus component role.
*/
- String ROLE = RepositoryTaskScheduler.class.getName();
+ public final static String ROLE = ArchivaTaskScheduler.class.getName();
- void runDataRefresh()
- throws TaskExecutionException;
+ public void runDatabaseTasks() throws TaskExecutionException;
+ public void runAllRepositoryTasks() throws TaskExecutionException;
+
+ public void runRepositoryTasks( String repositoryId ) throws TaskExecutionException;
+
}
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DatabaseTaskJob.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DatabaseTaskJob.java?view=auto&rev=527585
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DatabaseTaskJob.java (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DatabaseTaskJob.java Wed Apr 11 10:38:45 2007
@@ -0,0 +1,85 @@
+package org.apache.maven.archiva.scheduled;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.archiva.scheduled.tasks.ArchivaTask;
+import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
+import org.codehaus.plexus.scheduler.AbstractJob;
+import org.codehaus.plexus.taskqueue.TaskQueue;
+import org.codehaus.plexus.taskqueue.TaskQueueException;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+/**
+ * This class is the database job that is executed by the scheduler.
+ */
+public class DatabaseTaskJob
+ extends AbstractJob
+{
+ static final String TASK_KEY = "EXECUTION";
+
+ static final String TASK_QUEUE = "TASK_QUEUE";
+
+ static final String TASK_QUEUE_POLICY = "TASK_QUEUE_POLICY";
+
+ /**
+ * Execute the discoverer and the indexer.
+ *
+ * @param context
+ * @throws org.quartz.JobExecutionException
+ *
+ */
+ public void execute( JobExecutionContext context )
+ throws JobExecutionException
+ {
+ JobDataMap dataMap = context.getJobDetail().getJobDataMap();
+ setJobDataMap( dataMap );
+
+ TaskQueue taskQueue = (TaskQueue) dataMap.get( TASK_QUEUE );
+ String queuePolicy = dataMap.get( TASK_QUEUE_POLICY ).toString();
+
+ ArchivaTask task = new DatabaseTask();
+ task.setName( context.getJobDetail().getName() );
+
+ try
+ {
+ if ( taskQueue.getQueueSnapshot().size() == 0 )
+ {
+ taskQueue.put( task );
+ }
+ else
+ {
+ if ( ArchivaTask.QUEUE_POLICY_WAIT.equals( queuePolicy ) )
+ {
+ taskQueue.put( task );
+ }
+ else if ( ArchivaTask.QUEUE_POLICY_SKIP.equals( queuePolicy ) )
+ {
+ // do not queue anymore, policy is to skip
+ }
+ }
+ }
+ catch ( TaskQueueException e )
+ {
+ throw new JobExecutionException( e );
+ }
+ }
+}
Copied: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java (from r526890, maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultRepositoryTaskScheduler.java)
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java?view=diff&rev=527585&p1=maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultRepositoryTaskScheduler.java&r1=526890&p2=maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java&r2=527585
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultRepositoryTaskScheduler.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java Wed Apr 11 10:38:45 2007
@@ -21,9 +21,11 @@
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
-import org.apache.maven.archiva.repositories.ActiveManagedRepositories;
-import org.apache.maven.archiva.scheduler.task.DataRefreshTask;
-import org.apache.maven.archiva.scheduler.task.RepositoryTask;
+import org.apache.maven.archiva.configuration.RepositoryConfiguration;
+import org.apache.maven.archiva.database.ArchivaDatabaseException;
+import org.apache.maven.archiva.database.ObjectNotFoundException;
+import org.apache.maven.archiva.database.RepositoryDAO;
+import org.apache.maven.archiva.model.ArchivaRepository;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
@@ -40,54 +42,61 @@
import org.quartz.SchedulerException;
import java.text.ParseException;
+import java.util.Iterator;
+import java.util.List;
/**
* Default implementation of a scheduling component for the application.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @plexus.component role="org.apache.maven.archiva.scheduler.RepositoryTaskScheduler"
+ * @plexus.component role="org.apache.maven.archiva.scheduler.ArchivaTaskScheduler"
*/
-public class DefaultRepositoryTaskScheduler
+public class DefaultArchivaTaskScheduler
extends AbstractLogEnabled
- implements RepositoryTaskScheduler, Startable, RegistryListener
+ implements ArchivaTaskScheduler, Startable, RegistryListener
{
/**
* @plexus.requirement
*/
private Scheduler scheduler;
+
/**
- * @plexus.requirement role-hint="data-refresh"
+ * @plexus.requirement role-hint="archiva-task-queue"
*/
- private TaskQueue datarefreshQueue;
-
+ private TaskQueue archivaTaskQueue;
+
/**
* @plexus.requirement
*/
private ArchivaConfiguration archivaConfiguration;
+
+
+ public static final String DATABASE_DISCOVERER_GROUP = "database-group";
+
+ public static final String DATABASE_JOB = "database-job";
+ public static final String DATABASE_JOB_TRIGGER = "database-job-trigger";
+
+ public static final String REPOSITORY_DISCOVERER_GROUP = "repository-group";
+
+ public static final String REPOSITORY_JOB = "repository-job";
+ public static final String REPOSITORY_JOB_TRIGGER = "repository-job-trigger";
- /**
- * @plexus.requirement
- */
- private ActiveManagedRepositories activeRepositories;
-
- private static final String DISCOVERER_GROUP = "DISCOVERER";
-
- private static final String DATA_REFRESH_JOB = "dataRefreshTask";
-
public void start()
throws StartingException
{
- Configuration configuration = archivaConfiguration.getConfiguration();
- archivaConfiguration.addChangeListener( this );
-
try
{
- scheduleJobs( configuration.getDataRefreshCronExpression() );
- }
- catch ( ParseException e )
- {
- throw new StartingException( "Invalid configuration: " + configuration.getDataRefreshCronExpression(), e );
+ List repositories = archivaConfiguration.getConfiguration().getRepositories();
+
+ for ( Iterator i = repositories.iterator(); i.hasNext(); )
+ {
+ RepositoryConfiguration repoConfig = (RepositoryConfiguration)i.next();
+
+ scheduleRepositoryJobs( repoConfig );
+ }
+
+ scheduleDatabaseJobs( );
}
catch ( SchedulerException e )
{
@@ -95,35 +104,66 @@
}
}
- private void scheduleJobs( String indexerCronExpression )
- throws ParseException, SchedulerException
+ private void scheduleRepositoryJobs( RepositoryConfiguration repoConfig )
+ throws SchedulerException
{
- JobDetail jobDetail = createJobDetail( DATA_REFRESH_JOB );
-
- getLogger().info( "Scheduling data-refresh: " + indexerCronExpression );
- CronTrigger trigger = new CronTrigger( DATA_REFRESH_JOB + "Trigger", DISCOVERER_GROUP, indexerCronExpression );
- scheduler.scheduleJob( jobDetail, trigger );
-
- try
+ if ( repoConfig.getRefreshCronExpression() == null )
{
- queueNowIfNeeded();
+ getLogger().warn( "Skipping job, no cron expression for " + repoConfig.getId() );
+ return;
+ }
+
+ // get the cron string for these database scanning jobs
+ String cronString = repoConfig.getRefreshCronExpression();
+
+ // setup the unprocessed artifact job
+ JobDetail repositoryJob =
+ new JobDetail( REPOSITORY_JOB + ":" + repoConfig.getId() , REPOSITORY_DISCOVERER_GROUP, RepositoryTaskJob.class );
+
+ JobDataMap dataMap = new JobDataMap();
+ dataMap.put( RepositoryTaskJob.TASK_QUEUE, archivaTaskQueue );
+ dataMap.put( RepositoryTaskJob.TASK_REPOSITORY, repoConfig.getId() );
+ repositoryJob.setJobDataMap( dataMap );
+
+ try
+ {
+ CronTrigger trigger =
+ new CronTrigger( REPOSITORY_JOB_TRIGGER + ":" + repoConfig.getId() , REPOSITORY_DISCOVERER_GROUP, cronString );
+
+ scheduler.scheduleJob( repositoryJob, trigger );
}
- catch ( org.codehaus.plexus.taskqueue.execution.TaskExecutionException e )
+ catch ( ParseException e )
{
- getLogger().error( "Error executing task first time, continuing anyway: " + e.getMessage(), e );
+ getLogger().error( "ParseException in repository scanning cron expression, disabling repository scanning for '" + repoConfig.getId() + "': " + e.getMessage() );
}
+
}
-
- private JobDetail createJobDetail( String jobName )
- {
- JobDetail jobDetail = new JobDetail( jobName, DISCOVERER_GROUP, RepositoryTaskJob.class );
+
+ private void scheduleDatabaseJobs( )
+ throws SchedulerException
+ {
+ String cronString = archivaConfiguration.getConfiguration().getDatabaseScanning().getCronExpression();
+
+ // setup the unprocessed artifact job
+ JobDetail databaseJob =
+ new JobDetail( DATABASE_JOB, DATABASE_DISCOVERER_GROUP, DatabaseTaskJob.class );
JobDataMap dataMap = new JobDataMap();
- dataMap.put( RepositoryTaskJob.TASK_QUEUE, datarefreshQueue );
- dataMap.put( RepositoryTaskJob.TASK_QUEUE_POLICY, RepositoryTask.QUEUE_POLICY_SKIP );
- jobDetail.setJobDataMap( dataMap );
-
- return jobDetail;
+ dataMap.put( DatabaseTaskJob.TASK_QUEUE, archivaTaskQueue );
+ databaseJob.setJobDataMap( dataMap );
+
+ try
+ {
+ CronTrigger trigger =
+ new CronTrigger( DATABASE_JOB_TRIGGER, DATABASE_DISCOVERER_GROUP, cronString );
+
+ scheduler.scheduleJob( databaseJob, trigger );
+ }
+ catch ( ParseException e )
+ {
+ getLogger().error( "ParseException in database scanning cron expression, disabling database scanning: " + e.getMessage() );
+ }
+
}
public void stop()
@@ -131,7 +171,7 @@
{
try
{
- scheduler.unscheduleJob( DATA_REFRESH_JOB, DISCOVERER_GROUP );
+ scheduler.unscheduleJob( DATABASE_JOB, DATABASE_DISCOVERER_GROUP );
}
catch ( SchedulerException e )
{
@@ -145,66 +185,103 @@
// nothing to do
}
+ /**
+ *
+ */
public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{
- if ( "dataRefreshCronExpression".equals( propertyName ) )
+ // cronExpression comes from the database scanning section
+ if ( "cronExpression".equals( propertyName ) )
{
- getLogger().debug( "Restarting task scheduler with new configuration after property change: " +
- propertyName + " to " + propertyValue );
+ getLogger().debug( "Restarting the database scheduled task after property change: " + propertyName );
+
try
{
- stop();
- }
- catch ( StoppingException e )
- {
- getLogger().warn( "Error stopping task scheduler: " + e.getMessage(), e );
+ scheduler.unscheduleJob( DATABASE_JOB, DATABASE_DISCOVERER_GROUP );
+
+ scheduleDatabaseJobs();
}
-
- try
+ catch ( SchedulerException e )
{
- Configuration configuration = archivaConfiguration.getConfiguration();
- scheduleJobs( configuration.getDataRefreshCronExpression() );
+ getLogger().error( "Error restarting the database scanning job after property change." );
}
- catch ( ParseException e )
+ }
+
+ // refreshCronExpression comes from the repositories section
+ //
+ // currently we have to reschedule all repo jobs because we don't know where the changed one came from
+ if ( "refreshCronExpression".equals( propertyName ) )
+ {
+ List repositories = archivaConfiguration.getConfiguration().getRepositories();
+
+ for ( Iterator i = repositories.iterator(); i.hasNext(); )
{
- getLogger().error(
- "Error restarting task scheduler after configuration change, due to configuration error: " +
- e.getMessage(), e );
+ RepositoryConfiguration repoConfig = (RepositoryConfiguration)i.next();
+
+ if ( repoConfig.getRefreshCronExpression() != null )
+ {
+ try
+ {
+ // unschedule handles jobs that might not exist
+ scheduler.unscheduleJob( REPOSITORY_JOB + ":" + repoConfig.getId() , REPOSITORY_DISCOVERER_GROUP );
+ scheduleRepositoryJobs( repoConfig );
+ }
+ catch ( SchedulerException e )
+ {
+ getLogger().error( "error restarting job: " + REPOSITORY_JOB + ":" + repoConfig.getId() );
+ }
+ }
}
- catch ( SchedulerException e )
+ }
+ }
+
+ public void runAllRepositoryTasks() throws TaskExecutionException
+ {
+ try
+ {
+ List repositories = archivaConfiguration.getConfiguration().getRepositories();
+
+ for ( Iterator i = repositories.iterator(); i.hasNext(); )
{
- getLogger().error( "Error restarting task scheduler after configuration change: " + e.getMessage(), e );
+ RepositoryConfiguration repoConfig = (RepositoryConfiguration)i.next();
+
+ scheduleRepositoryJobs( repoConfig );
}
+
}
- else
+ catch ( SchedulerException e )
{
- getLogger().debug(
- "Not restarting task scheduler with new configuration after property change: " + propertyName );
+ throw new TaskExecutionException( "Unable to schedule repository jobs: " + e.getMessage(), e );
}
}
- public void runDataRefresh()
- throws TaskExecutionException
+ public void runDatabaseTasks() throws TaskExecutionException
{
- DataRefreshTask task = new DataRefreshTask();
- task.setJobName( "DATA_REFRESH_INIT" );
try
{
- datarefreshQueue.put( task );
+ scheduleDatabaseJobs();
}
- catch ( TaskQueueException e )
+ catch ( SchedulerException e )
{
- throw new TaskExecutionException( e.getMessage(), e );
+ throw new TaskExecutionException( "Unable to schedule repository jobs: " + e.getMessage(), e );
+
}
}
- public void queueNowIfNeeded()
- throws TaskExecutionException
+ public void runRepositoryTasks( String repositoryId ) throws TaskExecutionException
{
- if ( activeRepositories.needsDataRefresh() )
+ try
{
- runDataRefresh();
+ RepositoryConfiguration repoConfig = archivaConfiguration.getConfiguration().findRepositoryById( repositoryId );
+
+ scheduleRepositoryJobs( repoConfig );
}
+ catch ( SchedulerException e )
+ {
+ throw new TaskExecutionException( "Unable to schedule repository jobs: " + e.getMessage(), e );
+ }
}
+
+
}
Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskJob.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskJob.java?view=diff&rev=527585&r1=527584&r2=527585
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskJob.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskJob.java Wed Apr 11 10:38:45 2007
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.archiva.scheduled.tasks.DataRefreshTask;
+import org.apache.maven.archiva.scheduled.tasks.ArchivaTask;
import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
import org.codehaus.plexus.scheduler.AbstractJob;
import org.codehaus.plexus.taskqueue.TaskQueue;
@@ -29,7 +29,7 @@
import org.quartz.JobExecutionException;
/**
- * This class is the discoverer job that is executed by the scheduler.
+ * This class is the repository job that is executed by the scheduler.
*/
public class RepositoryTaskJob
extends AbstractJob
@@ -39,6 +39,8 @@
static final String TASK_QUEUE = "TASK_QUEUE";
static final String TASK_QUEUE_POLICY = "TASK_QUEUE_POLICY";
+
+ static final String TASK_REPOSITORY = "TASK_REPOSITORY";
/**
* Execute the discoverer and the indexer.
@@ -56,8 +58,8 @@
TaskQueue taskQueue = (TaskQueue) dataMap.get( TASK_QUEUE );
String queuePolicy = dataMap.get( TASK_QUEUE_POLICY ).toString();
- RepositoryTask task = new DataRefreshTask();
- task.setJobName( context.getJobDetail().getName() );
+ ArchivaTask task = new RepositoryTask();
+ task.setName( context.getJobDetail().getName() );
try
{
@@ -67,11 +69,11 @@
}
else
{
- if ( RepositoryTask.QUEUE_POLICY_WAIT.equals( queuePolicy ) )
+ if ( ArchivaTask.QUEUE_POLICY_WAIT.equals( queuePolicy ) )
{
taskQueue.put( task );
}
- else if ( RepositoryTask.QUEUE_POLICY_SKIP.equals( queuePolicy ) )
+ else if ( ArchivaTask.QUEUE_POLICY_SKIP.equals( queuePolicy ) )
{
// do not queue anymore, policy is to skip
}
Copied: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/ArchivaTask.java (from r526939, maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/RepositoryTask.java)
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/ArchivaTask.java?view=diff&rev=527585&p1=maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/RepositoryTask.java&r1=526939&p2=maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/ArchivaTask.java&r2=527585
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/RepositoryTask.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/ArchivaTask.java Wed Apr 11 10:38:45 2007
@@ -26,32 +26,43 @@
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public interface RepositoryTask
+public interface ArchivaTask
extends Task
{
- String QUEUE_POLICY_WAIT = "wait";
+ public static final String QUEUE_POLICY_WAIT = "wait";
- String QUEUE_POLICY_SKIP = "skip";
+ public static final String QUEUE_POLICY_SKIP = "skip";
/**
* Gets the queue policy for this task.
*
* @return Queue policy for this task
*/
- String getQueuePolicy();
+ public String getQueuePolicy();
/**
* Sets the queue policy for this task.
*
* @param policy
*/
- void setQueuePolicy( String policy );
+ public void setQueuePolicy( String policy );
/**
* Sets the job name to represent a group of similar / identical job tasks. Can be used to check the
* task queue for similar / identical job tasks.
*/
- void setJobName( String jobName );
+ public void setName( String name );
- String getJobName();
+ /**
+ * obtains the name of the task
+ * @return
+ */
+ public String getName();
+
+ public long getMaxExecutionTime();
+
+ public void setMaxExecutionTime( long maxExecutionTime );
+
+
+
}
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/DatabaseTask.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/DatabaseTask.java?view=auto&rev=527585
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/DatabaseTask.java (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/DatabaseTask.java Wed Apr 11 10:38:45 2007
@@ -0,0 +1,49 @@
+package org.apache.maven.archiva.scheduled.tasks;
+
+/**
+ * DataRefreshTask - task for discovering changes in the repository
+ * and updating all associated data.
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id: DataRefreshTask.java 525176 2007-04-03 15:21:33Z joakime $
+ */
+public class DatabaseTask
+ implements ArchivaTask
+{
+
+ String name;
+
+ String queuePolicy;
+
+ long maxExecutionTime;
+
+ public long getMaxExecutionTime()
+ {
+ return maxExecutionTime;
+ }
+
+ public void setMaxExecutionTime( long maxExecutionTime )
+ {
+ this.maxExecutionTime = maxExecutionTime;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+ public String getQueuePolicy()
+ {
+ return queuePolicy;
+ }
+
+ public void setQueuePolicy( String queuePolicy )
+ {
+ this.queuePolicy = queuePolicy;
+ }
+}
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml?view=auto&rev=527585
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml Wed Apr 11 10:38:45 2007
@@ -0,0 +1,16 @@
+<components>
+ <component>
+ <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
+ <role-hint>archiva-task-queue</role-hint>
+ <implementation>org.codehaus.plexus.taskqueue.DefaultTaskQueue</implementation>
+ <lifecycle-handler>plexus-configurable</lifecycle-handler>
+ <configuration>
+ <task-entry-evaluators>
+ </task-entry-evaluators>
+ <task-exit-evaluators>
+ </task-exit-evaluators>
+ <task-viability-evaluators>
+ </task-viability-evaluators>
+ </configuration>
+ </component>
+</components>
\ No newline at end of file
Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/DataRefreshExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/DataRefreshExecutorTest.java?view=diff&rev=527585&r1=527584&r2=527585
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/DataRefreshExecutorTest.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/DataRefreshExecutorTest.java Wed Apr 11 10:38:45 2007
@@ -22,7 +22,7 @@
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
-import org.apache.maven.archiva.scheduled.tasks.DataRefreshTask;
+import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
@@ -45,17 +45,13 @@
{
super.setUp();
- taskExecutor = (TaskExecutor) lookup( "org.codehaus.plexus.taskqueue.execution.TaskExecutor", "data-refresh" );
+ taskExecutor = (TaskExecutor) lookup( "org.codehaus.plexus.taskqueue.execution.TaskExecutor", "archiva-task-executor" );
ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName() );
Configuration configuration = archivaConfiguration.getConfiguration();
- File indexPath = new File( configuration.getIndexPath() );
- if ( indexPath.exists() )
- {
- FileUtils.deleteDirectory( indexPath );
- }
+
}
public void testExecutor()
@@ -65,7 +61,7 @@
}
class TestDataRefreshTask
- extends DataRefreshTask
+ extends RepositoryTask
{
public String getJobName()
{