You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2013/10/11 20:10:23 UTC
svn commit: r1531378 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/example/
solr/example/solr/collection1/conf/solrconfig.xml
solr/example/solr/collection1/conf/velocity/cluster.vm
Author: dweiss
Date: Fri Oct 11 18:10:22 2013
New Revision: 1531378
URL: http://svn.apache.org/r1531378
Log:
SOLR-5323: Disable ClusteringComponent by default in collection1 example. The solr.clustering.enabled system property needs to be set to 'true' to enable the clustering contrib (reverts SOLR-4708). (Dawid Weiss)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/cluster.vm
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1531378&r1=1531377&r2=1531378&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Fri Oct 11 18:10:22 2013
@@ -145,7 +145,14 @@ Bug Fixes
* SOLR-5325: ZooKeeper connection loss can cause the Overseer to stop processing
commands. (Christine Poerschke, Mark Miller, Jessica Cheng)
-
+
+Other Changes
+----------------------
+
+* SOLR-5323: Disable ClusteringComponent by default in collection1 example.
+ The solr.clustering.enabled system property needs to be set to 'true'
+ to enable the clustering contrib (reverts SOLR-4708). (Dawid Weiss)
+
================== 4.5.0 ==================
Versions of Major Components
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml?rev=1531378&r1=1531377&r2=1531378&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml Fri Oct 11 18:10:22 2013
@@ -1394,11 +1394,16 @@
<!-- Clustering Component
+ You'll need to set the solr.clustering.enabled system property
+ when running solr to run with clustering enabled:
+
+ java -Dsolr.clustering.enabled=true -jar start.jar
+
http://wiki.apache.org/solr/ClusteringComponent
http://carrot2.github.io/solr-integration-strategies/
-->
<searchComponent name="clustering"
- enable="${solr.clustering.enabled:true}"
+ enable="${solr.clustering.enabled:false}"
class="solr.clustering.ClusteringComponent" >
<!-- Declare a named clustering engine. Only one engine can be named
"default" (and it becomes the default one for the search component).
@@ -1457,7 +1462,7 @@
-->
<requestHandler name="/clustering"
startup="lazy"
- enable="${solr.clustering.enabled:true}"
+ enable="${solr.clustering.enabled:false}"
class="solr.SearchHandler">
<lst name="defaults">
<bool name="clustering">true</bool>
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/cluster.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/cluster.vm?rev=1531378&r1=1531377&r2=1531378&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/cluster.vm (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/cluster.vm Fri Oct 11 18:10:22 2013
@@ -9,7 +9,7 @@
## Div tag has placeholder text by default
<div id="clusters">
- Loading...
+ Run Solr with java -Dsolr.clustering.enabled=true -jar start.jar to see clustered search results.
</div>
## Replace the div content *if* Carrot^2 is available