From 86a6a5f0211b9f584d0602b4b3187dce57794719 Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Sun, 12 Feb 2012 15:20:42 +0200
Subject: [PATCH] move trim filter to a better package location

---
 .../lucene/analysis/miscellaneous}/TrimFilter.java              | 2 +-
 .../elasticsearch/index/analysis/TrimTokenFilterFactory.java    | 2 +-
 .../elasticsearch/indices/analysis/IndicesAnalysisService.java  | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename src/main/java/org/{elasticsearch/common/lucene/analysis => apache/lucene/analysis/miscellaneous}/TrimFilter.java (97%)

diff --git a/src/main/java/org/elasticsearch/common/lucene/analysis/TrimFilter.java b/src/main/java/org/apache/lucene/analysis/miscellaneous/TrimFilter.java
similarity index 97%
rename from src/main/java/org/elasticsearch/common/lucene/analysis/TrimFilter.java
rename to src/main/java/org/apache/lucene/analysis/miscellaneous/TrimFilter.java
index abbf95c761a..d3ad3133a9b 100644
--- a/src/main/java/org/elasticsearch/common/lucene/analysis/TrimFilter.java
+++ b/src/main/java/org/apache/lucene/analysis/miscellaneous/TrimFilter.java
@@ -1,4 +1,4 @@
-package org.elasticsearch.common.lucene.analysis;
+package org.apache.lucene.analysis.miscellaneous;
 
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java
index 8c438cea758..230fbe2b21a 100644
--- a/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java
+++ b/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java
@@ -20,9 +20,9 @@
 package org.elasticsearch.index.analysis;
 
 import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.miscellaneous.TrimFilter;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.inject.assistedinject.Assisted;
-import org.elasticsearch.common.lucene.analysis.TrimFilter;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.index.Index;
diff --git a/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java b/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java
index 2faebfd3756..d67ebbabab3 100644
--- a/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java
+++ b/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java
@@ -79,7 +79,6 @@ import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.lucene.analysis.HTMLStripCharFilter;
-import org.elasticsearch.common.lucene.analysis.TrimFilter;
 import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ConcurrentCollections;