You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2014/11/27 12:31:04 UTC

svn commit: r1642100 - in /jackrabbit/oak/branches/1.0: ./ oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java

Author: chetanm
Date: Thu Nov 27 11:31:03 2014
New Revision: 1642100

URL: http://svn.apache.org/r1642100
Log:
OAK-2278 - Same Lucene index to support both property restrictions and fulltext constraints

Merging revisions 1640865

Modified:
    jackrabbit/oak/branches/1.0/   (props changed)
    jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java

Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk:r1640865

Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java?rev=1642100&r1=1642099&r2=1642100&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java Thu Nov 27 11:31:03 2014
@@ -84,7 +84,6 @@ public class LucenePropertyIndexTest ext
         LuceneIndexProvider provider = new LuceneIndexProvider();
         return new Oak()
                 .with(new InitialContent())
-                .with(new LuceneInitializerHelper("luceneGlobal", (Set<String>) null))
                 .with(new OpenSecurityProvider())
                 .with((QueryIndexProvider) provider)
                 .with((Observer) provider)
@@ -670,13 +669,10 @@ public class LucenePropertyIndexTest ext
 
     @Test
     public void indexTimeFieldBoost() throws Exception {
-
         // Index Definition
         Tree idx = createIndex("test1", of("propa", "propb", "propc"));
         idx.setProperty(LuceneIndexConstants.FULL_TEXT_ENABLED, true);
 
-        //TODO Remove compat mode once OAK-2278 resolved
-        idx.setProperty(LuceneIndexConstants.COMPAT_MODE, IndexFormatVersion.V1.getVersion());
         Tree propNode = idx.addChild(PROP_NODE);
 
         // property definition for index test1