jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1130018 - in /jackrabbit/branches/2.2: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query...
Date Wed, 01 Jun 2011 06:51:02 GMT
Author: jukka
Date: Wed Jun  1 06:51:01 2011
New Revision: 1130018

URL: http://svn.apache.org/viewvc?rev=1130018&view=rev
Log:
2.2: Revert revision 1128329 due to a regression (JCR-2980)

Removed:
    jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/SQL2IndexingAggregateTest.java
Modified:
    jackrabbit/branches/2.2/RELEASE-NOTES.txt
    jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java
    jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/AbstractQueryTest.java

Modified: jackrabbit/branches/2.2/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/RELEASE-NOTES.txt?rev=1130018&r1=1130017&r2=1130018&view=diff
==============================================================================
--- jackrabbit/branches/2.2/RELEASE-NOTES.txt (original)
+++ jackrabbit/branches/2.2/RELEASE-NOTES.txt Wed Jun  1 06:51:01 2011
@@ -39,7 +39,6 @@ Bug fixes
   [JCR-2939] QueryObjectModel does not generate the corresponding SQL2 ...
   [JCR-2953] PathParser accepts illegal pahts containing curly brackets
   [JCR-2960] Long values not properly stored
-  [JCR-2980] Nodes that have properties marked for async extraction should ...
 
 For more detailed information about all the changes in this and other
 Jackrabbit releases, please see the Jackrabbit issue tracker at

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java?rev=1130018&r1=1130017&r2=1130018&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java
Wed Jun  1 06:51:01 2011
@@ -27,7 +27,6 @@ import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.Fieldable;
@@ -510,9 +509,6 @@ abstract class AbstractIndex {
                             stored, indexed, tv);
                 } else if (f.isBinary()) {
                     field = new Field(f.name(), f.binaryValue(), stored);
-                } else if (f.tokenStreamValue() != null) {
-                    TokenStream ts = f.tokenStreamValue();
-                    field = new Field(f.name(), ts);
                 }
                 if (field != null) {
                     field.setOmitNorms(f.getOmitNorms());

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/AbstractQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/AbstractQueryTest.java?rev=1130018&r1=1130017&r2=1130018&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/AbstractQueryTest.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/AbstractQueryTest.java
Wed Jun  1 06:51:01 2011
@@ -263,13 +263,6 @@ public class AbstractQueryTest extends A
         return qm.createQuery(statement, JCR_SQL2).execute();
     }
 
-    protected void executeSQL2Query(String statement, Node[] nodes)
-            throws RepositoryException {
-        getSearchIndex().flush();
-        QueryResult res = qm.createQuery(statement, JCR_SQL2).execute();
-        checkResult(res, nodes);
-    }
-
     /**
      * Returns a reference to the underlying search index.
      *



Mime
View raw message