Index: oak-core/src/test/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProviderTest.java =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProviderTest.java (revision 1797326) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/query/SimpleExcerptProviderTest.java (revision ) @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.jackrabbit.oak.query.fulltext; +package org.apache.jackrabbit.oak.query; import static com.google.common.collect.ImmutableSet.of; -import static org.apache.jackrabbit.oak.query.fulltext.SimpleExcerptProvider.highlight; +import static org.apache.jackrabbit.oak.query.SimpleExcerptProvider.highlight; import static org.junit.Assert.assertEquals; import java.util.Random; \ No newline at end of file Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProvider.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProvider.java (revision 1797326) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/SimpleExcerptProvider.java (revision ) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.query.fulltext; +package org.apache.jackrabbit.oak.query; import java.util.BitSet; import java.util.HashSet; @@ -27,8 +27,6 @@ import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; -import org.apache.jackrabbit.oak.query.Query; -import org.apache.jackrabbit.oak.query.QueryImpl; import org.apache.jackrabbit.oak.query.ast.AndImpl; import org.apache.jackrabbit.oak.query.ast.ConstraintImpl; import org.apache.jackrabbit.oak.query.ast.FullTextSearchImpl; @@ -41,19 +39,19 @@ /** * This class can extract excerpts from node. */ -public class SimpleExcerptProvider { +class SimpleExcerptProvider { - public static final String REP_EXCERPT_FN = "rep:excerpt(.)"; - public static final String EXCERPT_END = ""; - public static final String EXCERPT_BEGIN = "