Author: chetanm
Date: Thu Feb 19 05:22:15 2015
New Revision: 1660795
URL: http://svn.apache.org/r1660795
Log:
OAK-2526 - adding capabilities to use persisted solr config, SolrServers get
cached by SolrServerProviders
Fix the compilation issue
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java?rev=1660795&r1=1660794&r2=1660795&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
Thu Feb 19 05:22:15 2015
@@ -38,10 +38,11 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.RemoteSolrServerConfiguration;
import
org.apache.jackrabbit.oak.plugins.index.solr.index.SolrIndexEditorProvider;
import
org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndexProvider;
-import
org.apache.jackrabbit.oak.plugins.index.solr.server.DefaultSolrServerProvider;
import
org.apache.jackrabbit.oak.plugins.index.solr.server.EmbeddedSolrServerProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.util.SolrIndexInitializer;
+import org.apache.jackrabbit.oak.spi.commit.Observer;
+import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.slf4j.Logger;
@@ -76,9 +77,11 @@ public class FullTextSolrSearchTest exte
};
}
};
- oak.with(new SolrQueryIndexProvider(serverProvider,
configurationProvider))
- .with(new SolrIndexEditorProvider(serverProvider,
configurationProvider))
- .with(new SolrIndexInitializer(false));
+ SolrQueryIndexProvider solrPRovider = new
SolrQueryIndexProvider(serverProvider, configurationProvider);
+ oak.with((Observer) solrPRovider)
+ .with((QueryIndexProvider) solrPRovider)
+ .with(new SolrIndexEditorProvider(serverProvider,
configurationProvider))
+ .with(new SolrIndexInitializer(false));
return new Jcr(oak);
}
});