You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/12/24 15:35:42 UTC
svn commit: r1647797 - in /lucene/dev/branches/branch_5x: ./ dev-tools/
dev-tools/scripts/ lucene/ lucene/facet/
lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/
lucene/facet/src/test/org/apache/lucene/facet/taxonomy/ lucene/queries/ l...
Author: sarowe
Date: Wed Dec 24 14:35:41 2014
New Revision: 1647797
URL: http://svn.apache.org/r1647797
Log:
LUCENE-6134: fix typos: wether->whether, neccessary->necessary, initalize->initialize, specifed->specified, etc. (thanks Ahmet Arslan\!) (merged trunk r1647795)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/dev-tools/ (props changed)
lucene/dev/branches/branch_5x/dev-tools/scripts/archive-solr-ref-guide.sh
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/facet/ (props changed)
lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java
lucene/dev/branches/branch_5x/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java
lucene/dev/branches/branch_5x/lucene/queries/ (props changed)
lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
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/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsField.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/SOLR749Test.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
Modified: lucene/dev/branches/branch_5x/dev-tools/scripts/archive-solr-ref-guide.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/dev-tools/scripts/archive-solr-ref-guide.sh?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/dev-tools/scripts/archive-solr-ref-guide.sh (original)
+++ lucene/dev/branches/branch_5x/dev-tools/scripts/archive-solr-ref-guide.sh Wed Dec 24 14:35:41 2014
@@ -17,9 +17,9 @@
####
-# Convinience script to generates the SVN command line for you to run in order to
-# remove old (arvhived) versions of the solr ref guide from the dist repo, and
-# (if neccessary) clean up any old RC files.
+# Convenience script to generates the SVN command line for you to run in order to
+# remove old (archived) versions of the solr ref guide from the dist repo, and
+# (if necessary) clean up any old RC files.
#
# See: https://cwiki.apache.org/confluence/display/solr/Internal+-+How+To+Publish+This+Documentation
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Wed Dec 24 14:35:41 2014
@@ -644,7 +644,7 @@ Bug Fixes
* LUCENE-5818, LUCENE-5823: Fix hunspell overgeneration for short strings that also
match affixes, words are only stripped to a zero-length string if FULLSTRIP option
- is specifed in the dictionary. (Robert Muir)
+ is specified in the dictionary. (Robert Muir)
* LUCENE-5824: Fix hunspell 'long' flag handling. (Robert Muir)
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java Wed Dec 24 14:35:41 2014
@@ -38,7 +38,7 @@ class TaxonomyIndexArrays extends Parall
private final int[] parents;
- // the following two arrays are lazily intialized. note that we only keep a
+ // the following two arrays are lazily initialized. note that we only keep a
// single boolean member as volatile, instead of declaring the arrays
// volatile. the code guarantees that only after the boolean is set to true,
// the arrays are returned.
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java Wed Dec 24 14:35:41 2014
@@ -743,7 +743,7 @@ public class TestTaxonomyCombined extend
private void assertConsistentYoungestChild(final FacetLabel abPath,
final int abOrd, final int abYoungChildBase1, final int abYoungChildBase2, final int retry, int numCategories)
throws Exception {
- SlowRAMDirectory indexDir = new SlowRAMDirectory(-1, null); // no slowness for intialization
+ SlowRAMDirectory indexDir = new SlowRAMDirectory(-1, null); // no slowness for initialization
TaxonomyWriter tw = new DirectoryTaxonomyWriter(indexDir);
tw.addCategory(new FacetLabel("a", "0"));
tw.addCategory(abPath);
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java Wed Dec 24 14:35:41 2014
@@ -341,7 +341,7 @@ public class TestValueSources extends Lu
ValueSource vs = new NormValueSource("byte");
assertHits(new FunctionQuery(vs), new float[] { 0f, 0f });
- // regardless of wether norms exist, value source exists == 0
+ // regardless of whether norms exist, value source exists == 0
assertAllExist(vs);
vs = new NormValueSource("text");
@@ -486,7 +486,7 @@ public class TestValueSources extends Lu
assertHits(new FunctionQuery(vs), new float[] { 0f, 1f });
assertAllExist(vs);
- // regardless of wether norms exist, value source exists == 0
+ // regardless of whether norms exist, value source exists == 0
vs = new TermFreqValueSource("bogus", "bogus", "bogus", new BytesRef("bogus"));
assertHits(new FunctionQuery(vs), new float[] { 0F, 0F });
assertAllExist(vs);
@@ -507,7 +507,7 @@ public class TestValueSources extends Lu
assertHits(new FunctionQuery(vs), new float[] { 0f, 1f });
assertAllExist(vs);
- // regardless of wether norms exist, value source exists == 0
+ // regardless of whether norms exist, value source exists == 0
vs = new TFValueSource("bogus", "bogus", "bogus", new BytesRef("bogus"));
assertHits(new FunctionQuery(vs), new float[] { 0F, 0F });
assertAllExist(vs);
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Wed Dec 24 14:35:41 2014
@@ -2496,7 +2496,7 @@ Bug Fixes
* SOLR-4909: Use DirectoryReader.openIfChanged in non-NRT mode.
(Michael Garski via Robert Muir)
-* SOLR-5227: Correctly fail schema initalization if a dynamicField is configured to
+* SOLR-5227: Correctly fail schema initialization if a dynamicField is configured to
be required, or have a default value. (hossman)
* SOLR-5231: Fixed a bug with the behavior of BoolField that caused documents w/o
@@ -5851,7 +5851,7 @@ Bug Fixes
(James Dyer, others)
* SOLR-3260: DataImportHandler: ScriptTransformer gives better error messages when
- problems arise on initalization (no Script Engine, invalid script, etc). (James Dyer)
+ problems arise on initialization (no Script Engine, invalid script, etc). (James Dyer)
* SOLR-2959: edismax now respects the magic fields '_val_' and '_query_'
(Michael Watts, hossman)
@@ -9412,7 +9412,7 @@ Changes in runtime behavior
to facilitate checking for parameters that must be present.
(Ryan McKinley, J.J. Larrea via yonik)
- 8. SOLR-179: By default, solr will abort after any severe initalization
+ 8. SOLR-179: By default, solr will abort after any severe initialization
errors. This behavior can be disabled by setting:
<abortOnConfigurationError>false</abortOnConfigurationError>
in solrconfig.xml (ryan)
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml Wed Dec 24 14:35:41 2014
@@ -294,7 +294,7 @@
To enable solr1.1 behavior, remove the /update handler or change its path
- "update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized
+ "update.processor.class" is the class name for the UpdateRequestProcessor. It is initialized
only once. This can not be changed for each request.
-->
<requestHandler name="/update" class="solr.UpdateRequestHandler">
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java Wed Dec 24 14:35:41 2014
@@ -400,7 +400,7 @@ public class DocBuilder {
}
private void resetEntity(EntityProcessorWrapper epw) {
- epw.setInitalized(false);
+ epw.setInitialized(false);
for (EntityProcessorWrapper child : epw.getChildren()) {
resetEntity(child);
}
@@ -432,9 +432,9 @@ public class DocBuilder {
pk == null ? Context.FULL_DUMP : Context.DELTA_DUMP,
session, parentCtx, this);
epw.init(ctx);
- if (!epw.isInitalized()) {
+ if (!epw.isInitialized()) {
entitiesToDestroy.add(epw);
- epw.setInitalized(true);
+ epw.setInitialized(true);
}
if (reqParams.getStart() > 0) {
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java Wed Dec 24 14:35:41 2014
@@ -45,7 +45,7 @@ public class EntityProcessorWrapper exte
private DataSource datasource;
private List<EntityProcessorWrapper> children = new ArrayList<>();
private DocBuilder docBuilder;
- private boolean initalized;
+ private boolean initialized;
private String onError;
private Context context;
private VariableResolver resolver;
@@ -317,11 +317,23 @@ public class EntityProcessorWrapper exte
this.datasource = datasource;
}
+ /** @deprecated will be removed in Solr 6; use {@link #isInitialized()} */
+ @Deprecated
public boolean isInitalized() {
- return initalized;
+ return initialized;
}
- public void setInitalized(boolean initalized) {
- this.initalized = initalized;
+ public boolean isInitialized() {
+ return initialized;
+ }
+
+ /** @deprecated will be removed in Solr 6; use {@link #setInitialized(boolean)} */
+ @Deprecated
+ public void setInitalized(boolean initialized) {
+ this.initialized = initialized;
+ }
+
+ public void setInitialized(boolean initialized) {
+ this.initialized = initialized;
}
}
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java Wed Dec 24 14:35:41 2014
@@ -566,7 +566,7 @@ public class XPathRecordReader {
for (Node n : searchList)
if (n.xpathName.equals(xpathName)) return n;
// new territory! add a new node for this Xpath bitty
- Node n = new Node(xpathName, this); // a minimal Node initalization
+ Node n = new Node(xpathName, this); // a minimal Node initialization
Matcher m = ATTRIB_PRESENT_WITHVAL.matcher(xpathName);
if (m.find()) {
n.name = m.group(1);
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml Wed Dec 24 14:35:41 2014
@@ -298,7 +298,7 @@
To enable solr1.1 behavior, remove the /update handler or change its path
- "update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized
+ "update.processor.class" is the class name for the UpdateRequestProcessor. It is initialized
only once. This can not be changed for each request.
-->
<requestHandler name="/update" class="solr.UpdateRequestHandler">
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml Wed Dec 24 14:35:41 2014
@@ -296,7 +296,7 @@
To enable solr1.1 behavior, remove the /update handler or change its path
- "update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized
+ "update.processor.class" is the class name for the UpdateRequestProcessor. It is initialized
only once. This can not be changed for each request.
-->
<requestHandler name="/update" class="solr.UpdateRequestHandler">
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml Wed Dec 24 14:35:41 2014
@@ -297,7 +297,7 @@
To enable solr1.1 behavior, remove the /update handler or change its path
- "update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized
+ "update.processor.class" is the class name for the UpdateRequestProcessor. It is initialized
only once. This can not be changed for each request.
-->
<requestHandler name="/update" class="solr.UpdateRequestHandler" >
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml Wed Dec 24 14:35:41 2014
@@ -1088,7 +1088,7 @@
http://wiki.apache.org/solr/SolrReplication
- It is also neccessary for SolrCloud to function (in Cloud mode, the
+ It is also necessary for SolrCloud to function (in Cloud mode, the
replication handler is used to bulk transfer segments when nodes
are added or need to recover).
@@ -1097,7 +1097,7 @@
<requestHandler name="/replication" class="solr.ReplicationHandler" >
<!--
To enable simple master/slave replication, uncomment one of the
- sections below, depending on wether this solr instance should be
+ sections below, depending on whether this solr instance should be
the "master" or a "slave". If this instance is a "slave" you will
also need to fill in the masterUrl to point to a real machine.
-->
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml Wed Dec 24 14:35:41 2014
@@ -1101,7 +1101,7 @@
http://wiki.apache.org/solr/SolrReplication
- It is also neccessary for SolrCloud to function (in Cloud mode, the
+ It is also necessary for SolrCloud to function (in Cloud mode, the
replication handler is used to bulk transfer segments when nodes
are added or need to recover).
@@ -1110,7 +1110,7 @@
<requestHandler name="/replication" class="solr.ReplicationHandler" >
<!--
To enable simple master/slave replication, uncomment one of the
- sections below, depending on wether this solr instance should be
+ sections below, depending on whether this solr instance should be
the "master" or a "slave". If this instance is a "slave" you will
also need to fill in the masterUrl to point to a real machine.
-->
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java Wed Dec 24 14:35:41 2014
@@ -67,7 +67,7 @@ public class LoggingHandler extends Requ
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
// Don't do anything if the framework is unknown
if(watcher==null) {
- rsp.add("error", "Logging Not Initalized");
+ rsp.add("error", "Logging Not Initialized");
return;
}
rsp.add("watcher", watcher.getName());
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java Wed Dec 24 14:35:41 2014
@@ -138,7 +138,7 @@ public class StatsComponent extends Sear
/**
* Given a map of {@link StatsValues} using the appropriate response key,
- * builds up the neccessary "stats" data structure for including in the response --
+ * builds up the necessary "stats" data structure for including in the response --
* including the esoteric "stats_fields" wrapper.
*/
public static NamedList<NamedList<NamedList<?>>> convertToResponse
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsField.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsField.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsField.java Wed Dec 24 14:35:41 2014
@@ -361,7 +361,7 @@ public class StatsField {
}
/**
- * Wether or not the effective value of the {@link StatsParams#STATS_CALC_DISTINCT} param
+ * Whether or not the effective value of the {@link StatsParams#STATS_CALC_DISTINCT} param
* is true or false for this StatsField
*/
public boolean getCalcDistinct() {
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java Wed Dec 24 14:35:41 2014
@@ -359,7 +359,7 @@ class NumericStatsValues extends Abstrac
assert null != max : "max is null but min isn't ? ==> " + min;
// we always use the double value, because that way the response Object class is
- // consistent regardless of wether we only have 1 value or many that we min/max
+ // consistent regardless of whether we only have 1 value or many that we min/max
//
// TODO: would be nice to have subclasses for each type of Number ... breaks backcompat
double minD = min.doubleValue();
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java Wed Dec 24 14:35:41 2014
@@ -77,7 +77,7 @@ class ExtendedBufferedReader extends Buf
*/
@Override
public int read() throws IOException {
- // initalize the lookahead
+ // initialize the lookahead
if (lookaheadChar == UNDEFINED) {
lookaheadChar = super.read();
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java Wed Dec 24 14:35:41 2014
@@ -78,7 +78,7 @@ public final class SchemaField extends F
this.properties = properties;
this.defaultValue = defaultValue;
- // initalize with the required property flag
+ // initialize with the required property flag
required = (properties & REQUIRED) !=0;
type.checkSchemaField(this);
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Wed Dec 24 14:35:41 2014
@@ -199,7 +199,7 @@ public class SolrIndexSearcher extends I
}
/**
- * Builds the neccessary collector chain (via delegate wrapping) and executes the query
+ * Builds the necessary collector chain (via delegate wrapping) and executes the query
* against it. This method takes into consideration both the explicitly provided collector
* and postFilter as well as any needed collector wrappers for dealing with options
* specified in the QueryCOmmand.
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java Wed Dec 24 14:35:41 2014
@@ -61,9 +61,9 @@ import static org.apache.solr.common.Sol
* <li>If any individual settings from one of the above mentioned sets
* are specified, then all settings from that set must be specified.
* </li>
- * <li>If Baseline TF settings are spcified, then Hyperbolic TF settings
+ * <li>If Baseline TF settings are specified, then Hyperbolic TF settings
* are not permitted, and vice versa. (The settings specified will
- * determine wether {@link SweetSpotSimilarity#baselineTf} or
+ * determine whether {@link SweetSpotSimilarity#baselineTf} or
* {@link SweetSpotSimilarity#hyperbolicTf} will be used.
* </li>
* </ul>
@@ -139,7 +139,7 @@ public class SweetSpotSimilarityFactory
throw new SolrException(SERVER_ERROR, "Can not mix hyperbolicTf settings with baselineTf settings");
}
- // pick Similarity impl based on wether hyper tf settings are set
+ // pick Similarity impl based on whether hyper tf settings are set
sim = (null != hyper_min) ? new HyperbolicSweetSpotSimilarity()
: new SweetSpotSimilarity();
@@ -159,7 +159,7 @@ public class SweetSpotSimilarityFactory
@Override
public Similarity getSimilarity() {
- assert sim != null : "SweetSpotSimilarityFactory was not initalized";
+ assert sim != null : "SweetSpotSimilarityFactory was not initialized";
return sim;
}
@@ -183,5 +183,5 @@ public class SweetSpotSimilarityFactory
public float tf(float freq) {
return hyperbolicTf(freq);
}
- };
+ }
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java Wed Dec 24 14:35:41 2014
@@ -47,10 +47,10 @@ public class ConjunctionSolrSpellChecker
private String dictionaryName = null;
private Analyzer queryAnalyzer = null;
private List<SolrSpellChecker> checkers = new ArrayList<>();
- private boolean initalized = false;
+ private boolean initialized = false;
public void addChecker(SolrSpellChecker checker) {
- if (initalized) {
+ if (initialized) {
throw new IllegalStateException(
"Need to add checkers before calling init()");
}
@@ -102,7 +102,7 @@ public class ConjunctionSolrSpellChecker
if (dictionaryName == null) {
dictionaryName = DEFAULT_DICTIONARY_NAME;
}
- initalized = true;
+ initialized = true;
return dictionaryName;
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java Wed Dec 24 14:35:41 2014
@@ -78,7 +78,7 @@ public class SolrInfoMBeanTest extends S
}
catch( InstantiationException ex ) {
// expected...
- //System.out.println( "unable to initalize: "+clazz );
+ //System.out.println( "unable to initialize: "+clazz );
}
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/SOLR749Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/SOLR749Test.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/SOLR749Test.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/SOLR749Test.java Wed Dec 24 14:35:41 2014
@@ -79,7 +79,7 @@ public class SOLR749Test extends SolrTes
"//result[@numFound=19]");
// don't assume specific clause evaluation ordering.
- // ideally this is 19, but could be as high as 20 depending on wether frange's
+ // ideally this is 19, but could be as high as 20 depending on whether frange's
// scorer has next() called on it before other clauses skipTo
int count = CountUsageValueSourceParser.getAndClearCount("frange_in_bq");
assertTrue("frange_in_bq: " + count, (19 <= count && count <= 20));
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java Wed Dec 24 14:35:41 2014
@@ -207,7 +207,7 @@ public class DistributedFacetPivotLargeT
// basic check w/ limit & index sort
for (SolrParams facetParams :
- // results should be the same regardless of wether local params are used
+ // results should be the same regardless of whether local params are used
new SolrParams[] {
// Broken: SOLR-6193
// params("facet.pivot","{!facet.limit=4 facet.sort=index}place_s,company_t"),
@@ -476,7 +476,7 @@ public class DistributedFacetPivotLargeT
// Negative facet limit
for (SolrParams facetParams :
- // results should be the same regardless of wether facet.limit is global,
+ // results should be the same regardless of whether facet.limit is global,
// a local param, or specified as a per-field override for both fields
new SolrParams[] {
params(FacetParams.FACET_LIMIT, "-1",
@@ -508,7 +508,7 @@ public class DistributedFacetPivotLargeT
// Negative per-field facet limit (outer)
for (SolrParams facetParams :
- // results should be the same regardless of wether per-field facet.limit is
+ // results should be the same regardless of whether per-field facet.limit is
// a global or a local param
new SolrParams[] {
// Broken: SOLR-6193
@@ -535,7 +535,7 @@ public class DistributedFacetPivotLargeT
// Negative per-field facet limit (inner)
for (SolrParams facetParams :
- // results should be the same regardless of wether per-field facet.limit is
+ // results should be the same regardless of whether per-field facet.limit is
// a global or a local param
new SolrParams[] {
// Broken: SOLR-6193
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java Wed Dec 24 14:35:41 2014
@@ -142,7 +142,7 @@ public class DistributedFacetPivotSmallA
if (params.getBool("facet", false)) {
// if this was a facet request, then the top pivot constraint and pivot
- // stats should match what we expect - regardless of wether refine
+ // stats should match what we expect - regardless of whether refine
// was used, or if the query was initially satisfied by the default overrequest
List<PivotField> placePivots = rsp.getFacetPivot().get("place_t,company_t");
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java Wed Dec 24 14:35:41 2014
@@ -37,7 +37,7 @@ public class SearchHandlerTest extends S
@SuppressWarnings("unchecked")
@Test
- public void testInitalization()
+ public void testInitialization()
{
SolrCore core = h.getCore();
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=1647797&r1=1647796&r2=1647797&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java Wed Dec 24 14:35:41 2014
@@ -949,7 +949,7 @@ abstract public class SolrExampleTests e
server.commit();
assertNumFound("*:*", 0); // make sure it got in
- // results of this test should be the same regardless of wether any docs in index
+ // results of this test should be the same regardless of whether any docs in index
if (random().nextBoolean()) {
server.add(makeTestDoc("id", 1, "features", "aaa", "cat", "a", "inStock", true, "popularity", 12, "price", .017));
server.commit();