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/08/09 11:42:58 UTC
svn commit: r1512227 - in /lucene/dev/trunk: ./ solr/ solr/contrib/
solr/contrib/uima/src/test-files/uima/
solr/contrib/uima/src/test-files/uima/solr/collection1/conf/ solr/example/
solr/example/solr/collection1/conf/ solr/example/solr/collection1/conf...
Author: dweiss
Date: Fri Aug 9 09:42:57 2013
New Revision: 1512227
URL: http://svn.apache.org/r1512227
Log:
SOLR-4708: Enable ClusteringComponent by default in collection1 example.
The solr.clustering.enabled system property is set to 'true' by default.
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/solr/ (props changed)
lucene/dev/trunk/solr/CHANGES.txt (contents, props changed)
lucene/dev/trunk/solr/contrib/ (props changed)
lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
lucene/dev/trunk/solr/example/ (props changed)
lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml
lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/cluster.vm
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1512227&r1=1512226&r2=1512227&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Aug 9 09:42:57 2013
@@ -115,6 +115,10 @@ Optimizations
Other Changes
----------------------
+* SOLR-4708: Enable ClusteringComponent by default in collection1 example.
+ The solr.clustering.enabled system property is set to 'true' by default.
+ (ehatcher, Dawid Weiss)
+
* SOLR-4914: Factor out core list persistence and discovery into a
new CoresLocator interface. (Alan Woodward)
Modified: lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml?rev=1512227&r1=1512226&r2=1512227&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml Fri Aug 9 09:42:57 2013
@@ -48,13 +48,10 @@
ends) will be included.
-->
<lib dir="../../dist/" regex="solr-cell-\d.*\.jar" />
- <lib dir="../../dist/" regex="solr-clustering-\d.*\.jar" />
<!--
If a dir option (with or without a regex) is used and nothing is
found that matches, it will be ignored
-->
- <lib dir="../../contrib/clustering/lib/downloads/" />
- <lib dir="../../contrib/clustering/lib/" />
<lib dir="/total/crap/dir/ignored" />
<!--
an exact path can be used to specify a specific file. This will
@@ -596,68 +593,6 @@
</arr>
</requestHandler>
- <!--
- Clustering Component http://wiki.apache.org/solr/ClusteringComponent
- This relies on third party jars which are not included in the
- release. To use this component (and the "/clustering" handler) Those
- jars will need to be downloaded, and you'll need to set the
- solr.cluster.enabled system property when running solr... java
- -Dsolr.clustering.enabled=true -jar start.jar
- -->
- <searchComponent name="clusteringComponent"
- enable="${solr.clustering.enabled:false}" class="org.apache.solr.handler.clustering.ClusteringComponent">
- <!-- Declare an engine -->
- <lst name="engine">
- <!-- The name, only one can be named "default" -->
- <str name="name">default</str>
- <!--
- Class name of Carrot2 clustering algorithm. Currently available
- algorithms are: *
- org.carrot2.clustering.lingo.LingoClusteringAlgorithm *
- org.carrot2.clustering.stc.STCClusteringAlgorithm See
- http://project.carrot2.org/algorithms.html for the algorithm's
- characteristics.
- -->
- <str name="carrot.algorithm">org.carrot2.clustering.lingo.LingoClusteringAlgorithm</str>
- <!--
- Overriding values for Carrot2 default algorithm attributes. For
- a description of all available attributes, see:
- http://download.carrot2.org/stable/manual/#chapter.components.
- Use attribute key as name attribute of str elements below. These
- can be further overridden for individual requests by specifying
- attribute key as request parameter name and attribute value as
- parameter value.
- -->
- <str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str>
- </lst>
- <lst name="engine">
- <str name="name">stc</str>
- <str name="carrot.algorithm">org.carrot2.clustering.stc.STCClusteringAlgorithm</str>
- </lst>
- </searchComponent>
- <requestHandler name="/clustering" enable="${solr.clustering.enabled:false}"
- class="solr.SearchHandler">
- <lst name="defaults">
- <bool name="clustering">true</bool>
- <str name="clustering.engine">default</str>
- <bool name="clustering.results">true</bool>
- <!-- The title field -->
- <str name="carrot.title">name</str>
- <str name="carrot.url">id</str>
- <!-- The field to cluster on -->
- <str name="carrot.snippet">features</str>
- <!-- produce summaries -->
- <bool name="carrot.produceSummary">true</bool>
- <!-- the maximum number of labels per cluster -->
- <!--<int name="carrot.numDescriptions">5</int>-->
- <!-- produce sub clusters -->
- <bool name="carrot.outputSubClusters">false</bool>
- </lst>
- <arr name="last-components">
- <str>clusteringComponent</str>
- </arr>
- </requestHandler>
-
<!-- Solr Cell: http://wiki.apache.org/solr/ExtractingRequestHandler -->
<requestHandler name="/update/extract"
class="org.apache.solr.handler.extraction.ExtractingRequestHandler"
Modified: lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml?rev=1512227&r1=1512226&r2=1512227&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml Fri Aug 9 09:42:57 2013
@@ -48,13 +48,10 @@
ends) will be included.
-->
<lib dir="../../dist/" regex="solr-cell-\d.*\.jar" />
- <lib dir="../../dist/" regex="solr-clustering-\d.*\.jar" />
<!--
If a dir option (with or without a regex) is used and nothing is
found that matches, it will be ignored
-->
- <lib dir="../../contrib/clustering/lib/downloads/" />
- <lib dir="../../contrib/clustering/lib/" />
<lib dir="/total/crap/dir/ignored" />
<!--
an exact path can be used to specify a specific file. This will
@@ -595,68 +592,6 @@
</arr>
</requestHandler>
- <!--
- Clustering Component http://wiki.apache.org/solr/ClusteringComponent
- This relies on third party jars which are not included in the
- release. To use this component (and the "/clustering" handler) Those
- jars will need to be downloaded, and you'll need to set the
- solr.cluster.enabled system property when running solr... java
- -Dsolr.clustering.enabled=true -jar start.jar
- -->
- <searchComponent name="clusteringComponent"
- enable="${solr.clustering.enabled:false}" class="org.apache.solr.handler.clustering.ClusteringComponent">
- <!-- Declare an engine -->
- <lst name="engine">
- <!-- The name, only one can be named "default" -->
- <str name="name">default</str>
- <!--
- Class name of Carrot2 clustering algorithm. Currently available
- algorithms are: *
- org.carrot2.clustering.lingo.LingoClusteringAlgorithm *
- org.carrot2.clustering.stc.STCClusteringAlgorithm See
- http://project.carrot2.org/algorithms.html for the algorithm's
- characteristics.
- -->
- <str name="carrot.algorithm">org.carrot2.clustering.lingo.LingoClusteringAlgorithm</str>
- <!--
- Overriding values for Carrot2 default algorithm attributes. For
- a description of all available attributes, see:
- http://download.carrot2.org/stable/manual/#chapter.components.
- Use attribute key as name attribute of str elements below. These
- can be further overridden for individual requests by specifying
- attribute key as request parameter name and attribute value as
- parameter value.
- -->
- <str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str>
- </lst>
- <lst name="engine">
- <str name="name">stc</str>
- <str name="carrot.algorithm">org.carrot2.clustering.stc.STCClusteringAlgorithm</str>
- </lst>
- </searchComponent>
- <requestHandler name="/clustering" enable="${solr.clustering.enabled:false}"
- class="solr.SearchHandler">
- <lst name="defaults">
- <bool name="clustering">true</bool>
- <str name="clustering.engine">default</str>
- <bool name="clustering.results">true</bool>
- <!-- The title field -->
- <str name="carrot.title">name</str>
- <str name="carrot.url">id</str>
- <!-- The field to cluster on -->
- <str name="carrot.snippet">features</str>
- <!-- produce summaries -->
- <bool name="carrot.produceSummary">true</bool>
- <!-- the maximum number of labels per cluster -->
- <!--<int name="carrot.numDescriptions">5</int>-->
- <!-- produce sub clusters -->
- <bool name="carrot.outputSubClusters">false</bool>
- </lst>
- <arr name="last-components">
- <str>clusteringComponent</str>
- </arr>
- </requestHandler>
-
<!-- Solr Cell: http://wiki.apache.org/solr/ExtractingRequestHandler -->
<requestHandler name="/update/extract"
class="org.apache.solr.handler.extraction.ExtractingRequestHandler"
Modified: lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml?rev=1512227&r1=1512226&r2=1512227&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml Fri Aug 9 09:42:57 2013
@@ -1371,15 +1371,9 @@
<!-- Clustering Component
http://wiki.apache.org/solr/ClusteringComponent
-
- 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
-
-->
<searchComponent name="clustering"
- enable="${solr.clustering.enabled:false}"
+ enable="${solr.clustering.enabled:true}"
class="solr.clustering.ClusteringComponent" >
<!-- Declare an engine -->
<lst name="engine">
@@ -1445,7 +1439,7 @@
-->
<requestHandler name="/clustering"
startup="lazy"
- enable="${solr.clustering.enabled:false}"
+ enable="${solr.clustering.enabled:true}"
class="solr.SearchHandler">
<lst name="defaults">
<bool name="clustering">true</bool>
Modified: lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/cluster.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/cluster.vm?rev=1512227&r1=1512226&r2=1512227&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/cluster.vm (original)
+++ lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/cluster.vm Fri Aug 9 09:42:57 2013
@@ -9,7 +9,7 @@
## Div tag has placeholder text by default
<div id="clusters">
- Run Solr with java -Dsolr.clustering.enabled=true -jar start.jar to see results
+ Loading...
</div>
## Replace the div content *if* Carrot^2 is available