Author: tommaso
Date: Mon Mar 17 15:07:17 2014
New Revision: 1578419
URL: http://svn.apache.org/r1578419
Log:
OAK-1552 - switch to newest solr.xml format
Added:
jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/core.properties
(with props)
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/solr.xml
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java?rev=1578419&r1=1578418&r2=1578419&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java
Mon Mar 17 15:07:17 2014
@@ -84,6 +84,7 @@ public class RemoteSolrServerProvider im
private SolrServer initializeWithCloudSolrServer() throws IOException,
SolrServerException {
// try SolrCloud client
CloudSolrServer cloudSolrServer = new
CloudSolrServer(remoteSolrServerConfiguration.getSolrZkHost());
+ cloudSolrServer.setZkConnectTimeout(100);
cloudSolrServer.connect();
cloudSolrServer.setDefaultCollection("collection1"); // workaround for
first request when the needed collection may not exist
@@ -131,7 +132,13 @@ public class RemoteSolrServerProvider im
ZkStateReader zkStateReader = cloudSolrServer.getZkStateReader();
SolrZkClient zkClient = zkStateReader.getZkClient();
if (zkClient.isConnected() && !zkClient.exists("/configs/" +
solrCollection, false)) {
- File dir = new File(remoteSolrServerConfiguration != null ?
remoteSolrServerConfiguration.getSolrConfDir() :
getClass().getResource("/solr-oak-conf").getFile());
+ String solrConfDir =
remoteSolrServerConfiguration.getSolrConfDir();
+ File dir;
+ if (solrConfDir != null && solrConfDir.length() > 0) {
+ dir = new File(solrConfDir);
+ } else {
+ dir = new
File(getClass().getResource("/solr/oak/conf").getFile());
+ }
ZkController.uploadConfigDir(zkClient, dir, solrCollection);
UpdateRequest req = new UpdateRequest("/admin/collections");
req.setParam("action", "CREATE");
Added:
jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/core.properties
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/core.properties?rev=1578419&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/core.properties
(added)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/core.properties
Mon Mar 17 15:07:17 2014
@@ -0,0 +1 @@
+name=oak
Propchange:
jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/core.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/solr.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/solr.xml?rev=1578419&r1=1578418&r2=1578419&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/solr.xml
(original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/solr.xml Mon Mar
17 15:07:17 2014
@@ -17,23 +17,29 @@
-->
<!--
- All (relative) paths are relative to the installation path
-
- persistent: Save changes made via the API to this file
- sharedLib: path to a lib directory that will be shared across all cores
+ This is an example of a simple "solr.xml" file for configuring one or
+ more Solr Cores, as well as allowing Cores to be added, removed, and
+ reloaded via HTTP requests.
+
+ More information about options available in this configuration file,
+ and Solr Core administration can be found online:
+ http://wiki.apache.org/solr/CoreAdmin
-->
-<solr persistent="false">
- <!--
- adminPath: RequestHandler path to manage cores.
- If 'null' (or absent), cores will not be manageable via request handler
- -->
- <cores adminPath="/admin/cores" defaultCoreName="oak"
- host="127.0.0.1" hostPort="${hostPort:8080}" hostContext="solr"
- zkClientTimeout="8000" numShards="${numShards:1}">
- <core name="oak" instanceDir="oak" shard="${shard:shard1}"
- collection="${collection:oak}"
- config="${solrconfig:solrconfig.xml}"
- schema="${schema:schema.xml}"/>
- </cores>
+<solr>
+
+ <solrcloud>
+ <str name="host">${host:}</str>
+ <int name="hostPort">${jetty.port:8983}</int>
+ <str name="hostContext">${hostContext:solr}</str>
+ <int name="zkClientTimeout">${zkClientTimeout:30000}</int>
+ <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
+ </solrcloud>
+
+ <shardHandlerFactory name="shardHandlerFactory"
+ class="HttpShardHandlerFactory">
+ <int name="socketTimeout">${socketTimeout:0}</int>
+ <int name="connTimeout">${connTimeout:0}</int>
+ </shardHandlerFactory>
+
</solr>
