You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2010/05/04 14:43:16 UTC
svn commit: r940834 [3/3] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/java/org/apache/lucene/search/
lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/docume...
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java?rev=940834&r1=940833&r2=940834&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java Tue May 4 12:43:13 2010
@@ -19,7 +19,7 @@ package org.apache.solr.analysis;
import java.util.Map;
import java.io.IOException;
-import org.apache.lucene.analysis.KeywordMarkerTokenFilter;
+import org.apache.lucene.analysis.KeywordMarkerFilter;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.CharArraySet;
@@ -77,7 +77,7 @@ public class SnowballPorterFilterFactory
}
if (protectedWords != null)
- input = new KeywordMarkerTokenFilter(input, protectedWords);
+ input = new KeywordMarkerFilter(input, protectedWords);
return new SnowballFilter(input, program);
}
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java?rev=940834&r1=940833&r2=940834&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java Tue May 4 12:43:13 2010
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.TokenS
/** Factory for {@link ThaiWordFilter} */
public class ThaiWordFilterFactory extends BaseTokenFilterFactory {
public ThaiWordFilter create(TokenStream input) {
- return new ThaiWordFilter(input);
+ assureMatchVersion();
+ return new ThaiWordFilter(luceneMatchVersion, input);
}
}
Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 12:43:13 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:932163,932369,932698,932747,932749,932773,932862,935521,940451
+/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452
/lucene/solr/trunk/src/maven/solr-core-pom.xml.template:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 12:43:13 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:932163,932369,932698,932747,932749,932773,932862,935521,940451
+/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452
/lucene/solr/trunk/src/maven/solr-solrj-pom.xml.template:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/solrj/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 12:43:13 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/solrj/org:932163,932369,932698,932747,932749,932773,932862,935521,940451
+/lucene/dev/trunk/solr/src/solrj/org:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452
/lucene/solr/trunk/src/solrj/org:922950-923910,923912-925091
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java?rev=940834&r1=940833&r2=940834&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java Tue May 4 12:43:13 2010
@@ -35,6 +35,7 @@ public class TestThaiWordFilterFactory e
Reader reader = new StringReader("à¸à¸²à¸£à¸à¸µà¹à¹à¸à¹à¸à¹à¸à¸à¹à¸ªà¸à¸à¸§à¹à¸²à¸à¸²à¸à¸à¸µ");
Tokenizer tokenizer = new WhitespaceTokenizer(DEFAULT_VERSION, reader);
ThaiWordFilterFactory factory = new ThaiWordFilterFactory();
+ factory.init(DEFAULT_VERSION_PARAM);
TokenStream stream = factory.create(tokenizer);
assertTokenStreamContents(stream, new String[] {"à¸à¸²à¸£", "à¸à¸µà¹", "à¹à¸à¹",
"à¸à¹à¸à¸", "à¹à¸ªà¸à¸", "วà¹à¸²", "à¸à¸²à¸", "à¸à¸µ"});
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 12:43:13 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/test/org/apache/solr/client:932163,932369,932698,932747,932749,932773,932862,935521,940451
+/lucene/dev/trunk/solr/src/test/org/apache/solr/client:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452
/lucene/solr/trunk/src/test/org/apache/solr/client:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 12:43:13 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:932163,932369,932698,932747,932749,932773,932862,935521,940451
+/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452
/lucene/solr/trunk/src/webapp/src/org/apache/solr/client/solrj/embedded:922950-923910,923912-925091