jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomm...@apache.org
Subject svn commit: r1574104 - in /jackrabbit/oak/trunk: oak-parent/pom.xml oak-solr-core/pom.xml oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
Date Tue, 04 Mar 2014 14:11:10 GMT
Author: tommaso
Date: Tue Mar  4 14:11:10 2014
New Revision: 1574104

URL: http://svn.apache.org/r1574104
Log:
OAK-1492 - made Solr catch-all field configurable, moved Solr to same Lucene version

Modified:
    jackrabbit/oak/trunk/oak-parent/pom.xml
    jackrabbit/oak/trunk/oak-solr-core/pom.xml
    jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java

Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1574104&r1=1574103&r2=1574104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Tue Mar  4 14:11:10 2014
@@ -46,7 +46,7 @@
     <mongo.db>MongoMKDB</mongo.db>
     <mongo.db2>MongoMKDB2</mongo.db2>
     <segment.db>SegmentMK</segment.db>
-    <solr.version>4.1.0</solr.version>
+    <solr.version>4.7.0</solr.version>
     <!-- Note that we're using SLF4J API version 1.6 when compiling     -->
     <!-- core Oak components but more recent SLF4J and Logback versions -->
     <!-- when compiling and running test cases and the oak-run jar.     -->

Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/pom.xml?rev=1574104&r1=1574103&r2=1574104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-solr-core/pom.xml Tue Mar  4 14:11:10 2014
@@ -158,13 +158,19 @@
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-test-framework</artifactId>
-      <version>${lucene.version}</version>
+      <version>4.7.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
-      <version>${lucene.version}</version>
+      <version>4.7.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers-common</artifactId>
+      <version>4.7.0</version>
       <scope>test</scope>
     </dependency>
 

Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java?rev=1574104&r1=1574103&r2=1574104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
(original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
Tue Mar  4 14:11:10 2014
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.plugins.index.solr;
 
-import java.io.File;
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.plugins.index.solr.configuration.CommitPolicy;
 import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
@@ -34,13 +33,12 @@ public class TestUtils
         implements SolrServerProvider, OakSolrConfigurationProvider {
 
     static final String SOLR_HOME_PATH = "/solr";
-    static final String SOLRCONFIG_PATH = "/solr/solr.xml";
 
     public static SolrServer createSolrServer() {
         String homePath = SolrServerProvider.class.getResource(SOLR_HOME_PATH).getFile();
         CoreContainer coreContainer = new CoreContainer(homePath);
         try {
-            coreContainer.load(homePath, new File(SolrServerProvider.class.getResource(SOLRCONFIG_PATH).getFile()));
+            coreContainer.load();
         } catch (Exception e) {
             throw new IllegalStateException(e);
         }
@@ -99,6 +97,11 @@ public class TestUtils
                 return CommitPolicy.HARD;
             }
 
+            @Override
+            public String getCatchAllField() {
+                return "catch_all";
+            }
+
         };
     }
 



Mime
View raw message