You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/04/18 07:52:16 UTC
svn commit: r935302 - in /servicemix/smx4/nmr/trunk: ./ nmr/audit/
nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/
Author: jbonofre
Date: Sun Apr 18 05:52:16 2010
New Revision: 935302
URL: http://svn.apache.org/viewvc?rev=935302&view=rev
Log:
[SMX4NMR-185] Upgrade NMR audit to new version of Lucene.
Modified:
servicemix/smx4/nmr/trunk/nmr/audit/pom.xml
servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/DefaultLuceneCallback.java
servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneAuditor.java
servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneIndexer.java
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/nmr/audit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/audit/pom.xml?rev=935302&r1=935301&r2=935302&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/audit/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/audit/pom.xml Sun Apr 18 05:52:16 2010
@@ -54,8 +54,8 @@
<version>${felix.karaf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.lucene</artifactId>
<optional>true</optional>
</dependency>
<dependency>
Modified: servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/DefaultLuceneCallback.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/DefaultLuceneCallback.java?rev=935302&r1=935301&r2=935302&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/DefaultLuceneCallback.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/DefaultLuceneCallback.java Sun Apr 18 05:52:16 2010
@@ -25,6 +25,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.util.Version;
/**
* Default Lucene Callback implementation. Used on LuceneAuditor
@@ -48,7 +49,8 @@ public class DefaultLuceneCallback imple
public Object doCallback(IndexSearcher is) throws IOException {
try {
- QueryParser qp = new QueryParser(field, new StandardAnalyzer());
+ // LUCENE-2002
+ QueryParser qp = new QueryParser(Version.LUCENE_30, field, new StandardAnalyzer(Version.LUCENE_30));
Query queryObj = qp.parse(query);
TopDocs topdocs = is.search(queryObj, SEARCH_SIZE);
int total = topdocs.totalHits;
Modified: servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneAuditor.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneAuditor.java?rev=935302&r1=935301&r2=935302&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneAuditor.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneAuditor.java Sun Apr 18 05:52:16 2010
@@ -176,7 +176,8 @@ public class LuceneAuditor extends Abstr
if (message != null) {
String text = getBodyAsText(message);
if (text != null) {
- d.add(new Field(types[i].toString().toLowerCase() + "." + FIELD_CONTENT, text, Field.Store.COMPRESS, Field.Index.ANALYZED));
+ // LUCENE-1960
+ d.add(new Field(types[i].toString().toLowerCase() + "." + FIELD_CONTENT, text, Field.Store.YES, Field.Index.ANALYZED));
}
addMessageHeadersToDocument(message, d, types[i]);
}
Modified: servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneIndexer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneIndexer.java?rev=935302&r1=935301&r2=935302&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneIndexer.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneIndexer.java Sun Apr 18 05:52:16 2010
@@ -56,7 +56,7 @@ public class LuceneIndexer {
public void setDirectoryName(File directoryName) throws IOException {
this.segmentFile = new File(directoryName, "segments");
- this.directory = FSDirectory.getDirectory(directoryName.toString(), !this.segmentFile.exists());
+ this.directory = FSDirectory.open(directoryName);
}
/**
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=935302&r1=935301&r2=935302&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Sun Apr 18 05:52:16 2010
@@ -112,7 +112,7 @@
<jline.version>0.9.94</jline.version>
<junit.version>3.8.2_1</junit.version>
<log4j.version>1.2.14</log4j.version>
- <lucene.version>2.4.1</lucene.version>
+ <lucene.version>3.0.1_1-SNAPSHOT</lucene.version>
<mina.version>2.0.0-M6</mina.version>
<pax.exam.version>1.2.0</pax.exam.version>
<pax.logging.version>1.4</pax.logging.version>
@@ -724,8 +724,8 @@
<version>${derby.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.lucene</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>