Revert change to r1339781 - tests fail with clustering automatically enabled

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1339901 13f79535-47bb-0310-9956-ffa450edef68

solr/example/solr/conf/solrconfig.xml

@@ -1261,8 +1261,14 @@
 
        http://wiki.apache.org/solr/ClusteringComponent
 
+       You'll need to set the solr.cluster.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}"
                    class="solr.clustering.ClusteringComponent" >
     <!-- Declare an engine -->
     <lst name="engine">
@@ -1328,6 +1334,7 @@
     -->
   <requestHandler name="/clustering"
                   startup="lazy"
+                  enable="${solr.clustering.enabled:false}"
                   class="solr.SearchHandler">
     <lst name="defaults">
       <bool name="clustering">true</bool>

solr/example/solr/conf/velocity/cluster.vm

@@ -1,6 +1,6 @@
 <h2 #annTitle("Clusters generated by Carrot2 using the /clustering RequestHandler")>Clusters</h2>
 <div id="clusters">
-  Loading clusters...
+  Run Solr with java -Dsolr.clustering.enabled=true -jar start.jar to see results
 </div>
 <script type="text/javascript">