You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cm...@apache.org on 2012/03/26 16:11:45 UTC

svn commit: r1305367 - in /lucene/dev/branches/branch_3x: lucene/contrib/analyzers/kuromoji/ lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/ lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ lucene...

Author: cm
Date: Mon Mar 26 14:11:42 2012
New Revision: 1305367

URL: http://svn.apache.org/viewvc?rev=1305367&view=rev
Log:
Backport of LUCENE-3909 (move and rename Kuromoji)

Added:
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java
      - copied, changed from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java
      - copied, changed from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilter.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java
      - copied, changed from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilter.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/Token.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/Token.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/BinaryDictionary.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/BinaryDictionary.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/CharacterDefinition.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/CharacterDefinition.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ConnectionCosts.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ConnectionCosts.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/Dictionary.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/Dictionary.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UnknownDictionary.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UnknownDictionary.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/package.html
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/package.html
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/package.html
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/package.html
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/BaseFormAttribute.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/BaseFormAttribute.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/BaseFormAttributeImpl.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/BaseFormAttributeImpl.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttribute.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttribute.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttributeImpl.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttributeImpl.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttribute.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttribute.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttributeImpl.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttributeImpl.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttribute.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttribute.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttributeImpl.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttributeImpl.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/package.html
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/package.html
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/util/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package.html
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package.html
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/CharacterDefinition.dat
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/CharacterDefinition.dat
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/ConnectionCosts.dat
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/ConnectionCosts.dat
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary$buffer.dat
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary$buffer.dat
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary$fst.dat
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary$fst.dat
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary$posDict.dat
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary$posDict.dat
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary$targetMap.dat
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary$targetMap.dat
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/UnknownDictionary$buffer.dat
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/UnknownDictionary$buffer.dat
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/UnknownDictionary$posDict.dat
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/UnknownDictionary$posDict.dat
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/UnknownDictionary$targetMap.dat
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/UnknownDictionary$targetMap.dat
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/stoptags.txt
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/stoptags.txt
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/ja/stopwords.txt
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/stopwords.txt
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java
      - copied, changed from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java
      - copied, changed from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java
      - copied, changed from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java
      - copied, changed from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
      - copied, changed from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java
      - copied, changed from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/bocchan.utf-8
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/bocchan.utf-8
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/UserDictionaryTest.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/UserDictionaryTest.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/search-segmentation-tests.txt
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/search-segmentation-tests.txt
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/userdict.txt
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/userdict.txt
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/util/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/CharacterDefinitionWriter.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/CharacterDefinitionWriter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/ConnectionCostsBuilder.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/ConnectionCostsBuilder.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/ConnectionCostsWriter.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/ConnectionCostsWriter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/DictionaryBuilder.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/DictionaryBuilder.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryWriter.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryWriter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryWriter.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryWriter.java
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/test/org/apache/lucene/analysis/ja/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/test/org/apache/lucene/analysis/ja/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/test/org/apache/lucene/analysis/ja/dict/
      - copied from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/test/org/apache/lucene/analysis/ja/dict/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/test/org/apache/lucene/analysis/ja/dict/UnknownDictionaryTest.java
      - copied unchanged from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/tools/test/org/apache/lucene/analysis/ja/dict/UnknownDictionaryTest.java
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/JapaneseBaseFormFilterFactory.java
      - copied unchanged from r1305297, lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapaneseBaseFormFilterFactory.java
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/JapaneseKatakanaStemFilterFactory.java
      - copied unchanged from r1305297, lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapaneseKatakanaStemFilterFactory.java
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java
      - copied, changed from r1305297, lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/JapaneseReadingFormFilterFactory.java
      - copied unchanged from r1305297, lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapaneseReadingFormFilterFactory.java
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java
      - copied unchanged from r1305297, lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java
