servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r935457 - in /servicemix/smx4/nmr/trunk: ./ assembly/src/main/distribution/ant/ nmr/audit/ nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/ transaction/
Date Mon, 19 Apr 2010 06:17:21 GMT
Author: ccustine
Date: Mon Apr 19 06:17:21 2010
New Revision: 935457

URL: http://svn.apache.org/viewvc?rev=935457&view=rev
Log:
Backing out Lucene update until post 4.2 release

Modified:
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/   (props changed)
    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
    servicemix/smx4/nmr/trunk/transaction/   (props changed)

Propchange: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/
            ('svn:mergeinfo' removed)

Modified: servicemix/smx4/nmr/trunk/nmr/audit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/audit/pom.xml?rev=935457&r1=935456&r2=935457&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/audit/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/audit/pom.xml Mon Apr 19 06:17:21 2010
@@ -54,8 +54,8 @@
             <version>${felix.karaf.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.lucene</artifactId>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-core</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=935457&r1=935456&r2=935457&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
Mon Apr 19 06:17:21 2010
@@ -25,7 +25,6 @@ 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
@@ -49,8 +48,7 @@ public class DefaultLuceneCallback imple
 
     public Object doCallback(IndexSearcher is) throws IOException {
         try {
-            // LUCENE-2002
-            QueryParser qp = new QueryParser(Version.LUCENE_30, field, new StandardAnalyzer(Version.LUCENE_30));
+            QueryParser qp = new QueryParser(field, new StandardAnalyzer());
             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=935457&r1=935456&r2=935457&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
Mon Apr 19 06:17:21 2010
@@ -176,8 +176,7 @@ public class LuceneAuditor extends Abstr
                 if (message != null) {
                     String text = getBodyAsText(message);
                     if (text != null) {
-                        // LUCENE-1960
-                        d.add(new Field(types[i].toString().toLowerCase() + "." + FIELD_CONTENT,
text, Field.Store.YES, Field.Index.ANALYZED));
+                        d.add(new Field(types[i].toString().toLowerCase() + "." + FIELD_CONTENT,
text, Field.Store.COMPRESS, 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=935457&r1=935456&r2=935457&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
Mon Apr 19 06:17:21 2010
@@ -56,7 +56,7 @@ public class LuceneIndexer {
 
     public void setDirectoryName(File directoryName) throws IOException {
         this.segmentFile = new File(directoryName, "segments");
-        this.directory = FSDirectory.open(directoryName);
+        this.directory = FSDirectory.getDirectory(directoryName.toString(), !this.segmentFile.exists());
     }
 
     /**

Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=935457&r1=935456&r2=935457&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Mon Apr 19 06:17:21 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>3.0.1_1-SNAPSHOT</lucene.version>
+      <lucene.version>2.4.1</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.servicemix.bundles</groupId>
-          <artifactId>org.apache.servicemix.bundles.lucene</artifactId>
+          <groupId>org.apache.lucene</groupId>
+          <artifactId>lucene-core</artifactId>
           <version>${lucene.version}</version>
       </dependency>
       <dependency>

Propchange: servicemix/smx4/nmr/trunk/transaction/
            ('svn:mergeinfo' removed)



Mime
View raw message