Skip to content

Commit 9e649e4

Browse files
drunken-monkeydrunken-monkey
committed
Issue #2157839 by drunken monkey, Nick_vh: Updated config files to the newest version.
1 parent cf3a181 commit 9e649e4

8 files changed

+71
-43
lines changed

‎CHANGELOG.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Search API Solr search 1.x, dev (xx/xx/xxxx):
22
---------------------------------------------
3+
- #2157839 by drunken monkey, Nick_vh: Updated config files to the newest
4+
version.
35
- #2130827 by drunken monkey: Added additional Solr server information to the
46
Server overview.
57
- #2126281 by drunken monkey: Update error handling according to the latest

‎solr-conf/3.x/schema.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
http://wiki.apache.org/solr/SchemaXml
1111
-->
1212

13-
<schema name="drupal-4.1-solr-3.x" version="1.3">
13+
<schema name="drupal-4.2-solr-3.x" version="1.3">
1414
<!-- attribute "name" is the name of this schema and is only used for display purposes.
1515
Applications should change this to reflect the nature of the search collection.
1616
version="1.2" is Solr's version number for the schema syntax and semantics. It should
@@ -181,7 +181,7 @@
181181
catenateWords="1"
182182
catenateNumbers="1"
183183
catenateAll="0"
184-
splitOnCaseChange="1"
184+
splitOnCaseChange="0"
185185
preserveOriginal="1"/>
186186
<filter class="solr.LengthFilterFactory" min="2" max="100" />
187187
<filter class="solr.LowerCaseFilterFactory"/>
@@ -204,7 +204,7 @@
204204
catenateWords="0"
205205
catenateNumbers="0"
206206
catenateAll="0"
207-
splitOnCaseChange="1"
207+
splitOnCaseChange="0"
208208
preserveOriginal="1"/>
209209
<filter class="solr.LengthFilterFactory" min="2" max="100" />
210210
<filter class="solr.LowerCaseFilterFactory"/>

‎solr-conf/3.x/solrconfig.xml

