You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2009/05/23 09:28:13 UTC
svn commit: r777816 [1/2] - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/mai...
Author: oching
Date: Sat May 23 07:28:12 2009
New Revision: 777816
URL: http://svn.apache.org/viewvc?rev=777816&view=rev
Log:
[MRM-1161], [MRM-1179], [MRM-1143] and [MRM-1160]
o upgraded nexus indexer to 2.0.0
o queue all indexing tasks to avoid interrupting a current indexing task being executed
o cleaned up nexus indexer and index cleanup consumers
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/stubs/
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/stubs/ArchivaDAOStub.java
archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/TaskCreator.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/HttpProxyTransferTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml
archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskJob.java
archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java Sat May 23 07:28:12 2009
@@ -19,10 +19,6 @@
* under the License.
*/
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.Term;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
@@ -35,12 +31,12 @@
import org.slf4j.LoggerFactory;
import org.sonatype.nexus.index.ArtifactContext;
import org.sonatype.nexus.index.ArtifactContextProducer;
-import org.sonatype.nexus.index.ArtifactInfo;
import org.sonatype.nexus.index.DefaultArtifactContextProducer;
import org.sonatype.nexus.index.NexusIndexer;
+import org.sonatype.nexus.index.context.DefaultIndexingContext;
import org.sonatype.nexus.index.context.IndexingContext;
import org.sonatype.nexus.index.context.UnsupportedExistingLuceneIndexException;
-import org.sonatype.nexus.index.creator.AbstractIndexCreator;
+import org.sonatype.nexus.index.IndexerEngine;
import java.io.File;
import java.io.IOException;
@@ -59,37 +55,41 @@
private RepositoryContentFactory repoFactory;
- private NexusIndexer indexer;
-
private ArtifactContextProducer artifactContextProducer;
private IndexingContext context;
-
- public LuceneCleanupRemoveIndexedConsumer( RepositoryContentFactory repoFactory, NexusIndexer indexer )
+
+ private IndexerEngine indexerEngine;
+
+ //TODO - deng - use indexerEngine to remove documents instead of directly using the IndexingContext!
+
+ public LuceneCleanupRemoveIndexedConsumer( RepositoryContentFactory repoFactory, IndexerEngine indexerEngine )
{
this.repoFactory = repoFactory;
- this.indexer = indexer;
+ this.indexerEngine = indexerEngine;
this.artifactContextProducer = new DefaultArtifactContextProducer();
}
-
+
public void beginScan()
{
-
}
public void completeScan()
{
- try
+ /*synchronized( indexerEngine )
{
- context.getIndexWriter().close();
+ try
+ {
+ //context.getIndexWriter().close();
- //indexerEngine.endIndexing( context );
- indexer.removeIndexingContext( context, false );
- }
- catch ( IOException e )
- {
- log.error( e.getMessage() );
- }
+ //indexerEngine.endIndexing( context );
+ //indexer.removeIndexingContext( context, false );
+ }
+ catch ( IOException e )
+ {
+ log.error( e.getMessage() );
+ }
+ } */
}
public List<String> getIncludedTypes()
@@ -101,11 +101,21 @@
public void processArchivaArtifact( ArchivaArtifact artifact )
throws ConsumerException
{
- try
- {
- ManagedRepositoryContent repoContent =
- repoFactory.getManagedRepositoryContent( artifact.getModel().getRepositoryId() );
-
+ //synchronized( context )
+ //{
+ // TODO - deng - block this if there is the nexus indexer consumer is executing?
+ ManagedRepositoryContent repoContent = null;
+
+ try
+ {
+ repoContent =
+ repoFactory.getManagedRepositoryContent( artifact.getModel().getRepositoryId() );
+ }
+ catch ( RepositoryException e )
+ {
+ throw new ConsumerException( "Can't run index cleanup consumer: " + e.getMessage() );
+ }
+
ManagedRepositoryConfiguration repository = repoContent.getRepository();
String indexDir = repository.getIndexDir();
File managedRepository = new File( repository.getLocation() );
@@ -118,70 +128,81 @@
else
{
indexDirectory = new File( managedRepository, ".indexer" );
+ }
+
+ try
+ {
+ context =
+ new DefaultIndexingContext( repository.getId(), repository.getId(), managedRepository,
+ indexDirectory, null, null, NexusIndexer.FULL_INDEX, false );
+ //context =
+ // indexer.addIndexingContext( repository.getId(), repository.getId(), managedRepository,
+ // indexDirectory, null, null, NexusIndexer.FULL_INDEX );
+ context.setSearchable( repository.isScanned() );
+ }
+ catch ( UnsupportedExistingLuceneIndexException e )
+ {
+ log.warn( "Unsupported index format.", e );
+ return;
+ }
+ catch ( IOException e )
+ {
+ log.warn( "Unable to open index at " + indexDirectory.getAbsoluteFile(), e );
+ return;
}
- synchronized ( indexer )
+ try
{
- try
+ File artifactFile = new File( repoContent.getRepoRoot(), repoContent.toPath( artifact ) );
+
+ if ( !artifactFile.exists() )
{
- context =
- indexer.addIndexingContext( repository.getId(), repository.getId(), managedRepository,
- indexDirectory, null, null, NexusIndexer.FULL_INDEX );
- context.setSearchable( repository.isScanned() );
-
- File artifactFile = new File( repoContent.getRepoRoot(), repoContent.toPath( artifact ) );
+ ArtifactContext artifactContext =
+ artifactContextProducer.getArtifactContext( context, artifactFile );
- if ( !artifactFile.exists() )
+ if ( artifactContext != null )
{
- ArtifactContext artifactContext =
- artifactContextProducer.getArtifactContext( context, artifactFile );
+ //indexerEngine.remove( context, artifactContext );
- if ( artifactContext != null )
- {
- //indexerEngine.remove( context, artifactContext );
-
- // hack for deleting documents - indexer engine's remove(...) isn't working for me
- removeDocuments( artifactContext );
- }
+ indexerEngine.remove( context, artifactContext );
+
+ context.close( false );
+ // hack for deleting documents - indexer engine's remove(...) isn't working for me
+ //removeDocuments( artifactContext );
}
}
- catch ( UnsupportedExistingLuceneIndexException e )
- {
- log.error( "Unsupported index format.", e );
- }
- catch ( IOException e )
- {
- log.error( "Unable to open index at " + indexDirectory.getAbsoluteFile(), e );
- }
- }
- }
- catch ( RepositoryException e )
- {
- throw new ConsumerException( "Can't run index cleanup consumer: " + e.getMessage() );
- }
+ }
+ catch ( IOException e )
+ {
+ log.error( "Unable to open index at " + indexDirectory.getAbsoluteFile(), e );
+ }
+ // }
}
- private void removeDocuments( ArtifactContext ac )
+ /* private void removeDocuments( ArtifactContext ac )
throws IOException
{
- IndexWriter w = context.getIndexWriter();
-
- ArtifactInfo ai = ac.getArtifactInfo();
- String uinfo = AbstractIndexCreator.getGAV( ai.groupId, ai.artifactId, ai.version, ai.classifier, ai.packaging );
-
- Document doc = new Document();
- doc.add( new Field( ArtifactInfo.DELETED, uinfo, Field.Store.YES, Field.Index.NO ) );
- doc.add( new Field( ArtifactInfo.LAST_MODIFIED, Long.toString( System.currentTimeMillis() ), Field.Store.YES,
- Field.Index.NO ) );
-
- w.addDocument( doc );
-
- w.deleteDocuments( new Term( ArtifactInfo.UINFO, uinfo ) );
-
- w.commit();
-
- context.updateTimestamp();
- }
+ synchronized( indexerEngine )
+ {
+ IndexWriter w = context.getIndexWriter();
+
+ ArtifactInfo ai = ac.getArtifactInfo();
+ String uinfo = AbstractIndexCreator.getGAV( ai.groupId, ai.artifactId, ai.version, ai.classifier, ai.packaging );
+
+ Document doc = new Document();
+ doc.add( new Field( ArtifactInfo.DELETED, uinfo, Field.Store.YES, Field.Index.NO ) );
+ doc.add( new Field( ArtifactInfo.LAST_MODIFIED, Long.toString( System.currentTimeMillis() ), Field.Store.YES,
+ Field.Index.NO ) );
+
+ w.addDocument( doc );
+
+ w.deleteDocuments( new Term( ArtifactInfo.UINFO, uinfo ) );
+
+ w.commit();
+
+ context.updateTimestamp();
+ }
+ }*/
public String getDescription()
{
Modified: archiva/trunk/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/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java Sat May 23 07:28:12 2009
@@ -24,13 +24,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import java.util.zip.ZipException;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.index.IndexReader;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
@@ -40,14 +36,14 @@
import org.slf4j.LoggerFactory;
import org.sonatype.nexus.index.ArtifactContext;
import org.sonatype.nexus.index.ArtifactContextProducer;
-import org.sonatype.nexus.index.ArtifactInfo;
import org.sonatype.nexus.index.DefaultArtifactContextProducer;
import org.sonatype.nexus.index.NexusIndexer;
+import org.sonatype.nexus.index.context.DefaultIndexingContext;
import org.sonatype.nexus.index.context.IndexingContext;
import org.sonatype.nexus.index.context.UnsupportedExistingLuceneIndexException;
-import org.sonatype.nexus.index.creator.AbstractIndexCreator;
-import org.sonatype.nexus.index.creator.IndexerEngine;
+import org.sonatype.nexus.index.IndexerEngine;
import org.sonatype.nexus.index.packer.IndexPacker;
+import org.sonatype.nexus.index.packer.IndexPackingRequest;
/**
* Consumer for indexing the repository to provide search and IDE integration features.
@@ -58,8 +54,6 @@
{
private static final Logger log = LoggerFactory.getLogger( NexusIndexerConsumer.class );
- private NexusIndexer indexer;
-
private ArtifactContextProducer artifactContextProducer;
private IndexPacker indexPacker;
@@ -72,16 +66,23 @@
private IndexerEngine indexerEngine;
- private Set<String> uinfos;
-
- public NexusIndexerConsumer( NexusIndexer indexer, IndexPacker indexPacker, IndexerEngine indexerEngine )
+ //private IndexingContextMap indexingContextMap;
+
+ public NexusIndexerConsumer( IndexPacker indexPacker, IndexerEngine indexerEngine )
{
- this.indexer = indexer;
this.indexPacker = indexPacker;
- this.indexerEngine = indexerEngine;
+ this.indexerEngine = indexerEngine;
this.artifactContextProducer = new DefaultArtifactContextProducer();
}
-
+
+ /* public NexusIndexerConsumer( IndexPacker indexPacker, IndexerEngine indexerEngine, IndexingContextMap indexingContextMap )
+ {
+ this.indexPacker = indexPacker;
+ this.indexerEngine = indexerEngine;
+ this.indexingContextMap = indexingContextMap;
+ this.artifactContextProducer = new DefaultArtifactContextProducer();
+ }*/
+
public String getDescription()
{
return "Indexes the repository to provide search and IDE integration features";
@@ -99,53 +100,39 @@
public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered )
throws ConsumerException
- {
- managedRepository = new File( repository.getLocation() );
- String indexDir = repository.getIndexDir();
-
- File indexDirectory = null;
- if( indexDir != null && !"".equals( indexDir ) )
- {
- indexDirectory = new File( repository.getIndexDir() );
- }
- else
- {
- indexDirectory = new File( managedRepository, ".indexer" );
- }
-
- repositoryContent = new ManagedDefaultRepositoryContent();
- repositoryContent.setRepository( repository );
- uinfos = new HashSet<String>();
-
- synchronized ( indexer )
- {
+ {
+ //synchronized( context )
+ //{
+ log.debug( "Begin indexing of repository '" + repository.getId() + "'..");
+
+ managedRepository = new File( repository.getLocation() );
+ String indexDir = repository.getIndexDir();
+
+ File indexDirectory = null;
+ if( indexDir != null && !"".equals( indexDir ) )
+ {
+ indexDirectory = new File( repository.getIndexDir() );
+ }
+ else
+ {
+ indexDirectory = new File( managedRepository, ".indexer" );
+ }
+
+ repositoryContent = new ManagedDefaultRepositoryContent();
+ repositoryContent.setRepository( repository );
+
try
- {
+ {
context =
- indexer.addIndexingContext( repository.getId(), repository.getId(), managedRepository,
- indexDirectory, null, null, NexusIndexer.FULL_INDEX );
- context.setSearchable( repository.isScanned() );
+ new DefaultIndexingContext( repository.getId(), repository.getId(), managedRepository,
+ indexDirectory, null, null, NexusIndexer.FULL_INDEX, false );
- // read index to get all the artifacts already indexed
- IndexReader r = context.getIndexReader();
- for ( int i = 0; i < r.numDocs(); i++ )
- {
- if ( !r.isDeleted( i ) )
- {
- Document d = r.document( i );
- String uinfo = d.get( ArtifactInfo.UINFO );
-
- // should we add a check here if the contents of the document still exist in the file system
- // for cases when there is already an existing index & the contents of that index doesn't exist
- // in the file system & in the database?
- if ( uinfo != null )
- {
- uinfos.add( uinfo );
- }
- }
- }
+ //context = indexingContextMap.addIndexingContext( repository.getId(), repository.getId(), managedRepository,
+ // indexDirectory, null, null, NexusIndexer.FULL_INDEX, false );
+
+ context.setSearchable( repository.isScanned() );
- indexerEngine.beginIndexing( context );
+ //indexerEngine.beginIndexing( context );
}
catch ( UnsupportedExistingLuceneIndexException e )
{
@@ -155,68 +142,65 @@
{
throw new ConsumerException( "Could not create index at " + indexDirectory.getAbsoluteFile(), e );
}
- }
+ //}
}
public void processFile( String path )
throws ConsumerException
{
- if ( context == null )
- {
- // didn't start correctly, so skip
- return;
- }
-
- File artifactFile = new File( managedRepository, path );
- ArtifactContext artifactContext = artifactContextProducer.getArtifactContext( context, artifactFile );
-
- if ( artifactContext != null )
+ synchronized ( indexerEngine )
{
- try
- {
- ArtifactInfo ai = artifactContext.getArtifactInfo();
- String uinfo = AbstractIndexCreator.getGAV(
- ai.groupId, ai.artifactId, ai.version, ai.classifier, ai.packaging );
-
- // already indexed so update!
- if ( uinfos.contains( uinfo ) )
+ if ( context == null )
+ {
+ // didn't start correctly, so skip
+ return;
+ }
+
+ File artifactFile = new File( managedRepository, path );
+ ArtifactContext artifactContext = artifactContextProducer.getArtifactContext( context, artifactFile );
+
+ if ( artifactContext != null )
+ {
+ try
+ {
+ indexerEngine.index( context, artifactContext );
+ }
+ catch ( ZipException e )
{
- indexerEngine.update( context, artifactContext );
+ // invalid JAR file
+ log.info( e.getMessage() );
}
- else
+ catch ( IOException e )
{
- indexerEngine.index( context, artifactContext );
- }
- }
- catch ( ZipException e )
- {
- // invalid JAR file
- log.info( e.getMessage() );
- }
- catch ( IOException e )
- {
- throw new ConsumerException( e.getMessage(), e );
+ throw new ConsumerException( e.getMessage(), e );
+ }
}
}
}
public void completeScan()
{
- synchronized( indexer )
- {
+ //synchronized( context )
+ //{
+ log.debug( "End indexing of repository '" + context.getRepositoryId() + "'..");
+
final File indexLocation = new File( managedRepository, ".index" );
try
{
- indexerEngine.endIndexing( context );
- indexPacker.packIndex( context, indexLocation );
- indexer.removeIndexingContext( context, false );
- uinfos = null;
+ //indexerEngine.endIndexing( context );
+
+ IndexPackingRequest request = new IndexPackingRequest( context, indexLocation );
+ indexPacker.packIndex( request );
+
+ //indexingContextMap.removeIndexingContext( context.getId() );
+
+ context.close( false );
}
catch ( IOException e )
{
log.error( "Could not pack index" + indexLocation.getAbsolutePath(), e );
}
- }
+ //}
}
public List<String> getExcludes()
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml Sat May 23 07:28:12 2009
@@ -3,14 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
- <bean id="indexerConsumer" class="org.apache.archiva.consumers.lucene.NexusIndexerConsumer">
- <constructor-arg ref="nexusIndexer#archiva"/>
+ <bean id="indexerConsumer" class="org.apache.archiva.consumers.lucene.NexusIndexerConsumer">
<constructor-arg ref="indexPacker"/>
<constructor-arg ref="indexerEngine"/>
+ <!-- <constructor-arg ref="indexingContextMap"/> -->
</bean>
<bean id="indexCleanupConsumer" class="org.apache.archiva.consumers.lucene.LuceneCleanupRemoveIndexedConsumer">
<constructor-arg ref="repositoryContentFactory"/>
- <constructor-arg ref="nexusIndexer#archiva"/>
+ <constructor-arg ref="indexerEngine"/>
+ <!-- <constructor-arg ref="nexusIndexer#archiva"/> -->
</bean>
</beans>
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.java Sat May 23 07:28:12 2009
@@ -32,9 +32,7 @@
import org.easymock.classextension.MockClassControl;
import org.sonatype.nexus.index.ArtifactContext;
import org.sonatype.nexus.index.ArtifactContextProducer;
-import org.sonatype.nexus.index.ArtifactInfo;
-import org.sonatype.nexus.index.NexusIndexer;
-import org.sonatype.nexus.index.context.DefaultIndexingContext;
+import org.sonatype.nexus.index.IndexerEngine;
import org.sonatype.nexus.index.context.IndexingContext;
public class LuceneCleanupRemoveIndexedConsumerTest
@@ -42,15 +40,15 @@
{
private LuceneCleanupRemoveIndexedConsumer consumer;
- private MockControl indexerControl;
-
- private NexusIndexer indexer;
-
private RepositoryContentFactory repoFactory;
private MockControl repoFactoryControl;
private ManagedRepositoryConfiguration repositoryConfig;
+
+ private MockControl indexerEngineControl;
+
+ private IndexerEngine indexerEngine;
private MockControl contextProducerControl;
@@ -65,14 +63,14 @@
{
super.setUp();
- indexerControl = MockControl.createControl( NexusIndexer.class );
- indexerControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER );
- indexer = (NexusIndexer) indexerControl.getMock();
-
+ indexerEngineControl = MockControl.createControl( IndexerEngine.class );
+ indexerEngineControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER );
+ indexerEngine = (IndexerEngine) indexerEngineControl.getMock();
+
repoFactoryControl = MockClassControl.createControl( RepositoryContentFactory.class );
repoFactory = (RepositoryContentFactory) repoFactoryControl.getMock();
- consumer = new LuceneCleanupRemoveIndexedConsumer( repoFactory, indexer );
+ consumer = new LuceneCleanupRemoveIndexedConsumer( repoFactory, indexerEngine );
repositoryConfig = new ManagedRepositoryConfiguration();
repositoryConfig.setId( "test-repo" );
@@ -85,6 +83,7 @@
repositoryConfig.setIndexDir( getBasedir() + "/target/test-classes/test-repo/.cleanup-index" );
contextProducerControl = MockControl.createControl( ArtifactContextProducer.class );
+ contextProducerControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER );
artifactContextProducer = (ArtifactContextProducer) contextProducerControl.getMock();
consumer.setArtifactContextProducer( artifactContextProducer );
@@ -109,37 +108,27 @@
ManagedRepositoryContent repoContent = new ManagedDefaultRepositoryContent();
repoContent.setRepository( repositoryConfig );
- IndexingContext context =
- new DefaultIndexingContext( repositoryConfig.getId(), repositoryConfig.getId(),
- new File( repositoryConfig.getLocation() ),
- new File( repositoryConfig.getIndexDir() ), null, null,
- NexusIndexer.FULL_INDEX, false );
-
+ IndexingContext context = null;
+
File artifactFile =
new File( repositoryConfig.getLocation(),
"org/apache/archiva/archiva-lucene-consumers/1.2/archiva-lucene-consumers-1.2.jar" );
- ArtifactInfo ai = new ArtifactInfo( "test-repo", "org.apache.archiva", "archiva-lucene-consumers", "1.2", null );
-
+
repoFactoryControl.expectAndReturn( repoFactory.getManagedRepositoryContent( repositoryConfig.getId() ),
repoContent );
- indexerControl.expectAndReturn( indexer.addIndexingContext( repositoryConfig.getId(), repositoryConfig.getId(),
- new File( repositoryConfig.getLocation() ),
- new File( repositoryConfig.getIndexDir() ), null,
- null, NexusIndexer.FULL_INDEX ), context );
- contextProducerControl.expectAndReturn( artifactContextProducer.getArtifactContext( context, artifactFile ), ac );
- acControl.expectAndReturn( ac.getArtifactInfo(), ai );
-
- repoFactoryControl.replay();
- indexerControl.replay();
+ contextProducerControl.expectAndReturn( artifactContextProducer.getArtifactContext( context, artifactFile ), ac );
+ indexerEngine.remove( context, ac );
+ indexerEngineControl.setDefaultVoidCallable();
+
+ repoFactoryControl.replay();
contextProducerControl.replay();
- acControl.replay();
-
+ indexerEngineControl.replay();
+
consumer.processArchivaArtifact( artifact );
- repoFactoryControl.verify();
- indexerControl.verify();
+ repoFactoryControl.verify();
contextProducerControl.verify();
- acControl.verify();
+ indexerEngineControl.verify();
}
public void testProcessArtifactArtifactExists()
@@ -150,25 +139,13 @@
ManagedRepositoryContent repoContent = new ManagedDefaultRepositoryContent();
repoContent.setRepository( repositoryConfig );
- IndexingContext context =
- new DefaultIndexingContext( repositoryConfig.getId(), repositoryConfig.getId(),
- new File( repositoryConfig.getLocation() ),
- new File( repositoryConfig.getIndexDir() ), null, null,
- NexusIndexer.FULL_INDEX, false );
-
repoFactoryControl.expectAndReturn( repoFactory.getManagedRepositoryContent( repositoryConfig.getId() ),
repoContent );
- indexerControl.expectAndReturn( indexer.addIndexingContext( repositoryConfig.getId(), repositoryConfig.getId(),
- new File( repositoryConfig.getLocation() ),
- new File( repositoryConfig.getIndexDir() ), null,
- null, NexusIndexer.FULL_INDEX ), context );
repoFactoryControl.replay();
- indexerControl.replay();
consumer.processArchivaArtifact( artifact );
repoFactoryControl.verify();
- indexerControl.verify();
}
}
Modified: archiva/trunk/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/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java Sat May 23 07:28:12 2009
@@ -37,7 +37,7 @@
import org.sonatype.nexus.index.FlatSearchResponse;
import org.sonatype.nexus.index.NexusIndexer;
import org.sonatype.nexus.index.context.IndexingContext;
-import org.sonatype.nexus.index.creator.IndexerEngine;
+import org.sonatype.nexus.index.IndexerEngine;
import org.sonatype.nexus.index.packer.IndexPacker;
public class NexusIndexerConsumerTest
@@ -65,7 +65,9 @@
indexerEngine = ( IndexerEngine ) lookup( IndexerEngine.class );
- nexusIndexerConsumer = new NexusIndexerConsumer( nexusIndexer, indexPacker, indexerEngine );
+ //nexusIndexerConsumer = new NexusIndexerConsumer( nexusIndexer, indexPacker, indexerEngine );
+
+ nexusIndexerConsumer = new NexusIndexerConsumer( indexPacker, indexerEngine );
repositoryConfig = new ManagedRepositoryConfiguration();
repositoryConfig.setId( "test-repo" );
@@ -152,8 +154,8 @@
assertTrue( new File( repositoryConfig.getLocation(), ".indexer" ).exists() );
assertTrue( new File( repositoryConfig.getLocation(), ".index" ).exists() );
- // should return only 1 hit - artifact should have just been updated and not added as a separate doc
- assertEquals( 1, topDocs.totalHits );
+ // should return 2 hits - this will be filtered out by the NexusRespositorySearch when it returns the results!
+ assertEquals( 2, topDocs.totalHits );
}
public void testIndexerIndexArtifactThenPom()
@@ -184,5 +186,5 @@
// should return only 1 hit
assertEquals( 1, topDocs.totalHits );
- }
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java Sat May 23 07:28:12 2009
@@ -37,7 +37,6 @@
import org.sonatype.nexus.index.FlatSearchRequest;
import org.sonatype.nexus.index.FlatSearchResponse;
import org.sonatype.nexus.index.NexusIndexer;
-import org.sonatype.nexus.index.context.IndexContextInInconsistentStateException;
import org.sonatype.nexus.index.context.IndexingContext;
import org.sonatype.nexus.index.context.UnsupportedExistingLuceneIndexException;
@@ -155,10 +154,6 @@
return convertToSearchResults( response, limits );
}
- catch ( IndexContextInInconsistentStateException e )
- {
- throw new RepositorySearchException( e );
- }
catch ( IOException e )
{
throw new RepositorySearchException( e );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/resources/META-INF/spring-context.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/resources/META-INF/spring-context.xml Sat May 23 07:28:12 2009
@@ -4,7 +4,9 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<bean id="nexusSearch" class="org.apache.archiva.indexer.search.NexusRepositorySearch">
- <constructor-arg ref="nexusIndexer#archiva"/>
+ <constructor-arg ref="nexusIndexer"/>
<constructor-arg ref="archivaConfiguration"/>
</bean>
+
+ <!-- <bean id="indexingContextMap" class="org.apache.archiva.indexer.IndexingContextMap"/> -->
</beans>
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java Sat May 23 07:28:12 2009
@@ -33,9 +33,10 @@
import org.sonatype.nexus.index.ArtifactContext;
import org.sonatype.nexus.index.ArtifactContextProducer;
import org.sonatype.nexus.index.NexusIndexer;
+import org.sonatype.nexus.index.context.DefaultIndexingContext;
import org.sonatype.nexus.index.context.IndexingContext;
import org.sonatype.nexus.index.context.UnsupportedExistingLuceneIndexException;
-import org.sonatype.nexus.index.creator.IndexerEngine;
+import org.sonatype.nexus.index.IndexerEngine;
public class NexusRepositorySearchTest
extends PlexusInSpringTestCase
@@ -119,13 +120,15 @@
private void createIndex( String repository, List<File> filesToBeIndexed )
throws IOException, UnsupportedExistingLuceneIndexException
{
- context =
- indexer.addIndexingContext( repository, repository, new File( getBasedir(), "/target/test-classes/" +
- repository ), new File( getBasedir(), "/target/test-classes/" + repository + "/.indexer" ), null, null,
- NexusIndexer.FULL_INDEX );
+ context = new DefaultIndexingContext( repository, repository, new File( getBasedir(), "/target/test-classes/" +
+ repository ), new File( getBasedir(), "/target/test-classes/" + repository + "/.indexer" ), null, null,
+ NexusIndexer.FULL_INDEX, false );
+ //indexer.addIndexingContext( repository, repository, new File( getBasedir(), "/target/test-classes/" +
+ // repository ), new File( getBasedir(), "/target/test-classes/" + repository + "/.indexer" ), null, null,
+ // NexusIndexer.FULL_INDEX );
context.setSearchable( true );
- indexerEngine.beginIndexing( context );
+ //indexerEngine.beginIndexing( context );
for ( File artifactFile : filesToBeIndexed )
{
@@ -133,8 +136,9 @@
indexerEngine.index( context, ac );
}
- indexerEngine.endIndexing( context );
- indexer.removeIndexingContext( context, false );
+ context.close( false );
+ //indexerEngine.endIndexing( context );
+ //indexer.removeIndexingContext( context, false );
assertTrue( new File( getBasedir(), "/target/test-classes/" + repository + "/.indexer" ).exists() );
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml Sat May 23 07:28:12 2009
@@ -42,6 +42,10 @@
<artifactId>archiva-repository-layer</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-scheduled</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -89,6 +93,11 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java Sat May 23 07:28:12 2009
@@ -55,7 +55,9 @@
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.repository.scanner.RepositoryContentConsumers;
+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;
@@ -68,6 +70,7 @@
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryListener;
+import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.codehaus.plexus.util.SelectorUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -127,12 +130,12 @@
/**
* @plexus.requirement
*/
- private RepositoryContentConsumers consumers;
-
+ private WagonFactory wagonFactory;
+
/**
* @plexus.requirement
*/
- private WagonFactory wagonFactory;
+ private ArchivaTaskScheduler scheduler;
public File fetchFromProxies( ManagedRepositoryContent repository, ArtifactReference artifact )
throws ProxyDownloadException
@@ -470,7 +473,7 @@
return resource;
}
- log.warn( emsg );
+ log.debug( emsg );
return null;
}
@@ -573,10 +576,26 @@
if ( executeConsumers )
{
// Just-in-time update of the index and database by executing the consumers for this artifact
- consumers.executeConsumers( connector.getSourceRepository().getRepository(), resource );
+ //consumers.executeConsumers( connector.getSourceRepository().getRepository(), resource );
+ queueRepositoryTask( connector.getSourceRepository().getRepository().getId(), resource );
}
return resource;
+ }
+
+ private void queueRepositoryTask( String repositoryId, File localFile )
+ {
+ RepositoryTask task = TaskCreator.createRepositoryTask( repositoryId, localFile.getName(), localFile );
+
+ try
+ {
+ scheduler.queueRepositoryTask( task );
+ }
+ catch ( TaskQueueException e )
+ {
+ log.error( "Unable to queue repository task to execute consumers on resource file ['" +
+ localFile.getName() + "']." );
+ }
}
/**
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/HttpProxyTransferTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/HttpProxyTransferTest.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/HttpProxyTransferTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/HttpProxyTransferTest.java Sat May 23 07:28:12 2009
@@ -21,7 +21,12 @@
import java.io.File;
import java.io.IOException;
+import java.net.URL;
+import java.util.Map;
+import java.util.Properties;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -40,7 +45,10 @@
import org.apache.maven.archiva.policies.ReleasesPolicy;
import org.apache.maven.archiva.policies.SnapshotsPolicy;
import org.apache.maven.archiva.repository.ManagedRepositoryContent;
+import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
+import org.codehaus.plexus.jdo.JdoFactory;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+import org.jpox.SchemaTool;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.Request;
import org.mortbay.jetty.Server;
@@ -75,7 +83,7 @@
throws Exception
{
super.setUp();
-
+
// Setup source repository (using default layout)
String repoPath = "target/test-repository/managed/" + getName();
Added: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/stubs/ArchivaDAOStub.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/stubs/ArchivaDAOStub.java?rev=777816&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/stubs/ArchivaDAOStub.java (added)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/stubs/ArchivaDAOStub.java Sat May 23 07:28:12 2009
@@ -0,0 +1,75 @@
+package org.apache.maven.archiva.proxy.stubs;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.maven.archiva.database.ArchivaDAO;
+import org.apache.maven.archiva.database.ArtifactDAO;
+import org.apache.maven.archiva.database.ProjectModelDAO;
+import org.apache.maven.archiva.database.RepositoryContentStatisticsDAO;
+import org.apache.maven.archiva.database.RepositoryProblemDAO;
+import org.apache.maven.archiva.database.SimpleConstraint;
+
+/**
+ * Using a stub for faster tests! Not really used for the unit tests, just for dependency injection.
+ */
+public class ArchivaDAOStub
+ implements ArchivaDAO
+{
+
+ public ArtifactDAO getArtifactDAO()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public ProjectModelDAO getProjectModelDAO()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public RepositoryContentStatisticsDAO getRepositoryContentStatisticsDAO()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public RepositoryProblemDAO getRepositoryProblemDAO()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<?> query( SimpleConstraint constraint )
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Object save( Serializable obj )
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml Sat May 23 07:28:12 2009
@@ -74,13 +74,13 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
- <field-name>consumers</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
<field-name>urlFailureCache</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+ <field-name>scheduler</field-name>
+ </requirement>
</requirements>
</component>
@@ -104,5 +104,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
+
+ <component>
+ <role>org.apache.maven.archiva.database.ArchivaDAO</role>
+ <role-hint>jdo</role-hint>
+ <implementation>org.apache.maven.archiva.proxy.stubs.ArchivaDAOStub</implementation>
+ </component>
</components>
</component-set>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml Sat May 23 07:28:12 2009
@@ -72,13 +72,13 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
- <field-name>consumers</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
<field-name>urlFailureCache</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+ <field-name>scheduler</field-name>
+ </requirement>
</requirements>
</component>
@@ -102,5 +102,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
+
+ <component>
+ <role>org.apache.maven.archiva.database.ArchivaDAO</role>
+ <role-hint>jdo</role-hint>
+ <implementation>org.apache.maven.archiva.proxy.stubs.ArchivaDAOStub</implementation>
+ </component>
</components>
</component-set>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml Sat May 23 07:28:12 2009
@@ -81,8 +81,8 @@
<field-name>urlFailureCache</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
- <field-name>consumers</field-name>
+ <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+ <field-name>scheduler</field-name>
</requirement>
</requirements>
</component>
@@ -106,6 +106,12 @@
<!-- 30 minutes = 1800 seconds -->
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
- </component>
+ </component>
+
+ <component>
+ <role>org.apache.maven.archiva.database.ArchivaDAO</role>
+ <role-hint>jdo</role-hint>
+ <implementation>org.apache.maven.archiva.proxy.stubs.ArchivaDAOStub</implementation>
+ </component>
</components>
</component-set>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml Sat May 23 07:28:12 2009
@@ -64,10 +64,6 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
- <field-name>consumers</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
<field-name>urlFailureCache</field-name>
</requirement>
@@ -75,6 +71,10 @@
<role>org.apache.maven.archiva.proxy.WagonFactory</role>
<role-hint>default</role-hint>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+ <field-name>scheduler</field-name>
+ </requirement>
</requirements>
</component>
@@ -98,5 +98,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
+
+ <component>
+ <role>org.apache.maven.archiva.database.ArchivaDAO</role>
+ <role-hint>jdo</role-hint>
+ <implementation>org.apache.maven.archiva.proxy.stubs.ArchivaDAOStub</implementation>
+ </component>
</components>
</component-set>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml Sat May 23 07:28:12 2009
@@ -72,13 +72,13 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
- <field-name>consumers</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
<field-name>urlFailureCache</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+ <field-name>scheduler</field-name>
+ </requirement>
</requirements>
</component>
@@ -102,5 +102,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
+
+ <component>
+ <role>org.apache.maven.archiva.database.ArchivaDAO</role>
+ <role-hint>jdo</role-hint>
+ <implementation>org.apache.maven.archiva.proxy.stubs.ArchivaDAOStub</implementation>
+ </component>
</components>
</component-set>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml Sat May 23 07:28:12 2009
@@ -72,13 +72,13 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
- <field-name>consumers</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
<field-name>urlFailureCache</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+ <field-name>scheduler</field-name>
+ </requirement>
</requirements>
</component>
@@ -102,5 +102,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
+
+ <component>
+ <role>org.apache.maven.archiva.database.ArchivaDAO</role>
+ <role-hint>jdo</role-hint>
+ <implementation>org.apache.maven.archiva.proxy.stubs.ArchivaDAOStub</implementation>
+ </component>
</components>
</component-set>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml Sat May 23 07:28:12 2009
@@ -91,13 +91,13 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
- <field-name>consumers</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
<field-name>urlFailureCache</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+ <field-name>scheduler</field-name>
+ </requirement>
</requirements>
</component>
@@ -121,5 +121,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
+
+ <component>
+ <role>org.apache.maven.archiva.database.ArchivaDAO</role>
+ <role-hint>jdo</role-hint>
+ <implementation>org.apache.maven.archiva.proxy.stubs.ArchivaDAOStub</implementation>
+ </component>
</components>
</component-set>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml Sat May 23 07:28:12 2009
@@ -72,13 +72,13 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
- <field-name>consumers</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
<field-name>urlFailureCache</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+ <field-name>scheduler</field-name>
+ </requirement>
</requirements>
</component>
@@ -102,5 +102,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
+
+ <component>
+ <role>org.apache.maven.archiva.database.ArchivaDAO</role>
+ <role-hint>jdo</role-hint>
+ <implementation>org.apache.maven.archiva.proxy.stubs.ArchivaDAOStub</implementation>
+ </component>
</components>
</component-set>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml Sat May 23 07:28:12 2009
@@ -72,13 +72,13 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
- <field-name>consumers</field-name>
- </requirement>
- <requirement>
<role>org.apache.maven.archiva.policies.urlcache.UrlFailureCache</role>
<field-name>urlFailureCache</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
+ <field-name>scheduler</field-name>
+ </requirement>
</requirements>
</component>
@@ -102,5 +102,11 @@
<time-to-live-seconds>1800</time-to-live-seconds>
</configuration>
</component>
+
+ <component>
+ <role>org.apache.maven.archiva.database.ArchivaDAO</role>
+ <role-hint>jdo</role-hint>
+ <implementation>org.apache.maven.archiva.proxy.stubs.ArchivaDAOStub</implementation>
+ </component>
</components>
</component-set>
Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java Sat May 23 07:28:12 2009
@@ -33,6 +33,7 @@
import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
import org.apache.maven.archiva.scheduled.tasks.RepositoryTaskNameSelectionPredicate;
import org.apache.maven.archiva.scheduled.tasks.RepositoryTaskSelectionPredicate;
+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;
@@ -169,14 +170,8 @@
// MRM-848: Pre-configured repository initially appear to be empty
private synchronized void queueInitialRepoScan( ManagedRepositoryConfiguration repoConfig )
{
- String repoId = repoConfig.getId();
-
- RepositoryTask task = new RepositoryTask();
- task.setRepositoryId( repoId );
- task.setName( REPOSITORY_JOB + ":" + repoId + ":initial-scan" );
- task.setQueuePolicy( ArchivaTask.QUEUE_POLICY_WAIT );
-
- boolean scheduleTask = false;
+ String repoId = repoConfig.getId();
+ RepositoryTask task = TaskCreator.createRepositoryTask( repoId, "initial-scan" );
if ( queuedRepos.contains( repoId ) )
{
@@ -184,11 +179,6 @@
}
else
{
- scheduleTask = true;
- }
-
- if ( scheduleTask )
- {
try
{
queuedRepos.add( repoConfig.getId() );
@@ -408,6 +398,24 @@
{
synchronized( repositoryScanningQueue )
{
+ if( task.getResourceFile() != null )
+ {
+ try
+ {
+ if( isProcessingRepositoryTaskWithName( task.getName() ) )
+ {
+ log.debug( "Repository task '" + task.getName() + "' is already queued. Skipping task.." );
+ return;
+ }
+ }
+ catch ( ArchivaException e )
+ {
+ log.warn( "Error occurred while checking if repository task '" + task.getName() +
+ "' is already queued." );
+ }
+ }
+
+ // add check if the task is already queued if it is a file scan
repositoryScanningQueue.put( task );
}
}
Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskJob.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskJob.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskJob.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/RepositoryTaskJob.java Sat May 23 07:28:12 2009
@@ -21,6 +21,7 @@
import org.apache.maven.archiva.scheduled.tasks.ArchivaTask;
import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
+import org.apache.maven.archiva.scheduled.tasks.TaskCreator;
import org.codehaus.plexus.scheduler.AbstractJob;
import org.codehaus.plexus.taskqueue.TaskQueue;
import org.codehaus.plexus.taskqueue.TaskQueueException;
@@ -58,9 +59,8 @@
TaskQueue taskQueue = (TaskQueue) dataMap.get( TASK_QUEUE );
String queuePolicy = dataMap.get( TASK_QUEUE_POLICY ).toString();
- RepositoryTask task = new RepositoryTask();
+ RepositoryTask task = TaskCreator.createRepositoryTask( (String) dataMap.get( TASK_REPOSITORY ), "" );
task.setName( context.getJobDetail().getName() );
- task.setRepositoryId( (String) dataMap.get( TASK_REPOSITORY ) );
try
{
Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java Sat May 23 07:28:12 2009
@@ -107,17 +107,18 @@
throw new TaskExecutionException("Unable to execute RepositoryTask with blank repository Id.");
}
- log.info( "Executing task from queue with job name: " + repoTask.getName() );
-
ManagedRepositoryConfiguration arepo = archivaConfiguration.getConfiguration().findManagedRepositoryById( repoTask.getRepositoryId() );
// execute consumers on resource file if set
if( repoTask.getResourceFile() != null )
{
+ log.debug( "Executing task from queue with job name: " + repoTask.getName() );
consumers.executeConsumers( arepo, repoTask.getResourceFile() );
}
else
{
+ log.info( "Executing task from queue with job name: " + repoTask.getName() );
+
// otherwise, execute consumers on whole repository
try
{
Added: archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/TaskCreator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/TaskCreator.java?rev=777816&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/TaskCreator.java (added)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/tasks/TaskCreator.java Sat May 23 07:28:12 2009
@@ -0,0 +1,56 @@
+package org.apache.maven.archiva.scheduled.tasks;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.scheduled.DefaultArchivaTaskScheduler;
+
+/**
+ *
+ */
+public class TaskCreator
+{
+ public static RepositoryTask createRepositoryTask( String repositoryId, String taskNameSuffix )
+ {
+ String suffix = "";
+ if( !StringUtils.isEmpty( taskNameSuffix ) )
+ {
+ suffix = ":" + taskNameSuffix;
+ }
+
+ RepositoryTask task = new RepositoryTask();
+ task.setRepositoryId( repositoryId );
+ task.setName( DefaultArchivaTaskScheduler.REPOSITORY_JOB + ":" + repositoryId + suffix );
+ task.setQueuePolicy( ArchivaTask.QUEUE_POLICY_WAIT );
+
+ return task;
+ }
+
+ public static RepositoryTask createRepositoryTask( String repositoryId, String taskNameSuffix, File resourceFile )
+ {
+ RepositoryTask task = createRepositoryTask( repositoryId, taskNameSuffix );
+ task.setResourceFile( resourceFile );
+
+ return task;
+ }
+
+}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java Sat May 23 07:28:12 2009
@@ -56,6 +56,9 @@
import org.apache.maven.archiva.repository.project.ProjectModelException;
import org.apache.maven.archiva.repository.project.ProjectModelWriter;
import org.apache.maven.archiva.repository.project.writers.ProjectModel400Writer;
+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.archiva.security.AccessDeniedException;
import org.apache.maven.archiva.security.ArchivaSecurityException;
import org.apache.maven.archiva.security.PrincipalNotFoundException;
@@ -65,6 +68,7 @@
import com.opensymphony.xwork2.Validateable;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
+import org.codehaus.plexus.taskqueue.TaskQueueException;
/**
* Upload an artifact using Jakarta file upload in webwork. If set by the user a pom will also be generated. Metadata
@@ -146,6 +150,11 @@
*/
private RepositoryContentFactory repositoryFactory;
+ /**
+ * @plexus.requirement
+ */
+ private ArchivaTaskScheduler scheduler;
+
private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[] { ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5 };
private ProjectModelWriter pomWriter = new ProjectModel400Writer();
@@ -345,7 +354,8 @@
try
{
copyFile( artifactFile, targetPath, filename );
- consumers.executeConsumers( repoConfig, repository.toFile( artifactReference ) );
+ queueRepositoryTask( repository.getId(), repository.toFile( artifactReference ) );
+ //consumers.executeConsumers( repoConfig, repository.toFile( artifactReference ) );
}
catch ( IOException ie )
{
@@ -365,7 +375,8 @@
try
{
File generatedPomFile = createPom( targetPath, pomFilename );
- consumers.executeConsumers( repoConfig, generatedPomFile );
+ queueRepositoryTask( repoConfig.getId(), generatedPomFile );
+ //consumers.executeConsumers( repoConfig, generatedPomFile );
}
catch ( IOException ie )
{
@@ -384,7 +395,8 @@
try
{
copyFile( pomFile, targetPath, pomFilename );
- consumers.executeConsumers( repoConfig, new File( targetPath, pomFilename ) );
+ queueRepositoryTask( repoConfig.getId(), new File( targetPath, pomFilename ) );
+ //consumers.executeConsumers( repoConfig, new File( targetPath, pomFilename ) );
}
catch ( IOException ie )
{
@@ -585,4 +597,19 @@
}
return Collections.emptyList();
}
+
+ private void queueRepositoryTask( String repositoryId, File localFile )
+ {
+ RepositoryTask task = TaskCreator.createRepositoryTask( repositoryId, localFile.getName(), localFile );
+
+ try
+ {
+ scheduler.queueRepositoryTask( task );
+ }
+ catch ( TaskQueueException e )
+ {
+ log.error( "Unable to queue repository task to execute consumers on resource file ['" +
+ localFile.getName() + "']." );
+ }
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java Sat May 23 07:28:12 2009
@@ -26,6 +26,7 @@
import org.apache.maven.archiva.scheduled.tasks.ArchivaTask;
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.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.web.action.PlexusActionSupport;
import org.codehaus.plexus.redback.rbac.Resource;
@@ -58,11 +59,8 @@
return SUCCESS;
}
- RepositoryTask task = new RepositoryTask();
- task.setRepositoryId( repoid );
- task.setName( DefaultArchivaTaskScheduler.REPOSITORY_JOB + ":" + repoid );
- task.setQueuePolicy( ArchivaTask.QUEUE_POLICY_WAIT );
-
+ RepositoryTask task = TaskCreator.createRepositoryTask( repoid, "" );
+
boolean scheduleTask = false;
try
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml?rev=777816&r1=777815&r2=777816&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml Sat May 23 07:28:12 2009
@@ -35,6 +35,11 @@
<appender-ref ref="redbackAuditLog" />
</logger>
+ <logger name="org.apache.archiva.consumers">
+ <level value="info"/>
+ <appender-ref ref="rolling" />
+ </logger>
+
<logger name="org.apache.archiva">
<level value="info"/>
<appender-ref ref="rolling" />