You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2015/02/19 06:44:07 UTC

svn commit: r1660796 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/contrib/ solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ solr/contrib/morphlines-core/src/test-files/solr/ solr/contrib/morphlines-core/src/test-files/solr/minimr/ solr/co...

Author: erick
Date: Thu Feb 19 05:44:07 2015
New Revision: 1660796

URL: http://svn.apache.org/r1660796
Log:
SOLR-7032: Clean up tests remnanat of old-style solr.xml

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/contrib/   (props changed)
    lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
    lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
    lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/solr.xml
    lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/mrunit/solr.xml
    lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solr.xml
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/test-files/old-solr-example/README.txt
    lucene/dev/branches/branch_5x/solr/core/src/test-files/old-solr-example/solr.xml
    lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/solr-multicore.xml
    lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java
    lucene/dev/branches/branch_5x/solr/solrj/   (props changed)
    lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/shared/solr.xml
    lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/solr.xml

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1660796&r1=1660795&r2=1660796&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Thu Feb 19 05:44:07 2015
@@ -126,6 +126,8 @@ Other Changes
   tests to allow for multiple tests without the same class.
   (Ramkumar Aiyengar, Erick Erickson, Mike McCandless)
 
+* SOLR-7032: Clean up test remnants of old-style solr.xml (Erick Erickson)
+
 ==================  5.0.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

Modified: lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java?rev=1660796&r1=1660795&r2=1660796&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java Thu Feb 19 05:44:07 2015
@@ -244,7 +244,6 @@ public class SolrOutputFormat<K, V> exte
     
     ZipEntry ze = new ZipEntry("solr.xml");
     zos.putNextEntry(ze);
-    zos.write("<cores><core name=\"collection1\" instanceDir=\".\"/></cores>".getBytes(StandardCharsets.UTF_8));
     zos.flush();
     zos.closeEntry();
     zos.close();

Modified: lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java?rev=1660796&r1=1660795&r2=1660796&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java Thu Feb 19 05:44:07 2015
@@ -193,7 +193,7 @@ final class ZooKeeperInspector {
       Files.move(dir, confDir);
       dir = confDir.getParentFile();
     }
-    FileUtils.writeStringToFile(new File(dir, "solr.xml"), "<solr><cores><core name=\"collection1\" instanceDir=\".\" /></cores></solr>", "UTF-8");
+    FileUtils.writeStringToFile(new File(dir, "solr.xml"), "<solr></solr>", "UTF-8");
     verifyConfigDir(confDir);
     return dir;
   }

Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/solr.xml?rev=1660796&r1=1660795&r2=1660796&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/solr.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/solr.xml Thu Feb 19 05:44:07 2015
@@ -24,21 +24,23 @@
 -->
 <solr persistent="${solr.xml.persist:false}">
 
-  <!--
-  adminPath: RequestHandler path to manage cores.  
-    If 'null' (or absent), cores will not be manageable via request handler
-  -->
-  <cores adminPath="/admin/cores" defaultCoreName="collection1" host="127.0.0.1" hostPort="${hostPort:8983}" 
-         hostContext="${hostContext:solr}" zkClientTimeout="${solr.zkclienttimeout:30000}" numShards="${numShards:3}" shareSchema="${shareSchema:false}" 
-         genericCoreNodeNames="${genericCoreNodeNames:true}" leaderVoteWait="0"
-         distribUpdateConnTimeout="${distribUpdateConnTimeout:15000}" distribUpdateSoTimeout="${distribUpdateSoTimeout:120000}">
-    <core name="collection1" instanceDir="." shard="${shard:}" collection="${collection:collection1}" config="${solrconfig:solrconfig.xml}" schema="${schema:schema.xml}"
-          coreNodeName="${coreNodeName:}"/>
-    <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
+  <str name="shareSchema">${shareSchema:false}</str>
+
+  <solrcloud>
+  <str name="host">127.0.0.1</str>
+  <int name="hostPort">${hostPort:8983}</int>
+  <str name="hostContext">${hostContext:solr}</str>
+  <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
+  <int name="leaderVoteWait">0</int>
+  <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:120000}</int>
+  <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:15000}</int>
+  <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>
+
+
+  <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
       <str name="urlScheme">${urlScheme:}</str>
       <int name="socketTimeout">${socketTimeout:120000}</int>
       <int name="connTimeout">${connTimeout:15000}</int>
     </shardHandlerFactory>
-  </cores>
-  
+
 </solr>

Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/mrunit/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/mrunit/solr.xml?rev=1660796&r1=1660795&r2=1660796&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/mrunit/solr.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/mrunit/solr.xml Thu Feb 19 05:44:07 2015
@@ -22,23 +22,24 @@
   persistent: Save changes made via the API to this file
   sharedLib: path to a lib directory that will be shared across all cores
 -->
