Merge branch 'master' into GORA-417
Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/aad4ad41 Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/aad4ad41 Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/aad4ad41 Branch: refs/heads/master Commit: aad4ad41f914a3ceeb04965c0e6fefa7ddefec25 Parents: 983bed4 ea44388 Author: Lewis John McGibbney <lewis.j.mcgibb...@jpl.nasa.gov> Authored: Thu Sep 3 00:35:59 2015 -0700 Committer: Lewis John McGibbney <lewis.j.mcgibb...@jpl.nasa.gov> Committed: Thu Sep 3 00:35:59 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 4 + bin/gora | 5 + gora-accumulo/pom.xml | 2 +- .../gora/accumulo/store/AccumuloStore.java | 5 +- .../gora/accumulo/util/HexEncoderTest.java | 9 +- .../gora/cassandra/store/CassandraStore.java | 3 +- gora-compiler-cli/pom.xml | 11 +- .../gora/compiler/cli/GoraCompilerCLI.java | 20 +- gora-compiler/pom.xml | 18 +- .../org/apache/gora/compiler/GoraCompiler.java | 9 +- .../gora/compiler/utils/LicenseHeaders.java | 17 +- gora-core/pom.xml | 21 ++ .../gora/examples/WebPageDataCreator.java | 3 +- .../gora/examples/mapreduce/QueryCounter.java | 9 +- .../gora/examples/mapreduce/WordCount.java | 3 +- .../gora/examples/spark/SparkWordCount.java | 152 ++++++++++++++ .../apache/gora/mapreduce/GoraRecordReader.java | 6 +- .../apache/gora/mapreduce/GoraRecordWriter.java | 12 +- .../persistency/ws/impl/BeanFactoryWSImpl.java | 8 +- .../org/apache/gora/spark/GoraSparkEngine.java | 150 ++++++++++++++ .../org/apache/gora/store/DataStoreFactory.java | 5 +- .../store/ws/impl/WSBackedDataStoreBase.java | 9 +- .../gora/store/ws/impl/WSDataStoreFactory.java | 3 +- .../java/org/apache/gora/util/ByteUtils.java | 29 +-- .../java/org/apache/gora/util/TimingUtil.java | 3 +- .../java/org/apache/gora/util/VersionInfo.java | 13 +- .../gora/mapreduce/MapReduceTestUtils.java | 31 +++ .../persistency/impl/TestPersistentBase.java | 5 +- .../apache/gora/store/DataStoreTestUtil.java | 20 +- .../apache/gora/store/WSDataStoreTestBase.java | 3 +- gora-goraci/pom.xml | 20 ++ .../java/org/apache/gora/goraci/Delete.java | 9 +- .../java/org/apache/gora/goraci/Generator.java | 14 +- .../main/java/org/apache/gora/goraci/Loop.java | 17 +- .../main/java/org/apache/gora/goraci/Print.java | 11 +- .../java/org/apache/gora/goraci/Verify.java | 13 +- .../java/org/apache/gora/goraci/Walker.java | 19 +- .../rackspace/RackspaceOrchestration.java | 6 +- .../mapreduce/TestHBaseStoreWordCount.java | 8 + .../apache/gora/hbase/store/TestHBaseStore.java | 7 +- .../gora/hbase/util/HBaseClusterSingleton.java | 7 +- .../gora/hbase/util/TestHBaseByteInterface.java | 9 +- .../apache/gora/mongodb/store/MongoMapping.java | 3 +- .../apache/gora/mongodb/store/MongoStore.java | 2 +- .../mapreduce/TestMongoStoreWordCount.java | 9 + .../gora/mongodb/store/TestMongoMapping.java | 33 +-- .../gora/mongodb/utils/TestBSONDecorator.java | 13 +- .../org/apache/gora/solr/query/SolrResult.java | 2 +- .../org/apache/gora/solr/store/SolrStore.java | 26 +-- gora-tutorial/pom.xml | 5 + .../apache/gora/tutorial/log/LogAnalytics.java | 6 +- .../gora/tutorial/log/LogAnalyticsSpark.java | 200 +++++++++++++++++++ .../apache/gora/tutorial/log/LogManager.java | 31 +-- pom.xml | 34 +++- 54 files changed, 915 insertions(+), 177 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/aad4ad41/pom.xml ----------------------------------------------------------------------