You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2006/09/06 06:02:09 UTC
svn commit: r440607 - in /maven/archiva/trunk:
archiva-configuration/src/main/mdo/
archiva-core/src/main/java/org/apache/maven/archiva/scheduler/
archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/
archiva-webapp/src/main/java/org/apach...
Author: brett
Date: Tue Sep 5 21:02:08 2006
New Revision: 440607
URL: http://svn.apache.org/viewvc?view=rev&rev=440607
Log:
[MRM-161] remove scheduled execution, as it will be synchronised with the indexing
Removed:
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/ReporterTask.java
Modified:
maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskScheduler.java
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/IndexerTask.java
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/RepositoryTask.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java
maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
Modified: maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo?view=diff&rev=440607&r1=440606&r2=440607
==============================================================================
--- maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo Tue Sep 5 21:02:08 2006
@@ -73,13 +73,6 @@
<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>
<description>Blacklisted patterns in the discovery process</description>
Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java?view=diff&rev=440607&r1=440606&r2=440607
==============================================================================
--- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java (original)
+++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java Tue Sep 5 21:02:08 2006
@@ -61,18 +61,11 @@
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 @@
{
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 @@
try
{
scheduler.unscheduleJob( INDEXER_JOB, DISCOVERER_GROUP );
- scheduler.unscheduleJob( REPORTER_JOB, DISCOVERER_GROUP );
}
catch ( SchedulerException e )
{
@@ -190,9 +175,4 @@
indexerTask.execute();
}
- public void runReporter()
- throws TaskExecutionException
- {
- reporterTask.execute();
- }
}
Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskScheduler.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskScheduler.java?view=diff&rev=440607&r1=440606&r2=440607
==============================================================================
--- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskScheduler.java (original)
+++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskScheduler.java Tue Sep 5 21:02:08 2006
@@ -31,6 +31,4 @@
void runIndexer()
throws TaskExecutionException;
- void runReporter()
- throws TaskExecutionException;
}
Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/IndexerTask.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/IndexerTask.java?view=diff&rev=440607&r1=440606&r2=440607
==============================================================================
--- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/IndexerTask.java (original)
+++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/IndexerTask.java Tue Sep 5 21:02:08 2006
@@ -153,6 +153,8 @@
List artifacts = discoverer.discoverArtifacts( repository, blacklistedPatterns, filter );
if ( !artifacts.isEmpty() )
{
+ // TODO! reporting
+
getLogger().info( "Indexing " + artifacts.size() + " new artifacts" );
index.indexArtifacts( artifacts, recordFactory );
}
Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/RepositoryTask.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/RepositoryTask.java?view=diff&rev=440607&r1=440606&r2=440607
==============================================================================
--- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/RepositoryTask.java (original)
+++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/RepositoryTask.java Tue Sep 5 21:02:08 2006
@@ -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.
*
@@ -17,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import org.apache.maven.archiva.scheduler.TaskExecutionException;
/**
* A repository task.
Modified: maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java?view=diff&rev=440607&r1=440606&r2=440607
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java Tue Sep 5 21:02:08 2006
@@ -40,12 +40,4 @@
return SUCCESS;
}
-
- public String runReporter()
- throws TaskExecutionException
- {
- taskScheduler.runReporter();
-
- return SUCCESS;
- }
}
Modified: maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml?view=diff&rev=440607&r1=440606&r2=440607
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml Tue Sep 5 21:02:08 2006
@@ -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>