accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1230608 [1/16] - in /incubator/accumulo/trunk: ./ contrib/accumulo_sample/ src/assemble/ src/core/ src/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ src/core/src/main/java/org/apache/accumulo/core/master/thrift/ src/core/...
Date Thu, 12 Jan 2012 16:06:20 GMT
Author: ecn
Date: Thu Jan 12 16:06:14 2012
New Revision: 1230608

URL: http://svn.apache.org/viewvc?rev=1230608&view=rev
Log:
ACCUMULO-285 merge to trunk, resolve all 1.4 -> trunk merge conflicts

Added:
    incubator/accumulo/trunk/src/examples/simple/   (with props)
    incubator/accumulo/trunk/src/examples/simple/pom.xml   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/
    incubator/accumulo/trunk/src/examples/simple/src/main/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/AlphaNumKeyConstraint.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/MaxMutationSize.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/constraints/NumericValueConstraint.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Ingest.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkCombiner.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormat.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/KeyUtil.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/VisibilityCombiner.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/GenerateTestData.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Reverse.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/test/
    incubator/accumulo/trunk/src/examples/simple/src/test/java/
    incubator/accumulo/trunk/src/examples/simple/src/test/java/org/
    incubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/
    incubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/
    incubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/
    incubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/
    incubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/
    incubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/
    incubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkCombinerTest.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java   (with props)
    incubator/accumulo/trunk/src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/KeyUtilTest.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/README   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/bin/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/bin/ingest.sh   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/conf/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/conf/wikipedia.xml.example
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/pom.xml   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/assembly/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/assembly/dist.xml   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/GlobalIndexUidAggregator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/TextIndexAggregator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/ArticleExtractor.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaConfiguration.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaIngester.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaInputFormat.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/TotalAggregatingIterator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/LcNoDiacriticsNormalizer.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/NoOpNormalizer.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/Normalizer.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/NumberNormalizer.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/TermWeight.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/Uid.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReader.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/LfLineReader.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/LongLineRecordReader.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/TextUtil.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/protobuf/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/protobuf/TermWeight.proto
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/protobuf/Uid.proto
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/protobuf/compile_protos.sh   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/GlobalIndexUidAggregatorTest.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/TextIndexAggregatorTest.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/StandaloneStatusReporter.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapperTest.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/normalizer/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/normalizer/testNumberNormalizer.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/wikisearch/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/resources/
    incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/resources/enwiki-20110901-001.xml   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/pom.xml   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/pom.xml   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/src/
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/src/main/
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/src/main/webapp/
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/src/main/webapp/WEB-INF/
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/src/main/webapp/WEB-INF/jboss-web.xml   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/src/main/webapp/WEB-INF/web.xml   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/src/main/webapp/style.xsl   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/src/main/webapp/ui.jsp   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/src/test/
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/src/test/resources/
    incubator/accumulo/trunk/src/examples/wikisearch/query-war/src/test/resources/test.xml   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/pom.xml   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/assembly/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/assembly/dist.xml   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/function/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/function/QueryFunctions.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/BooleanLogicIterator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/BooleanLogicTreeNode.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/EvaluatingIterator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/FieldIndexIterator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/OptimizedQueryIterator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/OrIterator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/ReadAheadIterator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/UniqFieldNameValueIterator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/jexl/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/jexl/Arithmetic.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/logic/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/logic/AbstractQueryLogic.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/logic/ContentLogic.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/logic/QueryLogic.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/EventFields.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/FieldIndexQueryReWriter.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/JexlOperatorConstants.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/QueryEvaluator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/QueryParser.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/RangeCalculator.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/TreeBuilder.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/TreeNode.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/IQuery.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/sample/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/sample/Document.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/sample/Field.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/sample/Results.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/util/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/util/BaseKeyParser.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/util/FieldIndexKeyParser.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/util/KeyParser.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/resources/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/resources/META-INF/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/resources/META-INF/MANIFEST.MF   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/resources/META-INF/ejb-jar.xml.example
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/java/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/java/org/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/java/org/apache/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/examples/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/examples/wikisearch/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/examples/wikisearch/logic/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/examples/wikisearch/logic/StandaloneStatusReporter.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/examples/wikisearch/logic/TestQueryLogic.java   (with props)
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/wikisearch/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/resources/
    incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml   (with props)