-<solr persistent="${solr.xml.persist:false}">
+<solr>
+
+  <str name="shareSchema">${shareSchema:false}</str>
+
+  <solrcloud>
+    <int name="hostPort">${hostPort:8983}</int>
+    <int name="hostPort">${hostPort:8983}</int>
+    <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>
+    <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
+    <int name="leaderVoteWait">0</int>
+    <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:15000}</int>
+    <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:120000}</int>
+  </solrcloud>
+
+  <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
+    <str name="urlScheme">${urlScheme:}</str>
+    <int name="socketTimeout">${socketTimeout:120000}</int>
+    <int name="connTimeout">${connTimeout:15000}</int>
+  </shardHandlerFactory>
 
-  <!--
-  adminPath: RequestHandler path to manage cores.  
-    If 'null' (or absent), cores will not be manageable via request handler
-  -->
-  <cores adminPath="/admin/cores" defaultCoreName="collection1" host="127.0.0.1" hostPort="${hostPort:8983}" 
-         hostContext="${hostContext:solr}" zkClientTimeout="${solr.zkclienttimeout:30000}" numShards="${numShards:3}" shareSchema="${shareSchema:false}" 
-         genericCoreNodeNames="${genericCoreNodeNames:true}" leaderVoteWait="0"
-         distribUpdateConnTimeout="${distribUpdateConnTimeout:15000}" distribUpdateSoTimeout="${distribUpdateSoTimeout:120000}">
-    <core name="collection1" instanceDir="." shard="${shard:}" collection="${collection:collection1}" config="${solrconfig:solrconfig.xml}" schema="${schema:schema.xml}"
-          coreNodeName="${coreNodeName:}"/>
-    <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
-      <str name="urlScheme">${urlScheme:}</str>
-      <int name="socketTimeout">${socketTimeout:120000}</int>
-      <int name="connTimeout">${connTimeout:15000}</int>
-    </shardHandlerFactory>
-  </cores>
-  
 </solr>

Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solr.xml?rev=1660796&r1=1660795&r2=1660796&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solr.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solr.xml Thu Feb 19 05:44:07 2015
@@ -31,22 +31,4 @@
     <int name="connTimeout">${connTimeout:15000}</int>
   </shardHandlerFactory>
 
