ACCUMULO-285: update package name in query, fix up poms

git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/branches/1.4@1230189 13f79535-47bb-0310-9956-ffa450edef68
tequalsme · Jan 11, 2012 · a2a9154 · a2a9154
1 parent e574eee
commit a2a9154
Show file tree

Hide file tree

Showing 36 changed files with 99 additions and 97 deletions.
diff --git a/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaIngester.java b/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaIngester.java
@@ -103,9 +103,9 @@ private void createTables(TableOperations tops, String tableName) throws Accumul
       // Add the UID aggregator
       for (IteratorScope scope : IteratorScope.values()) {
         String stem = String.format("%s%s.%s", Property.TABLE_ITERATOR_PREFIX, scope.name(), "UIDAggregator");
-        tops.setProperty(indexTableName, stem, "19,org.apache.accumulo.wikisearch.iterator.TotalAggregatingIterator");
+        tops.setProperty(indexTableName, stem, "19,org.apache.accumulo.examples.wikisearch.iterator.TotalAggregatingIterator");
         stem += ".opt.";
-        tops.setProperty(indexTableName, stem + "*", "org.apache.accumulo.wikisearch.aggregator.GlobalIndexUidAggregator");
+        tops.setProperty(indexTableName, stem + "*", "org.apache.accumulo.examples.wikisearch.aggregator.GlobalIndexUidAggregator");
 
       }
     }
@@ -115,9 +115,9 @@ private void createTables(TableOperations tops, String tableName) throws Accumul
       // Add the UID aggregator
       for (IteratorScope scope : IteratorScope.values()) {
         String stem = String.format("%s%s.%s", Property.TABLE_ITERATOR_PREFIX, scope.name(), "UIDAggregator");
-        tops.setProperty(reverseIndexTableName, stem, "19,org.apache.accumulo.wikisearch.iterator.TotalAggregatingIterator");
+        tops.setProperty(reverseIndexTableName, stem, "19,org.apache.accumulo.examples.wikisearch.iterator.TotalAggregatingIterator");
         stem += ".opt.";
-        tops.setProperty(reverseIndexTableName, stem + "*", "org.apache.accumulo.wikisearch.aggregator.GlobalIndexUidAggregator");
+        tops.setProperty(reverseIndexTableName, stem + "*", "org.apache.accumulo.examples.wikisearch.aggregator.GlobalIndexUidAggregator");
 
       }
     }

diff --git a/query/pom.xml b/query/pom.xml
@@ -110,7 +110,7 @@
             <configuration>
               <outputDirectory>lib</outputDirectory>
               <!-- just grab the non-provided runtime dependencies -->
-              <includeArtifactIds>commons-lang,protobuf-java,libthrift,zookeeper,hadoop-core,commons-jexl,google-collections,kryo,asm,minlog,reflectasm,wikisearch-ingest</includeArtifactIds>
+              <includeArtifactIds>commons-lang,commons-codec,protobuf-java,libthrift,zookeeper,hadoop-core,commons-jexl,google-collections,kryo,asm,minlog,reflectasm,wikisearch-ingest,accumulo-core,cloudtrace</includeArtifactIds>
               <excludeTransitive>true</excludeTransitive>
             </configuration>
           </execution>

diff --git a/...o/wikisearch/function/QueryFunctions.java → ...s/wikisearch/function/QueryFunctions.java b/...o/wikisearch/function/QueryFunctions.java → ...s/wikisearch/function/QueryFunctions.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.function;
+package org.apache.accumulo.examples.wikisearch.function;
 
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;

diff --git a/.../iterator/AbstractEvaluatingIterator.java → .../iterator/AbstractEvaluatingIterator.java b/.../iterator/AbstractEvaluatingIterator.java → .../iterator/AbstractEvaluatingIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.iterator;
+package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -33,8 +33,8 @@
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.OptionDescriber;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.wikisearch.parser.EventFields;
-import org.apache.accumulo.wikisearch.parser.QueryEvaluator;
+import org.apache.accumulo.examples.wikisearch.parser.EventFields;
+import org.apache.accumulo.examples.wikisearch.parser.QueryEvaluator;
 import org.apache.commons.jexl2.parser.ParseException;
 import org.apache.log4j.Logger;
 

diff --git a/...mulo/wikisearch/iterator/AndIterator.java → ...ples/wikisearch/iterator/AndIterator.java b/...mulo/wikisearch/iterator/AndIterator.java → ...ples/wikisearch/iterator/AndIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.iterator;
+package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
 import java.util.Collection;