Removed:
    incubator/accumulo/trunk/contrib/accumulo_sample/
    incubator/accumulo/trunk/src/examples/src/
Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/pom.xml
    incubator/accumulo/trunk/src/assemble/pom.xml
    incubator/accumulo/trunk/src/core/   (props changed)
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/MutationLogger.java
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
    incubator/accumulo/trunk/src/examples/pom.xml
    incubator/accumulo/trunk/src/server/   (props changed)
    incubator/accumulo/trunk/src/trace/thrift.sh

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 12 16:06:14 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1228245,1228308,1229205,1229220,1229248,1229357,1229424,1229427-1229428,1229588,1229651,1229699,1229738,1229758,1230006,1230184-1230186,1230311
+/incubator/accumulo/branches/1.4:1201902-1229205,1229220,1229248,1229357,1229424,1229427-1229428,1229588,1229651,1229699,1229738,1229758,1230006,1230184-1230186,1230311

Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1230608&r1=1230607&r2=1230608&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Thu Jan 12 16:06:14 2012
@@ -168,6 +168,27 @@
           </environmentVariables>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <inherited>false</inherited>
+        <configuration>
+          <executable>bash</executable>
+          <arguments>
+            <argument>docs/src/user_manual/build.sh</argument>
+          </arguments>
+        </configuration>
+        <executions>
+          <execution>
+            <id>user-manual</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
 
 
@@ -199,7 +220,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -225,7 +246,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -410,7 +431,13 @@
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
-        <artifactId>accumulo-examples</artifactId>
+        <artifactId>examples-simple</artifactId>
+        <version>1.5.0-incubating-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
+        <artifactId>wikisearch-query-war</artifactId>
+        <type>war</type>
         <version>1.5.0-incubating-SNAPSHOT</version>
       </dependency>
 

Modified: incubator/accumulo/trunk/src/assemble/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/assemble/pom.xml?rev=1230608&r1=1230607&r2=1230608&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/assemble/pom.xml (original)
+++ incubator/accumulo/trunk/src/assemble/pom.xml Thu Jan 12 16:06:14 2012
@@ -42,7 +42,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-examples</artifactId>
+      <artifactId>examples-simple</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>wikisearch-query-war</artifactId>
+      <type>war</type>
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
@@ -87,7 +92,7 @@
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
-          <finalName>${parent.artifactId}-${version}</finalName>
+          <finalName>${project.parent.artifactId}-${project.version}</finalName>
           <descriptors>
             <descriptor>src/assemble/dist.xml</descriptor>
           </descriptors>
@@ -238,4 +243,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>

Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 12 16:06:14 2012
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
 /incubator/accumulo/branches/1.3.5rc/src/core:1209938
-/incubator/accumulo/branches/1.4/src/core:1201902-1228245,1228308,1229205,1229220,1229248,1229357,1229424,1229427-1229428,1229588,1229651,1229699,1229738,1229758,1230006,1230184-1230186,1230311
+/incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
+/incubator/accumulo/branches/1.4/src/core:1201902-1229205,1229220,1229248,1229357,1229424,1229427-1229428,1229588,1229651,1229699,1229738,1229758,1230006,1230184-1230186,1230311

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java?rev=1230608&r1=1230607&r2=1230608&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java Thu Jan 12 16:06:14 2012
@@ -6262,8 +6262,6 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -7821,8 +7819,6 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -14037,8 +14033,6 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -15168,8 +15162,6 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -21131,8 +21123,6 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java?rev=1230608&r1=1230607&r2=1230608&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java Thu Jan 12 16:06:14 2012
@@ -2990,8 +2990,6 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -13071,8 +13069,6 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/MutationLogger.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/MutationLogger.java?rev=1230608&r1=1230607&r2=1230608&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/MutationLogger.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/MutationLogger.java Thu Jan 12 16:06:14 2012
@@ -9319,8 +9319,6 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java?rev=1230608&r1=1230607&r2=1230608&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java Thu Jan 12 16:06:14 2012
@@ -9884,8 +9884,6 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);

Modified: incubator/accumulo/trunk/src/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/pom.xml?rev=1230608&r1=1230607&r2=1230608&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/pom.xml (original)
+++ incubator/accumulo/trunk/src/examples/pom.xml Thu Jan 12 16:06:14 2012
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
+  contributor license agreements. See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
+  the License. You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+  http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,29 +15,60 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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/maven-v4_0_0.xsd">
-
+<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">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.accumulo</groupId>
-    <artifactId>accumulo</artifactId>
-    <version>1.5.0-incubating-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+        <artifactId>accumulo</artifactId>
+        <groupId>org.apache.accumulo</groupId>
+        <version>1.5.0-incubating-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
   </parent>
-
-  <modelVersion>4.0.0</modelVersion>
   <artifactId>accumulo-examples</artifactId>
+  <packaging>pom</packaging>
   <name>accumulo-examples</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-core</artifactId>
-    </dependency>
-  </dependencies>
+  <modules>
+    <module>simple</module>
+    <module>wikisearch</module>
+  </modules>
+
+  <repositories>
+    <repository>
+      <id>central</id>
+      <name>Maven Repository Switchboard</name>
+      <layout>default</layout>
+      <url>http://repo1.maven.org/maven2</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>java.net</id>
+      <name>java.net</name>
+      <layout>default</layout>
+      <url>https://maven.java.net/content/groups/public</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <build>
+    <defaultGoal>package</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-mvn</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>

