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 06:49:01 UTC
svn commit: r1647735 [4/5] - in /lucene/dev/trunk: dev-tools/scripts/
lucene/ lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/
lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/
lucene/analysis/common/src/java/org/ap...
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java Wed Dec 24 05:48:58 2014
@@ -162,7 +162,7 @@ public class SolrResourceLoader implemen
* Adds every file/dir found in the baseDir which passes the specified Filter
* to the ClassLoader used by this ResourceLoader. This method <b>MUST</b>
* only be called prior to using this ResourceLoader to get any resources, otherwise
- * it's behavior will be non-deterministic. You also have to {link @reloadLuceneSPI}
+ * its behavior will be non-deterministic. You also have to {link @reloadLuceneSPI}
* before using this ResourceLoader.
*
* <p>This method will quietly ignore missing or non-directory <code>baseDir</code>
@@ -424,7 +424,7 @@ public class SolrResourceLoader implemen
}
/**
- * This method loads a class either with it's FQN or a short-name (solr.class-simplename or class-simplename).
+ * This method loads a class either with its FQN or a short-name (solr.class-simplename or class-simplename).
* It tries to load the class with the name that is given first and if it fails, it tries all the known
* solr packages. This method caches the FQN of a short-name in a static map in-order to make subsequent lookups
* for the same class faster. The caching is done only if the class is loaded by the webapp classloader and it
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java Wed Dec 24 05:48:58 2014
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
* <p>
- * In it's simplest form, the PingRequestHandler should be
+ * In its simplest form, the PingRequestHandler should be
* configured with some defaults indicating a request that should be
* executed. If the request succeeds, then the PingRequestHandler
* will respond back with a simple "OK" status. If the request fails,
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java Wed Dec 24 05:48:58 2014
@@ -651,7 +651,7 @@ public class SpellCheckComponent extends
NamedList spellchecker = (NamedList) initParams.getVal(i);
String className = (String) spellchecker.get("classname");
// TODO: this is a little bit sneaky: warn if class isnt supplied
- // so that its mandatory in a future release?
+ // so that it's mandatory in a future release?
if (className == null)
className = IndexBasedSpellChecker.class.getName();
SolrResourceLoader loader = core.getResourceLoader();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Wed Dec 24 05:48:58 2014
@@ -759,7 +759,7 @@ class OrderedToken {
int startOffset;
}
-/** For use with term vectors of multi-valued fields. We want an offset based window into it's TokenStream. */
+/** For use with term vectors of multi-valued fields. We want an offset based window into its TokenStream. */
final class OffsetWindowTokenFilter extends TokenFilter {
private final OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java Wed Dec 24 05:48:58 2014
@@ -161,7 +161,7 @@ public class PostingsSolrHighlighter ext
for (String field : fieldNames) {
String snippet = snippets.get(field)[i];
// box in an array to match the format of existing highlighters,
- // even though its always one element.
+ // even though it's always one element.
if (snippet == null) {
summary.add(field, new String[0]);
} else {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java Wed Dec 24 05:48:58 2014
@@ -55,7 +55,7 @@ public class CSVParser {
private static final int INITIAL_TOKEN_LENGTH = 50;
// the token types
- /** Token has no valid content, i.e. is in its initilized state. */
+ /** Token has no valid content, i.e. is in its initialized state. */
protected static final int TT_INVALID = -1;
/** Token with content, at beginning or in the middle of a line. */
protected static final int TT_TOKEN = 0;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java Wed Dec 24 05:48:58 2014
@@ -791,7 +791,7 @@ public abstract class SolrQueryParserBas
automaton = Operations.minus(automaton, falsePositives, Operations.DEFAULT_MAX_DETERMINIZED_STATES);
}
return new AutomatonQuery(term, automaton) {
- // override toString so its completely transparent
+ // override toString so it's completely transparent
@Override
public String toString(String field) {
StringBuilder buffer = new StringBuilder();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java Wed Dec 24 05:48:58 2014
@@ -99,7 +99,7 @@ import org.apache.solr.util.DefaultSolrT
* A class that generates simple Facet information for a request.
*
* More advanced facet implementations may compose or subclass this class
- * to leverage any of it's functionality.
+ * to leverage any of its functionality.
*/
public class SimpleFacets {
@@ -492,8 +492,8 @@ public class SimpleFacets {
SchemaField sf = searcher.getSchema().getFieldOrNull(groupField);
if (sf != null && sf.hasDocValues() == false && sf.multiValued() == false && sf.getType().getNumericType() != null) {
- // its a single-valued numeric field: we must currently create insanity :(
- // there isnt a GroupedFacetCollector that works on numerics right now...
+ // it's a single-valued numeric field: we must currently create insanity :(
+ // there isn't a GroupedFacetCollector that works on numerics right now...
searcher.search(new MatchAllDocsQuery(), base.getTopFilter(), new FilterCollector(collector) {
@Override
public LeafCollector getLeafCollector(LeafReaderContext context) throws IOException {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/UnInvertedField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/UnInvertedField.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/UnInvertedField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/UnInvertedField.java Wed Dec 24 05:48:58 2014
@@ -69,7 +69,7 @@ import org.apache.solr.util.PrimUtils;
*
* There are actually 256 byte arrays, to compensate for the fact that the pointers
* into the byte arrays are only 3 bytes long. The correct byte array for a document
- * is a function of it's id.
+ * is a function of its id.
*
* To save space and speed up faceting, any term that matches enough documents will
* not be un-inverted... it will be skipped while building the un-inverted field structure,
@@ -78,7 +78,7 @@ import org.apache.solr.util.PrimUtils;
* To further save memory, the terms (the actual string values) are not all stored in
* memory, but a TermIndex is used to convert term numbers to term values only
* for the terms needed after faceting has completed. Only every 128th term value
- * is stored, along with it's corresponding term number, and this is used as an
+ * is stored, along with its corresponding term number, and this is used as an
* index to find the closest term and iterate until the desired number is hit (very
* much like Lucene's own internal term index).
*
@@ -234,7 +234,7 @@ public class UnInvertedField extends Doc
final int[] counts = new int[numTermsInField + 1];
//
- // If there is prefix, find it's start and end term numbers
+ // If there is prefix, find its start and end term numbers
//
int startTerm = 0;
int endTerm = numTermsInField; // one past the end
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java Wed Dec 24 05:48:58 2014
@@ -88,7 +88,7 @@ class CSVWriter extends TextResponseWrit
char[] sharedCSVBuf = new char[8192];
- // prevent each instance from creating it's own buffer
+ // prevent each instance from creating its own buffer
class CSVSharedBufPrinter extends CSVPrinter {
public CSVSharedBufPrinter(Writer out, CSVStrategy strategy) {
super(out, strategy);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java Wed Dec 24 05:48:58 2014
@@ -83,7 +83,7 @@ class PythonWriter extends NaNFloatWrite
}
// use python unicode strings...
- // python doesn't tolerate newlines in strings in it's eval(), so we must escape them.
+ // python doesn't tolerate newlines in strings in its eval(), so we must escape them.
StringBuilder sb = new StringBuilder(val.length());
boolean needUnicode=false;
@@ -120,7 +120,7 @@ class PythonWriter extends NaNFloatWrite
old version that always used unicode
public void writeStr(String name, String val, boolean needsEscaping) throws IOException {
// use python unicode strings...
- // python doesn't tolerate newlines in strings in it's eval(), so we must escape them.
+ // python doesn't tolerate newlines in strings in its eval(), so we must escape them.
writer.write("u'");
// it might be more efficient to use a stringbuilder or write substrings
// if writing chars to the stream is slow.
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java Wed Dec 24 05:48:58 2014
@@ -35,7 +35,7 @@ import org.apache.solr.request.SolrQuery
* This writer is a special case that extends and alters the
* QueryResponseWriter contract. If SolrQueryResponse contains a
* ContentStream added with the key {@link #CONTENT}
- * then this writer will output that stream exactly as is (with it's
+ * then this writer will output that stream exactly as is (with its
* Content-Type). if no such ContentStream has been added, then a
* "base" QueryResponseWriter will be used to write the response
* according to the usual contract. The name of the "base" writer can
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CollationField.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CollationField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CollationField.java Wed Dec 24 05:48:58 2014
@@ -223,7 +223,7 @@ public class CollationField extends Fiel
/**
* analyze the range with the analyzer, instead of the collator.
* because jdk collators might not be thread safe (when they are
- * its just that all methods are synced), this keeps things
+ * it's just that all methods are synced), this keeps things
* simple (we already have a threadlocal clone in the reused TS)
*/
private BytesRef getCollationKey(String field, String text) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CurrencyField.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CurrencyField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CurrencyField.java Wed Dec 24 05:48:58 2014
@@ -252,7 +252,7 @@ public class CurrencyField extends Field
* <p>
* Returns a ValueSource over this field in which the numeric value for
* each document represents the indexed value as converted to the default
- * currency for the field, normalized to it's most granular form based
+ * currency for the field, normalized to its most granular form based
* on the default fractional digits.
* </p>
* <p>
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java Wed Dec 24 05:48:58 2014
@@ -450,7 +450,7 @@ public abstract class FieldType extends
}
/**
- * DocValues is not enabled for a field, but its indexed, docvalues can be constructed
+ * DocValues is not enabled for a field, but it's indexed, docvalues can be constructed
* on the fly (uninverted, aka fieldcache) on the first request to sort, facet, etc.
* This specifies the structure to use.
*
@@ -755,7 +755,7 @@ public abstract class FieldType extends
*
* <p>
* This method is called by the <code>SchemaField</code> constructor to
- * check that it's initialization does not violate any fundemental
+ * check that its initialization does not violate any fundemental
* requirements of the <code>FieldType</code>. The default implementation
* does nothing, but subclasses may chose to throw a {@link SolrException}
* if invariants are violated by the <code>SchemaField.</code>
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TextField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TextField.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TextField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TextField.java Wed Dec 24 05:48:58 2014
@@ -96,7 +96,7 @@ public class TextField extends FieldType
@Override
public SortField getSortField(SchemaField field, boolean reverse) {
- /* :TODO: maybe warn if isTokenized(), but doesn't use LimitTokenCountFilter in it's chain? */
+ /* :TODO: maybe warn if isTokenized(), but doesn't use LimitTokenCountFilter in its chain? */
field.checkSortability();
return Sorting.getTextSortField(field.getName(), reverse, field.sortMissingLast(), field.sortMissingFirst());
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BitDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BitDocSet.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BitDocSet.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BitDocSet.java Wed Dec 24 05:48:58 2014
@@ -321,7 +321,7 @@ public class BitDocSet extends DocSetBas
@Override
public long cost() {
// we don't want to actually compute cardinality, but
- // if its already been computed, we use it (pro-rated for the segment)
+ // if it's already been computed, we use it (pro-rated for the segment)
if (size != -1) {
return (long)(size * ((FixedBitSet.bits2words(maxDoc)<<6) / (float)bs.length()));
} else {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java Wed Dec 24 05:48:58 2014
@@ -617,7 +617,7 @@ public class CollapsingQParserPlugin ext
if(ord > -1) {
dummy.score = scores[ord];
} else if (boostDocs != null && boostDocs.containsKey(docId)) {
- //Its an elevated doc so no score is needed
+ //It's an elevated doc so no score is needed
dummy.score = 0F;
} else if (nullPolicy == CollapsingPostFilter.NULL_POLICY_COLLAPSE) {
dummy.score = nullScore;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java Wed Dec 24 05:48:58 2014
@@ -168,7 +168,7 @@ public class DisMaxQParser extends QPars
}
}
- /** Adds the main query to the query argument. If its blank then false is returned. */
+ /** Adds the main query to the query argument. If it's blank then false is returned. */
protected boolean addMainQuery(BooleanQuery query, SolrParams solrParams) throws SyntaxError {
Map<String, Float> phraseFields = SolrPluginUtils.parseFieldBoosts(solrParams.getParams(DisMaxParams.PF));
float tiebreaker = solrParams.getFloat(DisMaxParams.TIE, 0.0f);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSet.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSet.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSet.java Wed Dec 24 05:48:58 2014
@@ -93,7 +93,7 @@ public interface DocSet /* extends Colle
/**
* Returns the number of documents of the intersection of this set with another set.
- * May be more efficient than actually creating the intersection and then getting it's size.
+ * May be more efficient than actually creating the intersection and then getting its size.
*/
public int intersectionSize(DocSet other);
@@ -109,7 +109,7 @@ public interface DocSet /* extends Colle
/**
* Returns the number of documents of the union of this set with another set.
- * May be more efficient than actually creating the union and then getting it's size.
+ * May be more efficient than actually creating the union and then getting its size.
*/
public int unionSize(DocSet other);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBase.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBase.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBase.java Wed Dec 24 05:48:58 2014
@@ -139,7 +139,7 @@ abstract class DocSetBase implements Doc
if (!(other instanceof BitDocSet)) {
return other.intersectionSize(this);
}
- // less efficient way: do the intersection then get it's size
+ // less efficient way: do the intersection then get its size
return intersection(other).size();
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java Wed Dec 24 05:48:58 2014
@@ -840,7 +840,7 @@ public class ExtendedDismaxQParser exten
// special syntax in a string isn't special
clause.hasSpecialSyntax = false;
} else {
- // an empty clause... must be just a + or - on it's own
+ // an empty clause... must be just a + or - on its own
if (clause.val.length() == 0) {
clause.syntaxError = true;
if (clause.must != 0) {
@@ -997,7 +997,7 @@ public class ExtendedDismaxQParser exten
public ExtendedSolrQueryParser(QParser parser, String defaultField) {
super(parser, defaultField);
- // don't trust that our parent class won't ever change it's default
+ // don't trust that our parent class won't ever change its default
setDefaultOperator(QueryParser.Operator.OR);
}
@@ -1227,7 +1227,7 @@ public class ExtendedDismaxQParser exten
Query query = super.getFieldQuery(field, val, type == QType.PHRASE);
// A BooleanQuery is only possible from getFieldQuery if it came from
// a single whitespace separated term. In this case, check the coordination
- // factor on the query: if its enabled, that means we aren't a set of synonyms
+ // factor on the query: if it's enabled, that means we aren't a set of synonyms
// but instead multiple terms from one whitespace-separated term, we must
// apply minShouldMatch here so that it works correctly with other things
// like aliasing.
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java Wed Dec 24 05:48:58 2014
@@ -23,7 +23,7 @@ import org.apache.solr.common.util.Named
import org.apache.solr.request.SolrQueryRequest;
/**
- * Create a nested query, with the ability of that query to redefine it's type via
+ * Create a nested query, with the ability of that query to redefine its type via
* local parameters. This is useful in specifying defaults in configuration and
* letting clients indirectly reference them.
* <br>Example: <code>{!query defType=func v=$q1}</code>
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/PostFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/PostFilter.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/PostFilter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/PostFilter.java Wed Dec 24 05:48:58 2014
@@ -42,6 +42,6 @@ import org.apache.lucene.search.IndexSea
*/
public interface PostFilter extends ExtendedQuery {
- /** Returns a DelegatingCollector to be run after the main query and all of it's filters, but before any sorting or grouping collectors */
+ /** Returns a DelegatingCollector to be run after the main query and all of its filters, but before any sorting or grouping collectors */
public DelegatingCollector getFilterCollector(IndexSearcher searcher);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Wed Dec 24 05:48:58 2014
@@ -1604,7 +1604,7 @@ public class SolrIndexSearcher extends I
final Sort weightedSort = weightSort(cmd.getSort());
final CursorMark cursor = cmd.getCursorMark();
- // :TODO: make fillFields it's own QueryCommand flag? ...
+ // :TODO: make fillFields its own QueryCommand flag? ...
// ... see comments in populateNextCursorMarkFromTopDocs for cache issues (SOLR-5595)
final boolean fillFields = (null != cursor);
final FieldDoc searchAfter = (null != cursor ? cursor.getSearchAfterFieldDoc() : null);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/OrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/OrdFieldSource.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/OrdFieldSource.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/OrdFieldSource.java Wed Dec 24 05:48:58 2014
@@ -79,7 +79,7 @@ public class OrdFieldSource extends Valu
SolrIndexSearcher is = (SolrIndexSearcher) o;
SchemaField sf = is.getSchema().getFieldOrNull(field);
if (sf != null && sf.hasDocValues() == false && sf.multiValued() == false && sf.getType().getNumericType() != null) {
- // its a single-valued numeric field: we must currently create insanity :(
+ // it's a single-valued numeric field: we must currently create insanity :(
List<LeafReaderContext> leaves = is.getIndexReader().leaves();
LeafReader insaneLeaves[] = new LeafReader[leaves.size()];
int upto = 0;
@@ -95,7 +95,7 @@ public class OrdFieldSource extends Valu
IndexReader topReader = ReaderUtil.getTopLevelContext(readerContext).reader();
r = SlowCompositeReaderWrapper.wrap(topReader);
}
- // if its e.g. tokenized/multivalued, emulate old behavior of single-valued fc
+ // if it's e.g. tokenized/multivalued, emulate old behavior of single-valued fc
final SortedDocValues sindex = SortedSetSelector.wrap(DocValues.getSortedSet(r, field), SortedSetSelector.Type.MIN);
return new IntDocValues(this) {
protected String toTerm(String readableValue) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java Wed Dec 24 05:48:58 2014
@@ -79,7 +79,7 @@ public class ReverseOrdFieldSource exten
SolrIndexSearcher is = (SolrIndexSearcher) o;
SchemaField sf = is.getSchema().getFieldOrNull(field);
if (sf != null && sf.hasDocValues() == false && sf.multiValued() == false && sf.getType().getNumericType() != null) {
- // its a single-valued numeric field: we must currently create insanity :(
+ // it's a single-valued numeric field: we must currently create insanity :(
List<LeafReaderContext> leaves = is.getIndexReader().leaves();
LeafReader insaneLeaves[] = new LeafReader[leaves.size()];
int upto = 0;
@@ -95,7 +95,7 @@ public class ReverseOrdFieldSource exten
IndexReader topReader = ReaderUtil.getTopLevelContext(readerContext).reader();
r = SlowCompositeReaderWrapper.wrap(topReader);
}
- // if its e.g. tokenized/multivalued, emulate old behavior of single-valued fc
+ // if it's e.g. tokenized/multivalued, emulate old behavior of single-valued fc
final SortedDocValues sindex = SortedSetSelector.wrap(DocValues.getSortedSet(r, field), SortedSetSelector.Type.MIN);
final int end = sindex.getValueCount();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java Wed Dec 24 05:48:58 2014
@@ -548,7 +548,7 @@ public class SolrRequestParsers
while (iter.hasNext()) {
FileItem item = (FileItem) iter.next();
- // If its a form field, put it in our parameter map
+ // If it's a form field, put it in our parameter map
if (item.isFormField()) {
MultiMapSolrParams.addParam(
item.getFieldName(),
@@ -592,7 +592,7 @@ public class SolrRequestParsers
parseQueryString(qs, map);
}
- // may be -1, so we check again later. But if its already greater we can stop processing!
+ // may be -1, so we check again later. But if it's already greater we can stop processing!
final long totalLength = req.getContentLength();
final long maxLength = ((long) uploadLimitKB) * 1024L;
if (totalLength > maxLength) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java Wed Dec 24 05:48:58 2014
@@ -143,7 +143,7 @@ public final class DefaultSolrCoreState
// we need to wait for the Writer to fall out of use
// first lets stop it from being lent out
pauseWriter = true;
- // then lets wait until its out of use
+ // then lets wait until it's out of use
log.info("Waiting until IndexWriter is unused... core=" + coreName);
while (!writerFree) {
@@ -201,7 +201,7 @@ public final class DefaultSolrCoreState
// we need to wait for the Writer to fall out of use
// first lets stop it from being lent out
pauseWriter = true;
- // then lets wait until its out of use
+ // then lets wait until it's out of use
log.info("Waiting until IndexWriter is unused... core=" + coreName);
while (!writerFree) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java Wed Dec 24 05:48:58 2014
@@ -136,7 +136,7 @@ public class DirectUpdateHandler2 extend
UpdateLog existingLog = updateHandler.getUpdateLog();
if (this.ulog != null && this.ulog == existingLog) {
- // If we are reusing the existing update log, inform the log that it's update handler has changed.
+ // If we are reusing the existing update log, inform the log that its update handler has changed.
// We do this as late as possible.
this.ulog.init(this, core);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java Wed Dec 24 05:48:58 2014
@@ -168,7 +168,7 @@ public class PeerSync {
}
/** Returns true if peer sync was successful, meaning that this core may not be considered to have the latest updates
- * when considering the last N updates between it and it's peers.
+ * when considering the last N updates between it and its peers.
* A commit is not performed.
*/
public boolean sync() {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java Wed Dec 24 05:48:58 2014
@@ -118,7 +118,7 @@ public class SolrCmdDistributor {
doRetry = true;
}
- // if its a connect exception, lets try again
+ // if it's a connect exception, lets try again
if (err.e instanceof SolrServerException) {
if (((SolrServerException) err.e).getRootCause() instanceof ConnectException) {
doRetry = true;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java Wed Dec 24 05:48:58 2014
@@ -317,7 +317,7 @@ public class UpdateLog implements Plugin
}
/* Takes over ownership of the log, keeping it until no longer needed
- and then decrementing it's reference and dropping it.
+ and then decrementing its reference and dropping it.
*/
protected synchronized void addOldLog(TransactionLog oldLog, boolean removeOld) {
if (oldLog == null) return;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Wed Dec 24 05:48:58 2014
@@ -372,7 +372,7 @@ public class DistributedUpdateProcessor
doDefensiveChecks(phase);
// if request is coming from another collection then we want it to be sent to all replicas
- // even if it's phase is FROMLEADER
+ // even if its phase is FROMLEADER
String fromCollection = updateCommand.getReq().getParams().get(DISTRIB_FROM_COLLECTION);
if (DistribPhase.FROMLEADER == phase && !isSubShardLeader && fromCollection == null) {
@@ -774,7 +774,7 @@ public class DistributedUpdateProcessor
List<Error> errors = cmdDistrib.getErrors();
// TODO - we may need to tell about more than one error...
- // if its a forward, any fail is a problem -
+ // if it's a forward, any fail is a problem -
// otherwise we assume things are fine if we got it locally
// until we start allowing min replication param
if (errors.size() > 0) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java Wed Dec 24 05:48:58 2014
@@ -245,7 +245,7 @@ public class ConcurrentLRUCache<K,V> {
// this entry is guaranteed not to be in the bottom
// group, so do nothing but remove it from the eset.
numKept++;
- // remove the entry by moving the last element to it's position
+ // remove the entry by moving the last element to its position
eset[i] = eset[eSize-1];
eSize--;
@@ -258,7 +258,7 @@ public class ConcurrentLRUCache<K,V> {
evictEntry(ce.key);
numRemoved++;
- // remove the entry by moving the last element to it's position
+ // remove the entry by moving the last element to its position
eset[i] = eset[eSize-1];
eSize--;
} else {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java Wed Dec 24 05:48:58 2014
@@ -762,7 +762,7 @@ public class SimplePostTool {
}
/**
- * Opens the file and posts it's contents to the solrUrl,
+ * Opens the file and posts its contents to the solrUrl,
* writes to response to output.
*/
public void postFile(File file, OutputStream output, String type) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrCLI.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrCLI.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrCLI.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrCLI.java Wed Dec 24 05:48:58 2014
@@ -924,7 +924,7 @@ public class SolrCLI {
String coreUrl = replicaCoreProps.getCoreUrl();
boolean isLeader = coreUrl.equals(leaderUrl);
- // if replica's node is not live, it's status is DOWN
+ // if replica's node is not live, its status is DOWN
String nodeName = replicaCoreProps.getNodeName();
if (nodeName == null || !liveNodes.contains(nodeName)) {
replicaStatus = ZkStateReader.DOWN;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java Wed Dec 24 05:48:58 2014
@@ -266,7 +266,7 @@ public class SolrPluginUtils {
* <li>parsedquery - the main query executed formated by the Solr
* QueryParsing utils class (which knows about field types)
* </li>
- * <li>parsedquery_toString - the main query executed formated by it's
+ * <li>parsedquery_toString - the main query executed formatted by its
* own toString method (in case it has internal state Solr
* doesn't know about)
* </li>
@@ -701,7 +701,7 @@ public class SolrPluginUtils {
}
/**
- * Returns it's input if there is an even (ie: balanced) number of
+ * Returns its input if there is an even (ie: balanced) number of
* '"' characters -- otherwise returns a String in which all '"'
* characters are striped out.
*/
@@ -758,7 +758,7 @@ public class SolrPluginUtils {
protected Map<String,Alias> aliases = new HashMap<>(3);
public DisjunctionMaxQueryParser(QParser qp, String defaultField) {
super(qp,defaultField);
- // don't trust that our parent class won't ever change it's default
+ // don't trust that our parent class won't ever change its default
setDefaultOperator(QueryParser.Operator.OR);
}
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml Wed Dec 24 05:48:58 2014
@@ -587,7 +587,7 @@
<restManager>
<!--
IMPORTANT: Due to the Lucene SecurityManager, tests can only write to their runtime directory or below.
- But its easier to just keep everything in memory for testing so no remnants are left behind.
+ But it's easier to just keep everything in memory for testing so no remnants are left behind.
-->
<str name="storageIO">org.apache.solr.rest.ManagedResourceStorage$InMemoryStorageIO</str>
</restManager>
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java Wed Dec 24 05:48:58 2014
@@ -625,7 +625,7 @@ public class BasicFunctionalityTest exte
,"*[count(//doc)=2]"
,"//arr[@name='multiDefault']"
);
- assertQ("1 doc should have it's explicit multiDefault",
+ assertQ("1 doc should have its explicit multiDefault",
req("multiDefault:a")
,"*[count(//doc)=1]"
);
@@ -634,7 +634,7 @@ public class BasicFunctionalityTest exte
req("intDefault:42")
,"*[count(//doc)=2]"
);
- assertQ("1 doc should have it's explicit intDefault",
+ assertQ("1 doc should have its explicit intDefault",
req("intDefault:[3 TO 5]")
,"*[count(//doc)=1]"
);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java Wed Dec 24 05:48:58 2014
@@ -125,7 +125,7 @@ public class BasicDistributedZk2Test ext
// expected
}
- // TODO: bring this to it's own method?
+ // TODO: bring this to its own method?
// try indexing to a leader that has no replicas up
ZkStateReader zkStateReader = cloudClient.getZkStateReader();
ZkNodeProps leaderProps = zkStateReader.getLeaderRetry(
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java Wed Dec 24 05:48:58 2014
@@ -287,7 +287,7 @@ public class CollectionsAPIDistributedZk
private void deleteCollectionWithDownNodes() throws Exception {
String baseUrl = getBaseUrl((HttpSolrServer) clients.get(0));
- // now try to remove a collection when a couple of it's nodes are down
+ // now try to remove a collection when a couple of its nodes are down
if (secondConfigSet) {
createCollection(null, "halfdeletedcollection2", 3, 3, 6,
createNewSolrServer("", baseUrl), null, "conf2");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java Wed Dec 24 05:48:58 2014
@@ -84,7 +84,7 @@ public class LeaderInitiatedRecoveryOnCo
+ printClusterStateInfo(),
notLeaders.size() == 1);
- // let's put the leader in it's own partition, no replicas can contact it now
+ // let's put the leader in its own partition, no replicas can contact it now
Replica leader = cloudClient.getZkStateReader().getLeaderRetry(testCollectionName, "shard1");
SocketProxy leaderProxy = getProxyForReplica(leader);
leaderProxy.close();
@@ -127,7 +127,7 @@ public class LeaderInitiatedRecoveryOnCo
+ printClusterStateInfo(),
notLeaders.size() == 2);
- // let's put the leader in it's own partition, no replicas can contact it now
+ // let's put the leader in its own partition, no replicas can contact it now
Replica leader = cloudClient.getZkStateReader().getLeaderRetry(testCollectionName, "shard1");
SocketProxy leaderProxy = getProxyForReplica(leader);
leaderProxy.close();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java Wed Dec 24 05:48:58 2014
@@ -146,7 +146,7 @@ public class HdfsWriteToMultipleCollecti
// see SOLR-6424
assertFalse(blockDirectory.isBlockCacheWriteEnabled());
Cache cache = blockDirectory.getCache();
- // we know its a BlockDirectoryCache, but future proof
+ // we know it's a BlockDirectoryCache, but future proof
assertTrue(cache instanceof BlockDirectoryCache);
BlockCache blockCache = ((BlockDirectoryCache) cache)
.getBlockCache();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java Wed Dec 24 05:48:58 2014
@@ -41,7 +41,7 @@ public class SolrCoreCheckLockOnStartupT
System.setProperty("solr.directoryFactory", "org.apache.solr.core.SimpleFSDirectoryFactory");
// test tests native and simple in the same jvm in the same exact directory:
// the file will remain after the native test (it cannot safely be deleted without the risk of deleting another guys lock)
- // its ok, these aren't "compatible" anyway: really this test should not re-use the same directory at all.
+ // it's ok, these aren't "compatible" anyway: really this test should not re-use the same directory at all.
Files.deleteIfExists(new File(new File(initCoreDataDir, "index"), IndexWriter.WRITE_LOCK_NAME).toPath());
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java Wed Dec 24 05:48:58 2014
@@ -82,7 +82,7 @@ public class CoreAdminCreateDiscoverTest
setupCore(coreSysProps, true);
// create a new core (using CoreAdminHandler) w/ properties
- // Just to be sure its NOT written to the core.properties file
+ // Just to be sure it's NOT written to the core.properties file
File workDir = new File(solrHomeDirectory, coreSysProps);
System.setProperty("INSTDIR_TEST", workDir.getAbsolutePath());
System.setProperty("CONFIG_TEST", "solrconfig_ren.xml");
@@ -227,7 +227,7 @@ public class CoreAdminCreateDiscoverTest
setupCore(coreNormal, true);
// create a new core (using CoreAdminHandler) w/ properties
- // Just to be sure its NOT written to the core.properties file
+ // Just to be sure it's NOT written to the core.properties file
File workDir = new File(solrHomeDirectory, coreNormal);
File data = new File(workDir, "data");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java Wed Dec 24 05:48:58 2014
@@ -61,7 +61,7 @@ public class DebugComponentTest extends
"//lst[@name='explain']/str[@name='3']",
"//str[@name='QParser']",// make sure the QParser is specified
"count(//lst[@name='timing']/*)=3", //should be three pieces to timings
- "//lst[@name='timing']/double[@name='time']", //make sure we have a time value, but don't specify it's result
+ "//lst[@name='timing']/double[@name='time']", //make sure we have a time value, but don't specify its result
"count(//lst[@name='prepare']/*)>0",
"//lst[@name='prepare']/double[@name='time']",
"count(//lst[@name='process']/*)>0",
@@ -85,7 +85,7 @@ public class DebugComponentTest extends
"//lst[@name='explain']/str[@name='2']",
"//lst[@name='explain']/str[@name='3']",
"count(//lst[@name='timing']/*)=3", //should be three pieces to timings
- "//lst[@name='timing']/double[@name='time']", //make sure we have a time value, but don't specify it's result
+ "//lst[@name='timing']/double[@name='time']", //make sure we have a time value, but don't specify its result
"count(//lst[@name='prepare']/*)>0",
"//lst[@name='prepare']/double[@name='time']",
"count(//lst[@name='process']/*)>0",
@@ -100,7 +100,7 @@ public class DebugComponentTest extends
"count(//lst[@name='explain']/*)=0",
"count(//str[@name='QParser'])=0",// make sure the QParser is specified
"count(//lst[@name='timing']/*)=3", //should be three pieces to timings
- "//lst[@name='timing']/double[@name='time']", //make sure we have a time value, but don't specify it's result
+ "//lst[@name='timing']/double[@name='time']", //make sure we have a time value, but don't specify its result
"count(//lst[@name='prepare']/*)>0",
"//lst[@name='prepare']/double[@name='time']",
"count(//lst[@name='process']/*)>0",
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java Wed Dec 24 05:48:58 2014
@@ -178,7 +178,7 @@ public class DistributedFacetPivotLargeT
//
// This is tricky, here's what i think is happening....
// - "company:honda" only exists on twoShard, and only w/ "place:cardiff"
- // - twoShard has no other places in it's docs
+ // - twoShard has no other places in its docs
// - twoShard can't return any other places to w/ honda as a count=0 sub-value
// - if we refined all other companies places, would twoShard return honda==0 ?
// ... but there's no refinement since mincount==0
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java Wed Dec 24 05:48:58 2014
@@ -29,7 +29,7 @@ import junit.framework.TestCase;
* The test are organized in three different sections:
* The 'setter/getter' section, the lexer section and finally the parser
* section. In case a test fails, you should follow a top-down approach for
- * fixing a potential bug (its likely that the parser itself fails if the lexer
+ * fixing a potential bug (it's likely that the parser itself fails if the lexer
* has problems...).
*/
public class CSVParserTest extends TestCase {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/internal/csv/CSVStrategyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/internal/csv/CSVStrategyTest.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/internal/csv/CSVStrategyTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/internal/csv/CSVStrategyTest.java Wed Dec 24 05:48:58 2014
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
* The test are organized in three different sections:
* The 'setter/getter' section, the lexer section and finally the strategy
* section. In case a test fails, you should follow a top-down approach for
- * fixing a potential bug (its likely that the strategy itself fails if the lexer
+ * fixing a potential bug (it's likely that the strategy itself fails if the lexer
* has problems...).
*/
public class CSVStrategyTest extends TestCase {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java Wed Dec 24 05:48:58 2014
@@ -50,8 +50,8 @@ public class TestRawResponseWriter exten
@BeforeClass
public static void setupCoreAndWriters() throws Exception {
- // we don't directly use this core or it's config, we use
- // QueryResponseWriters' constructed programaticly,
+ // we don't directly use this core or its config, we use
+ // QueryResponseWriters' constructed programmatically,
// but we do use this core for managing the life cycle of the requests
// we spin up.
initCore("solrconfig.xml","schema.xml");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationField.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationField.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationField.java Wed Dec 24 05:48:58 2014
@@ -59,7 +59,7 @@ public class TestCollationField extends
* Ugly: but what to do? We want to test custom sort, which reads rules in as a resource.
* These are largish files, and jvm-specific (as our documentation says, you should always
* look out for jvm differences with collation).
- * So its preferable to create this file on-the-fly.
+ * So it's preferable to create this file on-the-fly.
*/
public static String setupSolrHome() throws Exception {
// make a solr home underneath the test's TEMP_DIR
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java Wed Dec 24 05:48:58 2014
@@ -57,7 +57,7 @@ public class TestCollationFieldDocValues
* Ugly: but what to do? We want to test custom sort, which reads rules in as a resource.
* These are largish files, and jvm-specific (as our documentation says, you should always
* look out for jvm differences with collation).
- * So its preferable to create this file on-the-fly.
+ * So it's preferable to create this file on-the-fly.
*/
public static String setupSolrHome() throws Exception {
// make a solr home underneath the test's TEMP_DIR
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressLucene.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressLucene.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressLucene.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressLucene.java Wed Dec 24 05:48:58 2014
@@ -317,7 +317,7 @@ public class TestStressLucene extends Te
int docid = getFirstMatch(r, new Term("id",Integer.toString(id)));
if (docid < 0 && tombstones) {
- // if we couldn't find the doc, look for it's tombstone
+ // if we couldn't find the doc, look for its tombstone
docid = getFirstMatch(r, new Term("id","-"+Integer.toString(id)));
if (docid < 0) {
if (val == -1L) {
@@ -336,7 +336,7 @@ public class TestStressLucene extends Te
if (docid < 0) {
verbose("ERROR: Couldn't find a doc for id", id, "using reader",r);
}
- assertTrue(docid >= 0); // we should have found the document, or it's tombstone
+ assertTrue(docid >= 0); // we should have found the document, or its tombstone
StoredDocument doc = r.document(docid);
long foundVal = Long.parseLong(doc.get(field));
if (foundVal < Math.abs(val)) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java Wed Dec 24 05:48:58 2014
@@ -210,7 +210,7 @@ public class DocumentBuilderTest extends
}
/**
- * Its ok to boost a field if it has norms
+ * It's ok to boost a field if it has norms
*/
public void testBoost() throws Exception {
XmlDoc xml = new XmlDoc();
@@ -385,7 +385,7 @@ public class DocumentBuilderTest extends
}
/**
- * Its ok to supply a document boost even if a field omits norms
+ * It's ok to supply a document boost even if a field omits norms
*/
public void testDocumentBoostOmitNorms() throws Exception {
XmlDoc xml = new XmlDoc();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java Wed Dec 24 05:48:58 2014
@@ -65,7 +65,7 @@ public class PeerSyncTest extends BaseDi
long v = 0;
add(client0, seenLeader, sdoc("id","1","_version_",++v));
- // this fails because client0 has no context (i.e. no updates of it's own to judge if applying the updates
+ // this fails because client0 has no context (i.e. no updates of its own to judge if applying the updates
// from client1 will bring it into sync with client1)
assertSync(client1, numVersions, false, shardsArr[0]);
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml Wed Dec 24 05:48:58 2014
@@ -142,7 +142,7 @@
index format, but hooks into the schema to provide per-field customization of
the postings lists and per-document values in the fieldType element
(postingsFormat/docValuesFormat). Note that most of the alternative implementations
- are experimental, so if you choose to customize the index format, its a good
+ are experimental, so if you choose to customize the index format, it's a good
idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
before upgrading to a newer version to avoid unnecessary reindexing.
-->
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Wed Dec 24 05:48:58 2014
@@ -145,7 +145,7 @@
index format, but hooks into the schema to provide per-field customization of
the postings lists and per-document values in the fieldType element
(postingsFormat/docValuesFormat). Note that most of the alternative implementations
- are experimental, so if you choose to customize the index format, its a good
+ are experimental, so if you choose to customize the index format, it's a good
idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
before upgrading to a newer version to avoid unnecessary reindexing.
-->
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Wed Dec 24 05:48:58 2014
@@ -142,7 +142,7 @@
index format, but hooks into the schema to provide per-field customization of
the postings lists and per-document values in the fieldType element
(postingsFormat/docValuesFormat). Note that most of the alternative implementations
- are experimental, so if you choose to customize the index format, its a good
+ are experimental, so if you choose to customize the index format, it's a good
idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
before upgrading to a newer version to avoid unnecessary reindexing.
-->
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml Wed Dec 24 05:48:58 2014
@@ -142,7 +142,7 @@
index format, but hooks into the schema to provide per-field customization of
the postings lists and per-document values in the fieldType element
(postingsFormat/docValuesFormat). Note that most of the alternative implementations
- are experimental, so if you choose to customize the index format, its a good
+ are experimental, so if you choose to customize the index format, it's a good
idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
before upgrading to a newer version to avoid unnecessary reindexing.
-->
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Wed Dec 24 05:48:58 2014
@@ -143,7 +143,7 @@
index format, but hooks into the schema to provide per-field customization of
the postings lists and per-document values in the fieldType element
(postingsFormat/docValuesFormat). Note that most of the alternative implementations
- are experimental, so if you choose to customize the index format, its a good
+ are experimental, so if you choose to customize the index format, it's a good
idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
before upgrading to a newer version to avoid unnecessary reindexing.
-->
Modified: lucene/dev/trunk/solr/server/etc/webdefault.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/etc/webdefault.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/etc/webdefault.xml (original)
+++ lucene/dev/trunk/solr/server/etc/webdefault.xml Wed Dec 24 05:48:58 2014
@@ -27,7 +27,7 @@
<description>
Default web.xml file.
- This file is applied to a Web application before it's own WEB_INF/web.xml file
+ This file is applied to a Web application before its own WEB_INF/web.xml file
</description>
<!-- ==================================================================== -->
Modified: lucene/dev/trunk/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml Wed Dec 24 05:48:58 2014
@@ -70,7 +70,7 @@
index format, but hooks into the schema to provide per-field customization of
the postings lists and per-document values in the fieldType element
(postingsFormat/docValuesFormat). Note that most of the alternative implementations
- are experimental, so if you choose to customize the index format, its a good
+ are experimental, so if you choose to customize the index format, it's a good
idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
before upgrading to a newer version to avoid unnecessary reindexing.
-->
Modified: lucene/dev/trunk/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml Wed Dec 24 05:48:58 2014
@@ -123,7 +123,7 @@
index format, but hooks into the schema to provide per-field customization of
the postings lists and per-document values in the fieldType element
(postingsFormat/docValuesFormat). Note that most of the alternative implementations
- are experimental, so if you choose to customize the index format, its a good
+ are experimental, so if you choose to customize the index format, it's a good
idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
before upgrading to a newer version to avoid unnecessary reindexing.
-->
Modified: lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml Wed Dec 24 05:48:58 2014
@@ -140,7 +140,7 @@
index format, but hooks into the schema to provide per-field customization of
the postings lists and per-document values in the fieldType element
(postingsFormat/docValuesFormat). Note that most of the alternative implementations
- are experimental, so if you choose to customize the index format, its a good
+ are experimental, so if you choose to customize the index format, it's a good
idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
before upgrading to a newer version to avoid unnecessary reindexing.
-->
Modified: lucene/dev/trunk/solr/solrj/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/build.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/build.xml (original)
+++ lucene/dev/trunk/solr/solrj/build.xml Wed Dec 24 05:48:58 2014
@@ -66,7 +66,7 @@
<!-- Specialized to use lucene's classpath too, because it refs e.g. qp syntax
(even though it doesnt compile with it)
- TODO: would be nice to fix this up better, but its hard because of
+ TODO: would be nice to fix this up better, but it's hard because of
the different ways solr links to lucene javadocs -->
<target name="-ecj-javadoc-lint-src" depends="-ecj-resolve">
<ecj-macro srcdir="${src.dir}" configuration="${common.dir}/tools/javadoc/ecj.javadocs.prefs">
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java Wed Dec 24 05:48:58 2014
@@ -35,7 +35,7 @@ public abstract class ResponseParser
public abstract NamedList<Object> processResponse(Reader reader);
/**
- * A well behaved ResponseParser will return it's content-type.
+ * A well behaved ResponseParser will return its content-type.
*
* @return the content-type this parser expects to parse
*/
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java Wed Dec 24 05:48:58 2014
@@ -730,7 +730,7 @@ public class SolrQuery extends Modifiabl
/**
* Updates or adds a single sort field specification to the current sort
* information. If the sort field already exist in the sort information map,
- * it's position is unchanged and the sort order is set; if it does not exist,
+ * its position is unchanged and the sort order is set; if it does not exist,
* it is appended at the end with the specified order..
*
* @return the modified SolrQuery object, for easy chaining
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java Wed Dec 24 05:48:58 2014
@@ -29,7 +29,7 @@ public class ZkCmdExecutor {
/**
* TODO: At this point, this should probably take a SolrZkClient in
- * it's constructor.
+ * its constructor.
*
* @param timeoutms
* the client timeout for the ZooKeeper clients that will be used
@@ -93,7 +93,7 @@ public class ZkCmdExecutor {
try {
zkClient.makePath(path, data, true);
} catch (NodeExistsException e) {
- // its okay if another beats us creating the node
+ // it's okay if another beats us creating the node
}
}
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/params/RequiredSolrParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/params/RequiredSolrParams.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/params/RequiredSolrParams.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/params/RequiredSolrParams.java Wed Dec 24 05:48:58 2014
@@ -106,7 +106,7 @@ public class RequiredSolrParams extends
//----------------------------------------------------------
// Functions with a default value - pass directly to the
- // wrapped SolrParams (they won't return null - unless its the default)
+ // wrapped SolrParams (they won't return null - unless it's the default)
//----------------------------------------------------------
@Override
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/Hash.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/Hash.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/Hash.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/Hash.java Wed Dec 24 05:48:58 2014
@@ -118,7 +118,7 @@ public class Hash {
/**
* <p>The hash value of a character sequence is defined to be the hash of
- * it's unicode code points, according to {@link #lookup3ycs(int[] k, int offset, int length, int initval)}
+ * its unicode code points, according to {@link #lookup3ycs(int[] k, int offset, int length, int initval)}
* </p>
* <p>If you know the number of code points in the {@code CharSequence}, you can
* generate the same hash as the original lookup3
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java Wed Dec 24 05:48:58 2014
@@ -455,7 +455,7 @@ public class NamedList<T> implements Clo
}
/**
- * Iterates over the Map and sequentially adds it's key/value pairs
+ * Iterates over the Map and sequentially adds its key/value pairs
*/
public boolean addAll(Map<String,T> args) {
for (Map.Entry<String, T> entry : args.entrySet() ) {
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java Wed Dec 24 05:48:58 2014
@@ -32,7 +32,7 @@ import java.util.*;
* the same way.
* </p>
* <p>
- * This class does not provide efficient lookup by key, it's main purpose is
+ * This class does not provide efficient lookup by key, its main purpose is
* to hold data to be serialized. It aims to minimize overhead and to be
* efficient at adding new elements.
* </p>
Modified: lucene/dev/trunk/solr/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/build.xml?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/build.xml (original)
+++ lucene/dev/trunk/solr/test-framework/build.xml Wed Dec 24 05:48:58 2014
@@ -46,7 +46,7 @@
<!-- redefine the clover setup, because we dont want to run clover for the test-framework -->
<target name="-clover.setup" if="run.clover"/>
- <!-- redefine the test compilation, so its just a no-op -->
+ <!-- redefine the test compilation, so it's just a no-op -->
<target name="compile-test"/>
<!-- redefine the forbidden apis for tests, as we check ourselves -->
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1647735&r1=1647734&r2=1647735&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Wed Dec 24 05:48:58 2014
@@ -440,7 +440,7 @@ public abstract class SolrTestCaseJ4 ext
if (endNumOpens-numOpens != endNumCloses-numCloses) {
String msg = "ERROR: SolrIndexSearcher opens=" + (endNumOpens-numOpens) + " closes=" + (endNumCloses-numCloses);
log.error(msg);
- // if its TestReplicationHandler, ignore it. the test is broken and gets no love
+ // if it's TestReplicationHandler, ignore it. the test is broken and gets no love
if ("TestReplicationHandler".equals(RandomizedContext.current().getTargetClass().getSimpleName())) {
log.warn("TestReplicationHandler wants to fail!: " + msg);
} else {