Merge branch 'two-dot-o' of https://github.com/GERey/usergrid-1 into two-dot-o
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o

# By Dave Johnson (64) and others
# Via Dave Johnson (18) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid: (207 commits)
  Rename test and add couple more query tests.
  Adding Apache license header.
  More progress on EntityCollectionIndex and tests.
  Use version properties everywhere, define them only in parent.
  Progress towards getting more query tests running.
  More refactoring and removal of unnecessary code.
  More refactoring and removal of unnecessary code.
  Remove classes not needed for query parsing.
  Added cache declaration to column family meta data
  Rename index to query index, add working query parser code.
  Initial commit of the async processor
  Composite ID creation and parsing and some test improvements.
  Refactored to avoid the need to copy for mark check
  Added buffering to ensure we have less chatter with cassandra
  Added validation with time UUIDTest and verified existing impl.  Needs to use new batch for filtering
  Remove unnecessary method.
  Remove redundant code and test.
  Added version property, did some refactoring / renaming and added a larger data set.
  Basic indexing of entities working, more tests needed.
  Progress on EntityIndex tests and impl.
  ...
Added a toByteBuffer method using Smile.
Found out that I was using a wrong format. This build still has errors though, so not for review.
Now pulling the version from the byte buffer.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid: (31 commits)
  Correcting document type generation because . , _ # and | are not allowed.
  Adding some issues to README.
  Still working on debugging IndexIT tests.
  Update README.md
  Update README.md
  Informative README for Query Index module.
  Eliminate redundant class.
  Add test for deindex() and ignore two problematic tests.
  Don't need the ElasticSearchRule
  Support for non-embedded ElasticSearch
  Ignore ANTLR output.
  re-enable ANTLR plugin.
  Enable testCollectionOrdering() test, also: use more specific exceptions.
  Enable another test, and make tests use different collection names because they were interfering with each other.
  Package re-org.
  Cursor support complete.
  Simple stress tests.
  Re-organize test packages.
  More GeoIT tests working.
  Basic geo queries working as well as part of one of the GeoIT tests.
  ...
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By grey (34) and others
# Via Dave Johnson (7) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid: (93 commits)
  Update to reflect current state of Query-Index module.
  Use validation utils to validate entity and scope.
  Strip down the Results class to bare essentials.
  99 of 100 tests passing in query-index module, one skipped because no connection support yet.
  Adding 43 more legacy tests for query-index for total of 100 (7 are still failing).
  Ignore two-dot-o's ignored files.
  Better stress test for EntityManagerFacade.
  61 tests passing, 3 tests skipped.
  Renamed PR to match org.apache
  Ignored file creation tests as they are not always deleted for unknown reasons.
  Added license file headers to all new files.
  Removed ExportInfo and all mentions of it in the code.
  Fixed bug where timestamp was only instantiated only once.
  Added error checking to rest endpoint, with test cases for each exception thrown. Renamed returned entity from export job “Export Entity”
  Fixed collections bug, fixed all tests to prepare for removal of ExportInfo.
  Fixed s3 cloud exporting functionality. Fixed and retested integration test to make sure.
  Made blanket changes to remove ExportInfo to support serialization of export information.
  Fixed all tests, and code. Tomcat issue still persists.
  Added test to avoid collisions in management service, but didn’t seem to work for a certain test. Currently ignored. Made errors clearer in for rest endpoints. Added map code to try to fix Tomcat runtime error, but didn’t fix the issue. Added exportJob as a beanie.
  Removed OAuthResponse to simplify code. Created test for new error checking in ExportInfo.
  ...
Changing code so that it uses the Object instead of the entity class.
Pushing relevant code to github so Dave can see issue on line 386
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Changes to get non-embedded ElasticSearch working.
  Minor refactoring to allow legacy EntityManager to be used outside of tests.
  Adding support for REST instance.
  Adding support for REST instance.
  Remove redundant copy of aws-cluster module.
Added working smile binary serialization.
Added working annotation to the corepersistance teir for the serialization of setters and getters.
Ignoring the Id when doing serialization.
Added test to prove it is working as intended.
Merge branch 'Fix_Core_Entity_Tests' of github.com:GERey/usergrid-1 into binary_serialization

* 'Fix_Core_Entity_Tests' of github.com:GERey/usergrid-1:
  Fixing tests so that they properly check obj serialization.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson (1) and Todd Nine (1)
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fixing merge error: duplicate module in POM.
Added newest version of jackson into model classes.
Added fix for serializing Location values.
Updated the json utils to see if the tests are fixed now.
Removed extra commented out code.
Forced EntityObject to ignore all unknown properties to fix tests and to make sure it only deals with fields.
Entity now gets the version for fields.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  JUnit test version of the code I've been using to test Core Persistence load and read performance.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fixes to CorePersistenceIT and index impl.

Conflicts:
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fixing annotation compile error.
Removed old unused jackson imports.
Removed indentObjectMapper from json utilities.
Removed the swallowing of exceptions, now throwing the proper exception.
Removed some more codehaus jackson imports that were lying around.