mirror of
https://github.com/apache/archiva.git
synced 2025-03-09 11:14:17 +00:00
[MRM-161] remove scheduled execution, as it will be synchronised with the indexing
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@440607 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter
parent
1b940da867
commit
e4cfdac7b3
@ -72,13 +72,6 @@
|
||||
<description>When to run the indexing mechanism. Default is every hour on the hour.</description>
|
||||
<defaultValue>0 0 * * * ?</defaultValue>
|
||||
</field>
|
||||
<field>
|
||||
<name>reporterCronExpression</name>
|
||||
<version>1.0.0</version>
|
||||
<type>String</type>
|
||||
<description>When to run the indexing mechanism. Default is every hour on the half hour.</description>
|
||||
<defaultValue>0 30 * * * ?</defaultValue>
|
||||
</field>
|
||||
<field>
|
||||
<name>globalBlackListPatterns</name>
|
||||
<version>1.0.0</version>
|
||||
|
||||
@ -61,18 +61,11 @@ public class DefaultRepositoryTaskScheduler
|
||||
|
||||
private static final String INDEXER_JOB = "indexerTask";
|
||||
|
||||
private static final String REPORTER_JOB = "reporterTask";
|
||||
|
||||
/**
|
||||
* @plexus.requirement role-hint="indexer"
|
||||
*/
|
||||
private RepositoryTask indexerTask;
|
||||
|
||||
/**
|
||||
* @plexus.requirement role-hint="reporter"
|
||||
*/
|
||||
private RepositoryTask reporterTask;
|
||||
|
||||
public void start()
|
||||
throws StartingException
|
||||
{
|
||||
@ -128,13 +121,6 @@ private void scheduleJobs( Configuration configuration )
|
||||
{
|
||||
getLogger().info( "Not scheduling indexer - index path is not configured" );
|
||||
}
|
||||
|
||||
JobDetail jobDetail = createJobDetail( REPORTER_JOB, reporterTask );
|
||||
|
||||
getLogger().info( "Scheduling reporter: " + configuration.getReporterCronExpression() );
|
||||
CronTrigger trigger =
|
||||
new CronTrigger( REPORTER_JOB + "Trigger", DISCOVERER_GROUP, configuration.getReporterCronExpression() );
|
||||
scheduler.scheduleJob( jobDetail, trigger );
|
||||
}
|
||||
|
||||
private JobDetail createJobDetail( String jobName, RepositoryTask task )
|
||||
@ -153,7 +139,6 @@ public void stop()
|
||||
try
|
||||
{
|
||||
scheduler.unscheduleJob( INDEXER_JOB, DISCOVERER_GROUP );
|
||||
scheduler.unscheduleJob( REPORTER_JOB, DISCOVERER_GROUP );
|
||||
}
|
||||
catch ( SchedulerException e )
|
||||
{
|
||||
@ -190,9 +175,4 @@ public void runIndexer()
|
||||
indexerTask.execute();
|
||||
}
|
||||
|
||||
public void runReporter()
|
||||
throws TaskExecutionException
|
||||
{
|
||||
reporterTask.execute();
|
||||
}
|
||||
}
|
||||
|
||||
@ -31,6 +31,4 @@ public interface RepositoryTaskScheduler
|
||||
void runIndexer()
|
||||
throws TaskExecutionException;
|
||||
|
||||
void runReporter()
|
||||
throws TaskExecutionException;
|
||||
}
|
||||
|
||||
@ -153,6 +153,8 @@ private void execute( Configuration configuration, File indexPath )
|
||||
List artifacts = discoverer.discoverArtifacts( repository, blacklistedPatterns, filter );
|
||||
if ( !artifacts.isEmpty() )
|
||||
{
|
||||
// TODO! reporting
|
||||
|
||||
getLogger().info( "Indexing " + artifacts.size() + " new artifacts" );
|
||||
index.indexArtifacts( artifacts, recordFactory );
|
||||
}
|
||||
|
||||
@ -1,98 +0,0 @@
|
||||
package org.apache.maven.archiva.scheduler.task;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
||||
*
|
||||
* Licensed 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.configuration.Configuration;
|
||||
import org.apache.maven.archiva.configuration.ConfigurationStore;
|
||||
import org.apache.maven.archiva.configuration.ConfigurationStoreException;
|
||||
import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory;
|
||||
import org.apache.maven.archiva.scheduler.TaskExecutionException;
|
||||
import org.codehaus.plexus.logging.AbstractLogEnabled;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Task for discovering problems in the repository.
|
||||
*
|
||||
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
|
||||
* @plexus.component role="org.apache.maven.archiva.scheduler.task.RepositoryTask" role-hint="reporter"
|
||||
*/
|
||||
public class ReporterTask
|
||||
extends AbstractLogEnabled
|
||||
implements RepositoryTask
|
||||
{
|
||||
/**
|
||||
* Configuration store.
|
||||
*
|
||||
* @plexus.requirement
|
||||
*/
|
||||
private ConfigurationStore configurationStore;
|
||||
|
||||
/**
|
||||
* @plexus.requirement
|
||||
*/
|
||||
private ConfiguredRepositoryFactory repoFactory;
|
||||
|
||||
/**
|
||||
* @plexus.requirement role="org.apache.maven.archiva.discoverer.ArtifactDiscoverer"
|
||||
*/
|
||||
private Map artifactDiscoverers;
|
||||
|
||||
public void execute()
|
||||
throws TaskExecutionException
|
||||
{
|
||||
Configuration configuration;
|
||||
try
|
||||
{
|
||||
configuration = configurationStore.getConfigurationFromStore();
|
||||
}
|
||||
catch ( ConfigurationStoreException e )
|
||||
{
|
||||
throw new TaskExecutionException( e.getMessage(), e );
|
||||
}
|
||||
|
||||
execute( configuration );
|
||||
}
|
||||
|
||||
private void execute( Configuration configuration )
|
||||
throws TaskExecutionException
|
||||
{
|
||||
long time = System.currentTimeMillis();
|
||||
getLogger().info( "Starting repository reporting process" );
|
||||
|
||||
// TODO!
|
||||
|
||||
time = System.currentTimeMillis() - time;
|
||||
getLogger().info( "Finished repository reporting process in " + time + "ms" );
|
||||
}
|
||||
|
||||
public void executeNowIfNeeded()
|
||||
throws TaskExecutionException
|
||||
{
|
||||
Configuration configuration;
|
||||
try
|
||||
{
|
||||
configuration = configurationStore.getConfigurationFromStore();
|
||||
}
|
||||
catch ( ConfigurationStoreException e )
|
||||
{
|
||||
throw new TaskExecutionException( e.getMessage(), e );
|
||||
}
|
||||
|
||||
// TODO!
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,5 @@
|
||||
package org.apache.maven.archiva.scheduler.task;
|
||||
|
||||
import org.apache.maven.archiva.scheduler.TaskExecutionException;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
||||
*
|
||||
@ -18,6 +16,8 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import org.apache.maven.archiva.scheduler.TaskExecutionException;
|
||||
|
||||
/**
|
||||
* A repository task.
|
||||
*
|
||||
|
||||
@ -40,12 +40,4 @@ public String runIndexer()
|
||||
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
public String runReporter()
|
||||
throws TaskExecutionException
|
||||
{
|
||||
taskScheduler.runReporter();
|
||||
|
||||
return SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
@ -211,10 +211,6 @@
|
||||
<action name="runIndexer" class="runRepositoryTaskAction" method="runIndexer">
|
||||
<result type="redirect-action">index</result>
|
||||
</action>
|
||||
|
||||
<action name="runReporter" class="runRepositoryTaskAction" method="runReporter">
|
||||
<result type="redirect-action">index</result>
|
||||
</action>
|
||||
</package>
|
||||
</xwork>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user