Author: yonik
Date: Wed Aug 27 09:02:46 2008
New Revision: 689510
URL: http://svn.apache.org/viewvc?rev=689510&view=rev
Log:
lucene 2.4-dev r688745
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/lib/lucene-analyzers-2.4-dev.jar
lucene/solr/trunk/lib/lucene-core-2.4-dev.jar
lucene/solr/trunk/lib/lucene-highlighter-2.4-dev.jar
lucene/solr/trunk/lib/lucene-memory-2.4-dev.jar
lucene/solr/trunk/lib/lucene-queries-2.4-dev.jar
lucene/solr/trunk/lib/lucene-snowball-2.4-dev.jar
lucene/solr/trunk/lib/lucene-spellchecker-2.4-dev.jar
lucene/solr/trunk/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java
lucene/solr/trunk/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
lucene/solr/trunk/src/test/org/apache/solr/analysis/EnglishPorterFilterFactoryTest.java
Modified: lucene/solr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=689510&r1=689509&r2=689510&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Wed Aug 27 09:02:46 2008
@@ -614,6 +614,7 @@
23. SOLR-692: Migrated to stable released builds of StAX API 1.0.1 and StAX
1.2.0 (shalin)
24. Upgraded to Lucene 2.4-dev (r686801) (yonik)
+24. Upgraded to Lucene 2.4-dev (r688745) 27-Aug-2008 (yonik)
Build
1. SOLR-411. Changed the names of the Solr JARs to use the defacto standard
JAR names based on
Modified: lucene/solr/trunk/lib/lucene-analyzers-2.4-dev.jar
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-analyzers-2.4-dev.jar?rev=689510&r1=689509&r2=689510&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/lib/lucene-core-2.4-dev.jar
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-core-2.4-dev.jar?rev=689510&r1=689509&r2=689510&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/lib/lucene-highlighter-2.4-dev.jar
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-highlighter-2.4-dev.jar?rev=689510&r1=689509&r2=689510&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/lib/lucene-memory-2.4-dev.jar
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-memory-2.4-dev.jar?rev=689510&r1=689509&r2=689510&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/lib/lucene-queries-2.4-dev.jar
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-queries-2.4-dev.jar?rev=689510&r1=689509&r2=689510&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/lib/lucene-snowball-2.4-dev.jar
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-snowball-2.4-dev.jar?rev=689510&r1=689509&r2=689510&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/lib/lucene-spellchecker-2.4-dev.jar
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-spellchecker-2.4-dev.jar?rev=689510&r1=689509&r2=689510&view=diff
==============================================================================
Binary files - no diff available.
Modified:
lucene/solr/trunk/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java?rev=689510&r1=689509&r2=689510&view=diff
==============================================================================
---
lucene/solr/trunk/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java
(original)
+++
lucene/solr/trunk/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java
Wed Aug 27 09:02:46 2008
@@ -75,12 +75,12 @@
*/
class EnglishPorterFilter extends TokenFilter {
private final CharArraySet protWords;
- private net.sf.snowball.ext.EnglishStemmer stemmer;
+ private org.tartarus.snowball.ext.EnglishStemmer stemmer;
public EnglishPorterFilter(TokenStream source, CharArraySet protWords) {
super(source);
this.protWords = protWords;
- stemmer = new net.sf.snowball.ext.EnglishStemmer();
+ stemmer = new org.tartarus.snowball.ext.EnglishStemmer();
}
Modified:
lucene/solr/trunk/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java?rev=689510&r1=689509&r2=689510&view=diff
==============================================================================
---
lucene/solr/trunk/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
(original)
+++
lucene/solr/trunk/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
Wed Aug 27 09:02:46 2008
@@ -20,6 +20,7 @@
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.snowball.SnowballFilter;
+import org.tartarus.snowball.SnowballProgram;
/**
* Factory for SnowballFilters, with configurable language
@@ -31,16 +32,29 @@
*/
public class SnowballPorterFilterFactory extends BaseTokenFilterFactory {
private String language = "English";
-
+ private Class stemClass;
+
@Override
public void init(Map<String, String> args) {
super.init(args);
final String cfgLanguage = args.get("language");
if(cfgLanguage!=null) language = cfgLanguage;
+
+ try {
+ stemClass = Class.forName("org.tartarus.snowball.ext." + language +
"Stemmer");
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeException("Can't find class for stemmer language " +
language, e);
+ }
}
public SnowballFilter create(TokenStream input) {
- return new SnowballFilter(input,language);
+ SnowballProgram program;
+ try {
+ program = (SnowballProgram)stemClass.newInstance();
+ } catch (Exception e) {
+ throw new RuntimeException("Error instantiating stemmer for language " +
language + "from class " +stemClass, e);
+ }
+ return new SnowballFilter(input, program);
}
}
Modified:
lucene/solr/trunk/src/test/org/apache/solr/analysis/EnglishPorterFilterFactoryTest.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/analysis/EnglishPorterFilterFactoryTest.java?rev=689510&r1=689509&r2=689510&view=diff
==============================================================================
---
lucene/solr/trunk/src/test/org/apache/solr/analysis/EnglishPorterFilterFactoryTest.java
(original)
+++
lucene/solr/trunk/src/test/org/apache/solr/analysis/EnglishPorterFilterFactoryTest.java
Wed Aug 27 09:02:46 2008
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import net.sf.snowball.ext.EnglishStemmer;
import org.apache.solr.common.ResourceLoader;
+import org.tartarus.snowball.ext.EnglishStemmer;
import java.io.IOException;
import java.io.InputStream;
@@ -30,7 +30,7 @@
public class EnglishPorterFilterFactoryTest extends BaseTokenTestCase {
public void test() throws IOException {
- EnglishStemmer stemmer = new net.sf.snowball.ext.EnglishStemmer();
+ EnglishStemmer stemmer = new EnglishStemmer();
String[] test = {"The", "fledgling", "banks", "were", "counting", "on",
"a", "big", "boom", "in", "banking"};
StringBuilder gold = new StringBuilder();
for (int i = 0; i < test.length; i++) {
@@ -49,7 +49,7 @@
}
public void testProtected() throws Exception {
- EnglishStemmer stemmer = new net.sf.snowball.ext.EnglishStemmer();
+ EnglishStemmer stemmer = new EnglishStemmer();
String[] test = {"The", "fledgling", "banks", "were", "counting", "on",
"a", "big", "boom", "in", "banking"};
StringBuilder gold = new StringBuilder();
for (int i = 0; i < test.length; i++) {
