Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

ACCUMULO-285 merge to trunk, resolve all 1.4 -> trunk merge conflicts

git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/trunk@1230608 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit a0aef75647200fd76d8ec33c82f9d33a720256d9 1 parent 5aec1f8
authored January 12, 2012

Showing 132 changed files with 596 additions and 556 deletions. Show diff stats Hide diff stats

  1. 65  contrib/accumulo_sample/README
  2. 58  contrib/accumulo_sample/query/src/main/java/iterator/DefaultIteratorEnvironment.java
  3. 33  pom.xml
  4. 11  src/assemble/pom.xml
  5. 10  src/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
  6. 4  src/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
  7. 2  src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/MutationLogger.java
  8. 2  src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
  9. 75  src/examples/pom.xml
  10. 68  src/examples/simple/pom.xml
  11. 2  ...apache/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/client/Flush.java
  12. 2  ...lo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/client/RandomBatchScanner.java
  13. 2  ...ulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/client/RandomBatchWriter.java
  14. 2  ...mulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/client/ReadWriteExample.java
  15. 2  ...ccumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/client/RowOperations.java
  16. 2  ...examples → simple/src/main/java/org/apache/accumulo/examples/simple}/client/SequentialBatchWriter.java
  17. 2  ...umulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/combiner/StatsCombiner.java
  18. 2  ...les → simple/src/main/java/org/apache/accumulo/examples/simple}/constraints/AlphaNumKeyConstraint.java
  19. 2  .../examples → simple/src/main/java/org/apache/accumulo/examples/simple}/constraints/MaxMutationSize.java
  20. 2  ...es → simple/src/main/java/org/apache/accumulo/examples/simple}/constraints/NumericValueConstraint.java
  21. 2  ...e/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/dirlist/FileCount.java
  22. 4  ...ache/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/dirlist/Ingest.java
  23. 2  ...e/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/dirlist/QueryUtil.java
  24. 4  ...ache/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/dirlist/Viewer.java
  25. 2  ...umulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/ChunkCombiner.java
  26. 2  ...lo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/ChunkInputFormat.java
  27. 2  ...lo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/ChunkInputStream.java
  28. 2  ...mulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/FileDataIngest.java
  29. 2  ...umulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/FileDataQuery.java
  30. 2  ...he/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/KeyUtil.java
  31. 2  .../examples → simple/src/main/java/org/apache/accumulo/examples/simple}/filedata/VisibilityCombiner.java
  32. 2  ...ples → simple/src/main/java/org/apache/accumulo/examples/simple}/helloworld/InsertWithBatchWriter.java
  33. 8  ...les → simple/src/main/java/org/apache/accumulo/examples/simple}/helloworld/InsertWithOutputFormat.java
  34. 2  ...accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/helloworld/ReadData.java
  35. 2  ...o/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/isolation/InterferenceTest.java
  36. 2  ...umulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/RegexExample.java
  37. 2  ...e/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/RowHash.java
  38. 2  ...cumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/TableToFile.java
  39. 2  ...ulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/TeraSortIngest.java
  40. 2  ...accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/WordCount.java
  41. 2  ...ples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/bulk/BulkIngestExample.java
  42. 2  ...mples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/bulk/GenerateTestData.java
  43. 2  ...lo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/bulk/SetupTable.java
  44. 2  .../examples → simple/src/main/java/org/apache/accumulo/examples/simple}/mapreduce/bulk/VerifyIngest.java
  45. 2  ...cumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/shard/ContinuousQuery.java
  46. 2  .../apache/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/shard/Index.java
  47. 2  .../apache/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/shard/Query.java
  48. 2  ...pache/accumulo/examples → simple/src/main/java/org/apache/accumulo/examples/simple}/shard/Reverse.java
  49. 5  ...e/accumulo/examples → simple/src/test/java/org/apache/accumulo/examples/simple}/dirlist/CountTest.java
  50. 6  ...o/examples → simple/src/test/java/org/apache/accumulo/examples/simple}/filedata/ChunkCombinerTest.java
  51. 20  ...xamples → simple/src/test/java/org/apache/accumulo/examples/simple}/filedata/ChunkInputFormatTest.java
  52. 6  ...xamples → simple/src/test/java/org/apache/accumulo/examples/simple}/filedata/ChunkInputStreamTest.java
  53. 4  ...ccumulo/examples → simple/src/test/java/org/apache/accumulo/examples/simple}/filedata/KeyUtilTest.java
  54. 65  src/examples/wikisearch/README
  55. 6  {contrib/accumulo_sample → src/examples/wikisearch}/ingest/bin/ingest.sh
  56. 0  .../accumulo_sample/ingest/conf/wikipedia.xml → src/examples/wikisearch/ingest/conf/wikipedia.xml.example
  57. 7  {contrib/accumulo_sample → src/examples/wikisearch}/ingest/pom.xml
  58. 0  {contrib/accumulo_sample → src/examples/wikisearch}/ingest/src/assembly/dist.xml
  59. 7  ...arch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/aggregator/GlobalIndexUidAggregator.java
  60. 4  ...ikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/aggregator/TextIndexAggregator.java
  61. 7  ...mples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/ingest/ArticleExtractor.java
  62. 2  ...wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/ingest/WikipediaConfiguration.java
  63. 17  ...ples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/ingest/WikipediaIngester.java
  64. 4  ...s/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/ingest/WikipediaInputFormat.java
  65. 10  ...amples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/ingest/WikipediaMapper.java
  66. 2  ...search/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/TotalAggregatingIterator.java
  67. 4  ...arch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/normalizer/LcNoDiacriticsNormalizer.java
  68. 2  ...les/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/normalizer/NoOpNormalizer.java
  69. 2  ...xamples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/normalizer/Normalizer.java
  70. 2  ...s/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/normalizer/NumberNormalizer.java
  71. 64  .../examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/protobuf/TermWeight.java
  72. 64  ...rr; src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/protobuf/Uid.java
  73. 6  ...ikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/reader/AggregatingRecordReader.java
  74. 2  .../examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/reader/LfLineReader.java
  75. 2  ...s/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/reader/LongLineRecordReader.java
  76. 2  ...r; src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch}/util/TextUtil.java
  77. 0  {contrib/accumulo_sample → src/examples/wikisearch}/ingest/src/main/protobuf/TermWeight.proto
  78. 0  {contrib/accumulo_sample → src/examples/wikisearch}/ingest/src/main/protobuf/Uid.proto
  79. 0  {contrib/accumulo_sample → src/examples/wikisearch}/ingest/src/main/protobuf/compile_protos.sh
  80. 10  .../ingest/src/test/java/org/apache/accumulo/examples/wikisearch}/aggregator/GlobalIndexUidAggregatorTest.java
  81. 7  ...earch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch}/aggregator/TextIndexAggregatorTest.java
  82. 2  ...kisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest}/StandaloneStatusReporter.java
  83. 29  ...es/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch}/ingest/WikipediaMapperTest.java
  84. 3  ...kisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch}/normalizer/testNumberNormalizer.java
  85. 3  ...earch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch}/reader/AggregatingRecordReaderTest.java
  86. 0  {contrib/accumulo_sample → src/examples/wikisearch}/ingest/src/test/resources/enwiki-20110901-001.xml
  87. 44  {contrib/accumulo_sample → src/examples/wikisearch}/pom.xml
  88. 7  {contrib/accumulo_sample → src/examples/wikisearch}/query-war/pom.xml
  89. 2  {contrib/accumulo_sample → src/examples/wikisearch}/query-war/src/main/webapp/WEB-INF/jboss-web.xml
  90. 0  {contrib/accumulo_sample → src/examples/wikisearch}/query-war/src/main/webapp/WEB-INF/web.xml
  91. 2  {contrib/accumulo_sample → src/examples/wikisearch}/query-war/src/main/webapp/style.xsl
  92. 6  {contrib/accumulo_sample → src/examples/wikisearch}/query-war/src/main/webapp/ui.jsp
  93. 0  {contrib/accumulo_sample → src/examples/wikisearch}/query-war/src/test/resources/test.xml
  94. 11  {contrib/accumulo_sample → src/examples/wikisearch}/query/pom.xml
  95. 13  {contrib/accumulo_sample → src/examples/wikisearch}/query/src/assembly/dist.xml
  96. 2  ...amples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/function/QueryFunctions.java
  97. 6  ...earch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/AbstractEvaluatingIterator.java
  98. 2  .../examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/AndIterator.java
  99. 16  .../wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/BooleanLogicIterator.java
  100. 4  .../wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/BooleanLogicTreeNode.java
  101. 6  ...es/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/EvaluatingIterator.java
  102. 6  ...es/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/FieldIndexIterator.java
  103. 2  ...ikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/OptimizedQueryIterator.java
  104. 2  ...c/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/OrIterator.java
  105. 2  ...les/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/ReadAheadIterator.java
  106. 4  ...earch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/iterator/UniqFieldNameValueIterator.java
  107. 2  ...; src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/jexl/Arithmetic.java
  108. 39  ...mples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/logic/AbstractQueryLogic.java
  109. 11  ...rc/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/logic/ContentLogic.java
  110. 22  ... src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/logic/QueryLogic.java
  111. 4  ...rc/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/EventFields.java
  112. 6  ...wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/FieldIndexQueryReWriter.java
  113. 2  ...s/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/JexlOperatorConstants.java
  114. 10  ...examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/QueryEvaluator.java
  115. 2  ...rc/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/QueryParser.java
  116. 14  ...xamples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/RangeCalculator.java
  117. 14  ...rc/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/TreeBuilder.java
  118. 4  ...; src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/parser/TreeNode.java
  119. 5  ...arr; src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/query/IQuery.java
  120. 10  ...rarr; src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/query/Query.java
  121. 2  ...; src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/sample/Document.java
  122. 2  ...arr; src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/sample/Field.java
  123. 2  ...r; src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/sample/Results.java
  124. 2  ...rc/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/util/BaseKeyParser.java
  125. 2  ...mples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/util/FieldIndexKeyParser.java
  126. 2  ...r; src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch}/util/KeyParser.java
  127. 0  {contrib/accumulo_sample → src/examples/wikisearch}/query/src/main/resources/META-INF/MANIFEST.MF
  128. 0  ...s/META-INF/ejb-jar.xml → src/examples/wikisearch/query/src/main/resources/META-INF/ejb-jar.xml.example
  129. 2  ...wikisearch/query/src/test/java/org/apache/accumulo/examples/wikisearch/logic}/StandaloneStatusReporter.java
  130. 64  .../examples/wikisearch/query/src/test/java/org/apache/accumulo/examples/wikisearch}/logic/TestQueryLogic.java
  131. 0  {contrib/accumulo_sample → src/examples/wikisearch}/query/src/test/resources/enwiki-20110901-001.xml
  132. 2  src/trace/thrift.sh
