Merge pull request msimons#1 from pdegeus/master

Merged from upstream

README.textile

@@ -207,7 +207,7 @@ h1. License
 <pre>
 This software is licensed under the Apache 2 license, quoted below.
 
-Copyright 2009-2012 Shay Banon and ElasticSearch <http://www.elasticsearch.org>
+Copyright 2009-2013 Shay Banon and ElasticSearch <http://www.elasticsearch.org>
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
 use this file except in compliance with the License. You may obtain a copy of
@@ -220,4 +220,4 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 License for the specific language governing permissions and limitations under
 the License.
-</pre>
+</pre>

pom.xml

@@ -30,7 +30,7 @@
     </parent>
 
     <properties>
-        <lucene.version>4.1.0</lucene.version>
+        <lucene.version>4.2.0</lucene.version>
     </properties>
 
     <repositories>
@@ -143,7 +143,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>14.0</version>
+            <version>14.0.1</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>

src/main/assemblies/targz-bin.xml

@@ -27,6 +27,7 @@
             <outputDirectory>lib/sigar</outputDirectory>
             <excludes>
                 <exclude>*.dll</exclude>
+                <exclude>**winnt**</exclude>
             </excludes>
         </fileSet>
     </fileSets>

src/main/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilter.java

@@ -0,0 +1,71 @@
+/*
+ * Licensed to ElasticSearch and Shay Banon under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. ElasticSearch licenses this
+ * file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.lucene.analysis.miscellaneous;
+
+import org.apache.lucene.analysis.TokenFilter;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.tokenattributes.KeywordAttribute;
+import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
+
+import java.io.IOException;
+
+
+/**
+ * This TokenFilter emits each incoming token twice once as keyword and once non-keyword, in other words once with
+ * {@link KeywordAttribute#setKeyword(boolean)} set to <code>true</code> and once set to <code>false</code>.
+ * This is useful if used with a stem filter that respects the {@link KeywordAttribute} to index the stemmed and the
+ * un-stemmed version of a term into the same field.
+ */
+//LUCENE MONITOR - this will be included in Lucene 4.3. (it's a plain copy of the lucene version)
+
+public final class KeywordRepeatFilter extends TokenFilter {
+  private final KeywordAttribute keywordAttribute = addAttribute(KeywordAttribute.class);
+  private final PositionIncrementAttribute posIncAttr = addAttribute(PositionIncrementAttribute.class);
+  private State state;
+
+  /**
+   * Construct a token stream filtering the given input.
+   */
+  public KeywordRepeatFilter(TokenStream input) {
+    super(input);
+  }
+
+  @Override
+  public boolean incrementToken() throws IOException {
+    if (state != null) {
+      restoreState(state);
+      posIncAttr.setPositionIncrement(0);
+      keywordAttribute.setKeyword(false);
+      state = null;
+      return true;
+    }
+    if (input.incrementToken()) {
+      state = captureState();
+      keywordAttribute.setKeyword(true);
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public void reset() throws IOException {
+    super.reset();
+    state = null;
+  }
+}

src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java

@@ -25,7 +25,7 @@
  * <tt>minimumNumberShouldMatch</tt> specification that uses the actual num of high frequent terms
  * to calculate the minimum matching terms.
  */
-public class ExtendedCommonTermsQuery extends XCommonTermsQuery {
+public class ExtendedCommonTermsQuery extends CommonTermsQuery {
 
     public ExtendedCommonTermsQuery(Occur highFreqOccur, Occur lowFreqOccur, float maxTermFrequency, boolean disableCoord) {
         super(highFreqOccur, lowFreqOccur, maxTermFrequency, disableCoord);
@@ -38,7 +38,7 @@ public ExtendedCommonTermsQuery(Occur highFreqOccur, Occur lowFreqOccur, float m
     private String minNumShouldMatchSpec;
 
     @Override
-    protected int getMinimumNumberShouldMatch(int numOptional) {
+    protected int calcLowFreqMinimumNumberShouldMatch(int numOptional) {
         if (minNumShouldMatchSpec == null) {
             return 0;
         }