svn commit: r1230122 [1/2] - in /incubator/accumulo/branches/1.4/src/examples: simple/src/main/java/org/apache/accumulo/examples/client/ simple/src/main/java/org/apache/accumulo/examples/combiner/ simple/src/main/java/org/apache/accumulo/examples/const...

[ec...@apache.org]

Author: ecn
Date: Wed Jan 11 16:15:13 2012
New Revision: 1230122

URL: http://svn.apache.org/viewvc?rev=1230122&view=rev
Log:
ACCUMULO-285 move examples to examples/simple, move wikisearch to examples/wikisearch

Added:
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/Flush.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/RandomBatchScanner.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/RandomBatchWriter.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/ReadWriteExample.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/RowOperations.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/SequentialBatchWriter.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/combiner/StatsCombiner.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/AlphaNumKeyConstraint.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/MaxMutationSize.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/MaxMutationSize.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/NumericValueConstraint.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/NumericValueConstraint.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/FileCount.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/Viewer.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkCombiner.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/ChunkCombiner.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/ChunkInputFormat.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/ChunkInputStream.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/FileDataIngest.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/FileDataQuery.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/KeyUtil.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/VisibilityCombiner.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/helloworld/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/isolation/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/RegexExample.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/RowHash.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/TableToFile.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/TeraSortIngest.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java   (contents, props changed)
      - copied, changed from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/WordCount.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/bulk/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/shard/
    incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/
    incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/dirlist/
    incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/filedata/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/aggregator/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/ingest/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/iterator/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/normalizer/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/protobuf/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/reader/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/util/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/wikisearch/aggregator/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/wikisearch/ingest/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/normalizer/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/wikisearch/normalizer/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/
      - copied from r1230099, incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/wikisearch/reader/
Removed:
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/combiner/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/helloworld/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/isolation/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/RegexExample.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/RowHash.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/TableToFile.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/TeraSortIngest.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/WordCount.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/bulk/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/shard/
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/wikisearch/
    incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/dirlist/
    incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/filedata/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/aggregator/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/ingest/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/iterator/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/normalizer/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/protobuf/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/reader/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/util/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/wikisearch/aggregator/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/wikisearch/ingest/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/wikisearch/normalizer/
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/wikisearch/reader/
Modified:
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/GenerateTestData.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Reverse.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/KeyUtilTest.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/GlobalIndexUidAggregator.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/TextIndexAggregator.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/ArticleExtractor.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaConfiguration.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaIngester.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaInputFormat.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/TotalAggregatingIterator.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/LcNoDiacriticsNormalizer.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/NoOpNormalizer.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/Normalizer.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/NumberNormalizer.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/TermWeight.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/Uid.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReader.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/LfLineReader.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/LongLineRecordReader.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/TextUtil.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/GlobalIndexUidAggregatorTest.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/TextIndexAggregatorTest.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/StandaloneStatusReporter.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapperTest.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/normalizer/testNumberNormalizer.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/AbstractQueryLogic.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/ContentLogic.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/QueryLogic.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/parser/RangeCalculator.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/wikisearch/logic/TestQueryLogic.java

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/Flush.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/Flush.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/Flush.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.client;
+package org.apache.accumulo.examples.simple.client;
 
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.ZooKeeperInstance;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/RandomBatchScanner.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/RandomBatchScanner.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/RandomBatchScanner.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.client;
+package org.apache.accumulo.examples.simple.client;
 
 import java.util.Arrays;
 import java.util.HashMap;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/RandomBatchWriter.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/RandomBatchWriter.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/RandomBatchWriter.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.client;
+package org.apache.accumulo.examples.simple.client;
 
 import java.util.HashSet;
 import java.util.Random;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/ReadWriteExample.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/ReadWriteExample.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/ReadWriteExample.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.client;
+package org.apache.accumulo.examples.simple.client;
 
 import java.util.Map.Entry;
 import java.util.SortedSet;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/RowOperations.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/RowOperations.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/RowOperations.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.client;
+package org.apache.accumulo.examples.simple.client;
 
 import java.io.IOException;
 import java.util.Map.Entry;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/SequentialBatchWriter.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/SequentialBatchWriter.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/client/SequentialBatchWriter.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.client;
+package org.apache.accumulo.examples.simple.client;
 
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/combiner/StatsCombiner.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/combiner/StatsCombiner.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/combiner/StatsCombiner.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.combiner;
+package org.apache.accumulo.examples.simple.combiner;
 
 import java.io.IOException;
 import java.util.Iterator;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/AlphaNumKeyConstraint.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/AlphaNumKeyConstraint.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/AlphaNumKeyConstraint.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.constraints;
