archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r882207 [1/3] - in /archiva/branches/MRM-1025: ./ archiva-modules/ archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/ archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/arc...
Date Thu, 19 Nov 2009 17:16:25 GMT
Author: brett
Date: Thu Nov 19 17:16:20 2009
New Revision: 882207

URL: http://svn.apache.org/viewvc?rev=882207&view=rev
Log:
split the scheduler into modules to isolate database and indexer dependent code

Added:
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/
      - copied from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/   (with props)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml   (with props)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/   (with props)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/pom.xml   (with props)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutor.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutor.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseArchivaTaskScheduler.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseTask.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/DatabaseTask.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseTaskJob.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DatabaseTaskJob.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus/components.xml
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutorTest.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/TestDatabaseUnprocessedConsumer.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/TestDatabaseUnprocessedConsumer.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/
      - copied from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/repositories/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/archiva-test.xml
      - copied unchanged from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/resources/archiva-test.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutorTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/   (with props)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml   (with props)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/ArtifactIndexingTask.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml   (with props)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutorTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/   (with props)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml   (with props)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java   (contents, props changed)
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/RepositoryTask.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskJob.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/components.xml   (with props)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
      - copied, changed from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/
      - copied from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/repositories/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml
      - copied unchanged from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/resources/archiva-test.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml   (with props)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo/
      - copied from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/resources/test-repo/
Removed:
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/stubs/
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/org/apache/archiva/consumers/lucene/LuceneConsumersTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/src/
Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
    archiva/branches/MRM-1025/archiva-modules/pom.xml
    archiva/branches/MRM-1025/pom.xml

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml Thu Nov 19 17:16:20 2009
@@ -32,14 +32,6 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-database</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
@@ -52,7 +44,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-scheduled</artifactId>
+      <artifactId>archiva-scheduler-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-scheduler-indexing</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java Thu Nov 19 17:16:20 2009
@@ -26,6 +26,8 @@
 import java.util.Date;
 import java.util.List;
 
+import org.apache.archiva.scheduler.ArchivaTaskScheduler;
+import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ConfigurationNames;
 import org.apache.maven.archiva.configuration.FileTypes;
@@ -34,9 +36,6 @@
 import org.apache.maven.archiva.consumers.ConsumerException;
 import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
 import org.apache.maven.archiva.repository.content.ManagedDefaultRepositoryContent;
-import org.apache.maven.archiva.scheduled.ArchivaTaskScheduler;
-import org.apache.maven.archiva.scheduled.tasks.ArtifactIndexingTask;
-import org.apache.maven.archiva.scheduled.tasks.TaskCreator;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.registry.Registry;
@@ -64,13 +63,14 @@
 
     private File managedRepository;
 
-    private ArchivaTaskScheduler scheduler;
+    private ArchivaTaskScheduler<ArtifactIndexingTask> scheduler;
 
     private IndexingContext context;
 
     private List<String> includes = new ArrayList<String>();
 