Propchange: incubator/accumulo/trunk/src/examples/simple/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jan 12 16:06:14 2012
@@ -0,0 +1,2 @@
+.*
+target

Added: incubator/accumulo/trunk/src/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/simple/pom.xml?rev=1230608&view=auto
==============================================================================
--- incubator/accumulo/trunk/src/examples/simple/pom.xml (added)
+++ incubator/accumulo/trunk/src/examples/simple/pom.xml Thu Jan 12 16:06:14 2012
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>org.apache.accumulo</groupId>
+    <artifactId>accumulo-examples</artifactId>
+    <version>1.5.0-incubating-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>examples-simple</artifactId>
+  <name>examples-simple</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-core</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <outputDirectory>../../../lib</outputDirectory>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+            <manifestEntries>
+              <Implementation-Build>${buildNumber}</Implementation-Build>
+              <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+            </manifestEntries>
+          </archive>
+          <includes>
+            <include>org/apache/accumulo**/**</include>
+            <include>**/META-INF/*</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Propchange: incubator/accumulo/trunk/src/examples/simple/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java?rev=1230608&view=auto
==============================================================================
--- incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java (added)
+++ incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java Thu Jan 12 16:06:14 2012
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.examples.simple.client;
+
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+
+/**
+ * Simple example for using tableOperations() (like create, delete, flush, etc).
+ */
+public class Flush {
+  
+  public static void main(String[] args) {
+    if (args.length != 5) {
+      System.err.println("Usage: accumulo accumulo.examples.client.Flush <instance name> <zoo keepers> <username> <password> <tableName>");
+      return;
+    }
+    String instanceName = args[0];
+    String zooKeepers = args[1];
+    String user = args[2];
+    String password = args[3];
+    String table = args[4];
+    
+    Connector connector;
+    try {
+      ZooKeeperInstance instance = new ZooKeeperInstance(instanceName, zooKeepers);
+      connector = instance.getConnector(user, password.getBytes());
+      connector.tableOperations().flush(table, null, null, true);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+}

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

Added: incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java?rev=1230608&view=auto
==============================================================================
--- incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java (added)
+++ incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java Thu Jan 12 16:06:14 2012
@@ -0,0 +1,186 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.examples.simple.client;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map.Entry;
+import java.util.Random;
+
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.BatchScanner;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.hadoop.io.Text;
+import org.apache.log4j.Logger;
+
+class CountingVerifyingReceiver {
+  private static final Logger log = Logger.getLogger(CountingVerifyingReceiver.class);
+  
+  long count = 0;
+  int expectedValueSize = 0;
+  HashMap<Text,Boolean> expectedRows;
+  
+  CountingVerifyingReceiver(HashMap<Text,Boolean> expectedRows, int expectedValueSize) {
+    this.expectedRows = expectedRows;
+    this.expectedValueSize = expectedValueSize;
+  }
+  
+  public void receive(Key key, Value value) {
+    
+    String row = key.getRow().toString();
+    long rowid = Integer.parseInt(row.split("_")[1]);
+    
+    byte expectedValue[] = RandomBatchWriter.createValue(rowid, expectedValueSize);
+    
+    if (!Arrays.equals(expectedValue, value.get())) {
+      log.error("Got unexpected value for " + key + " expected : " + new String(expectedValue) + " got : " + new String(value.get()));
+    }
+    
+    if (!expectedRows.containsKey(key.getRow())) {
+      log.error("Got unexpected key " + key);
+    } else {
+      expectedRows.put(key.getRow(), true);
+    }
+    
+    count++;
+  }
+}
+
+public class RandomBatchScanner {
+  private static final Logger log = Logger.getLogger(CountingVerifyingReceiver.class);
+  
+  static void generateRandomQueries(int num, long min, long max, Random r, HashSet<Range> ranges, HashMap<Text,Boolean> expectedRows) {
+    log.info(String.format("Generating %,d random queries...", num));
+    while (ranges.size() < num) {
+      long rowid = (Math.abs(r.nextLong()) % (max - min)) + min;
+      
+      Text row1 = new Text(String.format("row_%010d", rowid));
+      
+      Range range = new Range(new Text(row1));
+      ranges.add(range);
+      expectedRows.put(row1, false);
+    }
+    
+    log.info("finished");
+  }
+  
+  private static void printRowsNotFound(HashMap<Text,Boolean> expectedRows) {
+    int count = 0;
+    for (Entry<Text,Boolean> entry : expectedRows.entrySet())
+      if (!entry.getValue())
+        count++;
+    
+    if (count > 0)
+      log.warn("Did not find " + count + " rows");
+  }
+  
+  static void doRandomQueries(int num, long min, long max, int evs, Random r, BatchScanner tsbr) {
+    
+    HashSet<Range> ranges = new HashSet<Range>(num);
+    HashMap<Text,Boolean> expectedRows = new java.util.HashMap<Text,Boolean>();
+    
+    generateRandomQueries(num, min, max, r, ranges, expectedRows);
+    
+    tsbr.setRanges(ranges);
+    
+    CountingVerifyingReceiver receiver = new CountingVerifyingReceiver(expectedRows, evs);
+    
+    long t1 = System.currentTimeMillis();
+    
+    for (Entry<Key,Value> entry : tsbr) {
+      receiver.receive(entry.getKey(), entry.getValue());
+    }
+    
+    long t2 = System.currentTimeMillis();
+    
+    log.info(String.format("%6.2f lookups/sec %6.2f secs\n", num / ((t2 - t1) / 1000.0), ((t2 - t1) / 1000.0)));
+    log.info(String.format("num results : %,d\n", receiver.count));
+    
+    printRowsNotFound(expectedRows);
+  }
+  
+  public static void main(String[] args) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+    String seed = null;
+    
+    int index = 0;
+    String processedArgs[] = new String[11];
+    for (int i = 0; i < args.length; i++) {
+      if (args[i].equals("-s")) {
+        seed = args[++i];
+      } else {
+        processedArgs[index++] = args[i];
+      }
+    }
+    
+    if (index != 11) {
+      System.out
+          .println("Usage : RandomBatchScanner [-s <seed>] <instance name> <zoo keepers> <username> <password> <table> <num> <min> <max> <expected value size> <num threads> <auths>");
+      return;
+    }
+    
+    String instanceName = processedArgs[0];
+    String zooKeepers = processedArgs[1];
+    String user = processedArgs[2];
+    byte[] pass = processedArgs[3].getBytes();
+    String table = processedArgs[4];
+    int num = Integer.parseInt(processedArgs[5]);
+    long min = Long.parseLong(processedArgs[6]);
+    long max = Long.parseLong(processedArgs[7]);
+    int expectedValueSize = Integer.parseInt(processedArgs[8]);
+    int numThreads = Integer.parseInt(processedArgs[9]);
+    String auths = processedArgs[10];
+    
+    // Uncomment the following lines for detailed debugging info
+    // Logger logger = Logger.getLogger(Constants.CORE_PACKAGE_NAME);
+    // logger.setLevel(Level.TRACE);
+    
+    ZooKeeperInstance instance = new ZooKeeperInstance(instanceName, zooKeepers);
+    Connector connector = instance.getConnector(user, pass);
+    BatchScanner tsbr = connector.createBatchScanner(table, new Authorizations(auths.split(",")), numThreads);
+    
+    Random r;
+    if (seed == null)
+      r = new Random();
+    else
+      r = new Random(Long.parseLong(seed));
+    
+    // do one cold
+    doRandomQueries(num, min, max, expectedValueSize, r, tsbr);
+    
+    System.gc();
+    System.gc();
+    System.gc();
+    
+    if (seed == null)
+      r = new Random();
+    else
+      r = new Random(Long.parseLong(seed));
+    
+    // do one hot (connections already established, metadata table cached)
+    doRandomQueries(num, min, max, expectedValueSize, r, tsbr);
+    
+    tsbr.close();
+  }
+}

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

Added: incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java?rev=1230608&view=auto
==============================================================================
--- incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java (added)
+++ incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java Thu Jan 12 16:06:14 2012
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.examples.simple.client;
+
+import java.util.HashSet;
+import java.util.Random;
+
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MutationsRejectedException;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.data.KeyExtent;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.security.ColumnVisibility;
+import org.apache.hadoop.io.Text;
+
+public class RandomBatchWriter {
+  
+  public static byte[] createValue(long rowid, int dataSize) {
+    Random r = new Random(rowid);
+    byte value[] = new byte[dataSize];
+    
+    r.nextBytes(value);
+    
+    // transform to printable chars
+    for (int j = 0; j < value.length; j++) {
+      value[j] = (byte) (((0xff & value[j]) % 92) + ' ');
+    }
+    
+    return value;
+  }
+  
+  public static Mutation createMutation(long rowid, int dataSize, ColumnVisibility visibility) {
+    Text row = new Text(String.format("row_%010d", rowid));
+    
+    Mutation m = new Mutation(row);
+    
+    // create a random value that is a function of the
+    // row id for verification purposes
+    byte value[] = createValue(rowid, dataSize);
+    
+    m.put(new Text("foo"), new Text("1"), visibility, new Value(value));
+    
+    return m;
+  }
+  
+  public static void main(String[] args) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+    
+    String seed = null;
+    
+    int index = 0;
+    String processedArgs[] = new String[13];
+    for (int i = 0; i < args.length; i++) {
+      if (args[i].equals("-s")) {
+        seed = args[++i];
+      } else {
+        processedArgs[index++] = args[i];
+      }
+    }
+    
+    if (index != 13) {
+      System.out
+          .println("Usage : RandomBatchWriter [-s <seed>] <instance name> <zoo keepers> <username> <password> <table> <num> <min> <max> <value size> <max memory> <max latency> <num threads> <visibility>");
+      return;
+    }
+    
+    String instanceName = processedArgs[0];
+    String zooKeepers = processedArgs[1];
+    String user = processedArgs[2];
+    byte[] pass = processedArgs[3].getBytes();
+    String table = processedArgs[4];
+    int num = Integer.parseInt(processedArgs[5]);
+    long min = Long.parseLong(processedArgs[6]);
+    long max = Long.parseLong(processedArgs[7]);
+    int valueSize = Integer.parseInt(processedArgs[8]);
+    long maxMemory = Long.parseLong(processedArgs[9]);
+    long maxLatency = Long.parseLong(processedArgs[10]) == 0 ? Long.MAX_VALUE : Long.parseLong(processedArgs[10]);
+    int numThreads = Integer.parseInt(processedArgs[11]);
+    String visiblity = processedArgs[12];
+    
+    // Uncomment the following lines for detailed debugging info
+    // Logger logger = Logger.getLogger(Constants.CORE_PACKAGE_NAME);
+    // logger.setLevel(Level.TRACE);
+    
+    Random r;
+    if (seed == null)
+      r = new Random();
+    else {
+      r = new Random(Long.parseLong(seed));
+    }
+    
+    ZooKeeperInstance instance = new ZooKeeperInstance(instanceName, zooKeepers);
+    Connector connector = instance.getConnector(user, pass);
+    BatchWriter bw = connector.createBatchWriter(table, maxMemory, maxLatency, numThreads);
+    
+    // reuse the ColumnVisibility object to improve performance
+    ColumnVisibility cv = new ColumnVisibility(visiblity);
+    
+    for (int i = 0; i < num; i++) {
+      
+      long rowid = (Math.abs(r.nextLong()) % (max - min)) + min;
+      
+      Mutation m = createMutation(rowid, valueSize, cv);
+      
+      bw.addMutation(m);
+      
+    }
+    
+    try {
+      bw.close();
+    } catch (MutationsRejectedException e) {
+      if (e.getAuthorizationFailures().size() > 0) {
+        HashSet<String> tables = new HashSet<String>();
+        for (KeyExtent ke : e.getAuthorizationFailures()) {
+          tables.add(ke.getTableId().toString());
+        }
+        System.err.println("ERROR : Not authorized to write to tables : " + tables);
+      }
+      
+      if (e.getConstraintViolationSummaries().size() > 0) {
+        System.err.println("ERROR : Constraint violations occurred : " + e.getConstraintViolationSummaries());
+      }
+    }
+  }
+}

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