+package org.apache.accumulo.examples.simple.constraints;
 
 import java.util.ArrayList;
 import java.util.Collection;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/MaxMutationSize.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/MaxMutationSize.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/MaxMutationSize.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/MaxMutationSize.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/MaxMutationSize.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/MaxMutationSize.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/MaxMutationSize.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.constraints;
+package org.apache.accumulo.examples.simple.constraints;
 
 import java.util.Collections;
 import java.util.List;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/MaxMutationSize.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/NumericValueConstraint.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/NumericValueConstraint.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/NumericValueConstraint.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/NumericValueConstraint.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/NumericValueConstraint.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/constraints/NumericValueConstraint.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/NumericValueConstraint.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.constraints;
+package org.apache.accumulo.examples.simple.constraints;
 
 import java.util.ArrayList;
 import java.util.Collection;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/NumericValueConstraint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/FileCount.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/FileCount.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/FileCount.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.dirlist;
+package org.apache.accumulo.examples.simple.dirlist;
 
 import java.util.Iterator;
 import java.util.Map.Entry;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.dirlist;
+package org.apache.accumulo.examples.simple.dirlist;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,7 +27,7 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.iterators.LongCombiner;
 import org.apache.accumulo.core.iterators.TypedValueCombiner.Encoder;
 import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.examples.filedata.FileDataIngest;