Removed:
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/kuromoji/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/java/org/apache/lucene/analysis/kuromoji/
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/tools/test/org/apache/lucene/analysis/kuromoji/
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/KuromojiBaseFormFilterFactory.java
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/KuromojiKatakanaStemFilterFactory.java
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/KuromojiPartOfSpeechStopFilterFactory.java
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/KuromojiReadingFormFilterFactory.java
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/KuromojiTokenizerFactory.java
Modified:
    lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/build.xml
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/build.xml
    lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiBaseFormFilterFactory.java
    lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiPartOfSpeechStopFilterFactory.java
    lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiTokenizerFactory.java
    lucene/dev/branches/branch_3x/solr/example/solr/conf/schema.xml

Modified: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/build.xml?rev=1305367&r1=1305366&r2=1305367&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/build.xml Mon Mar 26 14:11:42 2012
@@ -79,10 +79,10 @@
   <target name="build-dict" depends="compile-tools, download-dict">
     <sequential>
       <delete verbose="true">
-        <fileset dir="src/resources/org/apache/lucene/analysis/kuromoji/dict" includes="**/*"/>
+        <fileset dir="src/resources/org/apache/lucene/analysis/ja/dict" includes="**/*"/>
       </delete>
       <!-- TODO: optimize the dictionary construction a bit so that you don't need 1G -->