Added: incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java?rev=1230608&view=auto
==============================================================================
--- incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java (added)
+++ incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java Thu Jan 12 16:06:14 2012
@@ -0,0 +1,202 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.examples.simple.client;
+
+import java.util.Map.Entry;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MutationsRejectedException;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableExistsException;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.ColumnVisibility;
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.hadoop.io.Text;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+public class ReadWriteExample {
+  // defaults
+  private static final String DEFAULT_INSTANCE_NAME = "test";
+  private static final String DEFAULT_ZOOKEEPERS = "localhost";
+  private static final String DEFAULT_AUTHS = "LEVEL1,GROUP1";
+  private static final String DEFAULT_TABLE_NAME = "test";
+  
+  // options
+  private Option instanceOpt = new Option("i", "instance", true, "instance name");
+  private Option zooKeepersOpt = new Option("z", "zooKeepers", true, "zoo keepers");
+  
+  private Option usernameOpt = new Option("u", "user", true, "user name");
+  private Option passwordOpt = new Option("p", "password", true, "password");
+  private Option scanAuthsOpt = new Option("s", "scanauths", true, "comma-separated scan authorizations");
+  
+  private Option tableNameOpt = new Option("t", "table", true, "table name");
+  private Option createtableOpt = new Option("C", "createtable", false, "create table before doing anything");
+  private Option deletetableOpt = new Option("D", "deletetable", false, "delete table when finished");
+  
+  private Option createEntriesOpt = new Option("e", "create", false, "create entries before any deletes");
+  private Option deleteEntriesOpt = new Option("d", "delete", false, "delete entries after any creates");
+  private Option readEntriesOpt = new Option("r", "read", false, "read entries after any creates/deletes");
+  
+  private Option debugOpt = new Option("dbg", "debug", false, "enable debugging");
+  
+  private Options opts;
+  private CommandLine cl;
+  private Connector conn;
+  
+  // hidden constructor
+  private ReadWriteExample() {}
+  
+  // setup
+  private void configure(String[] args) throws ParseException, AccumuloException, AccumuloSecurityException {
+    usernameOpt.setRequired(true);
+    passwordOpt.setRequired(true);
+    opts = new Options();
+    addOptions(instanceOpt, zooKeepersOpt, usernameOpt, passwordOpt, scanAuthsOpt, tableNameOpt, createtableOpt, deletetableOpt, createEntriesOpt,
+        deleteEntriesOpt, readEntriesOpt, debugOpt);
+    
+    // parse command line
+    cl = new BasicParser().parse(opts, args);
+    if (cl.getArgs().length != 0)
+      throw new ParseException("unrecognized options " + cl.getArgList());
+    
+    // optionally enable debugging
+    if (hasOpt(debugOpt))
+      Logger.getLogger(Constants.CORE_PACKAGE_NAME).setLevel(Level.TRACE);
+    
+    Instance inst = new ZooKeeperInstance(getOpt(instanceOpt, DEFAULT_INSTANCE_NAME), getOpt(zooKeepersOpt, DEFAULT_ZOOKEEPERS));
+    conn = inst.getConnector(getRequiredOpt(usernameOpt), getRequiredOpt(passwordOpt).getBytes());
+  }
+  
+  // for setup
+  private void addOptions(Option... addOpts) {
+    for (Option opt : addOpts)
+      opts.addOption(opt);
+  }
+  
+  // for checking for and getting options
+  private boolean hasOpt(Option opt) {
+    return cl.hasOption(opt.getOpt());
+  }
+  
+  private String getRequiredOpt(Option opt) {
+    return getOpt(opt, null);
+  }
+  
+  private String getOpt(Option opt, String defaultValue) {
+    return cl.getOptionValue(opt.getOpt(), defaultValue);
+  }
+  
+  // for usage
+  private void printHelp() {
+    HelpFormatter hf = new HelpFormatter();
+    instanceOpt.setArgName("name");
+    zooKeepersOpt.setArgName("hosts");
+    usernameOpt.setArgName("user");
+    passwordOpt.setArgName("pass");
+    scanAuthsOpt.setArgName("scanauths");
+    tableNameOpt.setArgName("name");
+    hf.printHelp("accumulo accumulo.examples.client.ReadWriteExample", opts, true);
+  }
+  
+  private void execute() throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException, MutationsRejectedException {
+    // create table
+    if (hasOpt(createtableOpt)) {
+      SortedSet<Text> partitionKeys = new TreeSet<Text>();
+      for (int i = Byte.MIN_VALUE; i < Byte.MAX_VALUE; i++)
+        partitionKeys.add(new Text(new byte[] {(byte) i}));
+      conn.tableOperations().create(getOpt(tableNameOpt, DEFAULT_TABLE_NAME));
+      conn.tableOperations().addSplits(getOpt(tableNameOpt, DEFAULT_TABLE_NAME), partitionKeys);
+    }
+    
+    // create entries
+    if (hasOpt(createEntriesOpt))
+      createEntries(false);
+    
+    // delete entries
+    if (hasOpt(deleteEntriesOpt))
+      createEntries(true);
+    
+    // read entries
+    if (hasOpt(readEntriesOpt)) {
+      // Note that the user needs to have the authorizations for the specified scan authorizations
+      // by an administrator first
+      Authorizations scanauths = new Authorizations(getOpt(scanAuthsOpt, DEFAULT_AUTHS).split(","));
+      
+      Scanner scanner = conn.createScanner(getOpt(tableNameOpt, DEFAULT_TABLE_NAME), scanauths);
+      for (Entry<Key,Value> entry : scanner)
+        System.out.println(entry.getKey().toString() + " -> " + entry.getValue().toString());
+    }
+    
+    // delete table
+    if (hasOpt(deletetableOpt))
+      conn.tableOperations().delete(getOpt(tableNameOpt, DEFAULT_TABLE_NAME));
+  }
+  
+  private void createEntries(boolean delete) throws AccumuloException, TableNotFoundException, MutationsRejectedException {
+    BatchWriter writer = conn.createBatchWriter(getOpt(tableNameOpt, DEFAULT_TABLE_NAME), 10000, Long.MAX_VALUE, 1);
+    ColumnVisibility cv = new ColumnVisibility(DEFAULT_AUTHS.replace(',', '|'));
+    
+    Text cf = new Text("datatypes");
+    Text cq = new Text("xml");
+    byte[] row = {'h', 'e', 'l', 'l', 'o', '\0'};
+    byte[] value = {'w', 'o', 'r', 'l', 'd', '\0'};
+    
+    for (int i = 0; i < 10; i++) {
+      row[row.length - 1] = (byte) i;
+      Mutation m = new Mutation(new Text(row));
+      if (delete) {
+        m.putDelete(cf, cq, cv);
+      } else {
+        value[value.length - 1] = (byte) i;
+        m.put(cf, cq, cv, new Value(value));
+      }
+      writer.addMutation(m);
+    }
+    writer.close();
+  }
+  
+  public static void main(String[] args) throws Exception {
+    ReadWriteExample rwe = new ReadWriteExample();
+    
+    try {
+      rwe.configure(args);
+      rwe.execute();
+    } catch (ParseException e) {
+      System.err.println(e.getMessage());
+      rwe.printHelp();
+      System.exit(1);
+    }
+  }
+}

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

