[dna-commits] DNA SVN: r1376 - in trunk/dna-search: src/test/java/org/jboss/dna/search/query and 1 other directory.

[dna-commits at lists.jboss.org]

Author: rhauch
Date: 2009-12-01 10:46:19 -0500 (Tue, 01 Dec 2009)
New Revision: 1376

Modified:
   trunk/dna-search/pom.xml
   trunk/dna-search/src/test/java/org/jboss/dna/search/query/NotQueryTest.java
Log:
DNA-562 Upgraded Lucene to the latest release (3.0.0), which was made just last week and contains only removal of deprecated APIs.

Modified: trunk/dna-search/pom.xml
===================================================================
--- trunk/dna-search/pom.xml	2009-12-01 15:20:21 UTC (rev 1375)
+++ trunk/dna-search/pom.xml	2009-12-01 15:46:19 UTC (rev 1376)
@@ -45,22 +45,22 @@
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
-      <version>2.9.1</version>
+      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-analyzers</artifactId>
-      <version>2.9.1</version>
+      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-snowball</artifactId>
-      <version>2.9.1</version>
+      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-regex</artifactId>
-      <version>2.9.1</version>
+      <version>3.0.0</version>
     </dependency>
     <!-- 
     Testing (note the scope)

Modified: trunk/dna-search/src/test/java/org/jboss/dna/search/query/NotQueryTest.java
===================================================================
--- trunk/dna-search/src/test/java/org/jboss/dna/search/query/NotQueryTest.java	2009-12-01 15:20:21 UTC (rev 1375)
+++ trunk/dna-search/src/test/java/org/jboss/dna/search/query/NotQueryTest.java	2009-12-01 15:46:19 UTC (rev 1376)
@@ -35,7 +35,6 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.Similarity;
-import org.jboss.dna.search.query.NotQuery;
 import org.junit.Test;
 
 public class NotQueryTest {
@@ -104,6 +103,29 @@
         /**
          * {@inheritDoc}
          * 
+         * @see org.apache.lucene.search.DocIdSetIterator#advance(int)
+         */
+        @Override
+        public int advance( int target ) {
+            int doc;
+            while ((doc = nextDoc()) < target) {
+            }
+            return doc;
+        }
+
+        /**
+         * {@inheritDoc}
+         * 
+         * @see org.apache.lucene.search.DocIdSetIterator#docID()
+         */
+        @Override
+        public int docID() {
+            return nextDoc();
+        }
+
+        /**
+         * {@inheritDoc}
+         * 
          * @see org.apache.lucene.search.DocIdSetIterator#nextDoc()
          */
         @Override