[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

diff --git a/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-configuration/src/main/mdo/configuration.mdo
index 17d9ddfc2f8ce5293f3aa238913df9a65a2b8934..9fd0424271e093de27fbe80dcd92e316b4e7bbae 100644 (file)
--- a/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-configuration/src/main/mdo/configuration.mdo
@@ -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>

diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java
index f300e5bcd7b55960281c8ef9d646a0ec1901ea8a..3db17e8edf3977bbd3c4bc9e62ca2ff20653dc5b 100644 (file)
--- a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java
+++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java
@@ -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 @@ public class DefaultRepositoryTaskScheduler
         {
             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 class DefaultRepositoryTaskScheduler
         try
         {
             scheduler.unscheduleJob( INDEXER_JOB, DISCOVERER_GROUP );
-            scheduler.unscheduleJob( REPORTER_JOB, DISCOVERER_GROUP );
         }
         catch ( SchedulerException e )
         {
@@ -190,9 +175,4 @@ public class DefaultRepositoryTaskScheduler
         indexerTask.execute();
     }
 
-    public void runReporter()
-        throws TaskExecutionException
-    {
-        reporterTask.execute();
-    }
 }

diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskScheduler.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskScheduler.java
index 08b1ca5cc0638bd463b9a5aaabf5ba0deb6926a0..04b2b62ea142719f7d6650a99b1850505b3867c8 100644 (file)
--- a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskScheduler.java
+++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskScheduler.java
@@ -31,6 +31,4 @@ public interface RepositoryTaskScheduler
     void runIndexer()
         throws TaskExecutionException;
 
-    void runReporter()
-        throws TaskExecutionException;
 }

diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/IndexerTask.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/IndexerTask.java
index 534039461a2c7410df21c4bd4d0ade87dde3919a..c15f3f4c60d9dbfa6c7f9eba79ed195817e879da 100644 (file)
--- a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/IndexerTask.java
+++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/IndexerTask.java
@@ -153,6 +153,8 @@ public class IndexerTask
                     List artifacts = discoverer.discoverArtifacts( repository, blacklistedPatterns, filter );
                     if ( !artifacts.isEmpty() )
                     {
+                        // TODO! reporting
+
                         getLogger().info( "Indexing " + artifacts.size() + " new artifacts" );
                         index.indexArtifacts( artifacts, recordFactory );
                     }

diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/ReporterTask.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/ReporterTask.java
deleted file mode 100644 (file)
index 641e920..0000000
--- a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/ReporterTask.java
+++ /dev/null
@@ -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!
-    }
-}

diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/RepositoryTask.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/RepositoryTask.java
index 3b1bc16eb753c0fa11ea0227fcd29e3f1a8c21c7..ae4162c293706074b29789387c3860c4ab54e65c 100644 (file)
--- a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/RepositoryTask.java
+++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/task/RepositoryTask.java
@@ -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 @@ import org.apache.maven.archiva.scheduler.TaskExecutionException;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.scheduler.TaskExecutionException;
+
 /**
  * A repository task.
  *

diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java
index fcafe3307e8ca74b0559010b666bec4c16c819b9..a87e861fafefcd0b9a27ece6e6fda5604b7fd98e 100644 (file)
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java
@@ -40,12 +40,4 @@ public class RunRepositoryTaskAction
 
         return SUCCESS;
     }
-
-    public String runReporter()
-        throws TaskExecutionException
-    {
-        taskScheduler.runReporter();
-
-        return SUCCESS;
-    }
 }

diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml
index f228e57c3c9bc4270222b7ec9cadd4e6ef24dae1..c90d005bf74044b1bd24b4a4103f994b6f2b83b4 100644 (file)
--- a/archiva-webapp/src/main/resources/xwork.xml
+++ b/archiva-webapp/src/main/resources/xwork.xml
@@ -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>