Added: incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java?rev=1230608&view=auto
==============================================================================
--- incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java (added)
+++ incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java Thu Jan 12 16:06:14 2012
@@ -0,0 +1,222 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.examples.simple.client;
+
+import java.io.IOException;
+import java.util.Map.Entry;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MutationsRejectedException;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableExistsException;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
+import org.apache.hadoop.io.Text;
+import org.apache.log4j.Logger;
+
+public class RowOperations {
+  
+  private static final Logger log = Logger.getLogger(RowOperations.class);
+  
+  private static Connector connector;
+  private static String table = "example";
+  private static BatchWriter bw;
+  
+  public static void main(String[] args) throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException,
+      MutationsRejectedException {
+    if (args.length != 4) {
+      log.error("Usage: <instance name> <zoo keepers> <username> <password>");
+      return;
+    }
+    
+    // First the setup work
+    connector = new ZooKeeperInstance(args[0], args[1]).getConnector(args[2], args[3].getBytes());
+    
+    // lets create an example table
+    connector.tableOperations().create(table);
+    
+    // lets create 3 rows of information
+    Text row1 = new Text("row1");
+    Text row2 = new Text("row2");
+    Text row3 = new Text("row3");
+    
+    // Which means 3 different mutations
+    Mutation mut1 = new Mutation(row1);
+    Mutation mut2 = new Mutation(row2);
+    Mutation mut3 = new Mutation(row3);
+    
+    // And we'll put 4 columns in each row
+    Text col1 = new Text("1");
+    Text col2 = new Text("2");
+    Text col3 = new Text("3");
+    Text col4 = new Text("4");
+    
+    // Now we'll add them to the mutations
+    mut1.put(new Text("column"), col1, System.currentTimeMillis(), new Value("This is the value for this key".getBytes()));
+    mut1.put(new Text("column"), col2, System.currentTimeMillis(), new Value("This is the value for this key".getBytes()));
+    mut1.put(new Text("column"), col3, System.currentTimeMillis(), new Value("This is the value for this key".getBytes()));
+    mut1.put(new Text("column"), col4, System.currentTimeMillis(), new Value("This is the value for this key".getBytes()));
+    
+    mut2.put(new Text("column"), col1, System.currentTimeMillis(), new Value("This is the value for this key".getBytes()));
+    mut2.put(new Text("column"), col2, System.currentTimeMillis(), new Value("This is the value for this key".getBytes()));
+    mut2.put(new Text("column"), col3, System.currentTimeMillis(), new Value("This is the value for this key".getBytes()));
+    mut2.put(new Text("column"), col4, System.currentTimeMillis(), new Value("This is the value for this key".getBytes()));
+    
+    mut3.put(new Text("column"), col1, System.currentTimeMillis(), new Value("This is the value for this key".getBytes()));
+    mut3.put(new Text("column"), col2, System.currentTimeMillis(), new Value("This is the value for this key".getBytes()));
+    mut3.put(new Text("column"), col3, System.currentTimeMillis(), new Value("This is the value for this key".getBytes()));
+    mut3.put(new Text("column"), col4, System.currentTimeMillis(), new Value("This is the value for this key".getBytes()));
+    
+    // Now we'll make a Batch Writer
+    bw = connector.createBatchWriter(table, 100000l, 30l, 1);
+    
+    // And add the mutations
+    bw.addMutation(mut1);
+    bw.addMutation(mut2);
+    bw.addMutation(mut3);
+    
+    // Force a send
+    bw.flush();
+    
+    // Now lets look at the rows
+    Scanner rowThree = getRow(new Text("row3"));
+    Scanner rowTwo = getRow(new Text("row2"));
+    Scanner rowOne = getRow(new Text("row1"));
+    
+    // And print them
+    log.info("This is everything");
+    printRow(rowOne);
+    printRow(rowTwo);
+    printRow(rowThree);
+    System.out.flush();
+    
+    // Now lets delete rowTwo with the iterator
+    rowTwo = getRow(new Text("row2"));
+    deleteRow(rowTwo);
+    
+    // Now lets look at the rows again
+    rowThree = getRow(new Text("row3"));
+    rowTwo = getRow(new Text("row2"));
+    rowOne = getRow(new Text("row1"));
+    
+    // And print them
+    log.info("This is row1 and row3");
+    printRow(rowOne);
+    printRow(rowTwo);
+    printRow(rowThree);
+    System.out.flush();
+    
+    // Should only see the two rows
+    // Now lets delete rowOne without passing in the iterator
+    
+    deleteRow(row1);
+    
+    // Now lets look at the rows one last time
+    rowThree = getRow(new Text("row3"));
+    rowTwo = getRow(new Text("row2"));
+    rowOne = getRow(new Text("row1"));
+    
+    // And print them
+    log.info("This is just row3");
+    printRow(rowOne);
+    printRow(rowTwo);
+    printRow(rowThree);
+    System.out.flush();
+    
+    // Should only see rowThree
+    
+    // Always close your batchwriter
+    
+    bw.close();
+    
+    // and lets clean up our mess
+    connector.tableOperations().delete(table);
+    
+    // fin~
+    
+  }
+  
+  /**
+   * Deletes a row given a text object
+   * 
+   * @param row
+   * @throws TableNotFoundException
+   * @throws AccumuloSecurityException
+   * @throws AccumuloException
+   */
+  private static void deleteRow(Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+    deleteRow(getRow(row));
+  }
+  
+  /**
+   * Deletes a row, given a Scanner of JUST that row
+   * 
+   * @param scanner
+   */
+  private static void deleteRow(Scanner scanner) throws MutationsRejectedException {
+    Mutation deleter = null;
+    // iterate through the keys
+    for (Entry<Key,Value> entry : scanner) {
+      // create a mutation for the row
+      if (deleter == null)
+        deleter = new Mutation(entry.getKey().getRow());
+      // the remove function adds the key with the delete flag set to true
+      deleter.putDelete(entry.getKey().getColumnFamily(), entry.getKey().getColumnQualifier());
+    }
+    bw.addMutation(deleter);
+    bw.flush();
+  }
+  
+  /**
+   * Just a generic print function given an iterator. Not necessarily just for printing a single row
+   * 
+   * @param scanner
+   */
+  private static void printRow(Scanner scanner) {
+    // iterates through and prints
+    for (Entry<Key,Value> entry : scanner)
+      log.info("Key: " + entry.getKey().toString() + " Value: " + entry.getValue().toString());
+  }
+  
+  /**
+   * Gets a scanner over one row
+   * 
+   * @param row
+   * @return
+   * @throws TableNotFoundException
+   * @throws AccumuloSecurityException
+   * @throws AccumuloException
+   * @throws IOException
+   */
+  private static Scanner getRow(Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+    // Create a scanner
+    Scanner scanner = connector.createScanner(table, Constants.NO_AUTHS);
+    // Say start key is the one with key of row
+    // and end key is the one that immediately follows the row
+    scanner.setRange(new Range(row));
+    return scanner;
+  }
+  
+}

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