+19-17
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
For more details about configurations options that may appear in
2121
this file, see http://wiki.apache.org/solr/SolrConfigXml.
2222
-->
23-
<config name="drupal-4.1-solr-3.x">
23+
<config name="drupal-4.2-solr-3.x">
2424
<!-- In all configuration below, a prefix of "solr." for class names
2525
is an alias that causes solr to search appropriate packages,
2626
including org.apache.solr.(search|update|request|core|analysis)
@@ -68,8 +68,9 @@
6868
the classpath, this is useful for including all jars in a
6969
directory.
7070
-->
71-
<lib dir="../../contrib/extraction/lib" />
72-
<lib dir="../../contrib/clustering/lib/" />
71+
<lib dir="${solr.contrib.dir:../../contrib}/extraction/lib" />
72+
<lib dir="${solr.contrib.dir:../../contrib}/clustering/lib/" />
73+
7374
<!-- The velocity library has been known to crash Solr in some
7475
instances when deployed as a war file to Tomcat. Therefore all
7576
references have been removed from the default configuration.
@@ -1076,27 +1077,27 @@
10761077
<!-- Solr Replication
10771078
10781079
The SolrReplicationHandler supports replicating indexes from a
1079-
"master" used for indexing and "salves" used for queries.
1080+
"master" used for indexing and "slaves" used for queries.
10801081
10811082
http://wiki.apache.org/solr/SolrReplication
10821083
10831084
In the example below, remove the <lst name="master"> section if
10841085
this is just a slave and remove the <lst name="slave"> section
10851086
if this is just a master.
10861087
-->
1087-
<requestHandler name="/replication" class="solr.ReplicationHandler" >
1088-
<lst name="master">
1089-
<str name="enable">${solr.replication.master:false}</str>
1090-
<str name="replicateAfter">commit</str>
1091-
<str name="replicateAfter">startup</str>
1092-
<str name="confFiles">${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
1093-
</lst>
1094-
<lst name="slave">
1095-
<str name="enable">${solr.replication.slave:false}</str>
1096-
<str name="masterUrl">${solr.replication.masterUrl:http://localhost:8983/solr}/replication</str>
1097-
<str name="pollInterval">${solr.replication.pollInterval:00:00:60}</str>
1098-
</lst>
1099-
</requestHandler>
1088+
<requestHandler name="/replication" class="solr.ReplicationHandler" >
1089+
<lst name="master">
1090+
<str name="enable">${solr.replication.master:false}</str>
1091+
<str name="replicateAfter">commit</str>
1092+
<str name="replicateAfter">startup</str>
1093+
<str name="confFiles">${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
1094+
</lst>
1095+
<lst name="slave">
1096+
<str name="enable">${solr.replication.slave:false}</str>
1097+
<str name="masterUrl">${solr.replication.masterUrl:http://localhost:8983/solr}/replication</str>
1098+
<str name="pollInterval">${solr.replication.pollInterval:00:00:60}</str>
1099+
</lst>
1100+
</requestHandler>
11001101

11011102
<!-- Search Components
11021103
@@ -1595,6 +1596,7 @@
15951596
http://wiki.apache.org/solr/SpellCheckComponent
15961597
-->
15971598
<searchComponent name="spellcheck" class="solr.SpellCheckComponent">
1599+
15981600
<str name="queryAnalyzerFieldType">textSpell</str>
15991601

16001602
<!-- a spellchecker built from a field of the main index -->

‎solr-conf/3.x/solrcore.properties

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ solr.replication.pollInterval=00:00:60
55
solr.replication.masterUrl=http://localhost:8983/solr
66
solr.replication.confFiles=schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml
77
solr.mlt.timeAllowed=2000
8-
# You should not set your luceneVersion to anything lower then your Solr Version.
8+
# You should not set your luceneMatchVersion to anything lower than your Solr
9+
# Version.
910
solr.luceneMatchVersion=LUCENE_35
1011
solr.pinkPony.timeAllowed=-1
12+
# autoCommit after 10000 docs
1113
solr.autoCommit.MaxDocs=10000
14+
# autoCommit after 2 minutes
1215
solr.autoCommit.MaxTime=120000
16+
solr.contrib.dir=../../contrib

‎solr-conf/3.x/stopwords.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Contains words which shouldn't be indexed for fulltext fields, e.g., because
2-
# they're to common. For documentation of the format, see
2+
# they're too common. For documentation of the format, see
33
# http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters#solr.StopFilterFactory
44
# (Lines starting with a pound character # are ignored.)

‎solr-conf/4.x/schema.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
http://wiki.apache.org/solr/SchemaXml
1111
-->
1212

13-
<schema name="drupal-4.1-solr-4.x" version="1.3">
13+
<schema name="drupal-4.2-solr-4.x" version="1.3">
1414
<!-- attribute "name" is the name of this schema and is only used for display purposes.
1515
Applications should change this to reflect the nature of the search collection.
1616
version="1.2" is Solr's version number for the schema syntax and semantics. It should
@@ -181,7 +181,7 @@
181181
catenateWords="1"
182182
catenateNumbers="1"
183183
catenateAll="0"
184-
splitOnCaseChange="1"
184+
splitOnCaseChange="0"
185185
preserveOriginal="1"/>
186186
<filter class="solr.LengthFilterFactory" min="2" max="100" />
187187
<filter class="solr.LowerCaseFilterFactory"/>
@@ -204,7 +204,7 @@
204204
catenateWords="0"
205205
catenateNumbers="0"
206206
catenateAll="0"
207-
splitOnCaseChange="1"
207+
splitOnCaseChange="0"
208208
preserveOriginal="1"/>
209209
<filter class="solr.LengthFilterFactory" min="2" max="100" />
210210
<filter class="solr.LowerCaseFilterFactory"/>

‎solr-conf/4.x/solrconfig.xml

+29-17
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
For more details about configurations options that may appear in
2121
this file, see http://wiki.apache.org/solr/SolrConfigXml.
2222
-->
23-
<config name="drupal-4.1-solr-4.x" >
23+
<config name="drupal-4.2-solr-4.x" >
2424
<!-- In all configuration below, a prefix of "solr." for class names
2525
is an alias that causes solr to search appropriate packages,
2626
including org.apache.solr.(search|update|request|core|analysis)
@@ -68,8 +68,9 @@
6868
the classpath, this is useful for including all jars in a
6969
directory.
7070
-->
71-
<lib dir="../../contrib/extraction/lib" />
72-
<lib dir="../../contrib/clustering/lib/" />
71+
<lib dir="${solr.contrib.dir:../../../contrib}/extraction/lib" />
72+
<lib dir="${solr.contrib.dir:../../../contrib}/clustering/lib/" />
73+
7374
<!-- The velocity library has been known to crash Solr in some
7475
instances when deployed as a war file to Tomcat. Therefore all
7576
references have been removed from the default configuration.
@@ -302,6 +303,16 @@
302303
<maxTime>${solr.autoCommit.MaxTime:120000}</maxTime>
303304
</autoCommit>
304305

306+
<!-- softAutoCommit is like autoCommit except it causes a
307+
'soft' commit which only ensures that changes are visible
308+
but does not ensure that data is synced to disk. This is
309+
faster and more near-realtime friendly than a hard commit.
310+
-->
311+
<autoSoftCommit>
312+
<maxDocs>${solr.autoSoftCommit.MaxDocs:2000}</maxDocs>
313+
<maxTime>${solr.autoSoftCommit.MaxTime:10000}</maxTime>
314+
</autoSoftCommit>
315+
305316
<!-- Update Related Event Listeners
306317
307318
Various IndexWriter related events can trigger Listeners to
@@ -1074,27 +1085,27 @@
10741085
<!-- Solr Replication
10751086
10761087
The SolrReplicationHandler supports replicating indexes from a
1077-
"master" used for indexing and "salves" used for queries.
1088+
"master" used for indexing and "slaves" used for queries.
10781089
10791090
http://wiki.apache.org/solr/SolrReplication
10801091
10811092
In the example below, remove the <lst name="master"> section if
10821093
this is just a slave and remove the <lst name="slave"> section
10831094
if this is just a master.
10841095
-->
1085-
<requestHandler name="/replication" class="solr.ReplicationHandler" >
1086-
<lst name="master">
1087-
<str name="enable">${solr.replication.master:false}</str>
1088-
<str name="replicateAfter">commit</str>
1089-
<str name="replicateAfter">startup</str>
1090-
<str name="confFiles">${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
1091-
</lst>
1092-
<lst name="slave">
1093-
<str name="enable">${solr.replication.slave:false}</str>
1094-
<str name="masterUrl">${solr.replication.masterUrl:http://localhost:8983/solr}/replication</str>
1095-
<str name="pollInterval">${solr.replication.pollInterval:00:00:60}</str>
1096-
</lst>
1097-
</requestHandler>
1096+
<requestHandler name="/replication" class="solr.ReplicationHandler" >
1097+
<lst name="master">
1098+
<str name="enable">${solr.replication.master:false}</str>
1099+
<str name="replicateAfter">commit</str>
1100+
<str name="replicateAfter">startup</str>
1101+
<str name="confFiles">${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
1102+
</lst>
1103+
<lst name="slave">
1104+
<str name="enable">${solr.replication.slave:false}</str>
1105+
<str name="masterUrl">${solr.replication.masterUrl:http://localhost:8983/solr}/replication</str>
1106+
<str name="pollInterval">${solr.replication.pollInterval:00:00:60}</str>
1107+
</lst>
1108+
</requestHandler>
10981109

10991110
<!-- Realtime get handler, guaranteed to return the latest stored fields of
11001111
any document, without the need to commit or open a new searcher. The
@@ -1605,6 +1616,7 @@
16051616
http://wiki.apache.org/solr/SpellCheckComponent
16061617
-->
16071618
<searchComponent name="spellcheck" class="solr.SpellCheckComponent">
1619+
16081620
<str name="queryAnalyzerFieldType">textSpell</str>
16091621

16101622
<!-- a spellchecker built from a field of the main index -->

‎solr-conf/4.x/solrcore.properties

+9-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,16 @@ solr.replication.pollInterval=00:00:60
55
solr.replication.masterUrl=http://localhost:8983/solr
66
solr.replication.confFiles=schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml
77
solr.mlt.timeAllowed=2000
8-
# You should not set your luceneVersion to anything lower then your Solr Version.
8+
# You should not set your luceneMatchVersion to anything lower than your Solr
9+
# Version.
910
solr.luceneMatchVersion=LUCENE_40
1011
solr.pinkPony.timeAllowed=-1
12+
# autoCommit after 10000 docs
1113
solr.autoCommit.MaxDocs=10000
14+
# autoCommit after 2 minutes
1215
solr.autoCommit.MaxTime=120000
16+
# autoSoftCommit after 2000 docs
17+
solr.autoSoftCommit.MaxDocs=2000
18+
# autoSoftCommit after 10 seconds
19+
solr.autoSoftCommit.MaxTime=10000
20+
solr.contrib.dir=../../../contrib

0 commit comments

Comments
 (0)