+import org.apache.accumulo.examples.simple.filedata.FileDataIngest;
 import org.apache.hadoop.io.Text;
 
 public class Ingest {

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.dirlist;
+package org.apache.accumulo.examples.simple.dirlist;
 
 import java.util.Map;
 import java.util.Map.Entry;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/Viewer.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/Viewer.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/dirlist/Viewer.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.dirlist;
+package org.apache.accumulo.examples.simple.dirlist;
 
 import java.awt.BorderLayout;
 import java.io.IOException;
@@ -37,7 +37,7 @@ import javax.swing.tree.TreePath;
 
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.examples.filedata.FileDataQuery;
+import org.apache.accumulo.examples.simple.filedata.FileDataQuery;
 import org.apache.log4j.Logger;
 
 @SuppressWarnings("serial")

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkCombiner.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/ChunkCombiner.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkCombiner.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkCombiner.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/ChunkCombiner.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/ChunkCombiner.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkCombiner.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.filedata;
+package org.apache.accumulo.examples.simple.filedata;
 
 import java.io.IOException;
 import java.util.Collection;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkCombiner.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/ChunkInputFormat.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/ChunkInputFormat.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/ChunkInputFormat.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.filedata;
+package org.apache.accumulo.examples.simple.filedata;
 
 import java.io.IOException;
 import java.io.InputStream;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/ChunkInputStream.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/ChunkInputStream.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/ChunkInputStream.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.filedata;
+package org.apache.accumulo.examples.simple.filedata;
 
 import java.io.IOException;
 import java.io.InputStream;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/FileDataIngest.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/FileDataIngest.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/FileDataIngest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.filedata;
+package org.apache.accumulo.examples.simple.filedata;
 
 import java.io.FileInputStream;
 import java.io.IOException;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/FileDataQuery.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/FileDataQuery.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/FileDataQuery.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.filedata;
+package org.apache.accumulo.examples.simple.filedata;
 
 import java.io.IOException;
 import java.util.ArrayList;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/KeyUtil.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/KeyUtil.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/KeyUtil.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.filedata;
+package org.apache.accumulo.examples.simple.filedata;
 
 import java.util.ArrayList;
 

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/VisibilityCombiner.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/VisibilityCombiner.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/filedata/VisibilityCombiner.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.filedata;
+package org.apache.accumulo.examples.simple.filedata;
 
 import java.util.TreeSet;
 

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.helloworld;
+package org.apache.accumulo.examples.simple.helloworld;
 
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.helloworld;
+package org.apache.accumulo.examples.simple.helloworld;
 
 import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
 import org.apache.accumulo.core.data.Mutation;

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.helloworld;
+package org.apache.accumulo.examples.simple.helloworld;
 
 import java.util.Iterator;
 import java.util.Map.Entry;

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.isolation;
+package org.apache.accumulo.examples.simple.isolation;
 
 import java.util.HashSet;
 import java.util.Map.Entry;

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/RegexExample.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/RegexExample.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/RegexExample.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.mapreduce;
+package org.apache.accumulo.examples.simple.mapreduce;
 
 import java.io.IOException;
 

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/RowHash.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/RowHash.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/RowHash.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.mapreduce;
+package org.apache.accumulo.examples.simple.mapreduce;
 
 import java.io.IOException;
 import java.util.Collections;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/TableToFile.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/TableToFile.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/TableToFile.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.mapreduce;
+package org.apache.accumulo.examples.simple.mapreduce;
 
 import java.io.IOException;
 import java.util.HashSet;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/TeraSortIngest.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/TeraSortIngest.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/TeraSortIngest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java Wed Jan 11 16:15:13 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.accumulo.examples.mapreduce;
+package org.apache.accumulo.examples.simple.mapreduce;
 
 import java.io.DataInput;
 import java.io.DataOutput;

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java (from r1230099, incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/WordCount.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java?p2=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java&p1=incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/WordCount.java&r1=1230099&r2=1230122&rev=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/WordCount.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.mapreduce;
+package org.apache.accumulo.examples.simple.mapreduce;
 
 import java.io.IOException;
 

Propchange: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.mapreduce.bulk;
+package org.apache.accumulo.examples.simple.mapreduce.bulk;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/GenerateTestData.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/GenerateTestData.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/GenerateTestData.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/GenerateTestData.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.mapreduce.bulk;
+package org.apache.accumulo.examples.simple.mapreduce.bulk;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.mapreduce.bulk;
+package org.apache.accumulo.examples.simple.mapreduce.bulk;
 
 import java.util.TreeSet;
 

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.mapreduce.bulk;
+package org.apache.accumulo.examples.simple.mapreduce.bulk;
 
 import java.util.Iterator;
 import java.util.Map.Entry;

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.shard;
+package org.apache.accumulo.examples.simple.shard;
 
 import java.util.ArrayList;
 import java.util.Arrays;

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.shard;
+package org.apache.accumulo.examples.simple.shard;
 
 import java.io.File;
 import java.io.FileReader;

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.shard;
+package org.apache.accumulo.examples.simple.shard;
 
 import java.util.Collections;
 import java.util.Map.Entry;

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Reverse.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Reverse.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Reverse.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Reverse.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.shard;
+package org.apache.accumulo.examples.simple.shard;
 
 import java.util.Map.Entry;
 

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.dirlist;
+package org.apache.accumulo.examples.simple.dirlist;
 
 import java.util.ArrayList;
 import java.util.Map.Entry;
@@ -30,6 +30,9 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.util.Pair;
+import org.apache.accumulo.examples.simple.dirlist.FileCount;
+import org.apache.accumulo.examples.simple.dirlist.Ingest;
+import org.apache.accumulo.examples.simple.dirlist.QueryUtil;
 import org.apache.hadoop.io.Text;
 
 public class CountTest extends TestCase {

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.filedata;
+package org.apache.accumulo.examples.simple.filedata;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -33,8 +33,8 @@ import org.apache.accumulo.core.data.Ran
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.examples.filedata.ChunkCombiner;
-import org.apache.accumulo.examples.filedata.FileDataIngest;
+import org.apache.accumulo.examples.simple.filedata.ChunkCombiner;
+import org.apache.accumulo.examples.simple.filedata.FileDataIngest;
 
 import junit.framework.TestCase;
 

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.filedata;
+package org.apache.accumulo.examples.simple.filedata;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,6 +37,8 @@ import org.apache.accumulo.core.data.Mut
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
+import org.apache.accumulo.examples.simple.filedata.ChunkInputFormat;
+import org.apache.accumulo.examples.simple.filedata.ChunkInputStream;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.JobContext;
 import org.apache.hadoop.mapreduce.JobID;

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.filedata;
+package org.apache.accumulo.examples.simple.filedata;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -38,8 +38,8 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.util.PeekingIterator;
-import org.apache.accumulo.examples.filedata.ChunkInputStream;
-import org.apache.accumulo.examples.filedata.FileDataIngest;
+import org.apache.accumulo.examples.simple.filedata.ChunkInputStream;
+import org.apache.accumulo.examples.simple.filedata.FileDataIngest;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/KeyUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/KeyUtilTest.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/KeyUtilTest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/KeyUtilTest.java Wed Jan 11 16:15:13 2012
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.examples.filedata;
+package org.apache.accumulo.examples.simple.filedata;
 
 import junit.framework.TestCase;
 
-import org.apache.accumulo.examples.filedata.KeyUtil;
+import org.apache.accumulo.examples.simple.filedata.KeyUtil;
 import org.apache.hadoop.io.Text;
 
 public class KeyUtilTest extends TestCase {

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/GlobalIndexUidAggregator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/GlobalIndexUidAggregator.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/GlobalIndexUidAggregator.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/GlobalIndexUidAggregator.java Wed Jan 11 16:15:13 2012
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.wikisearch.aggregator;
+package org.apache.accumulo.examples.wikisearch.aggregator;
 
 import java.util.HashSet;
 
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.aggregation.Aggregator;
-import org.apache.accumulo.wikisearch.protobuf.Uid;
+import org.apache.accumulo.examples.wikisearch.protobuf.Uid;
 import org.apache.log4j.Logger;
 
 import com.google.protobuf.InvalidProtocolBufferException;