lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1364878 - in /lucene/dev/branches/lucene2510: lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/ lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/ lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/ l...
Date Tue, 24 Jul 2012 03:59:35 GMT
Author: rmuir
Date: Tue Jul 24 03:59:34 2012
New Revision: 1364878

URL: http://svn.apache.org/viewvc?rev=1364878&view=rev
Log:
LUCENE-4044: more factories and tests

Added:
    lucene/dev/branches/lucene2510/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java
      - copied, changed from r1364864, lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java
    lucene/dev/branches/lucene2510/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java
      - copied, changed from r1364864, lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestCJKBigramFilterFactory.java
    lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java
      - copied, changed from r1364864, lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/analysis/JapaneseIterationMarkCharFilterFactory.java
    lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java
      - copied, changed from r1364864, lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseIterationMarkCharFilterFactory.java
    lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java
      - copied, changed from r1364864, lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseKatakanaStemFilterFactory.java
    lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java
      - copied, changed from r1364864, lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseReadingFormFilterFactory.java
Removed:
    lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/analysis/JapaneseIterationMarkCharFilterFactory.java
    lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java
    lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestCJKBigramFilterFactory.java
    lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseIterationMarkCharFilterFactory.java
    lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseKatakanaStemFilterFactory.java
    lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseReadingFormFilterFactory.java
Modified:
    lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory
    lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
    lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java

Copied: lucene/dev/branches/lucene2510/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java
(from r1364864, lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2510/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java?p2=lucene/dev/branches/lucene2510/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java&p1=lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java&r1=1364864&r2=1364878&rev=1364878&view=diff
==============================================================================
--- lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java
(original)
+++ lucene/dev/branches/lucene2510/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java
Tue Jul 24 03:59:34 2012
@@ -1,4 +1,4 @@
-package org.apache.solr.analysis;
+package org.apache.lucene.analysis.ar;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,6 +25,8 @@ import java.util.Map;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
+import org.apache.lucene.analysis.fa.PersianCharFilterFactory;
+import org.apache.lucene.analysis.standard.StandardTokenizerFactory;
 
 /**
  * Simple tests to ensure the Arabic filter Factories are working.

Copied: lucene/dev/branches/lucene2510/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java
(from r1364864, lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestCJKBigramFilterFactory.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2510/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java?p2=lucene/dev/branches/lucene2510/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java&p1=lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestCJKBigramFilterFactory.java&r1=1364864&r2=1364878&rev=1364878&view=diff
==============================================================================
--- lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestCJKBigramFilterFactory.java
(original)
+++ lucene/dev/branches/lucene2510/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java
Tue Jul 24 03:59:34 2012
@@ -1,4 +1,4 @@
-package org.apache.solr.analysis;
+package org.apache.lucene.analysis.cjk;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,7 +29,6 @@ import org.apache.lucene.analysis.standa
 
 /**
  * Simple tests to ensure the CJK bigram factory is working.
- * @deprecated
  */
 public class TestCJKBigramFilterFactory extends BaseTokenStreamTestCase {
   public void testDefaults() throws Exception {

Copied: lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java
(from r1364864, lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/analysis/JapaneseIterationMarkCharFilterFactory.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java?p2=lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java&p1=lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/analysis/JapaneseIterationMarkCharFilterFactory.java&r1=1364864&r2=1364878&rev=1364878&view=diff
==============================================================================
--- lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/analysis/JapaneseIterationMarkCharFilterFactory.java
(original)
+++ lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java
Tue Jul 24 03:59:34 2012
@@ -1,4 +1,4 @@
-package org.apache.solr.analysis;
+package org.apache.lucene.analysis.ja;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory?rev=1364878&r1=1364877&r2=1364878&view=diff
==============================================================================
--- lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory
(original)
+++ lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory
Tue Jul 24 03:59:34 2012
@@ -13,4 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-# TODO: add the iteration mark factory once moved over.
+org.apache.lucene.analysis.ja.JapaneseIterationMarkCharFilterFactory

Copied: lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java
(from r1364864, lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseIterationMarkCharFilterFactory.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java?p2=lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java&p1=lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseIterationMarkCharFilterFactory.java&r1=1364864&r2=1364878&rev=1364878&view=diff
==============================================================================
--- lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseIterationMarkCharFilterFactory.java
(original)
+++ lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java
Tue Jul 24 03:59:34 2012
@@ -1,4 +1,4 @@
-package org.apache.solr.analysis;
+package org.apache.lucene.analysis.ja;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Copied: lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java
(from r1364864, lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseKatakanaStemFilterFactory.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java?p2=lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java&p1=lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseKatakanaStemFilterFactory.java&r1=1364864&r2=1364878&rev=1364878&view=diff
==============================================================================
--- lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseKatakanaStemFilterFactory.java
(original)
+++ lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java
Tue Jul 24 03:59:34 2012
@@ -1,4 +1,4 @@
-package org.apache.solr.analysis;
+package org.apache.lucene.analysis.ja;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Copied: lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java
(from r1364864, lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseReadingFormFilterFactory.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java?p2=lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java&p1=lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseReadingFormFilterFactory.java&r1=1364864&r2=1364878&rev=1364878&view=diff
==============================================================================
--- lucene/dev/branches/lucene2510/solr/core/src/test/org/apache/solr/analysis/TestJapaneseReadingFormFilterFactory.java
(original)
+++ lucene/dev/branches/lucene2510/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java
Tue Jul 24 03:59:34 2012
@@ -1,4 +1,4 @@
-package org.apache.solr.analysis;
+package org.apache.lucene.analysis.ja;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java?rev=1364878&r1=1364877&r2=1364878&view=diff
==============================================================================
--- lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
(original)
+++ lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
Tue Jul 24 03:59:34 2012
@@ -19,9 +19,9 @@ package org.apache.solr.schema;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.core.KeywordAnalyzer;
+import org.apache.lucene.analysis.core.KeywordTokenizerFactory;
 import org.apache.lucene.analysis.util.*;
 import org.apache.lucene.util.Version;
-import org.apache.solr.analysis.KeywordTokenizerFactory;
 import org.apache.solr.analysis.TokenizerChain;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.util.DOMUtil;

Modified: lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java?rev=1364878&r1=1364877&r2=1364878&view=diff
==============================================================================
--- lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
(original)
+++ lucene/dev/branches/lucene2510/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
Tue Jul 24 03:59:34 2012
@@ -27,6 +27,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.core.StopFilterFactory;
 import org.apache.lucene.analysis.util.TokenFilterFactory;
 import org.apache.lucene.queries.function.BoostedQuery;
 import org.apache.lucene.queries.function.FunctionQuery;
@@ -36,7 +37,6 @@ import org.apache.lucene.queries.functio
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.apache.lucene.search.*;
-import org.apache.solr.analysis.StopFilterFactory;
 import org.apache.solr.analysis.TokenizerChain;
 import org.apache.solr.search.SolrQueryParser.MagicFieldName;
 import org.apache.solr.common.params.DisMaxParams;



Mime
View raw message