diff --git a/...search/iterator/BooleanLogicIterator.java → ...search/iterator/BooleanLogicIterator.java b/...search/iterator/BooleanLogicIterator.java → ...search/iterator/BooleanLogicIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.iterator;
+package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -39,12 +39,12 @@
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.OptionDescriber;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.wikisearch.parser.JexlOperatorConstants;
-import org.apache.accumulo.wikisearch.parser.QueryParser;
-import org.apache.accumulo.wikisearch.parser.TreeNode;
-import org.apache.accumulo.wikisearch.parser.QueryParser.QueryTerm;
-import org.apache.accumulo.wikisearch.parser.RangeCalculator.RangeBounds;
-import org.apache.accumulo.wikisearch.util.FieldIndexKeyParser;
+import org.apache.accumulo.examples.wikisearch.parser.JexlOperatorConstants;
+import org.apache.accumulo.examples.wikisearch.parser.QueryParser;
+import org.apache.accumulo.examples.wikisearch.parser.TreeNode;
+import org.apache.accumulo.examples.wikisearch.parser.QueryParser.QueryTerm;
+import org.apache.accumulo.examples.wikisearch.parser.RangeCalculator.RangeBounds;
+import org.apache.accumulo.examples.wikisearch.util.FieldIndexKeyParser;
 import org.apache.commons.jexl2.parser.ASTAndNode;
 import org.apache.commons.jexl2.parser.ASTEQNode;
 import org.apache.commons.jexl2.parser.ASTERNode;

diff --git a/...search/iterator/BooleanLogicTreeNode.java → ...search/iterator/BooleanLogicTreeNode.java b/...search/iterator/BooleanLogicTreeNode.java → ...search/iterator/BooleanLogicTreeNode.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.iterator;
+package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -29,7 +29,7 @@
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.wikisearch.parser.JexlOperatorConstants;
+import org.apache.accumulo.examples.wikisearch.parser.JexlOperatorConstants;
 import org.apache.commons.jexl2.parser.ParserTreeConstants;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;

diff --git a/.../iterator/DefaultIteratorEnvironment.java → .../iterator/DefaultIteratorEnvironment.java b/.../iterator/DefaultIteratorEnvironment.java → .../iterator/DefaultIteratorEnvironment.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.iterator;
+package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
 

diff --git a/...kisearch/iterator/EvaluatingIterator.java → ...kisearch/iterator/EvaluatingIterator.java b/...kisearch/iterator/EvaluatingIterator.java → ...kisearch/iterator/EvaluatingIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.iterator;
+package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -28,8 +28,8 @@
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.wikisearch.parser.EventFields;
-import org.apache.accumulo.wikisearch.parser.EventFields.FieldValue;
+import org.apache.accumulo.examples.wikisearch.parser.EventFields;
+import org.apache.accumulo.examples.wikisearch.parser.EventFields.FieldValue;
 import org.apache.hadoop.io.Text;
 
 