-    public NexusIndexerConsumer( ArchivaTaskScheduler scheduler, ArchivaConfiguration configuration, FileTypes filetypes )
+    public NexusIndexerConsumer( ArchivaTaskScheduler<ArtifactIndexingTask> scheduler,
+                                 ArchivaConfiguration configuration, FileTypes filetypes )
     {
         this.configuration = configuration;
         this.filetypes = filetypes;
@@ -102,7 +102,7 @@
 
         try
         {
-            context = TaskCreator.createContext( repository );
+            context = ArtifactIndexingTask.createContext( repository );
         }
         catch ( IOException e )
         {
@@ -120,12 +120,12 @@
         File artifactFile = new File( managedRepository, path );
 
         ArtifactIndexingTask task =
-            TaskCreator.createIndexingTask( repositoryContent.getRepository(), artifactFile,
-                                            ArtifactIndexingTask.Action.ADD, context );
+            new ArtifactIndexingTask( repositoryContent.getRepository(), artifactFile, ArtifactIndexingTask.Action.ADD,
+                                      context );
         try
         {
             log.debug( "Queueing indexing task + '" + task + "' to add or update the artifact in the index." );
-            scheduler.queueIndexingTask( task );
+            scheduler.queueTask( task );
         }
         catch ( TaskQueueException e )
         {
@@ -136,12 +136,12 @@
     public void completeScan()
     {
         ArtifactIndexingTask task =
-            TaskCreator.createIndexingTask( repositoryContent.getRepository(), null,
-                                            ArtifactIndexingTask.Action.FINISH, context );
+            new ArtifactIndexingTask( repositoryContent.getRepository(), null, ArtifactIndexingTask.Action.FINISH,
+                                      context );
         try
         {
             log.debug( "Queueing indexing task + '" + task + "' to finish indexing." );
-            scheduler.queueIndexingTask( task );
+            scheduler.queueTask( task );
         }
         catch ( TaskQueueException e )
         {
@@ -173,7 +173,7 @@
         includes.clear();
 
         includes.addAll( filetypes.getFileTypePatterns( FileTypes.INDEXABLE_CONTENT ) );
-        
+
         includes.addAll( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
     }
 

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java Thu Nov 19 17:16:20 2009
@@ -27,20 +27,16 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.archiva.scheduler.ArchivaTaskScheduler;
+import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
 import org.apache.commons.io.FileUtils;
-import org.apache.maven.archiva.common.ArchivaException;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.FileTypes;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
 import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.scheduled.ArchivaTaskScheduler;
-import org.apache.maven.archiva.scheduled.tasks.ArtifactIndexingTask;
-import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
-import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
-import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 
 /**
  * NexusIndexerConsumerTest
@@ -49,26 +45,11 @@
     extends PlexusInSpringTestCase
 {
     private final class ArchivaTaskSchedulerStub
-        implements ArchivaTaskScheduler
+        implements ArchivaTaskScheduler<ArtifactIndexingTask>
     {
         Set<File> indexed = new HashSet<File>();
         
-        public void startup()
-            throws ArchivaException
-        {
-        }
-
-        public void scheduleDatabaseTasks()
-            throws TaskExecutionException
-        {
-        }
-
-        public void queueRepositoryTask( RepositoryTask task )
-            throws TaskQueueException
-        {
-        }
-
-        public void queueIndexingTask( ArtifactIndexingTask task )
+        public void queueTask( ArtifactIndexingTask task )
             throws TaskQueueException
         {
             switch ( task.getAction() )
@@ -91,21 +72,6 @@
                     break;
             }
         }
-
-        public void queueDatabaseTask( DatabaseTask task )
-            throws TaskQueueException
-        {
-        }
-
-        public boolean isProcessingRepositoryTask( String repositoryId )
-        {
-            return false;
-        }
-
-        public boolean isProcessingDatabaseTask()
-        {
-            return false;
-        }
     }
 
     private KnownRepositoryContentConsumer nexusIndexerConsumer;

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml Thu Nov 19 17:16:20 2009
@@ -47,7 +47,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-scheduled</artifactId>
+      <artifactId>archiva-scheduler-repository</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java Thu Nov 19 17:16:20 2009
@@ -30,6 +30,8 @@
 import java.util.Map.Entry;
 import java.util.Properties;
 
+import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
+import org.apache.archiva.scheduler.repository.RepositoryTask;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
@@ -55,9 +57,6 @@
 import org.apache.maven.archiva.repository.RepositoryNotFoundException;
 import org.apache.maven.archiva.repository.metadata.MetadataTools;
 import org.apache.maven.archiva.repository.metadata.RepositoryMetadataException;
-import org.apache.maven.archiva.scheduled.ArchivaTaskScheduler;
-import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
-import org.apache.maven.archiva.scheduled.tasks.TaskCreator;
 import org.apache.maven.wagon.ConnectionException;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.apache.maven.wagon.Wagon;
@@ -133,9 +132,9 @@
     private WagonFactory wagonFactory;
     
     /**
-     * @plexus.requirement
+     * @plexus.requirement role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="repository"
      */
-    private ArchivaTaskScheduler scheduler;
+    private RepositoryArchivaTaskScheduler scheduler;
 
     public File fetchFromProxies( ManagedRepositoryContent repository, ArtifactReference artifact )
         throws ProxyDownloadException
@@ -585,11 +584,15 @@
 
     private void queueRepositoryTask( String repositoryId, File localFile )
     {
-        RepositoryTask task = TaskCreator.createRepositoryTask( repositoryId, localFile, true, true );
+        RepositoryTask task = new RepositoryTask();
+        task.setRepositoryId( repositoryId );
+        task.setResourceFile( localFile );
+        task.setUpdateRelatedArtifacts( true );
+        task.setScanAll( true );
 
         try
         {
-            scheduler.queueRepositoryTask( task );
+            scheduler.queueTask( task );
         }
         catch ( TaskQueueException e )
         {

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml Thu Nov 19 17:16:20 2009
@@ -78,7 +78,8 @@
           <field-name>urlFailureCache</field-name>
         </requirement>
         <requirement>
-          <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+          <role>org.apache.archiva.scheduler.ArchivaTaskScheduler</role>
+          <role-hint>repository</role-hint>
           <field-name>scheduler</field-name>
         </requirement>
       </requirements>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml Thu Nov 19 17:16:20 2009
@@ -76,7 +76,8 @@
           <field-name>urlFailureCache</field-name>
         </requirement>
         <requirement>
-          <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+          <role>org.apache.archiva.scheduler.ArchivaTaskScheduler</role>
+          <role-hint>repository</role-hint>
           <field-name>scheduler</field-name>
         </requirement>
       </requirements>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml Thu Nov 19 17:16:20 2009
@@ -81,7 +81,8 @@
           <field-name>urlFailureCache</field-name>
         </requirement>
         <requirement>
-          <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+          <role>org.apache.archiva.scheduler.ArchivaTaskScheduler</role>
+          <role-hint>repository</role-hint>
           <field-name>scheduler</field-name>
         </requirement>
       </requirements>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml Thu Nov 19 17:16:20 2009
@@ -72,7 +72,8 @@
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
-          <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+          <role>org.apache.archiva.scheduler.ArchivaTaskScheduler</role>
+          <role-hint>repository</role-hint>
           <field-name>scheduler</field-name>
         </requirement>
       </requirements>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml Thu Nov 19 17:16:20 2009
@@ -76,7 +76,8 @@
           <field-name>urlFailureCache</field-name>
         </requirement>
         <requirement>
-          <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+          <role>org.apache.archiva.scheduler.ArchivaTaskScheduler</role>
+          <role-hint>repository</role-hint>
           <field-name>scheduler</field-name>
         </requirement>
       </requirements>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml Thu Nov 19 17:16:20 2009
@@ -76,7 +76,8 @@
           <field-name>urlFailureCache</field-name>
         </requirement>
         <requirement>
-          <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+          <role>org.apache.archiva.scheduler.ArchivaTaskScheduler</role>
+          <role-hint>repository</role-hint>
           <field-name>scheduler</field-name>
         </requirement>
       </requirements>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml Thu Nov 19 17:16:20 2009
@@ -95,7 +95,8 @@
           <field-name>urlFailureCache</field-name>
         </requirement>
         <requirement>
-          <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+          <role>org.apache.archiva.scheduler.ArchivaTaskScheduler</role>
+          <role-hint>repository</role-hint>
           <field-name>scheduler</field-name>
         </requirement>
       </requirements>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml Thu Nov 19 17:16:20 2009
@@ -76,7 +76,8 @@
           <field-name>urlFailureCache</field-name>
         </requirement>
         <requirement>
-          <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+          <role>org.apache.archiva.scheduler.ArchivaTaskScheduler</role>
+          <role-hint>repository</role-hint>
           <field-name>scheduler</field-name>
         </requirement>
       </requirements>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml?rev=882207&r1=882206&r2=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml Thu Nov 19 17:16:20 2009
@@ -76,7 +76,8 @@
           <field-name>urlFailureCache</field-name>
         </requirement>
         <requirement>
-          <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+          <role>org.apache.archiva.scheduler.ArchivaTaskScheduler</role>
+          <role-hint>repository</role-hint>
           <field-name>scheduler</field-name>
         </requirement>
       </requirements>

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 19 17:16:20 2009
@@ -0,0 +1,2 @@
+target
+*.iml

Added: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml?rev=882207&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml Thu Nov 19 17:16:20 2009
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>archiva-scheduler</artifactId>
+    <groupId>org.apache.archiva</groupId>
+    <version>1.3-SNAPSHOT</version>
+  </parent>
+  <artifactId>archiva-scheduler-api</artifactId>
+  <name>Archiva Base :: Scheduled Tasks :: API</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-taskqueue</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java (from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java&r1=882062&r2=882207&rev=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java Thu Nov 19 17:16:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.scheduled;
+package org.apache.archiva.scheduler;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,18 +19,14 @@
  * under the License.
  */
 
-import org.apache.maven.archiva.common.ArchivaException;
-import org.apache.maven.archiva.scheduled.tasks.ArtifactIndexingTask;
-import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
-import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
+import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
-import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 
 /**
  * The component that takes care of scheduling in the application.
  *
  */
-public interface ArchivaTaskScheduler
+public interface ArchivaTaskScheduler<T extends Task>
 {
     /**
      * The Plexus component role.
@@ -38,57 +34,11 @@
     public final static String ROLE = ArchivaTaskScheduler.class.getName();
 
     /**
-     * Checks if there is any database scanning task queued.
-     * 
-     * @return
-     * @throws ArchivaException
-     */
-    public boolean isProcessingDatabaseTask();
-
-    /**
-     * Checks if a repository scanning task for the specified repository is queuedd.
-     * 
-     * @param repositoryId
-     * @return
-     * @throws ArchivaException
-     */
-    public boolean isProcessingRepositoryTask( String repositoryId );
-    
-    /**
-     * Adds the database task to the database scanning queue.
+     * Adds the task to the scanning queue.
      * 
      * @param task
      * @throws TaskQueueException
      */
-    public void queueDatabaseTask( DatabaseTask task )
+    public void queueTask( T task )
         throws TaskQueueException;
-
-    /**
-     * Adds the repository task to the repo scanning queue.
-     * 
-     * @param task
-     * @throws TaskQueueException
-     */
-    public void queueRepositoryTask( RepositoryTask task )
-        throws TaskQueueException;
-    
-    /**
-     * Adds the indexing task to the indexing queue.
-     * 
-     * @param task
-     * @throws TaskQueueException
-     */
-    public void queueIndexingTask( ArtifactIndexingTask task )
-        throws TaskQueueException;
-
-    /**
-     * Schedules the database tasks using the set cron expression.
-     * 
-     * @throws TaskExecutionException
-     */
-    public void scheduleDatabaseTasks()
-        throws TaskExecutionException;
-
-    public void startup()
-        throws ArchivaException;
 }

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 19 17:16:20 2009
@@ -0,0 +1,2 @@
+target
+*.iml

Added: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/pom.xml?rev=882207&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/pom.xml (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/pom.xml Thu Nov 19 17:16:20 2009
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>archiva-scheduler</artifactId>
+    <groupId>org.apache.archiva</groupId>
+    <version>1.3-SNAPSHOT</version>
+  </parent>
+  <artifactId>archiva-scheduler-database</artifactId>
+  <name>Archiva Base :: Scheduled Tasks :: Database</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-scheduler-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-configuration</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-database</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-quartz</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-spring</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-metadata</artifactId>
+        <executions>
+          <execution>
+            <id>merge</id>
+            <goals>
+              <goal>merge-metadata</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
+                <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutor.java (from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutor.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutor.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutor.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutor.java&r1=882062&r2=882207&rev=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutor.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutor.java Thu Nov 19 17:16:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.scheduled.executors;
+package org.apache.archiva.scheduler.database;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,6 @@
 
 import org.apache.maven.archiva.database.ArchivaDatabaseException;
 import org.apache.maven.archiva.database.updater.DatabaseUpdater;
-import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.taskqueue.Task;

Copied: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseArchivaTaskScheduler.java (from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseArchivaTaskScheduler.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseArchivaTaskScheduler.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java&r1=882062&r2=882207&rev=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseArchivaTaskScheduler.java Thu Nov 19 17:16:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.scheduled;
+package org.apache.archiva.scheduler.database;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,23 +20,13 @@
  */
 
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
-import org.apache.archiva.repository.scanner.RepositoryScanStatistics;
+import org.apache.archiva.scheduler.ArchivaTaskScheduler;
 import org.apache.maven.archiva.common.ArchivaException;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ConfigurationEvent;
 import org.apache.maven.archiva.configuration.ConfigurationListener;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.database.ArchivaDAO;
-import org.apache.maven.archiva.database.constraints.MostRecentRepositoryScanStatistics;
-import org.apache.maven.archiva.scheduled.tasks.ArtifactIndexingTask;
-import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
-import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
-import org.apache.maven.archiva.scheduled.tasks.TaskCreator;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException;
@@ -56,13 +46,13 @@
 /**
  * Default implementation of a scheduling component for archiva.
  *
- * @plexus.component role="org.apache.maven.archiva.scheduled.ArchivaTaskScheduler" role-hint="default"
+ * @plexus.component role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="database"
  */
-public class DefaultArchivaTaskScheduler
-    implements ArchivaTaskScheduler, Startable, ConfigurationListener
+public class DatabaseArchivaTaskScheduler
+    implements ArchivaTaskScheduler<DatabaseTask>, Startable, ConfigurationListener
 {
-    private Logger log = LoggerFactory.getLogger( DefaultArchivaTaskScheduler.class );
-    
+    private Logger log = LoggerFactory.getLogger( DatabaseArchivaTaskScheduler.class );
+
     /**
      * @plexus.requirement
      */
@@ -74,24 +64,9 @@
     private TaskQueue databaseUpdateQueue;
 
     /**
-     * @plexus.requirement role-hint="repository-scanning"
-     */
-    private TaskQueue repositoryScanningQueue;
-    
-    /**
-     * @plexus.requirement role-hint="indexing"
-     */
-    private TaskQueue indexingQueue;
-
-    /**
      * @plexus.requirement
      */
     private ArchivaConfiguration archivaConfiguration;
-    
-    /**
-     * @plexus.requirement role-hint="jdo"
-     */
-    private ArchivaDAO dao;
 
     private static final String DATABASE_SCAN_GROUP = "dbg";
 
@@ -99,22 +74,10 @@
 
     private static final String DATABASE_JOB_TRIGGER = "dbt";
 
-    private static final String REPOSITORY_SCAN_GROUP = "rg";
-
-    private static final String REPOSITORY_JOB = "rj";
-
-    private static final String REPOSITORY_JOB_TRIGGER = "rjt";
-
     static final String TASK_QUEUE = "TASK_QUEUE";
 
-    static final String TASK_REPOSITORY = "TASK_REPOSITORY";
-
     public static final String CRON_HOURLY = "0 0 * * * ?";
 
-    private Set<String> jobs = new HashSet<String>();
-    
-    private List<String> queuedRepos = new ArrayList<String>();
-
     public void startup()
         throws ArchivaException
     {
@@ -129,28 +92,12 @@
             throw new ArchivaException( e.getMessage(), e );
         }
     }
-    
+
     public void start()
         throws StartingException
     {
         try
         {
-            List<ManagedRepositoryConfiguration> repositories = archivaConfiguration.getConfiguration()
-                .getManagedRepositories();
-
-            for ( ManagedRepositoryConfiguration repoConfig : repositories )
-            {
-                if ( repoConfig.isScanned() )
-                {
-                    scheduleRepositoryJobs( repoConfig );
-                    
-                    if( !isPreviouslyScanned( repoConfig ) )
-                    {
-                        queueInitialRepoScan( repoConfig );
-                    }
-                }
-            }
-
             scheduleDatabaseJobs();
         }
         catch ( SchedulerException e )
@@ -165,13 +112,6 @@
         try
         {
             scheduler.unscheduleJob( DATABASE_JOB, DATABASE_SCAN_GROUP );
-
-            for ( String job : jobs )
-            {
-                scheduler.unscheduleJob( job, REPOSITORY_SCAN_GROUP );
-            }
-            jobs.clear();
-            queuedRepos.clear();
         }
         catch ( SchedulerException e )
         {
@@ -179,9 +119,6 @@
         }
     }
 
-    /**
-     * @see ArchivaTaskScheduler#scheduleDatabaseTasks()
-     */
     public void scheduleDatabaseTasks()
         throws TaskExecutionException
     {
@@ -196,69 +133,6 @@
         }
     }
 
-    /**
-     * @see ArchivaTaskScheduler#isProcessingRepositoryTask(String)
-     */
-    @SuppressWarnings("unchecked")
-    public boolean isProcessingRepositoryTask( String repositoryId )
-    {
-        synchronized( repositoryScanningQueue )
-        {
-            List<RepositoryTask> queue = null;
-    
-            try
-            {
-                queue = repositoryScanningQueue.getQueueSnapshot();
-            }
-            catch ( TaskQueueException e )
-            {
-                // not possible with plexus-taskqueue implementation, ignore
-            }
-    
-            for ( RepositoryTask queuedTask : queue )
-            {
-                if ( queuedTask.getRepositoryId().equals( repositoryId ) )
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-    
-    /**
-     * @see ArchivaTaskScheduler#isProcessingIndexingTaskWithName(String)
-     */
-    @SuppressWarnings("unchecked")
-    private boolean isProcessingRepositoryTask( RepositoryTask task )
-    {
-        synchronized( repositoryScanningQueue )
-        {
-            List<RepositoryTask> queue = null;
-    
-            try
-            {
-                queue = repositoryScanningQueue.getQueueSnapshot();
-            }
-            catch ( TaskQueueException e )
-            {
-                // not possible with plexus-taskqueue implementation, ignore
-            }
-    
-            for ( RepositoryTask queuedTask : queue )
-            {
-                if ( task.equals( queuedTask ) )
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
-    /**
-     * @see ArchivaTaskScheduler#isProcessingDatabaseTask()
-     */
     @SuppressWarnings("unchecked")
     public boolean isProcessingDatabaseTask()
     {
@@ -276,43 +150,11 @@
         return !queue.isEmpty();
     }
 
-    /**
-     * @see ArchivaTaskScheduler#queueRepositoryTask(RepositoryTask)
-     */
-    public void queueRepositoryTask( RepositoryTask task )
-        throws TaskQueueException
-    {
-        synchronized ( repositoryScanningQueue )
-        {
-            if ( isProcessingRepositoryTask( task ) )
-            {
-                log.debug( "Repository task '" + task + "' is already queued. Skipping task." );
-            }
-            else
-            {
-                // add check if the task is already queued if it is a file scan
-                repositoryScanningQueue.put( task );
-            }
-        }
-    }
-
-    /**
-     * @see ArchivaTaskScheduler#queueDatabaseTask(DatabaseTask)
-     */
-    public void queueDatabaseTask( DatabaseTask task )
+    public void queueTask( DatabaseTask task )
         throws TaskQueueException
     {
         databaseUpdateQueue.put( task );
     }
-    
-    /**
-     * @see ArchivaTaskScheduler#queueIndexingTask(ArtifactIndexingTask)
-     */
-    public void queueIndexingTask( ArtifactIndexingTask task )
-        throws TaskQueueException
-    {
-        indexingQueue.put( task );
-    }
 
     public void configurationEvent( ConfigurationEvent event )
     {
@@ -328,125 +170,7 @@
             {
                 log.error( "Error restarting the database scanning job after property change." );
             }
-
-            for ( String job : jobs )
-            {
-                try
-                {
-                    scheduler.unscheduleJob( job, REPOSITORY_SCAN_GROUP );
-                }
-                catch ( SchedulerException e )
-                {
-                    log.error( "Error restarting the repository scanning job after property change." );
-                }
-            }
-            jobs.clear();
-
-            List<ManagedRepositoryConfiguration> repositories = archivaConfiguration.getConfiguration().getManagedRepositories();
-
-            for ( ManagedRepositoryConfiguration repoConfig : repositories )
-            {
-                if ( repoConfig.getRefreshCronExpression() != null )
-                {
-                    try
-                    {
-                        scheduleRepositoryJobs( repoConfig );
-                    }
-                    catch ( SchedulerException e )
-                    {
-                        log.error( "error restarting job: " + REPOSITORY_JOB + ":" + repoConfig.getId() );
-                    }
-                }
-            }
-        }
-    }
-    
-    @SuppressWarnings("unchecked")
-    private boolean isPreviouslyScanned( ManagedRepositoryConfiguration repoConfig )
-    {
-        List<RepositoryScanStatistics> results =
-            (List<RepositoryScanStatistics>) dao.query( new MostRecentRepositoryScanStatistics( repoConfig.getId() ) );
-
-        if ( results != null && !results.isEmpty() )
-        {
-            return true;
         }
-
-        return false;
-    }
-    
-    // MRM-848: Pre-configured repository initially appear to be empty
-    private synchronized void queueInitialRepoScan( ManagedRepositoryConfiguration repoConfig )
-    {
-        String repoId = repoConfig.getId();        
-        RepositoryTask task = TaskCreator.createRepositoryTask( repoId );
-
-        if ( !queuedRepos.contains( repoId ) )
-        {
-            log.info( "Repository [" + repoId + "] is queued to be scanned as it hasn't been previously." );
-
-            try
-            {
-                queuedRepos.add( repoConfig.getId() );
-                this.queueRepositoryTask( task );
-            }
-            catch ( TaskQueueException e )
-            {
-                log.error( "Error occurred while queueing repository [" + repoId + "] task : " + e.getMessage() );
-            }
-        }
-    }
-    
-    private synchronized void scheduleRepositoryJobs( ManagedRepositoryConfiguration repoConfig )
-        throws SchedulerException
-    {
-        if ( repoConfig.getRefreshCronExpression() == null )
-        {
-            log.warn( "Skipping job, no cron expression for " + repoConfig.getId() );
-            return;
-        }
-        
-        if ( !repoConfig.isScanned() )
-        {
-            log.warn( "Skipping job, repository scannable has been disabled for " + repoConfig.getId() );
-            return;
-        }
-
-        // get the cron string for these database scanning jobs
-        String cronString = repoConfig.getRefreshCronExpression();
-
-        CronExpressionValidator cronValidator = new CronExpressionValidator();
-        if ( !cronValidator.validate( cronString ) )
-        {
-            log.warn( "Cron expression [" + cronString + "] for repository [" + repoConfig.getId() +
-                "] is invalid.  Defaulting to hourly." );
-            cronString = CRON_HOURLY;
-        }
-
-        // setup the unprocessed artifact job
-        JobDetail repositoryJob =
-            new JobDetail( REPOSITORY_JOB + ":" + repoConfig.getId(), REPOSITORY_SCAN_GROUP, RepositoryTaskJob.class );
-
-        JobDataMap dataMap = new JobDataMap();
-        dataMap.put( DefaultArchivaTaskScheduler.TASK_QUEUE, repositoryScanningQueue );
-        dataMap.put( DefaultArchivaTaskScheduler.TASK_REPOSITORY, repoConfig.getId() );
-        repositoryJob.setJobDataMap( dataMap );
-
-        try
-        {
-            CronTrigger trigger =
-                new CronTrigger( REPOSITORY_JOB_TRIGGER + ":" + repoConfig.getId(), REPOSITORY_SCAN_GROUP, cronString );
-
-            jobs.add( REPOSITORY_JOB + ":" + repoConfig.getId() );
-            scheduler.scheduleJob( repositoryJob, trigger );
-        }
-        catch ( ParseException e )
-        {
-            log.error(
-                "ParseException in repository scanning cron expression, disabling repository scanning for '" +
-                    repoConfig.getId() + "': " + e.getMessage() );
-        }
-
     }
 
     private synchronized void scheduleDatabaseJobs()
@@ -482,4 +206,4 @@
         }
 
     }
-}
+}
\ No newline at end of file

Copied: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseTask.java (from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/DatabaseTask.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseTask.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseTask.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/DatabaseTask.java&r1=882062&r2=882207&rev=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/DatabaseTask.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseTask.java Thu Nov 19 17:16:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.scheduled.tasks;
+package org.apache.archiva.scheduler.database;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseTaskJob.java (from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DatabaseTaskJob.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseTaskJob.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseTaskJob.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DatabaseTaskJob.java&r1=882062&r2=882207&rev=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DatabaseTaskJob.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseTaskJob.java Thu Nov 19 17:16:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.scheduled;
+package org.apache.archiva.scheduler.database;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
 import org.codehaus.plexus.scheduler.AbstractJob;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.TaskQueue;
@@ -47,7 +46,7 @@
         JobDataMap dataMap = context.getJobDetail().getJobDataMap();
         setJobDataMap( dataMap );
 
-        TaskQueue taskQueue = (TaskQueue) dataMap.get( DefaultArchivaTaskScheduler.TASK_QUEUE );
+        TaskQueue taskQueue = (TaskQueue) dataMap.get( DatabaseArchivaTaskScheduler.TASK_QUEUE );
 
         Task task = new DatabaseTask();
 

Copied: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus/components.xml (from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus/components.xml?p2=archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus/components.xml&p1=archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml&r1=882062&r2=882207&rev=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus/components.xml Thu Nov 19 17:16:20 2009
@@ -59,86 +59,5 @@
         <name>database-update</name>
       </configuration>
     </component>
-
-    <!--
-     |
-     |  Repository Scanning Task Queue / Executor
-     |
-     -->
-    <component>
-      <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
-      <role-hint>repository-scanning</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>
-
-    <component>
-      <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
-      <role-hint>repository-scanning</role-hint>
-      <implementation>org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor</implementation>
-      <instantiation-strategy>singleton</instantiation-strategy>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
-          <role-hint>repository-scanning</role-hint>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
-          <role-hint>repository-scanning</role-hint>
-        </requirement>
-      </requirements>
-      <configuration>
-        <name>repository-scanning</name>
-      </configuration>
-    </component>
   </components>
-  
-  <!--
-   |
-   |  Indexing Task Queue / Executor
-   |
-   -->
-   <component>
-      <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
-      <role-hint>indexing</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>
-
-    <component>
-      <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
-      <role-hint>indexing</role-hint>
-      <implementation>org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor</implementation>
-      <instantiation-strategy>singleton</instantiation-strategy>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
-          <role-hint>indexing</role-hint>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
-          <role-hint>indexing</role-hint>
-        </requirement>
-      </requirements>
-      <configuration>
-        <name>indexing</name>
-      </configuration>
-    </component>
-
 </component-set>

Copied: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutorTest.java (from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutorTest.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutorTest.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java&r1=882062&r2=882207&rev=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutorTest.java Thu Nov 19 17:16:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.scheduled.executors;
+package org.apache.archiva.scheduler.database;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
 
@@ -34,7 +33,6 @@
 import org.apache.maven.archiva.database.ArtifactDAO;
 import org.apache.maven.archiva.database.constraints.ArtifactsProcessedConstraint;
 import org.apache.maven.archiva.model.ArchivaArtifact;
-import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
 import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
 import org.codehaus.plexus.jdo.JdoFactory;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;

Copied: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/TestDatabaseUnprocessedConsumer.java (from r882062, archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/TestDatabaseUnprocessedConsumer.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/TestDatabaseUnprocessedConsumer.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/TestDatabaseUnprocessedConsumer.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/TestDatabaseUnprocessedConsumer.java&r1=882062&r2=882207&rev=882207&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/TestDatabaseUnprocessedConsumer.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/TestDatabaseUnprocessedConsumer.java Thu Nov 19 17:16:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.scheduled;
+package org.apache.archiva.scheduler.database;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Added: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutorTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutorTest.xml?rev=882207&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutorTest.xml (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutorTest.xml Thu Nov 19 17:16:20 2009
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+
+<component-set>
+  <components>
+    <component>
+      <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
+      <role-hint>test-database-update</role-hint>
+      <implementation>org.apache.archiva.scheduler.database.ArchivaDatabaseUpdateTaskExecutor</implementation>
+      <description></description>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.archiva.database.updater.DatabaseUpdater</role>
+          <role-hint>jdo</role-hint>
+          <field-name>databaseUpdater</field-name>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
+      <implementation>org.apache.maven.archiva.configuration.DefaultArchivaConfiguration</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.registry.Registry</role>
+          <role-hint>configured</role-hint>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.archiva.policies.PreDownloadPolicy</role>
+          <field-name>prePolicies</field-name>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.archiva.policies.PostDownloadPolicy</role>
+          <field-name>postPolicies</field-name>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.codehaus.plexus.registry.Registry</role>
+      <role-hint>configured</role-hint>
+      <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
+      <configuration>
+        <properties>
+          <system/>
+          <xml fileName="${basedir}/src/test/resources/archiva-test.xml"
+               config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+        </properties>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.archiva.database.updater.DatabaseUnprocessedArtifactConsumer</role>
+      <role-hint>test-db-unprocessed</role-hint>
+      <implementation>org.apache.archiva.scheduler.database.TestDatabaseUnprocessedConsumer</implementation>
+    </component>
+
+
+    <component>
+      <role>org.codehaus.plexus.jdo.JdoFactory</role>
+      <role-hint>archiva</role-hint>
+      <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
+      <configuration>
+        <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
+        <otherProperties>
+          <property>
+            <name>javax.jdo.PersistenceManagerFactoryClass</name>
+            <value>org.jpox.PersistenceManagerFactoryImpl</value>
+          </property>
+        </otherProperties>
+      </configuration>
+    </component>
+
+  </components>
+</component-set>

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 19 17:16:20 2009
@@ -0,0 +1,2 @@
+target
+*.iml



Mime
View raw message