svn commit: r1484729 - in /jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene: LuceneIndexConstants.java LuceneIndexUpdate.java

[al...@apache.org]

Author: alexparvulescu
Date: Tue May 21 10:01:50 2013
New Revision: 1484729

URL: http://svn.apache.org/r1484729
Log:
OAK-831 Lucene filesystem based index
 - renamed the 'data' folder for file based persistence

Modified:
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexUpdate.java

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java?rev=1484729&r1=1484728&r2=1484729&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java Tue May 21 10:01:50 2013
@@ -43,6 +43,8 @@ public interface LuceneIndexConstants {
 
     String PERSISTENCE_PATH = "path";
 
+    String INDEX_DATA_CHILD_NAME_FS = "data";
+
     String INDEX_PATH = "index";
 
     /**

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexUpdate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexUpdate.java?rev=1484729&r1=1484728&r2=1484729&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexUpdate.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexUpdate.java Tue May 21 10:01:50 2013
@@ -24,6 +24,7 @@ import static org.apache.jackrabbit.oak.
 import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.ANALYZER;
 import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INCLUDE_PROPERTY_TYPES;
 import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME_FS;
 import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_PATH;
 import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_FILE;
 import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_NAME;
@@ -183,6 +184,7 @@ class LuceneIndexUpdate implements Close
                 throw new CommitFailedException("Lucene", 1,
                         "Index config path should be a descendant of the repository directory.");
             }
+            root = root.toLowerCase();
             for (String p : root.split("/")) {
                 rootf = new File(rootf, p);
             }
@@ -190,7 +192,7 @@ class LuceneIndexUpdate implements Close
         // TODO factor in the 'path' argument to not have overlapping lucene
         // index defs
         if (!PathUtils.denotesRoot(path)) {
-            String elements = path;
+            String elements = path.toLowerCase();
             if (elements.startsWith("/")) {
                 elements = elements.substring(1);
             }
@@ -199,7 +201,7 @@ class LuceneIndexUpdate implements Close
             }
         }
 
-        File f = new File(rootf, INDEX_DATA_CHILD_NAME);
+        File f = new File(rootf, INDEX_DATA_CHILD_NAME_FS);
         f.mkdirs();
         return f;
     }