You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2012/11/16 09:47:06 UTC

svn commit: r1410255 - in /maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index: DefaultNexusIndexer.java NexusIndexer.java context/DefaultIndexingContext.java

Author: cstamas
Date: Fri Nov 16 08:47:05 2012
New Revision: 1410255

URL: http://svn.apache.org/viewvc?rev=1410255&view=rev
Log:
MINDEXER-66 provided a way to customize IndexWriterConfig

Introduced protected DefaultNexusIndexer#getWriterConfig() which
allows DefaultNexusIndexer subclasses customize writer configuration
as necessary.

Introduced NexusIndexer#addIndexingContext(IndexingContext) which
allows adding custom context implementations to the indexer.

Updated version to 5.1.0-SNAPSHOT to signify introduction of new
API methods.

Signed-off-by: Igor Fedorenko <ig...@ifedorenko.com>
Signed-off-by: Tamás Cservenák <cs...@apache.org>

Modified:
    maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java
    maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/NexusIndexer.java
    maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java

Modified: maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java?rev=1410255&r1=1410254&r2=1410255&view=diff
==============================================================================
--- maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java (original)
+++ maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java Fri Nov 16 08:47:05 2012
@@ -74,7 +74,7 @@ public class DefaultNexusIndexer
     @Requirement
     private QueryCreator queryCreator;
 
-    private Map<String, IndexingContext> indexingContexts;
+    private final Map<String, IndexingContext> indexingContexts;
 
     public DefaultNexusIndexer()
     {
@@ -85,6 +85,11 @@ public class DefaultNexusIndexer
     // Contexts
     // ----------------------------------------------------------------------------
 
+    public void addIndexingContext( IndexingContext context )
+    {
+        indexingContexts.put( context.getId(), context );
+    };
+
     public IndexingContext addIndexingContext( String id, String repositoryId, File repository, File indexDirectory,
                                                String repositoryUrl, String indexUpdateUrl,
                                                List<? extends IndexCreator> indexers )

Modified: maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/NexusIndexer.java
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/NexusIndexer.java?rev=1410255&r1=1410254&r2=1410255&view=diff
==============================================================================
--- maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/NexusIndexer.java (original)
+++ maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/NexusIndexer.java Fri Nov 16 08:47:05 2012
@@ -91,6 +91,13 @@ public interface NexusIndexer
     /**
      * Adds an indexing context to Nexus indexer.
      * 
+     * @since 5.1.0
+     */
+    void addIndexingContext( IndexingContext context );
+
+    /**
+     * Adds an indexing context to Nexus indexer.
+     * 
      * @param id the ID of the context.
      * @param repositoryId the ID of the repository that this context represents.
      * @param repository the location of the repository.

Modified: maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java?rev=1410255&r1=1410254&r2=1410255&view=diff
==============================================================================
--- maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java (original)
+++ maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java Fri Nov 16 08:47:05 2012
@@ -469,12 +469,21 @@ public class DefaultIndexingContext
             searcherManager = null;
         }
 
-        final IndexWriterConfig config = NexusIndexWriter.defaultConfig();
-        this.indexWriter = new NexusIndexWriter( getIndexDirectory(), config );
+        this.indexWriter = new NexusIndexWriter( getIndexDirectory(), getWriterConfig() );
         this.indexWriter.commit(); // LUCENE-2386
         this.searcherManager = new SearcherManager( indexWriter, false, new NexusIndexSearcherFactory( this ) );
     }
 
+    /**
+     * Returns new IndexWriterConfig instance
+     * 
+     * @since 5.1
+     */
+    protected IndexWriterConfig getWriterConfig()
+    {
+        return NexusIndexWriter.defaultConfig();
+    }
+
     public IndexWriter getIndexWriter()
         throws IOException
     {