From e7b30a7d8dbfbbc5b6accddb49a43e45a3e37762 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Tue, 24 Jul 2012 05:27:52 +0000 Subject: [PATCH] LUCENE-4044: port over icu module git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene2510@1364897 13f79535-47bb-0310-9956-ffa450edef68 --- .../analysis/icu}/ICUFoldingFilterFactory.java | 2 +- .../icu}/ICUNormalizer2FilterFactory.java | 7 +++---- .../icu}/ICUTransformFilterFactory.java | 9 ++++----- .../icu/segmentation}/ICUTokenizerFactory.java | 2 +- ...che.lucene.analysis.util.TokenFilterFactory | 18 ++++++++++++++++++ ...pache.lucene.analysis.util.TokenizerFactory | 16 ++++++++++++++++ .../icu}/TestICUFoldingFilterFactory.java | 2 +- .../icu}/TestICUNormalizer2FilterFactory.java | 2 +- .../icu}/TestICUTransformFilterFactory.java | 2 +- .../segmentation}/TestICUTokenizerFactory.java | 2 +- 10 files changed, 47 insertions(+), 15 deletions(-) rename {solr/contrib/analysis-extras/src/java/org/apache/solr/analysis => lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu}/ICUFoldingFilterFactory.java (97%) rename {solr/contrib/analysis-extras/src/java/org/apache/solr/analysis => lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu}/ICUNormalizer2FilterFactory.java (93%) rename {solr/contrib/analysis-extras/src/java/org/apache/solr/analysis => lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu}/ICUTransformFilterFactory.java (88%) rename {solr/contrib/analysis-extras/src/java/org/apache/solr/analysis => lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation}/ICUTokenizerFactory.java (95%) create mode 100644 lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory create mode 100644 lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory rename {solr/contrib/analysis-extras/src/test/org/apache/solr/analysis => lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu}/TestICUFoldingFilterFactory.java (97%) rename {solr/contrib/analysis-extras/src/test/org/apache/solr/analysis => lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu}/TestICUNormalizer2FilterFactory.java (97%) rename {solr/contrib/analysis-extras/src/test/org/apache/solr/analysis => lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu}/TestICUTransformFilterFactory.java (98%) rename {solr/contrib/analysis-extras/src/test/org/apache/solr/analysis => lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation}/TestICUTokenizerFactory.java (96%) diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUFoldingFilterFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilterFactory.java similarity index 97% rename from solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUFoldingFilterFactory.java rename to lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilterFactory.java index 0fdf711aaaf..05b3cd44848 100644 --- a/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUFoldingFilterFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilterFactory.java @@ -1,4 +1,4 @@ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.icu; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.icu.ICUFoldingFilter; diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUNormalizer2FilterFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2FilterFactory.java similarity index 93% rename from solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUNormalizer2FilterFactory.java rename to lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2FilterFactory.java index 0aef42fe9bb..fdb115cc313 100644 --- a/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUNormalizer2FilterFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2FilterFactory.java @@ -1,4 +1,4 @@ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.icu; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -22,9 +22,8 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.icu.ICUNormalizer2Filter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; +import org.apache.lucene.analysis.util.InitializationException; import org.apache.lucene.analysis.util.MultiTermAwareComponent; -import org.apache.solr.common.SolrException; -import org.apache.solr.common.SolrException.ErrorCode; import org.apache.lucene.analysis.util.TokenFilterFactory; import com.ibm.icu.text.FilteredNormalizer2; @@ -66,7 +65,7 @@ public class ICUNormalizer2FilterFactory extends TokenFilterFactory implements M else if (mode.equals("decompose")) normalizer = Normalizer2.getInstance(null, name, Normalizer2.Mode.DECOMPOSE); else - throw new SolrException(ErrorCode.SERVER_ERROR, "Invalid mode: " + mode); + throw new InitializationException("Invalid mode: " + mode); String filter = args.get("filter"); if (filter != null) { diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTransformFilterFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilterFactory.java similarity index 88% rename from solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTransformFilterFactory.java rename to lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilterFactory.java index 695c1baa706..8b0e3c8fc1a 100644 --- a/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTransformFilterFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilterFactory.java @@ -1,4 +1,4 @@ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.icu; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -22,9 +22,8 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.icu.ICUTransformFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; +import org.apache.lucene.analysis.util.InitializationException; import org.apache.lucene.analysis.util.MultiTermAwareComponent; -import org.apache.solr.common.SolrException; -import org.apache.solr.common.SolrException.ErrorCode; import org.apache.lucene.analysis.util.TokenFilterFactory; import com.ibm.icu.text.Transliterator; @@ -48,7 +47,7 @@ public class ICUTransformFilterFactory extends TokenFilterFactory implements Mul super.init(args); String id = args.get("id"); if (id == null) { - throw new SolrException(ErrorCode.SERVER_ERROR, "id is required."); + throw new InitializationException("id is required."); } int dir; @@ -58,7 +57,7 @@ public class ICUTransformFilterFactory extends TokenFilterFactory implements Mul else if (direction.equalsIgnoreCase("reverse")) dir = Transliterator.REVERSE; else - throw new SolrException(ErrorCode.SERVER_ERROR, "invalid direction: " + direction); + throw new InitializationException("invalid direction: " + direction); transliterator = Transliterator.getInstance(id, dir); } diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTokenizerFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java similarity index 95% rename from solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTokenizerFactory.java rename to lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java index 061bc3c0a05..d3c39cbf628 100644 --- a/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTokenizerFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java @@ -1,4 +1,4 @@ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.icu.segmentation; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory b/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory new file mode 100644 index 00000000000..cae49ca6380 --- /dev/null +++ b/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +org.apache.lucene.analysis.icu.ICUFoldingFilterFactory +org.apache.lucene.analysis.icu.ICUNormalizer2FilterFactory +org.apache.lucene.analysis.icu.ICUTransformFilterFactory diff --git a/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory b/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory new file mode 100644 index 00000000000..cc90ed5b349 --- /dev/null +++ b/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +org.apache.lucene.analysis.icu.segmentation.ICUTokenizerFactory diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUFoldingFilterFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilterFactory.java similarity index 97% rename from solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUFoldingFilterFactory.java rename to lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilterFactory.java index dc30038863e..f43b30d1d68 100644 --- a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUFoldingFilterFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilterFactory.java @@ -1,4 +1,4 @@ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.icu; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUNormalizer2FilterFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2FilterFactory.java similarity index 97% rename from solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUNormalizer2FilterFactory.java rename to lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2FilterFactory.java index 0b1adf2b3c2..397afd0527e 100644 --- a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUNormalizer2FilterFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2FilterFactory.java @@ -1,4 +1,4 @@ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.icu; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTransformFilterFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java similarity index 98% rename from solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTransformFilterFactory.java rename to lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java index 6092cdf0f1c..52b19739efa 100644 --- a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTransformFilterFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java @@ -1,4 +1,4 @@ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.icu; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTokenizerFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java similarity index 96% rename from solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTokenizerFactory.java rename to lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java index 21e6afb245b..1314db6fbc9 100644 --- a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTokenizerFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java @@ -1,4 +1,4 @@ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.icu.segmentation; /* * Licensed to the Apache Software Foundation (ASF) under one or more