Author: olamy
Date: Mon Aug 15 22:17:08 2011
New Revision: 1158035
URL: http://svn.apache.org/viewvc?rev=1158035&view=rev
Log:
cleanup creation of IndexCreator with using the container rather than using
default constructors
Removed:
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/ArchivaNexusIndexerUtil.java
Modified:
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-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
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=1158035&r1=1158034&r2=1158035&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
Mon Aug 15 22:17:08 2011
@@ -38,6 +38,7 @@ import org.apache.maven.archiva.consumer
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.index.NexusIndexer;
+import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -73,6 +74,8 @@ public class NexusIndexerConsumer
private ManagedRepositoryConfiguration repository;
+ private List<IndexCreator> allIndexCreators;
+
public NexusIndexerConsumer( ArchivaTaskScheduler<ArtifactIndexingTask>
scheduler,
ArchivaConfiguration configuration, FileTypes
filetypes, PlexusSisuBridge plexusSisuBridge )
throws PlexusSisuBridgeException
@@ -81,6 +84,7 @@ public class NexusIndexerConsumer
this.filetypes = filetypes;
this.scheduler = scheduler;
this.nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class );
+ this.allIndexCreators = plexusSisuBridge.lookupList(
IndexCreator.class );
}
public String getDescription()
@@ -107,7 +111,7 @@ public class NexusIndexerConsumer
try
{
log.info( "Creating indexing context for repo : " +
repository.getId() );
- context = ArtifactIndexingTask.createContext( repository,
nexusIndexer );
+ context = ArtifactIndexingTask.createContext( repository,
nexusIndexer, allIndexCreators );
}
catch ( IOException e )
{
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=1158035&r1=1158034&r2=1158035&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
Mon Aug 15 22:17:08 2011
@@ -25,7 +25,6 @@ import org.apache.archiva.indexer.util.S
import org.apache.commons.lang.StringUtils;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery;
-import org.apache.maven.archiva.common.utils.ArchivaNexusIndexerUtil;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@@ -35,6 +34,7 @@ import org.apache.maven.index.FlatSearch
import org.apache.maven.index.MAVEN;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.OSGI;
+import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException;
import org.apache.maven.index.expr.StringSearchExpression;
@@ -62,12 +62,15 @@ public class NexusRepositorySearch
private ArchivaConfiguration archivaConfig;
+ private List<? extends IndexCreator> allIndexCreators;
+
@Inject
public NexusRepositorySearch( PlexusSisuBridge plexusSisuBridge,
ArchivaConfiguration archivaConfig )
throws PlexusSisuBridgeException
{
this.indexer = plexusSisuBridge.lookup( NexusIndexer.class );
this.archivaConfig = archivaConfig;
+ allIndexCreators = plexusSisuBridge.lookupList( IndexCreator.class );
}
/**
@@ -274,7 +277,7 @@ public class NexusRepositorySearch
IndexingContext context = indexer.addIndexingContext(
repoConfig.getId(), repoConfig.getId(),
new
File( repoConfig.getLocation() ),
indexDirectory, null, null,
-
ArchivaNexusIndexerUtil.FULL_INDEX );
+
getAllIndexCreators() );
context.setSearchable( repoConfig.isScanned() );
}
else
@@ -295,6 +298,13 @@ public class NexusRepositorySearch
}
}
+
+ protected List<? extends IndexCreator> getAllIndexCreators()
+ {
+ return allIndexCreators;
+ }
+
+
private SearchResults convertToSearchResults( FlatSearchResponse response,
SearchResultLimits limits )
{
SearchResults results = new SearchResults();
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java?rev=1158035&r1=1158034&r2=1158035&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java
Mon Aug 15 22:17:08 2011
@@ -22,7 +22,6 @@ package org.apache.archiva.indexer.searc
import junit.framework.TestCase;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.commons.io.FileUtils;
-import org.apache.maven.archiva.common.utils.ArchivaNexusIndexerUtil;
import org.apache.maven.archiva.common.utils.FileUtil;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
@@ -30,7 +29,6 @@ import org.apache.maven.archiva.configur
import org.apache.maven.index.ArtifactContext;
import org.apache.maven.index.ArtifactContextProducer;
import org.apache.maven.index.NexusIndexer;
-import org.apache.maven.index.artifact.IllegalArtifactCoordinateException;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException;
import org.easymock.MockControl;
@@ -59,7 +57,7 @@ public abstract class AbstractNexusRepos
public static String TEST_REPO_2 = "nexus-search-test-repo-2";
- RepositorySearch search;
+ NexusRepositorySearch search;
ArchivaConfiguration archivaConfig;
@@ -166,7 +164,7 @@ public abstract class AbstractNexusRepos
IndexingContext context = nexusIndexer.addIndexingContext( repository,
repository, repo, indexDirectory,
repo.toURI().toURL().toExternalForm(),
indexDirectory.toURI().toURL().toString(),
-
ArchivaNexusIndexerUtil.FULL_INDEX );
+
search.getAllIndexCreators() );
List<ArtifactContext> artifactContexts = new
ArrayList<ArtifactContext>( filesToBeIndexed.size() );
for ( File artifactFile : filesToBeIndexed )
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=1158035&r1=1158034&r2=1158035&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
Mon Aug 15 22:17:08 2011
@@ -19,23 +19,9 @@ package org.apache.archiva.indexer.searc
* under the License.
*/
-import junit.framework.TestCase;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.archiva.common.utils.ArchivaNexusIndexerUtil;
import org.apache.maven.archiva.common.utils.FileUtil;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.configuration.Configuration;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.index.ArtifactContext;
-import org.apache.maven.index.ArtifactContextProducer;
-import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.artifact.IllegalArtifactCoordinateException;
-import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException;
-import org.easymock.MockControl;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
@@ -46,7 +32,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import javax.inject.Inject;
@RunWith( SpringJUnit4ClassRunner.class )
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java?rev=1158035&r1=1158034&r2=1158035&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
Mon Aug 15 22:17:08 2011
@@ -32,6 +32,7 @@ import org.apache.maven.index.FlatSearch
import org.apache.maven.index.MAVEN;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.artifact.IllegalArtifactCoordinateException;
+import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException;
import org.apache.maven.index.expr.SourcedSearchExpression;
@@ -48,6 +49,7 @@ import javax.annotation.PostConstruct;
import javax.inject.Inject;
import java.io.File;
import java.io.IOException;
+import java.util.List;
/**
* ArchivaIndexingTaskExecutor Executes all indexing tasks. Adding, updating
and removing artifacts from the index are
@@ -75,6 +77,8 @@ public class ArchivaIndexingTaskExecutor
private NexusIndexer nexusIndexer;
+ private List<IndexCreator> allIndexCreators;
+
@PostConstruct
public void initialize()
throws PlexusSisuBridgeException
@@ -86,6 +90,8 @@ public class ArchivaIndexingTaskExecutor
indexPacker = plexusSisuBridge.lookup( IndexPacker.class, "default" );
nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class );
+
+ allIndexCreators = plexusSisuBridge.lookupList( IndexCreator.class );
}
public void executeTask( Task task )
@@ -113,7 +119,7 @@ public class ArchivaIndexingTaskExecutor
{
log.debug( "Creating indexing context on resource: {}",
indexingTask.getResourceFile().getPath() );
- context = ArtifactIndexingTask.createContext(
repository, nexusIndexer );
+ context = ArtifactIndexingTask.createContext(
repository, nexusIndexer, allIndexCreators );
}
catch ( IOException e )
{
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java?rev=1158035&r1=1158034&r2=1158035&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
Mon Aug 15 22:17:08 2011
@@ -19,9 +19,9 @@ package org.apache.archiva.scheduler.ind
* under the License.
*/
-import org.apache.maven.archiva.common.utils.ArchivaNexusIndexerUtil;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.index.NexusIndexer;
+import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException;
import org.codehaus.plexus.taskqueue.Task;
@@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.util.List;
public class ArtifactIndexingTask
implements Task
@@ -157,7 +158,8 @@ public class ArtifactIndexingTask
return true;
}
- public static IndexingContext createContext(
ManagedRepositoryConfiguration repository, NexusIndexer indexer )
+ public static IndexingContext createContext(
ManagedRepositoryConfiguration repository, NexusIndexer indexer,
+ List<IndexCreator>
indexCreators )
throws IOException, UnsupportedExistingLuceneIndexException
{
String indexDir = repository.getIndexDir();
@@ -182,7 +184,7 @@ public class ArtifactIndexingTask
IndexingContext context =
indexer.addIndexingContext( repository.getId(),
repository.getId(), managedRepository, indexDirectory,
managedRepository.toURI().toURL().toString(),
-
indexDirectory.toURI().toURL().toString(), ArchivaNexusIndexerUtil.FULL_INDEX );
+
indexDirectory.toURI().toURL().toString(), indexCreators );
context.setSearchable( repository.isScanned() );
return context;
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java?rev=1158035&r1=1158034&r2=1158035&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
Mon Aug 15 22:17:08 2011
@@ -26,7 +26,6 @@ import org.apache.lucene.search.BooleanC
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TopDocs;
-import org.apache.maven.archiva.common.utils.ArchivaNexusIndexerUtil;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.index.ArtifactInfo;
@@ -34,6 +33,7 @@ import org.apache.maven.index.FlatSearch
import org.apache.maven.index.FlatSearchResponse;
import org.apache.maven.index.MAVEN;
import org.apache.maven.index.NexusIndexer;
+import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.expr.SourcedSearchExpression;
import org.apache.maven.index.expr.StringSearchExpression;
@@ -96,7 +96,8 @@ public class ArchivaIndexingTaskExecutor
indexer = plexusSisuBridge.lookup( NexusIndexer.class );
- ArtifactIndexingTask.createContext( repositoryConfig, indexer );
+ ArtifactIndexingTask.createContext( repositoryConfig, indexer,
+ plexusSisuBridge.lookupList(
IndexCreator.class ) );
}
@After
@@ -152,7 +153,7 @@ public class ArchivaIndexingTaskExecutor
new File(
repositoryConfig.getLocation() ),
new File(
repositoryConfig.getLocation(),
".indexer" ), null, null,
-
ArchivaNexusIndexerUtil.FULL_INDEX );
+
plexusSisuBridge.lookupList( IndexCreator.class ) );
context.setSearchable( true );
}
@@ -297,7 +298,6 @@ public class ArchivaIndexingTaskExecutor
indexer.constructQuery( MAVEN.ARTIFACT_ID, new
StringSearchExpression( "archiva-index-methods-jar-test" ) ),
Occur.SHOULD );
-
FlatSearchRequest request = new FlatSearchRequest( q,
getIndexingContext() );
FlatSearchResponse response = indexer.searchFlat( request );