-  <!--
-  adminPath: RequestHandler path to manage cores.  
-    If 'null' (or absent), cores will not be manageable via request handler
-
-  <cores adminPath="/admin/cores" defaultCoreName="collection1" host="127.0.0.1" hostPort="${hostPort:8983}" 
-         hostContext="${hostContext:solr}" zkClientTimeout="${solr.zkclienttimeout:30000}" numShards="${numShards:3}" shareSchema="${shareSchema:false}" 
-         genericCoreNodeNames="${genericCoreNodeNames:true}" leaderVoteWait="0"
-         distribUpdateConnTimeout="${distribUpdateConnTimeout:15000}" distribUpdateSoTimeout="${distribUpdateSoTimeout:120000}">
-    <core name="collection1" instanceDir="collection1" shard="${shard:}" collection="${collection:collection1}" config="${solrconfig:solrconfig.xml}" schema="${schema:schema.xml}"
-          coreNodeName="${coreNodeName:}"/>
-    <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
-      <str name="urlScheme">${urlScheme:}</str>
-      <int name="socketTimeout">${socketTimeout:120000}</int>
-      <int name="connTimeout">${connTimeout:15000}</int>
-    </shardHandlerFactory>
-  </cores>
-  -->
-  
 </solr>

Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/old-solr-example/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/old-solr-example/README.txt?rev=1660796&r1=1660795&r2=1660796&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/old-solr-example/README.txt (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/old-solr-example/README.txt Thu Feb 19 05:44:07 2015
@@ -1 +0,0 @@
-This is around for back compat testing purposes and should be able to be removed in Solr 5.0
\ No newline at end of file

Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/old-solr-example/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/old-solr-example/solr.xml?rev=1660796&r1=1660795&r2=1660796&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/old-solr-example/solr.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/old-solr-example/solr.xml Thu Feb 19 05:44:07 2015
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
-   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
--->
-
-<!--
- All (relative) paths are relative to the Solr Home Directory
-  
-  persistent: Save changes made via the API to this file
-  sharedLib: path to a lib directory that will be shared across all cores
--->
-<solr persistent="true">
-	<!-- by default, this is 50 @ WARN
-  <logging enabled="true">
-  	<watcher size="100" threshold="INFO" />
-  </logging>
-   -->
-
-  <!--
-  adminPath: RequestHandler path to manage cores.  
-    If 'null' (or absent), cores will not be manageable via request handler
-  defaultCoreName: (optional) core to use when no core name is specified in an access url
-    
-  All of the attributes in cores after defaultCoreName only apply when running in SolrCloud mode.
-  You can read more about SolrCloud mode at http://wiki.apache.org/solr/SolrCloud
-  -->
-  <cores adminPath="/admin/cores" defaultCoreName="collection1" host="${host:}" hostPort="${jetty.port:8983}" hostContext="${hostContext:solr}" zkClientTimeout="${zkClientTimeout:15000}">
-    <core name="collection1" instanceDir="collection1" />
-  </cores>
-</solr>

Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/solr-multicore.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/solr-multicore.xml?rev=1660796&r1=1660795&r2=1660796&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/solr-multicore.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/solr-multicore.xml Thu Feb 19 05:44:07 2015
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- 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
--->
-<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" host="${host:}" hostPort="${jetty.port:}">
-    <core name="core0" instanceDir="core0" />
-    <core name="core1" instanceDir="core1" />
-  </cores>
-</solr>
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- 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
--->
-<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" host="${host:}" hostPort="${jetty.port:}">
-    <core name="core0" instanceDir="core0" />
-    <core name="core1" instanceDir="core1" />
-  </cores>
-  <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
-    <str name="urlScheme">${urlScheme:}</str>
-  </shardHandlerFactory>
-</solr>

Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java?rev=1660796&r1=1660795&r2=1660796&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java Thu Feb 19 05:44:07 2015
@@ -43,8 +43,12 @@ public class SolrTestCaseJ4Test extends
     FileUtils.copyFile(new File(top, "solrconfig.snippet.randomindexconfig.xml"), new File(subHome, "solrconfig.snippet.randomindexconfig.xml"));
 
     FileUtils.copyDirectory(new File(tmpSolrHome, "core0"), new File(tmpSolrHome, "core1"));
+    // Core discovery will default to the name of the dir the core.properties file is in. So if everything else is
+    // OK as defaults, just the _presence_ of this file is sufficient.
+    FileUtils.touch(new File(tmpSolrHome, "core0/core.properties"));
+    FileUtils.touch(new File(tmpSolrHome, "core1/core.properties"));
 
-    FileUtils.copyFile(getFile("solr/solr-multicore.xml"), new File(tmpSolrHome, "solr.xml"));
+    FileUtils.copyFile(getFile("solr/solr.xml"), new File(tmpSolrHome, "solr.xml"));
 
     initCore("solrconfig-minimal.xml", "schema-tiny.xml", tmpSolrHome, "core1");
   }

Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/shared/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/shared/solr.xml?rev=1660796&r1=1660795&r2=1660796&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/shared/solr.xml (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/shared/solr.xml Thu Feb 19 05:44:07 2015
@@ -40,35 +40,3 @@
   </solrcloud>
 
 </solr>
-
-<!--
- 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
-
-<solr persistent="false">
-  <property name="version" value="1.3"/>
-  <property name="lang" value="english, french"/>
-
-
-  adminPath: RequestHandler path to manage cores.  
-    If 'null' (or absent), cores will not be manageable via REST
-
-  <cores adminPath="/admin/cores" defaultCoreName="core0" host="127.0.0.1" hostPort="${hostPort:8983}" hostContext="${hostContext:solr}" zkClientTimeout="8000" genericCoreNodeNames="${genericCoreNodeNames:true}" configSetBaseDir="${configSetBase:configsets}">
-    <core name="collection1" instanceDir="." />
-    <core name="core0" instanceDir="${theInstanceDir:./}" dataDir="${dataDir1}" collection="${collection:acollection}">
-      <property name="version" value="3.5"/>
-      <property name="l10n" value="EN"/>
-      <property name="ctlField" value="core0"/>
-      <property name="comment" value="This is a sample with a sys prop ${sysprop:default}"/>
-    </core>
-    <core name="core1" instanceDir="./" dataDir="${dataDir2}">
-      <property name="version" value="2.4"/>
-      <property name="l10n" value="FR"/>
-      <property name="ctlField" value="core1"/>
-      <property name="comment" value="Ceci est un exemple"/>
-    </core>
-  </cores>
-</solr>
--->

Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/solr.xml?rev=1660796&r1=1660795&r2=1660796&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/solr.xml (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/solr.xml Thu Feb 19 05:44:07 2015
@@ -44,29 +44,3 @@
   </solrcloud>
 
 </solr>
-
-
-    <!--
-     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
-
-<solr persistent="false">
-
-
-
-  <cores adminPath="/admin/cores" defaultCoreName="collection1" host="127.0.0.1" hostPort="${hostPort:8983}" 
-         hostContext="${hostContext:solr}" zkClientTimeout="${solr.zkclienttimeout:30000}" shareSchema="${shareSchema:false}" 
-         genericCoreNodeNames="${genericCoreNodeNames:true}" leaderVoteWait="0"
-         distribUpdateConnTimeout="${distribUpdateConnTimeout:45000}" distribUpdateSoTimeout="${distribUpdateSoTimeout:340000}">
-    <core name="collection1" instanceDir="collection1" shard="${shard:}" collection="${collection:collection1}" />
-
-    <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
-      <str name="urlScheme">${urlScheme:}</str>
-      <int name="socketTimeout">${socketTimeout:90000}</int>
-      <int name="connTimeout">${connTimeout:15000}</int>
-    </shardHandlerFactory>
-  </cores>
-</solr>
--->
\ No newline at end of file