diff --git a/...kisearch/iterator/FieldIndexIterator.java → ...kisearch/iterator/FieldIndexIterator.java b/...kisearch/iterator/FieldIndexIterator.java → ...kisearch/iterator/FieldIndexIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.iterator;
+package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -38,8 +38,8 @@
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.WrappingIterator;
-import org.apache.accumulo.wikisearch.function.QueryFunctions;
-import org.apache.accumulo.wikisearch.util.FieldIndexKeyParser;
+import org.apache.accumulo.examples.wikisearch.function.QueryFunctions;
+import org.apache.accumulo.examples.wikisearch.util.FieldIndexKeyParser;
 
 /**
  * This iterator should only return keys from the fi\0{fieldName}:{fieldValue} part of the shard table. Expect topKey to be CF, {datatype}\0{UID}

diff --git a/...arch/iterator/OptimizedQueryIterator.java → ...arch/iterator/OptimizedQueryIterator.java b/...arch/iterator/OptimizedQueryIterator.java → ...arch/iterator/OptimizedQueryIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.iterator;
+package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
 import java.util.Collection;

diff --git a/...umulo/wikisearch/iterator/OrIterator.java → ...mples/wikisearch/iterator/OrIterator.java b/...umulo/wikisearch/iterator/OrIterator.java → ...mples/wikisearch/iterator/OrIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.iterator;
+package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...ikisearch/iterator/ReadAheadIterator.java → ...ikisearch/iterator/ReadAheadIterator.java b/...ikisearch/iterator/ReadAheadIterator.java → ...ikisearch/iterator/ReadAheadIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.iterator;
+package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
 import java.lang.Thread.State;

diff --git a/.../iterator/UniqFieldNameValueIterator.java → .../iterator/UniqFieldNameValueIterator.java b/.../iterator/UniqFieldNameValueIterator.java → .../iterator/UniqFieldNameValueIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.iterator;
+package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,7 +29,7 @@
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.WrappingIterator;
-import org.apache.accumulo.wikisearch.util.FieldIndexKeyParser;
+import org.apache.accumulo.examples.wikisearch.util.FieldIndexKeyParser;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;

diff --git a/.../accumulo/wikisearch/jexl/Arithmetic.java → .../examples/wikisearch/jexl/Arithmetic.java b/.../accumulo/wikisearch/jexl/Arithmetic.java → .../examples/wikisearch/jexl/Arithmetic.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.jexl;
+package org.apache.accumulo.examples.wikisearch.jexl;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

diff --git a/.../wikisearch/logic/AbstractQueryLogic.java → .../wikisearch/logic/AbstractQueryLogic.java b/.../wikisearch/logic/AbstractQueryLogic.java → .../wikisearch/logic/AbstractQueryLogic.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.logic;
+package org.apache.accumulo.examples.wikisearch.logic;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
@@ -40,22 +40,22 @@
 import org.apache.accumulo.core.iterators.user.RegExFilter;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.examples.wikisearch.ingest.WikipediaMapper;
+import org.apache.accumulo.examples.wikisearch.iterator.BooleanLogicIterator;
+import org.apache.accumulo.examples.wikisearch.iterator.EvaluatingIterator;
+import org.apache.accumulo.examples.wikisearch.iterator.OptimizedQueryIterator;
+import org.apache.accumulo.examples.wikisearch.iterator.ReadAheadIterator;
 import org.apache.accumulo.examples.wikisearch.normalizer.LcNoDiacriticsNormalizer;
 import org.apache.accumulo.examples.wikisearch.normalizer.Normalizer;
-import org.apache.accumulo.wikisearch.iterator.BooleanLogicIterator;
-import org.apache.accumulo.wikisearch.iterator.EvaluatingIterator;
-import org.apache.accumulo.wikisearch.iterator.OptimizedQueryIterator;
-import org.apache.accumulo.wikisearch.iterator.ReadAheadIterator;
-import org.apache.accumulo.wikisearch.parser.EventFields;
-import org.apache.accumulo.wikisearch.parser.EventFields.FieldValue;
-import org.apache.accumulo.wikisearch.parser.FieldIndexQueryReWriter;
-import org.apache.accumulo.wikisearch.parser.JexlOperatorConstants;
-import org.apache.accumulo.wikisearch.parser.QueryParser;
-import org.apache.accumulo.wikisearch.parser.QueryParser.QueryTerm;
-import org.apache.accumulo.wikisearch.parser.RangeCalculator;
-import org.apache.accumulo.wikisearch.sample.Document;
-import org.apache.accumulo.wikisearch.sample.Field;
-import org.apache.accumulo.wikisearch.sample.Results;
+import org.apache.accumulo.examples.wikisearch.parser.EventFields;
+import org.apache.accumulo.examples.wikisearch.parser.FieldIndexQueryReWriter;
+import org.apache.accumulo.examples.wikisearch.parser.JexlOperatorConstants;
+import org.apache.accumulo.examples.wikisearch.parser.QueryParser;
+import org.apache.accumulo.examples.wikisearch.parser.RangeCalculator;
+import org.apache.accumulo.examples.wikisearch.parser.EventFields.FieldValue;
+import org.apache.accumulo.examples.wikisearch.parser.QueryParser.QueryTerm;
+import org.apache.accumulo.examples.wikisearch.sample.Document;
+import org.apache.accumulo.examples.wikisearch.sample.Field;
+import org.apache.accumulo.examples.wikisearch.sample.Results;
 import org.apache.commons.jexl2.parser.ParserTreeConstants;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.StopWatch;

diff --git a/...cumulo/wikisearch/logic/ContentLogic.java → ...amples/wikisearch/logic/ContentLogic.java b/...cumulo/wikisearch/logic/ContentLogic.java → ...amples/wikisearch/logic/ContentLogic.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.logic;
+package org.apache.accumulo.examples.wikisearch.logic;
 
 import java.util.List;
 import java.util.Map.Entry;
@@ -29,9 +29,9 @@
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.examples.wikisearch.ingest.WikipediaMapper;
-import org.apache.accumulo.wikisearch.sample.Document;
-import org.apache.accumulo.wikisearch.sample.Field;
-import org.apache.accumulo.wikisearch.sample.Results;
+import org.apache.accumulo.examples.wikisearch.sample.Document;
+import org.apache.accumulo.examples.wikisearch.sample.Field;
+import org.apache.accumulo.examples.wikisearch.sample.Results;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;

diff --git a/...accumulo/wikisearch/logic/QueryLogic.java → ...examples/wikisearch/logic/QueryLogic.java b/...accumulo/wikisearch/logic/QueryLogic.java → ...examples/wikisearch/logic/QueryLogic.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.logic;
+package org.apache.accumulo.examples.wikisearch.logic;
 
 
 import java.util.Collection;
@@ -30,13 +30,13 @@
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.examples.wikisearch.iterator.EvaluatingIterator;
 import org.apache.accumulo.examples.wikisearch.normalizer.LcNoDiacriticsNormalizer;
 import org.apache.accumulo.examples.wikisearch.normalizer.Normalizer;
+import org.apache.accumulo.examples.wikisearch.parser.RangeCalculator;
+import org.apache.accumulo.examples.wikisearch.parser.QueryParser.QueryTerm;
 import org.apache.accumulo.examples.wikisearch.protobuf.Uid;
 import org.apache.accumulo.examples.wikisearch.util.TextUtil;
-import org.apache.accumulo.wikisearch.iterator.EvaluatingIterator;
-import org.apache.accumulo.wikisearch.parser.QueryParser.QueryTerm;
-import org.apache.accumulo.wikisearch.parser.RangeCalculator;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 

diff --git a/...cumulo/wikisearch/parser/EventFields.java → ...amples/wikisearch/parser/EventFields.java b/...cumulo/wikisearch/parser/EventFields.java → ...amples/wikisearch/parser/EventFields.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.parser;
+package org.apache.accumulo.examples.wikisearch.parser;
 
 import java.nio.ByteBuffer;
 import java.util.Collection;
@@ -23,7 +23,7 @@
 import java.util.Set;
 
 import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.wikisearch.parser.EventFields.FieldValue;
+import org.apache.accumulo.examples.wikisearch.parser.EventFields.FieldValue;
 
 import com.esotericsoftware.kryo.CustomSerialization;
 import com.esotericsoftware.kryo.Kryo;

diff --git a/...earch/parser/FieldIndexQueryReWriter.java → ...earch/parser/FieldIndexQueryReWriter.java b/...earch/parser/FieldIndexQueryReWriter.java → ...earch/parser/FieldIndexQueryReWriter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.parser;
+package org.apache.accumulo.examples.wikisearch.parser;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,8 +29,8 @@
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
-import org.apache.accumulo.wikisearch.parser.QueryParser.QueryTerm;
-import org.apache.accumulo.wikisearch.parser.RangeCalculator.RangeBounds;
+import org.apache.accumulo.examples.wikisearch.parser.QueryParser.QueryTerm;
+import org.apache.accumulo.examples.wikisearch.parser.RangeCalculator.RangeBounds;
 import org.apache.commons.jexl2.parser.ASTAndNode;
 import org.apache.commons.jexl2.parser.ASTEQNode;
 import org.apache.commons.jexl2.parser.ASTERNode;

diff --git a/...isearch/parser/JexlOperatorConstants.java → ...isearch/parser/JexlOperatorConstants.java b/...isearch/parser/JexlOperatorConstants.java → ...isearch/parser/JexlOperatorConstants.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.parser;
+package org.apache.accumulo.examples.wikisearch.parser;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/...ulo/wikisearch/parser/QueryEvaluator.java → ...les/wikisearch/parser/QueryEvaluator.java b/...ulo/wikisearch/parser/QueryEvaluator.java → ...les/wikisearch/parser/QueryEvaluator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.parser;
+package org.apache.accumulo.examples.wikisearch.parser;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -24,10 +24,10 @@
 import java.util.Set;
 
 
-import org.apache.accumulo.wikisearch.function.QueryFunctions;
-import org.apache.accumulo.wikisearch.jexl.Arithmetic;
-import org.apache.accumulo.wikisearch.parser.EventFields.FieldValue;
-import org.apache.accumulo.wikisearch.parser.QueryParser.QueryTerm;
+import org.apache.accumulo.examples.wikisearch.function.QueryFunctions;
+import org.apache.accumulo.examples.wikisearch.jexl.Arithmetic;
+import org.apache.accumulo.examples.wikisearch.parser.EventFields.FieldValue;
+import org.apache.accumulo.examples.wikisearch.parser.QueryParser.QueryTerm;
 import org.apache.commons.jexl2.Expression;
 import org.apache.commons.jexl2.JexlContext;
 import org.apache.commons.jexl2.JexlEngine;

diff --git a/...cumulo/wikisearch/parser/QueryParser.java → ...amples/wikisearch/parser/QueryParser.java b/...cumulo/wikisearch/parser/QueryParser.java → ...amples/wikisearch/parser/QueryParser.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.parser;
+package org.apache.accumulo.examples.wikisearch.parser;
 
 import java.io.StringReader;
 import java.util.ArrayList;