65  contrib/accumulo_sample/README
... ...
@@ -1,65 +0,0 @@
1  
-
2  
- This project contains a sample application for ingesting and querying wikipedia data.
3  
- 
4  
-  
5  
- Ingest
6  
- ------
7  
- 
8  
- 	Prerequisites
9  
- 	-------------
10  
- 	1. ACCUMULO, Hadoop, and ZooKeeper must be installed and running
11  
- 	2. ACCUMULO_HOME and ZOOKEEPER_HOME are defined in the environment
12  
- 	3. One or more wikipedia dump files (http://dumps.wikimedia.org/backup-index.html) placed in an HDFS directory.
13  
-	   You will want to grab the files with the link name of pages-articles.xml.bz2
14  
- 
15  
- 
16  
- 	INSTRUCTIONS
17  
- 	------------
18  
-   1. Build the ingest assembly by running 'mvn assembly:assembly' in the ingest directory. 
19  
-   2. Untar the distribution in some directory. 
20  
-   3. Modify the conf/wikipedia.xml file to specify ACCUMULO information. 
21  
-   4. Copy the lib/accumulo-sample*.jar and lib/protobuf*.jar to $ACCUMULO_HOME/lib/ext
22  
-   5. Then run bin/ingest.sh with one argument (the name of the directory in HDFS where the wikipedia XML files reside) 
23  
-   	  and this will kick off a MapReduce job to ingest the data into ACCUMULO.
24  
-   
25  
- Query
26  
- -----
27  
- 
28  
- 	Prerequisites
29  
- 	-------------
30  
- 	1. The query software was tested using JBoss AS 6. Install this unless you feel like messing with the installation.
31  
- 	
32  
-	NOTE: Ran into a bug (https://issues.jboss.org/browse/RESTEASY-531) that did not allow an EJB3.1 war file. I was able
33  
-	to workaround this by separating the RESTEasy servlet from the EJBs by creating an EJB jar and a WAR file.
34  
-	
35  
-	INSTRUCTIONS
36  
-	-------------
37  
-	1. Modify the query/src/main/resources/META-INF/ejb-jar.xml file with the same information that you put into the wikipedia.xml
38  
-	   file from the Ingest step above. 
39  
-	2. Build the query distribution by running 'mvn assembly:assembly' in the query directory. 
40  
-	3. Untar the resulting file from the $JBOSS_HOME/server/default directory. This will place the dependent jars in the lib 
41  
-	directory and the EJB jar into the deploy directory. 
42  
-	4. Next, run 'mvn clean package' in the query-war directory and copy the war to $JBOSS_HOME/server/default/deploy. 
43  
-	5. Start JBoss ($JBOSS_HOME/bin/run.sh)
44  
-	6. Login to Accumulo and give the user permissions for the wikis that you loaded, for example: 
45  
-			setauths -u <user> -s all,enwiki,eswiki,frwiki,fawiki
46  
-	7. Copy the following jars to the $ACCUMULO_HOME/lib/ext directory from the $JBOSS_HOME/server/default/lib directory:
47  
-	
48  
-		commons-lang*.jar
49  
-		kryo*.jar
50  
-		minlog*.jar
51  
-		reflectasm*.jar
52  
-		asm*.jar
53  
-		commons-jexl*.jar
54  
-		google-collections*.jar
55  
-		
56  
-	8. Copy the $JBOSS_HOME/server/default/deploy/accumulo-sample-query*.jar to $ACCUMULO_HOME/lib/ext.
57  
-		
58  
-	
59  
-	9. At this point you should be able to open a browser and view the page: http://localhost:8080/accumulo-sample/ui/ui.jsp.
60  
-	You can issue the queries using this user interface or via the following REST urls: <host>/accumulo-sample/rest/Query/xml,
61  
-	<host>/accumulo-sample/rest/Query/html, <host>/accumulo-sample/rest/Query/yaml, or <host>/accumulo-sample/rest/Query/json.
62  
-	There are two parameters to the REST service, query and auths. The query parameter is the same string that you would type
63  
-	into the search box at ui.jsp, and the auths parameter is a comma-separated list of wikis that you want to search (i.e.
64  
-	enwiki,frwiki,dewiki, etc. Or you can use all) 
65  
- 
58  contrib/accumulo_sample/query/src/main/java/iterator/DefaultIteratorEnvironment.java
... ...
@@ -1,58 +0,0 @@
1  
-/*
2  
- * Licensed to the Apache Software Foundation (ASF) under one or more
3  
- * contributor license agreements.  See the NOTICE file distributed with
4  
- * this work for additional information regarding copyright ownership.
5  
- * The ASF licenses this file to You under the Apache License, Version 2.0
6  
- * (the "License"); you may not use this file except in compliance with
7  
- * the License.  You may obtain a copy of the License at
8  
- *
9  
- *     http://www.apache.org/licenses/LICENSE-2.0
10  
- *
11  
- * Unless required by applicable law or agreed to in writing, software
12  
- * distributed under the License is distributed on an "AS IS" BASIS,
13  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14  
- * See the License for the specific language governing permissions and
15  
- * limitations under the License.
16  
- */
17  
-package iterator;
18  
-
19  
-import java.io.IOException;
20  
-
21  
-import org.apache.hadoop.conf.Configuration;
22  
-import org.apache.hadoop.fs.FileSystem;
23  
-
24  
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
25  
-import org.apache.accumulo.core.data.Key;
26  
-import org.apache.accumulo.core.data.Value;
27  
-import org.apache.accumulo.core.file.map.MyMapFile;
28  
-import org.apache.accumulo.core.file.map.MyMapFile.Reader;
29  
-import org.apache.accumulo.core.iterators.IteratorEnvironment;
30  
-import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
31  
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
32  
-import org.apache.accumulo.core.util.CachedConfiguration;
33  
-
34  
-public class DefaultIteratorEnvironment implements IteratorEnvironment {
35  
-  
36  
-  public Reader reserveMapFileReader(String mapFileName) throws IOException {
37  
-    Configuration conf = CachedConfiguration.getInstance();
38  
-    FileSystem fs = FileSystem.get(conf);
39  
-    return new MyMapFile.Reader(fs, mapFileName, conf);
40  
-  }
41  
-  
42  
-  public AccumuloConfiguration getConfig() {
43  
-    return AccumuloConfiguration.getDefaultConfiguration();
44  
-  }
45  
-  
46  
-  public IteratorScope getIteratorScope() {
47  
-    throw new UnsupportedOperationException();
48  
-  }
49  
-  
50  
-  public boolean isFullMajorCompaction() {
51  
-    throw new UnsupportedOperationException();
52  
-  }
53  
-  
54  
-  public void registerSideChannel(SortedKeyValueIterator<Key,Value> iter) {
55  
-    throw new UnsupportedOperationException();
56  
-  }
57  
-  
58  
-}
33  pom.xml
@@ -168,6 +168,27 @@
168 168
           </environmentVariables>
169 169
         </configuration>
170 170
       </plugin>
  171
+
  172
+      <plugin>
  173
+        <groupId>org.codehaus.mojo</groupId>
  174
+        <artifactId>exec-maven-plugin</artifactId>
  175
+        <inherited>false</inherited>
  176
+        <configuration>
  177
+          <executable>bash</executable>
  178
+          <arguments>
  179
+            <argument>docs/src/user_manual/build.sh</argument>
  180
+          </arguments>
  181
+        </configuration>
  182
+        <executions>
  183
+          <execution>
  184
+            <id>user-manual</id>
  185
+            <phase>prepare-package</phase>
  186
+            <goals>
  187
+              <goal>exec</goal>
  188
+            </goals>
  189
+          </execution>
  190
+        </executions>
  191
+      </plugin>
171 192
     </plugins>
172 193
 
173 194
 
@@ -199,7 +220,7 @@
199 220
                     </goals>
200 221
                   </pluginExecutionFilter>
201 222
                   <action>
202  
-                    <ignore />
  223
+                    <ignore/>
203 224
                   </action>
204 225
                 </pluginExecution>
205 226
                 <pluginExecution>
@@ -225,7 +246,7 @@
225 246
                     </goals>
226 247
                   </pluginExecutionFilter>
227 248
                   <action>
228  
-                    <ignore />
  249
+                    <ignore/>
229 250
                   </action>
230 251
                 </pluginExecution>
231 252
                 <pluginExecution>
@@ -410,7 +431,13 @@
410 431
       </dependency>
411 432
       <dependency>
412 433
         <groupId>org.apache.accumulo</groupId>
413  
-        <artifactId>accumulo-examples</artifactId>
  434
+        <artifactId>examples-simple</artifactId>
  435
+        <version>1.5.0-incubating-SNAPSHOT</version>
  436
+      </dependency>
  437
+      <dependency>
  438
+        <groupId>org.apache.accumulo</groupId>
  439
+        <artifactId>wikisearch-query-war</artifactId>
  440
+        <type>war</type>
414 441
         <version>1.5.0-incubating-SNAPSHOT</version>
415 442
       </dependency>
416 443
 
11  src/assemble/pom.xml
@@ -42,7 +42,12 @@
42 42
     </dependency>
43 43
     <dependency>
44 44
       <groupId>org.apache.accumulo</groupId>
45  
-      <artifactId>accumulo-examples</artifactId>
  45
+      <artifactId>examples-simple</artifactId>
  46
+    </dependency>
  47
+    <dependency>
  48
+      <groupId>org.apache.accumulo</groupId>
  49
+      <artifactId>wikisearch-query-war</artifactId>
  50
+      <type>war</type>
46 51
     </dependency>
47 52
     <dependency>
48 53
       <groupId>org.apache.accumulo</groupId>
@@ -87,7 +92,7 @@
87 92
       <plugin>
88 93
         <artifactId>maven-assembly-plugin</artifactId>
89 94
         <configuration>
90  
-          <finalName>${parent.artifactId}-${version}</finalName>
  95
+          <finalName>${project.parent.artifactId}-${project.version}</finalName>
91 96
           <descriptors>
92 97
             <descriptor>src/assemble/dist.xml</descriptor>
93 98
           </descriptors>
@@ -238,4 +243,4 @@
238 243
       </build>
239 244
     </profile>
240 245
   </profiles>
241  
-</project>
  246
+</project>
10  src/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
@@ -6262,8 +6262,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
6262 6262
 
6263 6263
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
6264 6264
       try {
6265  
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
6266  
-        __isset_bit_vector = new BitSet(1);
6267 6265
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
6268 6266
       } catch (org.apache.thrift.TException te) {
6269 6267
         throw new java.io.IOException(te);
@@ -7821,8 +7819,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
7821 7819
 
7822 7820
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
7823 7821
       try {
7824  
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
7825  
-        __isset_bit_vector = new BitSet(1);
7826 7822
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
7827 7823
       } catch (org.apache.thrift.TException te) {
7828 7824
         throw new java.io.IOException(te);
@@ -14037,8 +14033,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
14037 14033
 
14038 14034
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
14039 14035
       try {
14040  
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
14041  
-        __isset_bit_vector = new BitSet(1);
14042 14036
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
14043 14037
       } catch (org.apache.thrift.TException te) {
14044 14038
         throw new java.io.IOException(te);
@@ -15168,8 +15162,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
15168 15162
 
15169 15163
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
15170 15164
       try {
15171  
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
15172  
-        __isset_bit_vector = new BitSet(1);
15173 15165
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
15174 15166
       } catch (org.apache.thrift.TException te) {
15175 15167
         throw new java.io.IOException(te);
@@ -21131,8 +21123,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
21131 21123
 
21132 21124
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
21133 21125
       try {
21134  
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
21135  
-        __isset_bit_vector = new BitSet(1);
21136 21126
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
21137 21127
       } catch (org.apache.thrift.TException te) {
21138 21128
         throw new java.io.IOException(te);
4  src/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
@@ -2990,8 +2990,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
2990 2990
 
2991 2991
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
2992 2992
       try {
2993  
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
2994  
-        __isset_bit_vector = new BitSet(1);
2995 2993
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
2996 2994
       } catch (org.apache.thrift.TException te) {
2997 2995
         throw new java.io.IOException(te);
@@ -13071,8 +13069,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
13071 13069
 
13072 13070
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
13073 13071
       try {
13074  
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
13075  
-        __isset_bit_vector = new BitSet(1);
13076 13072
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
13077 13073
       } catch (org.apache.thrift.TException te) {
13078 13074
         throw new java.io.IOException(te);
2  src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/MutationLogger.java
@@ -9319,8 +9319,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
9319 9319
 
9320 9320
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
9321 9321
       try {
9322  
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
9323  
-        __isset_bit_vector = new BitSet(1);
9324 9322
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
9325 9323
       } catch (org.apache.thrift.TException te) {
9326 9324
         throw new java.io.IOException(te);
2  src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
@@ -9884,8 +9884,6 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept
9884 9884
 
9885 9885
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
9886 9886
       try {
9887  
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
9888  
-        __isset_bit_vector = new BitSet(1);
9889 9887
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
9890 9888
       } catch (org.apache.thrift.TException te) {
9891 9889
         throw new java.io.IOException(te);
75  src/examples/pom.xml
... ...
@@ -1,13 +1,13 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <!--
3 3
   Licensed to the Apache Software Foundation (ASF) under one or more
4  
-  contributor license agreements.  See the NOTICE file distributed with
  4
+  contributor license agreements. See the NOTICE file distributed with
5 5
   this work for additional information regarding copyright ownership.
6 6
   The ASF licenses this file to You under the Apache License, Version 2.0
7 7
   (the "License"); you may not use this file except in compliance with
8  
-  the License.  You may obtain a copy of the License at
  8
+  the License. You may obtain a copy of the License at
9 9
 
10  
-      http://www.apache.org/licenses/LICENSE-2.0
  10
+  http://www.apache.org/licenses/LICENSE-2.0
11 11
 
12 12
   Unless required by applicable law or agreed to in writing, software
13 13
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,29 +15,60 @@
15 15
   See the License for the specific language governing permissions and
16 16
   limitations under the License.
17 17
 -->
18  
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19  
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20  
-
  18
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  19
+  <modelVersion>4.0.0</modelVersion>
21 20
   <parent>
22  
-    <groupId>org.apache.accumulo</groupId>
23  
-    <artifactId>accumulo</artifactId>
24  
-    <version>1.5.0-incubating-SNAPSHOT</version>
25  
-    <relativePath>../../</relativePath>
  21
+        <artifactId>accumulo</artifactId>
  22
+        <groupId>org.apache.accumulo</groupId>
  23
+        <version>1.5.0-incubating-SNAPSHOT</version>
  24
+        <relativePath>../../</relativePath>
26 25
   </parent>
27  
-
28  
-  <modelVersion>4.0.0</modelVersion>
29 26
   <artifactId>accumulo-examples</artifactId>
  27
+  <packaging>pom</packaging>
30 28
   <name>accumulo-examples</name>
31 29
 
32  
-  <dependencies>
33  
-    <dependency>
34  
-      <groupId>org.apache.hadoop</groupId>
35  
-      <artifactId>hadoop-core</artifactId>
36  
-    </dependency>
37  
-    <dependency>
38  
-      <groupId>org.apache.accumulo</groupId>
39  
-      <artifactId>accumulo-core</artifactId>
40  
-    </dependency>
41  
-  </dependencies>
  30
+  <modules>
  31
+    <module>simple</module>
  32
+    <module>wikisearch</module>
  33
+  </modules>
  34
+
  35
+  <repositories>
  36
+    <repository>
  37
+      <id>central</id>
  38
+      <name>Maven Repository Switchboard</name>
  39
+      <layout>default</layout>
  40
+      <url>http://repo1.maven.org/maven2</url>
  41
+      <snapshots>
  42
+        <enabled>false</enabled>
  43
+      </snapshots>
  44
+    </repository>
  45
+    <repository>
  46
+      <id>java.net</id>
  47
+      <name>java.net</name>
  48
+      <layout>default</layout>
  49
+      <url>https://maven.java.net/content/groups/public</url>
  50
+      <snapshots>
  51
+        <enabled>false</enabled>
  52
+      </snapshots>
  53
+    </repository>
  54
+  </repositories>
  55
+
  56
+  <build>
  57
+    <defaultGoal>package</defaultGoal>
  58
+    <plugins>
  59
+      <plugin>
  60
+        <groupId>org.apache.maven.plugins</groupId>
  61
+        <artifactId>maven-enforcer-plugin</artifactId>
  62
+        <executions>
  63
+          <execution>
  64
+            <id>enforce-mvn</id>
  65
+            <goals>
  66
+              <goal>enforce</goal>
  67
+            </goals>
  68
+          </execution>
  69
+        </executions>
  70
+      </plugin>
  71
+    </plugins>
  72
+  </build>
42 73
 
43 74
 </project>
68  src/examples/simple/pom.xml
... ...
@@ -0,0 +1,68 @@
  1
+<?xml version="1.0" encoding="UTF-8"?>
  2
+<!--
  3
+  Licensed to the Apache Software Foundation (ASF) under one or more
  4
+  contributor license agreements.  See the NOTICE file distributed with
  5
+  this work for additional information regarding copyright ownership.
  6
+  The ASF licenses this file to You under the Apache License, Version 2.0
  7
+  (the "License"); you may not use this file except in compliance with
  8
+  the License.  You may obtain a copy of the License at
  9
+
  10
+      http://www.apache.org/licenses/LICENSE-2.0
  11
+
  12
+  Unless required by applicable law or agreed to in writing, software
  13
+  distributed under the License is distributed on an "AS IS" BASIS,
  14
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  15
+  See the License for the specific language governing permissions and
  16
+  limitations under the License.
  17
+-->
  18
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  19
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  20
+
  21
+  <parent>
  22
+    <groupId>org.apache.accumulo</groupId>
  23
+    <artifactId>accumulo-examples</artifactId>
  24
+    <version>1.5.0-incubating-SNAPSHOT</version>
  25
+    <relativePath>../</relativePath>
  26
+  </parent>
  27
+
  28
+  <modelVersion>4.0.0</modelVersion>
  29
+  <artifactId>examples-simple</artifactId>
  30
+  <name>examples-simple</name>
  31
+
  32
+  <dependencies>
  33
+    <dependency>
  34
+      <groupId>org.apache.hadoop</groupId>
  35
+      <artifactId>hadoop-core</artifactId>
  36
+    </dependency>
  37
+    <dependency>
  38
+      <groupId>org.apache.accumulo</groupId>
  39
+      <artifactId>accumulo-core</artifactId>
  40
+    </dependency>
  41
+  </dependencies>
  42
+
  43
+  <build>
  44
+    <plugins>
  45
+      <plugin>
  46
+        <artifactId>maven-jar-plugin</artifactId>
  47
+        <configuration>
  48
+          <outputDirectory>../../../lib</outputDirectory>
  49
+          <archive>
  50
+            <manifest>
  51
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
  52
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
  53
+            </manifest>
  54
+            <manifestEntries>
  55
+              <Implementation-Build>${buildNumber}</Implementation-Build>
  56
+              <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
  57
+            </manifestEntries>
  58
+          </archive>
  59
+          <includes>
  60
+            <include>org/apache/accumulo**/**</include>
  61
+            <include>**/META-INF/*</include>
  62
+          </includes>
  63
+        </configuration>
  64
+      </plugin>
  65
+    </plugins>
  66
+  </build>
  67
+
  68
+</project>
2  ...va/org/apache/accumulo/examples/client/Flush.java → ...apache/accumulo/examples/simple/client/Flush.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.client;
  17
+package org.apache.accumulo.examples.simple.client;
18 18
 
19 19
 import org.apache.accumulo.core.client.Connector;
20 20
 import org.apache.accumulo.core.client.ZooKeeperInstance;
2  .../accumulo/examples/client/RandomBatchScanner.java → ...lo/examples/simple/client/RandomBatchScanner.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.client;
  17
+package org.apache.accumulo.examples.simple.client;
18 18
 
19 19
 import java.util.Arrays;
20 20
 import java.util.HashMap;
2  ...e/accumulo/examples/client/RandomBatchWriter.java → ...ulo/examples/simple/client/RandomBatchWriter.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.client;
  17
+package org.apache.accumulo.examples.simple.client;
18 18
 
19 19
 import java.util.HashSet;
20 20
 import java.util.Random;
2  ...he/accumulo/examples/client/ReadWriteExample.java → ...mulo/examples/simple/client/ReadWriteExample.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.client;
  17
+package org.apache.accumulo.examples.simple.client;
18 18
 
19 19
 import java.util.Map.Entry;
20 20
 import java.util.SortedSet;
2  ...pache/accumulo/examples/client/RowOperations.java → ...ccumulo/examples/simple/client/RowOperations.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.client;
  17
+package org.apache.accumulo.examples.simple.client;
18 18
 
19 19
 import java.io.IOException;
20 20
 import java.util.Map.Entry;
2  ...cumulo/examples/client/SequentialBatchWriter.java → ...examples/simple/client/SequentialBatchWriter.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.client;
  17
+package org.apache.accumulo.examples.simple.client;
18 18
 
19 19
 import org.apache.accumulo.core.client.AccumuloException;
20 20
 import org.apache.accumulo.core.client.AccumuloSecurityException;
2  ...che/accumulo/examples/combiner/StatsCombiner.java → ...umulo/examples/simple/combiner/StatsCombiner.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.combiner;
  17
+package org.apache.accumulo.examples.simple.combiner;
18 18
 
19 19
 import java.io.IOException;
20 20
 import java.util.Iterator;
2  ...o/examples/constraints/AlphaNumKeyConstraint.java → ...les/simple/constraints/AlphaNumKeyConstraint.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.constraints;
  17
+package org.apache.accumulo.examples.simple.constraints;
18 18
 
19 19
 import java.util.ArrayList;
20 20
 import java.util.Collection;
2  ...ccumulo/examples/constraints/MaxMutationSize.java → .../examples/simple/constraints/MaxMutationSize.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.constraints;
  17
+package org.apache.accumulo.examples.simple.constraints;
18 18
 
19 19
 import java.util.Collections;
20 20
 import java.util.List;
2  .../examples/constraints/NumericValueConstraint.java → ...es/simple/constraints/NumericValueConstraint.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.constraints;
  17
+package org.apache.accumulo.examples.simple.constraints;
18 18
 
19 19
 import java.util.ArrayList;
20 20
 import java.util.Collection;
2  ...g/apache/accumulo/examples/dirlist/FileCount.java → ...e/accumulo/examples/simple/dirlist/FileCount.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.dirlist;
  17
+package org.apache.accumulo.examples.simple.dirlist;
18 18
 
19 19
 import java.util.Iterator;
20 20
 import java.util.Map.Entry;
4  .../org/apache/accumulo/examples/dirlist/Ingest.java → ...ache/accumulo/examples/simple/dirlist/Ingest.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.dirlist;
  17
+package org.apache.accumulo.examples.simple.dirlist;
18 18
 
19 19
 import java.io.File;
20 20
 import java.io.IOException;
@@ -27,7 +27,7 @@
27 27
 import org.apache.accumulo.core.iterators.LongCombiner;
28 28
 import org.apache.accumulo.core.iterators.TypedValueCombiner.Encoder;
29 29
 import org.apache.accumulo.core.security.ColumnVisibility;
30  
-import org.apache.accumulo.examples.filedata.FileDataIngest;
  30
+import org.apache.accumulo.examples.simple.filedata.FileDataIngest;
31 31
 import org.apache.hadoop.io.Text;
32 32
 
33 33
 public class Ingest {
2  ...g/apache/accumulo/examples/dirlist/QueryUtil.java → ...e/accumulo/examples/simple/dirlist/QueryUtil.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.dirlist;
  17
+package org.apache.accumulo.examples.simple.dirlist;
18 18
 
19 19
 import java.util.Map;
20 20
 import java.util.Map.Entry;
4  .../org/apache/accumulo/examples/dirlist/Viewer.java → ...ache/accumulo/examples/simple/dirlist/Viewer.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.dirlist;
  17
+package org.apache.accumulo.examples.simple.dirlist;
18 18
 
19 19
 import java.awt.BorderLayout;
20 20
 import java.io.IOException;
@@ -37,7 +37,7 @@
37 37
 
38 38
 import org.apache.accumulo.core.client.TableNotFoundException;
39 39
 import org.apache.accumulo.core.security.Authorizations;
40  
-import org.apache.accumulo.examples.filedata.FileDataQuery;
  40
+import org.apache.accumulo.examples.simple.filedata.FileDataQuery;
41 41
 import org.apache.log4j.Logger;
42 42
 
43 43
 @SuppressWarnings("serial")
2  ...che/accumulo/examples/filedata/ChunkCombiner.java → ...umulo/examples/simple/filedata/ChunkCombiner.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.filedata;
  17
+package org.apache.accumulo.examples.simple.filedata;
18 18
 
19 19
 import java.io.IOException;
20 20
 import java.util.Collection;
2  .../accumulo/examples/filedata/ChunkInputFormat.java → ...lo/examples/simple/filedata/ChunkInputFormat.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.filedata;
  17
+package org.apache.accumulo.examples.simple.filedata;
18 18
 
19 19
 import java.io.IOException;
20 20
 import java.io.InputStream;
2  .../accumulo/examples/filedata/ChunkInputStream.java → ...lo/examples/simple/filedata/ChunkInputStream.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.filedata;
  17
+package org.apache.accumulo.examples.simple.filedata;
18 18
 
19 19
 import java.io.IOException;
20 20
 import java.io.InputStream;
2  ...he/accumulo/examples/filedata/FileDataIngest.java → ...mulo/examples/simple/filedata/FileDataIngest.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.filedata;
  17
+package org.apache.accumulo.examples.simple.filedata;
18 18
 
19 19
 import java.io.FileInputStream;
20 20
 import java.io.IOException;
2  ...che/accumulo/examples/filedata/FileDataQuery.java → ...umulo/examples/simple/filedata/FileDataQuery.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.filedata;
  17
+package org.apache.accumulo.examples.simple.filedata;
18 18
 
19 19
 import java.io.IOException;
20 20
 import java.util.ArrayList;
2  ...rg/apache/accumulo/examples/filedata/KeyUtil.java → ...he/accumulo/examples/simple/filedata/KeyUtil.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.filedata;
  17
+package org.apache.accumulo.examples.simple.filedata;
18 18
 
19 19
 import java.util.ArrayList;
20 20
 
2  ...ccumulo/examples/filedata/VisibilityCombiner.java → .../examples/simple/filedata/VisibilityCombiner.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.filedata;
  17
+package org.apache.accumulo.examples.simple.filedata;
18 18
 
19 19
 import java.util.TreeSet;
20 20
 
2  ...lo/examples/helloworld/InsertWithBatchWriter.java → ...ples/simple/helloworld/InsertWithBatchWriter.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.helloworld;
  17
+package org.apache.accumulo.examples.simple.helloworld;
18 18
 
19 19
 import org.apache.accumulo.core.client.AccumuloException;
20 20
 import org.apache.accumulo.core.client.AccumuloSecurityException;
8  ...o/examples/helloworld/InsertWithOutputFormat.java → ...les/simple/helloworld/InsertWithOutputFormat.java
@@ -14,18 +14,19 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.helloworld;
  17
+package org.apache.accumulo.examples.simple.helloworld;
18 18
 
19 19
 import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
20 20
 import org.apache.accumulo.core.data.Mutation;
21 21
 import org.apache.accumulo.core.data.Value;
22 22
 import org.apache.accumulo.core.util.CachedConfiguration;
23  
-import org.apache.accumulo.core.util.ContextFactory;
  23
+import org.apache.hadoop.conf.Configuration;
24 24
 import org.apache.hadoop.conf.Configured;
25 25
 import org.apache.hadoop.io.Text;
26 26
 import org.apache.hadoop.mapreduce.Job;
27 27
 import org.apache.hadoop.mapreduce.RecordWriter;
28 28
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
  29
+import org.apache.hadoop.mapreduce.TaskAttemptID;
29 30
 import org.apache.hadoop.util.Tool;
30 31
 import org.apache.hadoop.util.ToolRunner;
31 32
 
@@ -42,6 +43,7 @@ public int run(String[] args) throws Exception {
42 43
     }
43 44
     Text tableName = new Text(args[2]);
44 45
     Job job = new Job(getConf());
  46
+    Configuration conf = job.getConfiguration();
45 47
     AccumuloOutputFormat.setZooKeeperInstance(job, args[0], args[1]);
46 48
     AccumuloOutputFormat.setOutputInfo(job, args[3], args[4].getBytes(), true, null);
47 49
     job.setOutputFormatClass(AccumuloOutputFormat.class);
@@ -50,7 +52,7 @@ public int run(String[] args) throws Exception {
50 52
     // format and record writer
51 53
     // mapreduce will do that for you, and you will just use
52 54
     // output.collect(tableName, mutation)
53  
-    TaskAttemptContext context = ContextFactory.createTaskAttemptContext(job);
  55
+    TaskAttemptContext context = new TaskAttemptContext(conf, new TaskAttemptID());
54 56
     RecordWriter<Text,Mutation> rw = new AccumuloOutputFormat().getRecordWriter(context);
55 57
     
56 58
     Text colf = new Text("colfam");
2  ...apache/accumulo/examples/helloworld/ReadData.java → ...accumulo/examples/simple/helloworld/ReadData.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.helloworld;
  17
+package org.apache.accumulo.examples.simple.helloworld;
18 18
 
19 19
 import java.util.Iterator;
20 20
 import java.util.Map.Entry;
2  ...accumulo/examples/isolation/InterferenceTest.java → ...o/examples/simple/isolation/InterferenceTest.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.isolation;
  17
+package org.apache.accumulo.examples.simple.isolation;
18 18
 
19 19
 import java.util.HashSet;
20 20
 import java.util.Map.Entry;
2  ...che/accumulo/examples/mapreduce/RegexExample.java → ...umulo/examples/simple/mapreduce/RegexExample.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.mapreduce;
  17
+package org.apache.accumulo.examples.simple.mapreduce;
18 18
 
19 19
 import java.io.IOException;
20 20
 
2  ...g/apache/accumulo/examples/mapreduce/RowHash.java → ...e/accumulo/examples/simple/mapreduce/RowHash.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.mapreduce;
  17
+package org.apache.accumulo.examples.simple.mapreduce;
18 18
 
19 19
 import java.io.IOException;
20 20
 import java.util.Collections;
2  ...ache/accumulo/examples/mapreduce/TableToFile.java → ...cumulo/examples/simple/mapreduce/TableToFile.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.mapreduce;
  17
+package org.apache.accumulo.examples.simple.mapreduce;
18 18
 
19 19
 import java.io.IOException;
20 20
 import java.util.HashSet;
2  ...e/accumulo/examples/mapreduce/TeraSortIngest.java → ...ulo/examples/simple/mapreduce/TeraSortIngest.java
@@ -16,7 +16,7 @@
16 16
  * limitations under the License.
17 17
  */
18 18
 
19  
-package org.apache.accumulo.examples.mapreduce;
  19
+package org.apache.accumulo.examples.simple.mapreduce;
20 20
 
21 21
 import java.io.DataInput;
22 22
 import java.io.DataOutput;
2  ...apache/accumulo/examples/mapreduce/WordCount.java → ...accumulo/examples/simple/mapreduce/WordCount.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.mapreduce;
  17
+package org.apache.accumulo.examples.simple.mapreduce;
18 18
 
19 19
 import java.io.IOException;
20 20
 
2  ...lo/examples/mapreduce/bulk/BulkIngestExample.java → ...ples/simple/mapreduce/bulk/BulkIngestExample.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.mapreduce.bulk;
  17
+package org.apache.accumulo.examples.simple.mapreduce.bulk;
18 18
 
19 19
 import java.io.BufferedOutputStream;
20 20
 import java.io.IOException;
2  ...ulo/examples/mapreduce/bulk/GenerateTestData.java → ...mples/simple/mapreduce/bulk/GenerateTestData.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.mapreduce.bulk;
  17
+package org.apache.accumulo.examples.simple.mapreduce.bulk;
18 18
 
19 19
 import java.io.BufferedOutputStream;
20 20
 import java.io.IOException;
2  .../accumulo/examples/mapreduce/bulk/SetupTable.java → ...lo/examples/simple/mapreduce/bulk/SetupTable.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.mapreduce.bulk;
  17
+package org.apache.accumulo.examples.simple.mapreduce.bulk;
18 18
 
19 19
 import java.util.TreeSet;
20 20
 
2  ...ccumulo/examples/mapreduce/bulk/VerifyIngest.java → .../examples/simple/mapreduce/bulk/VerifyIngest.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.mapreduce.bulk;
  17
+package org.apache.accumulo.examples.simple.mapreduce.bulk;
18 18
 
19 19
 import java.util.Iterator;
20 20
 import java.util.Map.Entry;
2  ...ache/accumulo/examples/shard/ContinuousQuery.java → ...cumulo/examples/simple/shard/ContinuousQuery.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.shard;
  17
+package org.apache.accumulo.examples.simple.shard;
18 18
 
19 19
 import java.util.ArrayList;
20 20
 import java.util.Arrays;
2  ...ava/org/apache/accumulo/examples/shard/Index.java → .../apache/accumulo/examples/simple/shard/Index.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.shard;
  17
+package org.apache.accumulo.examples.simple.shard;
18 18
 
19 19
 import java.io.File;
20 20
 import java.io.FileReader;
2  ...ava/org/apache/accumulo/examples/shard/Query.java → .../apache/accumulo/examples/simple/shard/Query.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.shard;
  17
+package org.apache.accumulo.examples.simple.shard;
18 18
 
19 19
 import java.util.Collections;
20 20
 import java.util.Map.Entry;
2  ...a/org/apache/accumulo/examples/shard/Reverse.java → ...pache/accumulo/examples/simple/shard/Reverse.java
@@ -14,7 +14,7 @@
14 14
  * See the License for the specific language governing permissions and
15 15
  * limitations under the License.
16 16
  */
17  
-package org.apache.accumulo.examples.shard;
  17