You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/07/14 14:48:57 UTC
svn commit: r964034 [1/3] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/document/
lucene/backwards/src/test/org/apache/lucene/inde...
Author: rmuir
Date: Wed Jul 14 12:48:54 2010
New Revision: 964034
URL: http://svn.apache.org/viewvc?rev=964034&view=rev
Log:
LUCENE-2503: add light stemmers for european languages
Added:
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanLightStemmer.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemmer.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemmer.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemmer.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemmer.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemmer.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemmer.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemmer.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemmer.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemmer.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemmer.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemmer.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/util/
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/util/StemmerUtil.java
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/StemmerUtil.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/delighttestdata.zip
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/de/delighttestdata.zip
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/deminimaltestdata.zip
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/de/deminimaltestdata.zip
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/es/eslighttestdata.zip
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/es/eslighttestdata.zip
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fi/filighttestdata.zip
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/fi/filighttestdata.zip
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/frlighttestdata.zip
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/frlighttestdata.zip
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/frminimaltestdata.zip
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/frminimaltestdata.zip
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hu/hulighttestdata.zip
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/hu/hulighttestdata.zip
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/it/itlighttestdata.zip
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/it/itlighttestdata.zip
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pt/ptlighttestdata.zip
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/ptlighttestdata.zip
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pt/ptminimaltestdata.zip
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/ptminimaltestdata.zip
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/rulighttestdata.zip
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/rulighttestdata.zip
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sv/svlighttestdata.zip
- copied unchanged from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/svlighttestdata.zip
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/VocabularyAssert.java
- copied, changed from r964019, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/VocabularyAssert.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java
- copied unchanged from r964019, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestItalianLightStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestItalianLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestPortugueseLightStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestPortugueseLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestPortugueseMinimalStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestPortugueseMinimalStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestRussianLightStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestRussianLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestSpanishLightStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestSpanishLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestSwedishLightStemFilterFactory.java
- copied, changed from r964019, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestSwedishLightStemFilterFactory.java
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_3x/lucene/NOTICE.txt
lucene/dev/branches/branch_3x/lucene/backwards/src/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/dev/branches/branch_3x/lucene/build.xml (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/id/IndonesianStemmer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/in/IndicNormalizer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/data.txt
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianStem.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/smartcn/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/highlighter/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/icu/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestPorterStemFilter.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/example/ (props changed)
lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar (props changed)
lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.5.5.jar (props changed)
lucene/dev/branches/branch_3x/solr/src/ (props changed)
lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/ (props changed)
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SynonymFilter.java (props changed)
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/SynonymMap.java (props changed)
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/ (props changed)
lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template (props changed)
lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template (props changed)
lucene/dev/branches/branch_3x/solr/src/solrj/org/ (props changed)
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java (props changed)
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestTrimFilter.java (props changed)
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/ (props changed)
lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/ (props changed)
Propchange: lucene/dev/branches/branch_3x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1 +1 @@
-/lucene/dev/trunk:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
Propchange: lucene/dev/branches/branch_3x/lucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk:932749
-/lucene/dev/trunk/lucene:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk/lucene:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
/lucene/java/branches/flex_1458:924791,924850,930201
/lucene/java/branches/lucene_2_4:748824
/lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036,896850,909334,948516
Propchange: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk/lucene/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
/lucene/java/branches/flex_1458/CHANGES.txt:924791,924850,930201
/lucene/java/branches/lucene_2_9/CHANGES.txt:896850,909334,948516
/lucene/java/trunk/CHANGES.txt:924483-925561
Modified: lucene/dev/branches/branch_3x/lucene/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/NOTICE.txt?rev=964034&r1=964033&r2=964034&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/NOTICE.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/NOTICE.txt Wed Jul 14 12:48:54 2010
@@ -13,30 +13,29 @@ were developed by Martin Porter and Rich
The full snowball package is available from
http://snowball.tartarus.org/
-The Arabic stemmer (contrib/analyzers) comes with a default
-stopword list that is BSD-licensed created by Jacques Savoy. The file resides in
-contrib/analyzers/common/src/resources/org/apache/lucene/analysis/ar/stopwords.txt.
+The Arabic,Persian,Romanian,Bulgarian, and Hindi analyzers (contrib/analyzers) come with a default
+stopword list that is BSD-licensed created by Jacques Savoy. These files reside in:
+contrib/analyzers/common/src/resources/org/apache/lucene/analysis/ar/stopwords.txt,
+contrib/analyzers/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt,
+contrib/analyzers/common/src/resources/org/apache/lucene/analysis/ro/stopwords.txt,
+contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt,
+contrib/analyzers/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt
See http://members.unine.ch/jacques.savoy/clef/index.html.
-The Persian analyzer (contrib/analyzers) comes with a default
-stopword list that is BSD-licensed created by Jacques Savoy. The file resides in
-contrib/analyzers/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt.
-See http://members.unine.ch/jacques.savoy/clef/index.html.
-
-The Romanian analyzer (contrib/analyzers) comes with a default
-stopword list that is BSD-licensed created by Jacques Savoy. The file resides in
-contrib/analyzers/common/src/resources/org/apache/lucene/analysis/ro/stopwords.txt.
-See http://members.unine.ch/jacques.savoy/clef/index.html.
-
-The Bulgarian analyzer (contrib/analyzers) comes with a default
-stopword list that is BSD-licensed created by Jacques Savoy. The file resides in
-contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt.
-See http://members.unine.ch/jacques.savoy/clef/index.html.
-
-The Hindi analyzer (contrib/analyzers) comes with a default
-stopword list that is BSD-licensed created by Jacques Savoy. The file resides in
-contrib/analyzers/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt.
-See http://members.unine.ch/jacques.savoy/clef/index.html.
+The German,Spanish,Finnish,French,Hungarian,Italian,Portuguese,Russian and Swedish light stemmers
+(common) are based on BSD-licensed reference implementations created by Jacques Savoy and
+Ljiljana Dolamic. These files reside in:
+contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanLightStemmer.java
+contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemmer.java
+contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemmer.java
+contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemmer.java
+contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemmer.java
+contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemmer.java
+contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java
+contrib/analyzers/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemmer.java
+contrib/analyzers/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemmer.java
+contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemmer.java
+contrib/analyzers/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemmer.java
The Stempel analyzer (contrib/analyzers) includes BSD-licensed software developed
by the Egothor project http://egothor.sf.net/, created by Leo Galambos, Martin Kvapil,
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,3 +1,3 @@
-/lucene/dev/trunk/lucene/backwards/src:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk/lucene/backwards/src:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
/lucene/java/branches/flex_1458/backwards/src:924850,930201
/lucene/java/trunk/backwards/src:924781
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/util/TestAttributeSource.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:817269-818600,825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/build.xml:932749
-/lucene/dev/trunk/lucene/build.xml:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk/lucene/build.xml:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
/lucene/java/branches/flex_1458/build.xml:924791,924850,930201
/lucene/java/branches/lucene_2_9/build.xml:896850,909334,948516
/lucene/java/trunk/build.xml:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk/lucene/contrib:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
/lucene/java/branches/flex_1458/contrib:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib:748824
/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334,948516
Modified: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt?rev=964034&r1=964033&r2=964034&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt Wed Jul 14 12:48:54 2010
@@ -178,6 +178,9 @@ New features
* LUCENE-2464: FastVectorHighlighter: add SingleFragListBuilder to return
entire field contents. (Koji Sekiguchi)
+ * LUCENE-2503: Added lighter stemming alternatives for European languages.
+ (Robert Muir)
+
Build
* LUCENE-2124: Moved the JDK-based collation support from contrib/collation
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk/lucene/contrib/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
/lucene/java/branches/flex_1458/contrib/CHANGES.txt:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334,948516
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/analyzers:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
+/lucene/dev/trunk/lucene/contrib/analyzers:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
/lucene/dev/trunk/modules/analysis:942235,945090,946139
/lucene/java/branches/flex_1458/contrib/analyzers:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib/analyzers:748824
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 12:48:54 2010
@@ -1,5 +1,5 @@
-/lucene/dev/trunk/lucene/contrib/analyzers/common:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920
-/lucene/dev/trunk/modules/analysis/common:942235,945090,946139,950008
+/lucene/dev/trunk/lucene/contrib/analyzers/common:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953628,955547,955613,955615,956715,957465,957520,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019
+/lucene/dev/trunk/modules/analysis/common:942235,945090,946139,950008,964019
/lucene/java/branches/flex_1458/contrib/analyzers/common:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib/analyzers/common:748824
/lucene/java/branches/lucene_2_9/contrib/analyzers/common:817269-818600,825998,829134,829816,829881,831036,896850,909334,948516
Modified: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java?rev=964034&r1=964033&r2=964034&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java Wed Jul 14 12:48:54 2010
@@ -17,6 +17,8 @@ package org.apache.lucene.analysis.ar;
* limitations under the License.
*/
+import static org.apache.lucene.analysis.util.StemmerUtil.*;
+
/**
* Normalizer for Arabic.
* <p>
@@ -96,20 +98,4 @@ public class ArabicNormalizer {
return len;
}
-
- /**
- * Delete a character in-place
- *
- * @param s Input Buffer
- * @param pos Position of character to delete
- * @param len length of input buffer
- * @return length of input buffer after deletion
- */
- protected int delete(char s[], int pos, int len) {
- if (pos < len)
- System.arraycopy(s, pos + 1, s, pos, len - pos - 1);
-
- return len - 1;
- }
-
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java?rev=964034&r1=964033&r2=964034&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java Wed Jul 14 12:48:54 2010
@@ -1,4 +1,6 @@
package org.apache.lucene.analysis.ar;
+
+
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,6 +18,8 @@ package org.apache.lucene.analysis.ar;
* limitations under the License.
*/
+import static org.apache.lucene.analysis.util.StemmerUtil.*;
+
/**
* Stemmer for Arabic.
* <p>
@@ -86,7 +90,7 @@ public class ArabicStemmer {
*/
public int stemPrefix(char s[], int len) {
for (int i = 0; i < prefixes.length; i++)
- if (startsWith(s, len, prefixes[i]))
+ if (startsWithCheckLength(s, len, prefixes[i]))
return deleteN(s, 0, len, prefixes[i].length);
return len;
}
@@ -99,7 +103,7 @@ public class ArabicStemmer {
*/
public int stemSuffix(char s[], int len) {
for (int i = 0; i < suffixes.length; i++)
- if (endsWith(s, len, suffixes[i]))
+ if (endsWithCheckLength(s, len, suffixes[i]))
len = deleteN(s, len - suffixes[i].length, len, suffixes[i].length);
return len;
}
@@ -111,7 +115,7 @@ public class ArabicStemmer {
* @param prefix prefix to check
* @return true if the prefix matches and can be stemmed
*/
- boolean startsWith(char s[], int len, char prefix[]) {
+ boolean startsWithCheckLength(char s[], int len, char prefix[]) {
if (prefix.length == 1 && len < 4) { // wa- prefix requires at least 3 characters
return false;
} else if (len < prefix.length + 2) { // other prefixes require only 2.
@@ -132,7 +136,7 @@ public class ArabicStemmer {
* @param suffix suffix to check
* @return true if the suffix matches and can be stemmed
*/
- boolean endsWith(char s[], int len, char suffix[]) {
+ boolean endsWithCheckLength(char s[], int len, char suffix[]) {
if (len < suffix.length + 2) { // all suffixes require at least 2 characters after stemming
return false;
} else {
@@ -142,37 +146,5 @@ public class ArabicStemmer {
return true;
}
- }
-
-
- /**
- * Delete n characters in-place
- *
- * @param s Input Buffer
- * @param pos Position of character to delete
- * @param len Length of input buffer
- * @param nChars number of characters to delete
- * @return length of input buffer after deletion
- */
- protected int deleteN(char s[], int pos, int len, int nChars) {
- for (int i = 0; i < nChars; i++)
- len = delete(s, pos, len);
- return len;
- }
-
- /**
- * Delete a character in-place
- *
- * @param s Input Buffer
- * @param pos Position of character to delete
- * @param len length of input buffer
- * @return length of input buffer after deletion
- */
- protected int delete(char s[], int pos, int len) {
- if (pos < len)
- System.arraycopy(s, pos + 1, s, pos, len - pos - 1);
-
- return len - 1;
- }
-
+ }
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java?rev=964034&r1=964033&r2=964034&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java Wed Jul 14 12:48:54 2010
@@ -17,6 +17,8 @@ package org.apache.lucene.analysis.bg;
* limitations under the License.
*/
+import static org.apache.lucene.analysis.util.StemmerUtil.*;
+
/**
* Light Stemmer for Bulgarian.
* <p>
@@ -138,15 +140,4 @@ public class BulgarianStemmer {
return len;
}
-
- private boolean endsWith(final char s[], final int len, final String suffix) {
- final int suffixLen = suffix.length();
- if (suffixLen > len)
- return false;
- for (int i = suffixLen - 1; i >= 0; i--)
- if (s[len -(suffixLen - i)] != suffix.charAt(i))
- return false;
-
- return true;
- }
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java?rev=964034&r1=964033&r2=964034&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java Wed Jul 14 12:48:54 2010
@@ -17,6 +17,8 @@ package org.apache.lucene.analysis.cz;
* limitations under the License.
*/
+import static org.apache.lucene.analysis.util.StemmerUtil.*;
+
/**
* Light Stemmer for Czech.
* <p>
@@ -166,16 +168,4 @@ public class CzechStemmer {
return len;
}
-
- private boolean endsWith(char s[], int len, String suffix) {
- int suffixLen = suffix.length();
- if (suffixLen > len)
- return false;
-
- for (int i = suffixLen - 1; i >= 0; i--)
- if (s[len - (suffixLen - i)] != suffix.charAt(i))
- return false;
-
- return true;
- }
}
Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java (from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java&p1=lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java&r1=964019&r2=964034&rev=964034&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java Wed Jul 14 12:48:54 2010
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter;
+import org.apache.lucene.analysis.KeywordMarkerFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.KeywordAttribute;
Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java (from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java&p1=lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java&r1=964019&r2=964034&rev=964034&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java Wed Jul 14 12:48:54 2010
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter;
+import org.apache.lucene.analysis.KeywordMarkerFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.KeywordAttribute;
Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java (from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java&p1=lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java&r1=964019&r2=964034&rev=964034&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java Wed Jul 14 12:48:54 2010
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter;
+import org.apache.lucene.analysis.KeywordMarkerFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.KeywordAttribute;
Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java (from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java&p1=lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java&r1=964019&r2=964034&rev=964034&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java Wed Jul 14 12:48:54 2010
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter;
+import org.apache.lucene.analysis.KeywordMarkerFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.KeywordAttribute;
Modified: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java?rev=964034&r1=964033&r2=964034&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java Wed Jul 14 12:48:54 2010
@@ -17,6 +17,8 @@ package org.apache.lucene.analysis.fa;
* limitations under the License.
*/
+import static org.apache.lucene.analysis.util.StemmerUtil.*;
+
/**
* Normalizer for Persian.
* <p>
@@ -82,20 +84,4 @@ public class PersianNormalizer {
return len;
}
-
- /**
- * Delete a character in-place
- *
- * @param s Input Buffer
- * @param pos Position of character to delete
- * @param len length of input buffer
- * @return length of input buffer after deletion
- */
- protected int delete(char s[], int pos, int len) {
- if (pos < len)
- System.arraycopy(s, pos + 1, s, pos, len - pos - 1);
-
- return len - 1;
- }
-
}
Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java (from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java&p1=lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java&r1=964019&r2=964034&rev=964034&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java Wed Jul 14 12:48:54 2010
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter;
+import org.apache.lucene.analysis.KeywordMarkerFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.KeywordAttribute;
Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java (from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java&p1=lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java&r1=964019&r2=964034&rev=964034&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java Wed Jul 14 12:48:54 2010
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter;
+import org.apache.lucene.analysis.KeywordMarkerFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.KeywordAttribute;
Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java (from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java&p1=lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java&r1=964019&r2=964034&rev=964034&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java Wed Jul 14 12:48:54 2010
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter;
+import org.apache.lucene.analysis.KeywordMarkerFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.KeywordAttribute;
Modified: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java?rev=964034&r1=964033&r2=964034&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java Wed Jul 14 12:48:54 2010
@@ -17,6 +17,8 @@ package org.apache.lucene.analysis.hi;
* limitations under the License.
*/
+import static org.apache.lucene.analysis.util.StemmerUtil.*;
+
/**
* Normalizer for Hindi.
* <p>
@@ -176,19 +178,4 @@ public class HindiNormalizer {
return len;
}
-
- /**
- * Delete a character in-place
- *
- * @param s Input Buffer
- * @param pos Position of character to delete
- * @param len length of input buffer
- * @return length of input buffer after deletion
- */
- protected int delete(char s[], int pos, int len) {
- if (pos < len)
- System.arraycopy(s, pos + 1, s, pos, len - pos - 1);
-
- return len - 1;
- }
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java?rev=964034&r1=964033&r2=964034&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java Wed Jul 14 12:48:54 2010
@@ -17,6 +17,8 @@ package org.apache.lucene.analysis.hi;
* limitations under the License.
*/
+import static org.apache.lucene.analysis.util.StemmerUtil.*;
+
/**
* Light Stemmer for Hindi.
* <p>
@@ -116,15 +118,4 @@ public class HindiStemmer {
return len - 1;
return len;
}
-
- private boolean endsWith(final char s[], final int len, final String suffix) {
- final int suffixLen = suffix.length();
- if (suffixLen > len)
- return false;
- for (int i = suffixLen - 1; i >= 0; i--)
- if (s[len -(suffixLen - i)] != suffix.charAt(i))
- return false;
-
- return true;
- }
}
Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java (from r964019, lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java&p1=lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java&r1=964019&r2=964034&rev=964034&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java Wed Jul 14 12:48:54 2010
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter;
+import org.apache.lucene.analysis.KeywordMarkerFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.KeywordAttribute;