Merge remote-tracking branch 'upstream/master' into issue-502
Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/56087311 Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/56087311 Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/56087311 Branch: refs/heads/master Commit: 5608731163dc05b7f8d66ea4071d0a1af04911f2 Parents: 1ad1cc9 d5e5560 Author: nishadi <[email protected]> Authored: Sat Jun 17 22:26:45 2017 +0530 Committer: nishadi <[email protected]> Committed: Sat Jun 17 22:26:45 2017 +0530 ---------------------------------------------------------------------- .../gora/accumulo/store/AccumuloStoreTest.java | 13 +- .../cassandra/store/TestCassandraStore.java | 12 - .../apache/gora/memory/store/MemStoreTest.java | 16 +- .../gora/memory/store/MemStoreTestDriver.java | 44 + .../apache/gora/store/DataStoreTestBase.java | 13 - .../gora/couchdb/store/TestCouchDBStore.java | 12 - .../org/apache/gora/hbase/store/HBaseStore.java | 7 +- .../test/conf/gora-hbase-mapping-mismatch.xml | 47 + .../apache/gora/hbase/store/TestHBaseStore.java | 33 +- .../infinispan/store/InfinispanStoreTest.java | 12 - .../jcache/store/JCacheGoraDataStoreTest.java | 10 - .../gora/mongodb/store/TestMongoStore.java | 14 - gora-solr-5/pom.xml | 275 ---- .../java/org/apache/gora/solr/package-info.java | 20 - .../org/apache/gora/solr/query/SolrQuery.java | 80 - .../org/apache/gora/solr/query/SolrResult.java | 121 -- .../apache/gora/solr/query/package-info.java | 21 - .../org/apache/gora/solr/store/SolrMapping.java | 58 - .../org/apache/gora/solr/store/SolrStore.java | 841 ----------- .../apache/gora/solr/store/package-info.java | 20 - gora-solr-5/src/test/conf/gora-solr-mapping.xml | 40 - gora-solr-5/src/test/conf/gora.properties | 21 - gora-solr-5/src/test/conf/log4j.properties | 35 - .../solr/Employee/conf/lang/stopwords_en.txt | 54 - .../test/conf/solr/Employee/conf/protwords.txt | 21 - .../src/test/conf/solr/Employee/conf/schema.xml | 45 - .../test/conf/solr/Employee/conf/solrconfig.xml | 107 -- .../test/conf/solr/Employee/conf/stopwords.txt | 14 - .../test/conf/solr/Employee/conf/synonyms.txt | 29 - .../solr/WebPage/conf/lang/stopwords_en.txt | 54 - .../test/conf/solr/WebPage/conf/protwords.txt | 21 - .../src/test/conf/solr/WebPage/conf/schema.xml | 46 - .../test/conf/solr/WebPage/conf/solrconfig.xml | 107 -- .../test/conf/solr/WebPage/conf/stopwords.txt | 14 - .../test/conf/solr/WebPage/conf/synonyms.txt | 29 - .../test/conf/solr/collection1/conf/schema.xml | 32 - .../conf/solr/collection1/conf/solrconfig.xml | 113 -- .../test/conf/solr/collection1/core.properties | 1 - gora-solr-5/src/test/conf/solr/solr.xml | 69 - gora-solr-5/src/test/conf/solr/zoo.cfg | 17 - .../apache/gora/solr/GoraSolrTestDriver.java | 94 -- .../java/org/apache/gora/solr/package-info.java | 21 - .../apache/gora/solr/store/TestSolrStore.java | 120 -- .../apache/gora/solr/store/package-info.java | 21 - gora-solr/pom.xml | 90 +- .../java/org/apache/gora/solr/package-info.java | 20 + .../org/apache/gora/solr/query/SolrQuery.java | 22 +- .../org/apache/gora/solr/query/SolrResult.java | 22 +- .../apache/gora/solr/query/package-info.java | 21 + .../org/apache/gora/solr/store/SolrMapping.java | 3 + .../org/apache/gora/solr/store/SolrStore.java | 117 +- .../apache/gora/solr/store/package-info.java | 20 + .../Employee/conf/elevate.xml | 42 + .../Employee/conf/lang/stopwords_en.txt | 54 + .../Employee/conf/managed-schema | 33 + .../Employee/conf/protwords.txt | 21 + .../Employee/conf/solrconfig.xml | 1411 ++++++++++++++++++ .../Employee/conf/synonyms.txt | 29 + .../WebPage/conf/elevate.xml | 42 + .../WebPage/conf/lang/stopwords_en.txt | 54 + .../WebPage/conf/managed-schema | 34 + .../WebPage/conf/protwords.txt | 21 + .../WebPage/conf/solrconfig.xml | 1411 ++++++++++++++++++ .../WebPage/conf/synonyms.txt | 29 + .../collection1/conf/elevate.xml | 42 + .../collection1/conf/managed-schema | 26 + .../collection1/conf/solrconfig.xml | 1403 +++++++++++++++++ .../collection1/core.properties | 18 + .../src/test/conf/solr-managed-schema/solr.xml | 53 + .../src/test/conf/solr-managed-schema/zoo.cfg | 35 + .../test/conf/solr/Employee/conf/solrconfig.xml | 2 +- .../test/conf/solr/Employee/conf/stopwords.txt | 14 - .../src/test/conf/solr/Employee/core.properties | 1 - .../test/conf/solr/WebPage/conf/solrconfig.xml | 2 +- .../test/conf/solr/WebPage/conf/stopwords.txt | 14 - .../src/test/conf/solr/WebPage/core.properties | 1 - .../conf/solr/collection1/conf/solrconfig.xml | 2 +- .../test/conf/solr/collection1/core.properties | 17 + gora-solr/src/test/conf/solr/solr.xml | 30 +- gora-solr/src/test/conf/solr/zoo.cfg | 17 + .../solr/GoraSolrManagedSchemaTestDriver.java | 89 ++ .../apache/gora/solr/GoraSolrTestDriver.java | 20 +- .../java/org/apache/gora/solr/package-info.java | 21 + .../solr/store/TestSolrManagedSchemaStore.java | 31 + .../apache/gora/solr/store/TestSolrStore.java | 87 +- .../apache/gora/solr/store/package-info.java | 21 + gora-tutorial/pom.xml | 2 +- pom.xml | 68 +- 88 files changed, 5484 insertions(+), 2822 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/56087311/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 618cda1,2c2e20a..b81d7e6 --- a/pom.xml +++ b/pom.xml @@@ -729,11 -729,9 +729,10 @@@ <!--module>gora-sql</module --> <module>gora-maven-plugin</module> <module>gora-mongodb</module> - <!--module>gora-solr</module--> - <module>gora-solr-5</module> + <module>gora-solr</module> <module>gora-tutorial</module> <module>sources-dist</module> + <module>gora-aerospike</module> </modules> <properties>
