mirror of https://github.com/apache/lucene.git
LUCENE-4335: commit current patch
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4335@1506240 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless
parent
d1a80ebcfa
commit
75c92695a8
10
build.xml
10
build.xml
|
|
@ -33,7 +33,7 @@
|
|||
<property name="tests.heap-dump-dir" location="heapdumps"/>
|
||||
|
||||
<target name="precommit" description="Run basic checks before committing"
|
||||
depends="check-svn-working-copy,validate,documentation-lint"/>
|
||||
depends="regenerate,check-svn-working-copy,validate,documentation-lint"/>
|
||||
|
||||
<target name="test" description="Test both Lucene and Solr">
|
||||
<subant target="test" inheritall="false" failonerror="true">
|
||||
|
|
@ -423,4 +423,12 @@
|
|||
</antcall>
|
||||
</target>
|
||||
|
||||
<target name="regenerate" description="Run all code generators">
|
||||
<subant target="regenerate" inheritall="false" failonerror="false">
|
||||
<fileset dir="lucene" includes="build.xml" />
|
||||
<!-- todo:
|
||||
<fileset dir="solr" includes="build.xml" />-->
|
||||
</subant>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -135,4 +135,8 @@
|
|||
<forall-analyzers target="-ecj-javadoc-lint"/>
|
||||
</target>
|
||||
|
||||
<target name="regenerate">
|
||||
<forall-analyzers target="regenerate"/>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -143,4 +143,6 @@
|
|||
</target>
|
||||
|
||||
<target name="javadocs" depends="module-build.javadocs"/>
|
||||
|
||||
<target name="regenerate" depends="jflex"/>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
// Generated using ICU4J 49.1.0.0 on Sunday, July 15, 2012 5:42:00 AM UTC
|
||||
// Generated using ICU4J 49.1.0.0
|
||||
// by org.apache.lucene.analysis.icu.GenerateHTMLStripCharFilterSupplementaryMacros
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/19/12 6:24 PM */
|
||||
/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 3:28 PM */
|
||||
|
||||
package org.apache.lucene.analysis.charfilter;
|
||||
|
||||
|
|
@ -40,8 +40,8 @@ import org.apache.lucene.analysis.util.OpenStringBuilder;
|
|||
/**
|
||||
* This class is a scanner generated by
|
||||
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
|
||||
* on 9/19/12 6:24 PM from the specification file
|
||||
* <tt>C:/svn/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex</tt>
|
||||
* on 7/23/13 3:28 PM from the specification file
|
||||
* <tt>/l/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex</tt>
|
||||
*/
|
||||
public final class HTMLStripCharFilter extends BaseCharFilter {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/19/12 6:23 PM */
|
||||
/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 3:28 PM */
|
||||
|
||||
package org.apache.lucene.analysis.standard;
|
||||
|
||||
|
|
@ -33,8 +33,8 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
|
|||
/**
|
||||
* This class is a scanner generated by
|
||||
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
|
||||
* on 9/19/12 6:23 PM from the specification file
|
||||
* <tt>C:/svn/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex</tt>
|
||||
* on 7/23/13 3:28 PM from the specification file
|
||||
* <tt>/l/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex</tt>
|
||||
*/
|
||||
class ClassicTokenizerImpl implements StandardTokenizerInterface {
|
||||
|
||||
|
|
@ -359,7 +359,6 @@ public static final int ACRONYM_DEP = StandardTokenizer.ACRONYM_DEP;
|
|||
|
||||
public static final String [] TOKEN_TYPES = StandardTokenizer.TOKEN_TYPES;
|
||||
|
||||
@Override
|
||||
public final int yychar()
|
||||
{
|
||||
return yychar;
|
||||
|
|
@ -368,7 +367,6 @@ public final int yychar()
|
|||
/**
|
||||
* Fills CharTermAttribute with the current token text.
|
||||
*/
|
||||
@Override
|
||||
public final void getText(CharTermAttribute t) {
|
||||
t.copyBuffer(zzBuffer, zzStartRead, zzMarkedPos-zzStartRead);
|
||||
}
|
||||
|
|
@ -484,7 +482,6 @@ public final void getText(CharTermAttribute t) {
|
|||
*
|
||||
* @param reader the new input stream
|
||||
*/
|
||||
@Override
|
||||
public final void yyreset(java.io.Reader reader) {
|
||||
zzReader = reader;
|
||||
zzAtBOL = true;
|
||||
|
|
@ -544,7 +541,6 @@ public final void getText(CharTermAttribute t) {
|
|||
/**
|
||||
* Returns the length of the matched text region.
|
||||
*/
|
||||
@Override
|
||||
public final int yylength() {
|
||||
return zzMarkedPos-zzStartRead;
|
||||
}
|
||||
|
|
@ -600,7 +596,6 @@ public final void getText(CharTermAttribute t) {
|
|||
* @return the next token
|
||||
* @exception java.io.IOException if any I/O-Error occurs
|
||||
*/
|
||||
@Override
|
||||
public int getNextToken() throws java.io.IOException {
|
||||
int zzInput;
|
||||
int zzAction;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
// Generated using ICU4J 49.1.0.0 on Wednesday, September 19, 2012 10:23:34 PM UTC
|
||||
// Generated using ICU4J 49.1.0.0
|
||||
// by org.apache.lucene.analysis.icu.GenerateJFlexSupplementaryMacros
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/19/12 6:23 PM */
|
||||
/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 3:28 PM */
|
||||
|
||||
package org.apache.lucene.analysis.standard;
|
||||
|
||||
|
|
@ -843,7 +843,6 @@ public final class StandardTokenizerImpl implements StandardTokenizerInterface {
|
|||
|
||||
public static final int HANGUL_TYPE = StandardTokenizer.HANGUL;
|
||||
|
||||
@Override
|
||||
public final int yychar()
|
||||
{
|
||||
return yychar;
|
||||
|
|
@ -852,7 +851,6 @@ public final class StandardTokenizerImpl implements StandardTokenizerInterface {
|
|||
/**
|
||||
* Fills CharTermAttribute with the current token text.
|
||||
*/
|
||||
@Override
|
||||
public final void getText(CharTermAttribute t) {
|
||||
t.copyBuffer(zzBuffer, zzStartRead, zzMarkedPos-zzStartRead);
|
||||
}
|
||||
|
|
@ -967,7 +965,6 @@ public final class StandardTokenizerImpl implements StandardTokenizerInterface {
|
|||
*
|
||||
* @param reader the new input stream
|
||||
*/
|
||||
@Override
|
||||
public final void yyreset(java.io.Reader reader) {
|
||||
zzReader = reader;
|
||||
zzAtBOL = true;
|
||||
|
|
@ -1027,7 +1024,6 @@ public final class StandardTokenizerImpl implements StandardTokenizerInterface {
|
|||
/**
|
||||
* Returns the length of the matched text region.
|
||||
*/
|
||||
@Override
|
||||
public final int yylength() {
|
||||
return zzMarkedPos-zzStartRead;
|
||||
}
|
||||
|
|
@ -1083,7 +1079,6 @@ public final class StandardTokenizerImpl implements StandardTokenizerInterface {
|
|||
* @return the next token
|
||||
* @exception java.io.IOException if any I/O-Error occurs
|
||||
*/
|
||||
@Override
|
||||
public int getNextToken() throws java.io.IOException {
|
||||
int zzInput;
|
||||
int zzAction;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/19/12 6:23 PM */
|
||||
/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 3:28 PM */
|
||||
|
||||
package org.apache.lucene.analysis.standard;
|
||||
|
||||
|
|
@ -4033,7 +4033,6 @@ public final class UAX29URLEmailTokenizerImpl implements StandardTokenizerInterf
|
|||
|
||||
public static final int URL_TYPE = UAX29URLEmailTokenizer.URL;
|
||||
|
||||
@Override
|
||||
public final int yychar()
|
||||
{
|
||||
return yychar;
|
||||
|
|
@ -4042,7 +4041,6 @@ public final class UAX29URLEmailTokenizerImpl implements StandardTokenizerInterf
|
|||
/**
|
||||
* Fills CharTermAttribute with the current token text.
|
||||
*/
|
||||
@Override
|
||||
public final void getText(CharTermAttribute t) {
|
||||
t.copyBuffer(zzBuffer, zzStartRead, zzMarkedPos-zzStartRead);
|
||||
}
|
||||
|
|
@ -4157,7 +4155,6 @@ public final class UAX29URLEmailTokenizerImpl implements StandardTokenizerInterf
|
|||
*
|
||||
* @param reader the new input stream
|
||||
*/
|
||||
@Override
|
||||
public final void yyreset(java.io.Reader reader) {
|
||||
zzReader = reader;
|
||||
zzAtBOL = true;
|
||||
|
|
@ -4217,7 +4214,6 @@ public final class UAX29URLEmailTokenizerImpl implements StandardTokenizerInterf
|
|||
/**
|
||||
* Returns the length of the matched text region.
|
||||
*/
|
||||
@Override
|
||||
public final int yylength() {
|
||||
return zzMarkedPos-zzStartRead;
|
||||
}
|
||||
|
|
@ -4273,7 +4269,6 @@ public final class UAX29URLEmailTokenizerImpl implements StandardTokenizerInterf
|
|||
* @return the next token
|
||||
* @exception java.io.IOException if any I/O-Error occurs
|
||||
*/
|
||||
@Override
|
||||
public int getNextToken() throws java.io.IOException {
|
||||
int zzInput;
|
||||
int zzAction;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/19/12 6:23 PM */
|
||||
/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 3:28 PM */
|
||||
|
||||
package org.apache.lucene.analysis.wikipedia;
|
||||
|
||||
|
|
@ -25,8 +25,8 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
|
|||
/**
|
||||
* This class is a scanner generated by
|
||||
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
|
||||
* on 9/19/12 6:23 PM from the specification file
|
||||
* <tt>C:/svn/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex</tt>
|
||||
* on 7/23/13 3:28 PM from the specification file
|
||||
* <tt>/l/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex</tt>
|
||||
*/
|
||||
class WikipediaTokenizerImpl {
|
||||
|
||||
|
|
|
|||
|
|
@ -150,4 +150,6 @@ are part of the ICU4C package. See http://site.icu-project.org/ </echo>
|
|||
</compile>
|
||||
</target>
|
||||
|
||||
<target name="regenerate" depends="gen-html-strip-charfilter-supp-macros,gen-uax29-supp-macros,gen-utr30-data-files,gennorm2"/>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -60,8 +60,7 @@ public class GenerateHTMLStripCharFilterSupplementaryMacros {
|
|||
|
||||
static void outputHeader() {
|
||||
System.out.print(APACHE_LICENSE);
|
||||
System.out.print("// Generated using ICU4J " + VersionInfo.ICU_VERSION.toString() + " on ");
|
||||
System.out.println(DATE_FORMAT.format(new Date()));
|
||||
System.out.println("// Generated using ICU4J " + VersionInfo.ICU_VERSION.toString());
|
||||
System.out.println("// by " + GenerateHTMLStripCharFilterSupplementaryMacros.class.getName());
|
||||
System.out.print(NL + NL);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,8 +74,7 @@ public class GenerateJFlexSupplementaryMacros {
|
|||
|
||||
static void outputHeader() {
|
||||
System.out.print(APACHE_LICENSE);
|
||||
System.out.print("// Generated using ICU4J " + VersionInfo.ICU_VERSION.toString() + " on ");
|
||||
System.out.println(DATE_FORMAT.format(new Date()));
|
||||
System.out.println("// Generated using ICU4J " + VersionInfo.ICU_VERSION.toString());
|
||||
System.out.println("// by " + GenerateJFlexSupplementaryMacros.class.getName());
|
||||
System.out.print(NL + NL);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -139,4 +139,6 @@
|
|||
<!-- TODO: not until we properly make 'test-tools' work with clover etc
|
||||
<target name="test" depends="module-build.test, test-tools"/> -->
|
||||
|
||||
<target name="regenerate" depends="build-dict"/>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -610,4 +610,8 @@
|
|||
<jar-checksum-macro srcdir="${common.dir}" dstdir="${common.dir}/licenses"/>
|
||||
</target>
|
||||
|
||||
<target name="regenerate">
|
||||
<modules-crawl target="regenerate"/>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -141,4 +141,7 @@
|
|||
<arg value="${moman.rev}"/>
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
<target name="regenerate" depends="createLevAutomata,createPackedIntSources"/>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -152,4 +152,6 @@ import org.apache.lucene.queryparser.flexible.core.messages.*;"
|
|||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
<target name="regenerate" depends="javacc"/>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -112,4 +112,4 @@ interface CharStream {
|
|||
void Done();
|
||||
|
||||
}
|
||||
/* JavaCC - OriginalChecksum=c847dd1920bf7901125a7244125682ad (do not edit this line) */
|
||||
/* JavaCC - OriginalChecksum=30b94cad7b10d0d81e3a59a1083939d0 (do not edit this line) */
|
||||
|
|
|
|||
|
|
@ -184,4 +184,4 @@ public class ParseException extends Exception {
|
|||
}
|
||||
|
||||
}
|
||||
/* JavaCC - OriginalChecksum=61602edcb3a15810cbc58f5593eba40d (do not edit this line) */
|
||||
/* JavaCC - OriginalChecksum=b187d97d5bb75c3fc63d642c1c26ac6e (do not edit this line) */
|
||||
|
|
|
|||
|
|
@ -128,4 +128,4 @@ public class Token implements java.io.Serializable {
|
|||
}
|
||||
|
||||
}
|
||||
/* JavaCC - OriginalChecksum=c1e1418b35aa9e47ef8dc98b87423d70 (do not edit this line) */
|
||||
/* JavaCC - OriginalChecksum=405bb5d2fcd84e94ac1c8f0b12c1f914 (do not edit this line) */
|
||||
|
|
|
|||
|
|
@ -144,4 +144,4 @@ public class TokenMgrError extends Error
|
|||
this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
|
||||
}
|
||||
}
|
||||
/* JavaCC - OriginalChecksum=0c275864a1972d9a01601ab81426872d (do not edit this line) */
|
||||
/* JavaCC - OriginalChecksum=f433e1a52b8eadbf12f3fbbbf87fd140 (do not edit this line) */
|
||||
|
|
|
|||
|
|
@ -112,4 +112,4 @@ interface CharStream {
|
|||
void Done();
|
||||
|
||||
}
|
||||
/* JavaCC - OriginalChecksum=c95f1720d9b38046dc5d294b741c44cb (do not edit this line) */
|
||||
/* JavaCC - OriginalChecksum=53b2ec7502d50e2290e86187a6c01270 (do not edit this line) */
|
||||
|
|
|
|||
|
|
@ -187,4 +187,4 @@ public class ParseException extends QueryNodeParseException {
|
|||
}
|
||||
|
||||
}
|
||||
/* JavaCC - OriginalChecksum=81401c29cf6f9909761c636b4778ccc0 (do not edit this line) */
|
||||
/* JavaCC - OriginalChecksum=4263a02db9988d7a863aa97ad2f6dc67 (do not edit this line) */
|
||||
|
|
|
|||
|
|
@ -128,4 +128,4 @@ public class Token implements java.io.Serializable {
|
|||
}
|
||||
|
||||
}
|
||||
/* JavaCC - OriginalChecksum=30bbd23e0dec26f141130dc62a4f6e9d (do not edit this line) */
|
||||
/* JavaCC - OriginalChecksum=ea8b1e55950603be28e2f63dcd544ab4 (do not edit this line) */
|
||||
|
|
|
|||
|
|
@ -144,4 +144,4 @@ public class TokenMgrError extends Error
|
|||
this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
|
||||
}
|
||||
}
|
||||
/* JavaCC - OriginalChecksum=3ca7fbf7de9f2424b131a5499b0a78d0 (do not edit this line) */
|
||||
/* JavaCC - OriginalChecksum=be88283d82a985d82a34dda46bcf42d5 (do not edit this line) */
|
||||
|
|
|
|||
|
|
@ -112,4 +112,4 @@ interface CharStream {
|
|||
void Done();
|
||||
|
||||
}
|
||||
/* JavaCC - OriginalChecksum=5ca20c9145f29a0f8909470a7f949fe4 (do not edit this line) */
|
||||
/* JavaCC - OriginalChecksum=242ae59b965491e225a44534cbc73b42 (do not edit this line) */
|
||||
|
|
|
|||
|
|
@ -184,4 +184,4 @@ public class ParseException extends Exception {
|
|||
}
|
||||
|
||||
}
|
||||
/* JavaCC - OriginalChecksum=be6f55e3bf157e8c96b4c06cca5ec81b (do not edit this line) */
|
||||
/* JavaCC - OriginalChecksum=bd8163f41bf2fd1bb00f025fce3dcaaf (do not edit this line) */
|
||||
|
|
|
|||
|
|
@ -128,4 +128,4 @@ public class Token implements java.io.Serializable {
|
|||
}
|
||||
|
||||
}
|
||||
/* JavaCC - OriginalChecksum=db38f23b3674db52ff034369707a0ac3 (do not edit this line) */
|
||||
/* JavaCC - OriginalChecksum=f2df701e24da1cf2d025118ce6efdd2f (do not edit this line) */
|
||||
|
|
|
|||
|
|
@ -144,4 +144,4 @@ public class TokenMgrError extends Error
|
|||
this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
|
||||
}
|
||||
}
|
||||
/* JavaCC - OriginalChecksum=dcdd5ccde13b91bcd8f76a86ca618852 (do not edit this line) */
|
||||
/* JavaCC - OriginalChecksum=8c69a370d9a9893140562c8bb911678c (do not edit this line) */
|
||||
|
|
|
|||
Loading…
Reference in New Issue