-      <java fork="true" failonerror="true" maxmemory="1g" classname="org.apache.lucene.analysis.kuromoji.util.DictionaryBuilder">
+      <java fork="true" failonerror="true" maxmemory="1g" classname="org.apache.lucene.analysis.ja.util.DictionaryBuilder">
         <classpath>
           <path refid="tools.classpath"/>
           <pathelement path="${build.dir}/classes/tools"/>

Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java (from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java&p1=lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java&r1=1305297&r2=1305367&rev=1305367&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java Mon Mar 26 14:11:42 2012
@@ -25,12 +25,12 @@ import java.util.Set;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.cjk.CJKWidthFilter;
-import org.apache.lucene.analysis.core.LowerCaseFilter;
-import org.apache.lucene.analysis.core.StopFilter;
+import org.apache.lucene.analysis.LowerCaseFilter;
+import org.apache.lucene.analysis.StopFilter;
+import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode;
 import org.apache.lucene.analysis.ja.dict.UserDictionary;
-import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.analysis.util.StopwordAnalyzerBase;
+import org.apache.lucene.analysis.StopwordAnalyzerBase;
 import org.apache.lucene.util.Version;
 
 /**

Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java (from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java&p1=lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java&r1=1305297&r2=1305367&rev=1305367&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java Mon Mar 26 14:11:42 2012
@@ -22,7 +22,7 @@ import java.io.IOException;
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.ja.tokenattributes.BaseFormAttribute;
-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/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java (from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java&p1=lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java&r1=1305297&r2=1305367&rev=1305367&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java Mon Mar 26 14:11:42 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.util.Set;
 
 import org.apache.lucene.analysis.ja.tokenattributes.PartOfSpeechAttribute;
-import org.apache.lucene.analysis.util.FilteringTokenFilter;
+import org.apache.lucene.analysis.FilteringTokenFilter;
 import org.apache.lucene.analysis.TokenStream;
 
 /**

Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java (from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java&p1=lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java&r1=1305297&r2=1305367&rev=1305367&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java Mon Mar 26 14:11:42 2012
@@ -23,6 +23,7 @@ import java.io.StringReader;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.ReusableAnalyzerBase;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode;
@@ -31,7 +32,7 @@ import org.apache.lucene.util.UnicodeUti
 import org.apache.lucene.util._TestUtil;
 
 public class TestExtendedMode extends BaseTokenStreamTestCase {
-  private final Analyzer analyzer = new Analyzer() {
+  private final Analyzer analyzer = new ReusableAnalyzerBase() {
     
     @Override
     protected TokenStreamComponents createComponents(String fieldName, Reader reader) {

Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java (from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java&p1=lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java&r1=1305297&r2=1305367&rev=1305367&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java Mon Mar 26 14:11:42 2012
@@ -22,11 +22,12 @@ import java.io.Reader;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.KeywordTokenizer;
+import org.apache.lucene.analysis.ReusableAnalyzerBase;
 import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.core.KeywordTokenizer;
 
 public class TestJapaneseBaseFormFilter extends BaseTokenStreamTestCase {
-  private Analyzer analyzer = new Analyzer() {
+  private Analyzer analyzer = new ReusableAnalyzerBase() {
     @Override
     protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
       Tokenizer tokenizer = new JapaneseTokenizer(reader, null, true, JapaneseTokenizer.DEFAULT_MODE);
@@ -50,7 +51,7 @@ public class TestJapaneseBaseFormFilter 
   }
   
   public void testEmptyTerm() throws IOException {
-    Analyzer a = new Analyzer() {
+    Analyzer a = new ReusableAnalyzerBase() {
       @Override
       protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
         Tokenizer tokenizer = new KeywordTokenizer(reader);

Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java (from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java&p1=lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java&r1=1305297&r2=1305367&rev=1305367&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java Mon Mar 26 14:11:42 2012
@@ -19,9 +19,10 @@ package org.apache.lucene.analysis.ja;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.KeywordTokenizer;
 import org.apache.lucene.analysis.MockTokenizer;
+import org.apache.lucene.analysis.ReusableAnalyzerBase;
 import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.core.KeywordTokenizer;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -30,7 +31,7 @@ import java.io.Reader;
  * Tests for {@link JapaneseKatakanaStemFilter}
  */
 public class TestJapaneseKatakanaStemFilter extends BaseTokenStreamTestCase {
-  private Analyzer analyzer = new Analyzer() {
+  private Analyzer analyzer = new ReusableAnalyzerBase() {
     @Override
     protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
       // Use a MockTokenizer here since this filter doesn't really depend on Kuromoji
@@ -71,7 +72,7 @@ public class TestJapaneseKatakanaStemFil
   }
   
   public void testEmptyTerm() throws IOException {
-    Analyzer a = new Analyzer() {
+    Analyzer a = new ReusableAnalyzerBase() {
       @Override
       protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
         Tokenizer tokenizer = new KeywordTokenizer(reader);

Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java (from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java&p1=lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java&r1=1305297&r2=1305367&rev=1305367&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java Mon Mar 26 14:11:42 2012
@@ -19,8 +19,9 @@ package org.apache.lucene.analysis.ja;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.KeywordTokenizer;
+import org.apache.lucene.analysis.ReusableAnalyzerBase;
 import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.core.KeywordTokenizer;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -29,7 +30,7 @@ import java.io.Reader;
  * Tests for {@link TestJapaneseReadingFormFilter}
  */
 public class TestJapaneseReadingFormFilter extends BaseTokenStreamTestCase {
-  private Analyzer katakanaAnalyzer = new Analyzer() {
+  private Analyzer katakanaAnalyzer = new ReusableAnalyzerBase() {
     @Override
     protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
       Tokenizer tokenizer = new JapaneseTokenizer(reader, null, true, JapaneseTokenizer.Mode.SEARCH);
@@ -37,7 +38,7 @@ public class TestJapaneseReadingFormFilt
     }
   };
 
-  private Analyzer romajiAnalyzer = new Analyzer() {
+  private Analyzer romajiAnalyzer = new ReusableAnalyzerBase() {
     @Override
     protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
       Tokenizer tokenizer = new JapaneseTokenizer(reader, null, true, JapaneseTokenizer.Mode.SEARCH);
@@ -64,7 +65,7 @@ public class TestJapaneseReadingFormFilt
   }
   
   public void testEmptyTerm() throws IOException {
-    Analyzer a = new Analyzer() {
+    Analyzer a = new ReusableAnalyzerBase() {
       @Override
       protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
         Tokenizer tokenizer = new KeywordTokenizer(reader);

Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java (from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java&p1=lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java&r1=1305297&r2=1305367&rev=1305367&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java Mon Mar 26 14:11:42 2012
@@ -26,6 +26,7 @@ import java.io.StringReader;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.ReusableAnalyzerBase;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode;
@@ -56,7 +57,7 @@ public class TestJapaneseTokenizer exten
     }
   }
 
-  private Analyzer analyzer = new Analyzer() {
+  private Analyzer analyzer = new ReusableAnalyzerBase() {
     @Override
     protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
       Tokenizer tokenizer = new JapaneseTokenizer(reader, readDict(), false, Mode.SEARCH);
@@ -64,7 +65,7 @@ public class TestJapaneseTokenizer exten
     }
   };
 
-  private Analyzer analyzerNormal = new Analyzer() {
+  private Analyzer analyzerNormal = new ReusableAnalyzerBase() {
     @Override
     protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
       Tokenizer tokenizer = new JapaneseTokenizer(reader, readDict(), false, Mode.NORMAL);
@@ -72,7 +73,7 @@ public class TestJapaneseTokenizer exten
     }
   };
 
-  private Analyzer analyzerNoPunct = new Analyzer() {
+  private Analyzer analyzerNoPunct = new ReusableAnalyzerBase() {
     @Override
     protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
       Tokenizer tokenizer = new JapaneseTokenizer(reader, readDict(), true, Mode.SEARCH);
@@ -80,7 +81,7 @@ public class TestJapaneseTokenizer exten
     }
   };
 
-  private Analyzer extendedModeAnalyzerNoPunct = new Analyzer() {
+  private Analyzer extendedModeAnalyzerNoPunct = new ReusableAnalyzerBase() {
     @Override
     protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
       Tokenizer tokenizer = new JapaneseTokenizer(reader, readDict(), true, Mode.EXTENDED);
@@ -324,7 +325,7 @@ public class TestJapaneseTokenizer exten
 
   public void testLatticeToDot() throws Exception {
     final GraphvizFormatter gv2 = new GraphvizFormatter(ConnectionCosts.getInstance());
-    final Analyzer analyzer = new Analyzer() {
+    final Analyzer analyzer = new ReusableAnalyzerBase() {
       @Override
       protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
         JapaneseTokenizer tokenizer = new JapaneseTokenizer(reader, readDict(), false, Mode.SEARCH);

Copied: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java (from r1305297, lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java&p1=lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java&r1=1305297&r2=1305367&rev=1305367&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java Mon Mar 26 14:11:42 2012
@@ -26,13 +26,14 @@ import java.io.Reader;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.ReusableAnalyzerBase;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode;
 import org.apache.lucene.util.IOUtils;
 
 public class TestSearchMode extends BaseTokenStreamTestCase {
   private final static String SEGMENTATION_FILENAME = "search-segmentation-tests.txt";
-  private final Analyzer analyzer = new Analyzer() {
+  private final Analyzer analyzer = new ReusableAnalyzerBase() {
     @Override
     protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
       Tokenizer tokenizer = new JapaneseTokenizer(reader, null, true, Mode.SEARCH);

Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1305367&r1=1305366&r2=1305367&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Mon Mar 26 14:11:42 2012
@@ -700,9 +700,9 @@
     <copy verbose="true" file="${analysis-common.res.dir}/snowball/italian_stop.txt"
                          tofile="${analysis.conf.dest}/stopwords_it.txt"/>
     <!-- japanese -->
-    <copy verbose="true" file="${analysis-kuromoji.res.dir}/kuromoji/stopwords.txt" 
+    <copy verbose="true" file="${analysis-kuromoji.res.dir}/ja/stopwords.txt"
                          tofile="${analysis.conf.dest}/stopwords_ja.txt"/>
-    <copy verbose="true" file="${analysis-kuromoji.res.dir}/kuromoji/stoptags.txt" 
+    <copy verbose="true" file="${analysis-kuromoji.res.dir}/ja/stoptags.txt"
                          tofile="${analysis.conf.dest}/stoptags_ja.txt"/>
   	<!-- latvian -->
     <copy verbose="true" file="${analysis-common.res.dir}/lv/stopwords.txt"

Copied: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java (from r1305297, lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java?p2=lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java&p1=lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java&r1=1305297&r2=1305367&rev=1305367&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java Mon Mar 26 14:11:42 2012
@@ -23,7 +23,7 @@ import java.util.Set;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.ja.JapanesePartOfSpeechStopFilter;
-import org.apache.lucene.analysis.util.CharArraySet;
+import org.apache.lucene.analysis.CharArraySet;
 import org.apache.solr.common.ResourceLoader;
 import org.apache.solr.util.plugin.ResourceLoaderAware;
 

Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiBaseFormFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiBaseFormFilterFactory.java?rev=1305367&r1=1305366&r2=1305367&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiBaseFormFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiBaseFormFilterFactory.java Mon Mar 26 14:11:42 2012
@@ -24,15 +24,15 @@ import org.apache.lucene.analysis.TokenS
 import org.apache.solr.core.SolrResourceLoader;
 
 /**
- * Simple tests for {@link KuromojiBaseFormFilterFactory}
+ * Simple tests for {@link JapaneseBaseFormFilterFactory}
  */
 public class TestKuromojiBaseFormFilterFactory extends BaseTokenTestCase {
   public void testBasics() throws IOException {
-    KuromojiTokenizerFactory tokenizerFactory = new KuromojiTokenizerFactory();
+    JapaneseTokenizerFactory tokenizerFactory = new JapaneseTokenizerFactory();
     tokenizerFactory.init(DEFAULT_VERSION_PARAM);
     tokenizerFactory.inform(new SolrResourceLoader(null, null));
     TokenStream ts = tokenizerFactory.create(new StringReader("それはまだ実験段階にあります"));
-    KuromojiBaseFormFilterFactory factory = new KuromojiBaseFormFilterFactory();
+    JapaneseBaseFormFilterFactory factory = new JapaneseBaseFormFilterFactory();
     ts = factory.create(ts);
     assertTokenStreamContents(ts,
         new String[] { "それ", "は", "まだ", "実験", "段階", "に", "ある", "ます"  }

Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiPartOfSpeechStopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiPartOfSpeechStopFilterFactory.java?rev=1305367&r1=1305366&r2=1305367&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiPartOfSpeechStopFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiPartOfSpeechStopFilterFactory.java Mon Mar 26 14:11:42 2012
@@ -34,11 +34,11 @@ public class TestKuromojiPartOfSpeechSto
         "#  verb-main:\n" +
         "動詞-自立\n";
     
-    KuromojiTokenizerFactory tokenizerFactory = new KuromojiTokenizerFactory();
+    JapaneseTokenizerFactory tokenizerFactory = new JapaneseTokenizerFactory();
     tokenizerFactory.init(DEFAULT_VERSION_PARAM);
     tokenizerFactory.inform(new SolrResourceLoader(null, null));
     TokenStream ts = tokenizerFactory.create(new StringReader("私は制限スピードを超える。"));
-    KuromojiPartOfSpeechStopFilterFactory factory = new KuromojiPartOfSpeechStopFilterFactory();
+    JapanesePartOfSpeechStopFilterFactory factory = new JapanesePartOfSpeechStopFilterFactory();
     Map<String,String> args = new HashMap<String,String>();
     args.put("luceneMatchVersion", TEST_VERSION_CURRENT.toString());
     args.put("tags", "stoptags.txt");

Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiTokenizerFactory.java?rev=1305367&r1=1305366&r2=1305367&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestKuromojiTokenizerFactory.java Mon Mar 26 14:11:42 2012
@@ -26,11 +26,11 @@ import org.apache.lucene.analysis.TokenS
 import org.apache.solr.core.SolrResourceLoader;
 
 /**
- * Simple tests for {@link KuromojiTokenizerFactory}
+ * Simple tests for {@link JapaneseTokenizerFactory}
  */
 public class TestKuromojiTokenizerFactory extends BaseTokenTestCase {
   public void testSimple() throws IOException {
-    KuromojiTokenizerFactory factory = new KuromojiTokenizerFactory();
+    JapaneseTokenizerFactory factory = new JapaneseTokenizerFactory();
     factory.init(DEFAULT_VERSION_PARAM);
     factory.inform(new SolrResourceLoader(null, null));
     TokenStream ts = factory.create(new StringReader("これは本ではない"));
@@ -45,7 +45,7 @@ public class TestKuromojiTokenizerFactor
    * Test that search mode is enabled and working by default
    */
   public void testDefaults() throws IOException {
-    KuromojiTokenizerFactory factory = new KuromojiTokenizerFactory();
+    JapaneseTokenizerFactory factory = new JapaneseTokenizerFactory();
     factory.init(DEFAULT_VERSION_PARAM);
     factory.inform(new SolrResourceLoader(null, null));
     TokenStream ts = factory.create(new StringReader("シニアソフトウェアエンジニア"));
@@ -58,7 +58,7 @@ public class TestKuromojiTokenizerFactor
    * Test mode parameter: specifying normal mode
    */
   public void testMode() throws IOException {
-    KuromojiTokenizerFactory factory = new KuromojiTokenizerFactory();
+    JapaneseTokenizerFactory factory = new JapaneseTokenizerFactory();
     Map<String,String> args = new HashMap<String,String>();
     args.put("mode", "normal");
     factory.init(args);
@@ -76,7 +76,7 @@ public class TestKuromojiTokenizerFactor
         "関西国際空港,関西 国際 空港,カンサイ コクサイ クウコウ,テスト名詞\n" +
         "# Custom reading for sumo wrestler\n" +
         "朝青龍,朝青龍,アサショウリュウ,カスタム人名\n";
-    KuromojiTokenizerFactory factory = new KuromojiTokenizerFactory();
+    JapaneseTokenizerFactory factory = new JapaneseTokenizerFactory();
     Map<String,String> args = new HashMap<String,String>();
     args.put("user-dictionary", "userdict.txt");
     factory.init(args);

Modified: lucene/dev/branches/branch_3x/solr/example/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/schema.xml?rev=1305367&r1=1305366&r2=1305367&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/schema.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/schema.xml Mon Mar 26 14:11:42 2012
@@ -741,17 +741,17 @@
 
            NOTE: Search-mode improves segmentation for search at the expense of part-of-speech and reading accuracy
         -->
-        <tokenizer class="solr.KuromojiTokenizerFactory" mode="search"/>
+        <tokenizer class="solr.JapaneseTokenizerFactory" mode="search"/>
         <!-- Reduces inflected verbs and adjectives to their base/dictionary forms (辞書形) -->	
-        <filter class="solr.KuromojiBaseFormFilterFactory"/>
+        <filter class="solr.JapaneseBaseFormFilterFactory"/>
         <!-- Removes tokens with certain part-of-speech tags -->
-        <filter class="solr.KuromojiPartOfSpeechStopFilterFactory" tags="lang/stoptags_ja.txt" enablePositionIncrements="true"/>
+        <filter class="solr.JapanesePartOfSpeechStopFilterFactory" tags="lang/stoptags_ja.txt" enablePositionIncrements="true"/>
         <!-- Normalizes full-width romaji to half-width and half-width kana to full-width (Unicode NFKC subset) -->
         <filter class="solr.CJKWidthFilterFactory"/>
         <!-- Removes common tokens typically not useful for search, but have a negative effect on ranking -->
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ja.txt" enablePositionIncrements="true" />
         <!-- Normalizes common katakana spelling variations by removing any last long sound character (U+30FC) -->
-        <filter class="solr.KuromojiKatakanaStemFilterFactory" minimumLength="4"/>
+        <filter class="solr.JapaneseKatakanaStemFilterFactory" minimumLength="4"/>
         <!-- Lower-cases romaji characters -->
         <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>