You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/03/03 01:51:15 UTC
svn commit: r632893 -
/maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndex.java
Author: brett
Date: Sun Mar 2 16:51:14 2008
New Revision: 632893
URL: http://svn.apache.org/viewvc?rev=632893&view=rev
Log:
[MRM-715] switch to IndexWriter since IndexModifier is deprecated in 2.3.1
Merged from r632892 on archiva-1.0.x branch
Modified:
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndex.java
Modified: maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndex.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndex.java?rev=632893&r1=632892&r2=632893&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndex.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndex.java Sun Mar 2 16:51:14 2008
@@ -21,7 +21,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.IndexModifier;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
@@ -86,11 +85,11 @@
{
synchronized( repository )
{
- IndexModifier indexModifier = null;
+ IndexWriter indexWriter = null;
try
{
- indexModifier = new IndexModifier( indexLocation, indexHandlers.getAnalyzer(), !exists() );
- indexModifier.setMaxFieldLength( MAX_FIELD_LENGTH );
+ indexWriter = new IndexWriter( indexLocation, indexHandlers.getAnalyzer(), !exists() );
+ indexWriter.setMaxFieldLength( MAX_FIELD_LENGTH );
for ( Iterator i = records.iterator(); i.hasNext(); )
{
@@ -100,14 +99,14 @@
{
Term term = new Term( LuceneDocumentMaker.PRIMARY_KEY, record.getPrimaryKey() );
- indexModifier.deleteDocuments( term );
+ indexWriter.deleteDocuments( term );
Document document = indexHandlers.getConverter().convert( record );
- indexModifier.addDocument( document );
+ indexWriter.addDocument( document );
}
}
- indexModifier.optimize();
+ indexWriter.optimize();
}
catch ( IOException e )
{
@@ -115,7 +114,7 @@
}
finally
{
- closeQuietly( indexModifier );
+ closeQuietly( indexWriter );
}
}
}
@@ -125,23 +124,23 @@
{
synchronized( repository )
{
- IndexModifier indexModifier = null;
+ IndexWriter indexWriter = null;
try
{
- indexModifier = new IndexModifier( indexLocation, indexHandlers.getAnalyzer(), !exists() );
- indexModifier.setMaxFieldLength( MAX_FIELD_LENGTH );
+ indexWriter = new IndexWriter( indexLocation, indexHandlers.getAnalyzer(), !exists() );
+ indexWriter.setMaxFieldLength( MAX_FIELD_LENGTH );
if ( record != null )
{
Term term = new Term( LuceneDocumentMaker.PRIMARY_KEY, record.getPrimaryKey() );
- indexModifier.deleteDocuments( term );
+ indexWriter.deleteDocuments( term );
Document document = indexHandlers.getConverter().convert( record );
- indexModifier.addDocument( document );
+ indexWriter.addDocument( document );
}
- indexModifier.optimize();
+ indexWriter.optimize();
}
catch ( IOException e )
{
@@ -149,7 +148,7 @@
}
finally
{
- closeQuietly( indexModifier );
+ closeQuietly( indexWriter );
}
}
}
@@ -404,21 +403,6 @@
{
// write should compain if it can't be closed, data probably not persisted
throw new RepositoryIndexException( e.getMessage(), e );
- }
- }
-
- private static void closeQuietly( IndexModifier indexModifier )
- {
- if ( indexModifier != null )
- {
- try
- {
- indexModifier.close();
- }
- catch ( IOException e )
- {
- // ignore
- }
}
}