Added: incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java?rev=1230608&view=auto
==============================================================================
--- incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java (added)
+++ incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java Thu Jan 12 16:06:14 2012
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.examples.simple.client;
+
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MutationsRejectedException;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.security.ColumnVisibility;
+
+public class SequentialBatchWriter {
+  
+  public static void main(String[] args) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, MutationsRejectedException {
+    if (args.length != 12) {
+      System.out
+          .println("Usage : SequentialBatchWriter <instance name> <zoo keepers> <username> <password> <table> <start> <num> <value size> <max memory> <max latency> <num threads> <visibility>");
+      return;
+    }
+    
+    String instanceName = args[0];
+    String zooKeepers = args[1];
+    String user = args[2];
+    byte[] pass = args[3].getBytes();
+    String table = args[4];
+    long start = Long.parseLong(args[5]);
+    long num = Long.parseLong(args[6]);
+    int valueSize = Integer.parseInt(args[7]);
+    long maxMemory = Long.parseLong(args[8]);
+    long maxLatency = Long.parseLong(args[9]) == 0 ? Long.MAX_VALUE : Long.parseLong(args[9]);
+    int numThreads = Integer.parseInt(args[10]);
+    String visibility = args[11];
+    
+    // Uncomment the following lines for detailed debugging info
+    // Logger logger = Logger.getLogger(Constants.CORE_PACKAGE_NAME);
+    // logger.setLevel(Level.TRACE);
+    
+    ZooKeeperInstance instance = new ZooKeeperInstance(instanceName, zooKeepers);
+    Connector connector = instance.getConnector(user, pass);
+    BatchWriter bw = connector.createBatchWriter(table, maxMemory, maxLatency, numThreads);
+    
+    long end = start + num;
+    
+    // reuse ColumnVisibility object for better performance
+    ColumnVisibility cv = new ColumnVisibility(visibility);
+    
+    for (long i = start; i < end; i++) {
+      Mutation m = RandomBatchWriter.createMutation(i, valueSize, cv);
+      bw.addMutation(m);
+    }
+    
+    bw.close();
+  }
+}

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



Mime
View raw message