Merge branch 'master' of github.com:usergrid/usergrid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ebc5f18d Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ebc5f18d Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ebc5f18d Branch: refs/pull/35/head Commit: ebc5f18de24630370e2a6307356958308aa2e353 Parents: 508ef2f 2a01c30 Author: Rod Simpson <[email protected]> Authored: Mon Jan 27 16:05:02 2014 -0700 Committer: Rod Simpson <[email protected]> Committed: Mon Jan 27 16:05:02 2014 -0700 ---------------------------------------------------------------------- sdks/html5-javascript/Gruntfile.js | 83 + sdks/html5-javascript/lib/Client.js | 865 +++ sdks/html5-javascript/lib/Collection.js | 446 ++ sdks/html5-javascript/lib/Counter.js | 186 + sdks/html5-javascript/lib/Entity.js | 646 +++ sdks/html5-javascript/lib/Group.js | 233 + sdks/html5-javascript/lib/Usergrid.js | 87 + sdks/html5-javascript/package.json | 22 + sdks/html5-javascript/tests/mocha/index.html | 49 + sdks/html5-javascript/tests/mocha/test.js | 325 ++ .../tests/qunit/apigee_test.html | 14 + sdks/html5-javascript/tests/qunit/tests.js | 3 + .../resources/css/bootstrap-combined.min.css | 18 + .../tests/resources/css/mocha.css | 270 + .../tests/resources/css/styles.css | 91 + .../tests/resources/images/apigee.png | Bin 0 -> 6010 bytes .../tests/resources/js/blanket_mocha.min.js | 1 + .../tests/resources/js/json2.js | 486 ++ .../tests/resources/js/mocha.js | 5341 ++++++++++++++++++ sdks/html5-javascript/tests/test.html | 37 + sdks/html5-javascript/tests/test.js | 910 +++ sdks/html5-javascript/usergrid.js | 3078 +++++----- sdks/html5-javascript/usergrid.min.js | 3 +- sdks/php/lib/vendor/Apigee/Usergrid/Client.php | 7 +- stack/core/pom.xml | 6 +- .../org/usergrid/persistence/EntityManager.java | 6 +- .../usergrid/persistence/RelationManager.java | 6 +- .../persistence/cassandra/CassandraService.java | 10 + .../cassandra/EntityManagerImpl.java | 35 +- .../persistence/cassandra/QueryProcessor.java | 18 +- .../cassandra/RelationManagerImpl.java | 35 +- .../cassandra/index/IndexScanner.java | 1 + .../usergrid/persistence/query/ir/OrNode.java | 18 +- .../persistence/query/ir/SearchVisitor.java | 4 +- .../query/ir/result/AbstractScanColumn.java | 14 +- .../query/ir/result/IntersectionIterator.java | 5 +- .../query/ir/result/SliceIterator.java | 56 +- .../query/ir/result/UnionIterator.java | 210 +- .../persistence/query/util/PeekingIterator.java | 64 - .../main/resources/usergrid-core-context.xml | 2 +- .../batch/job/AbstractSchedulerRuntimeIT.java | 1 + .../usergrid/batch/job/SchedulerRuntime1IT.java | 38 +- .../usergrid/batch/job/SchedulerRuntime2IT.java | 61 +- .../org/usergrid/batch/job/TestJobListener.java | 20 +- .../usergrid/batch/job/TestJobListenerTest.java | 8 +- .../count/BatchCountParallelismTest.java | 29 +- .../count/CassandraCounterStoreTest.java | 63 - .../org/usergrid/persistence/CollectionIT.java | 8 +- .../query/AbstractIteratingQueryIT.java | 20 +- .../persistence/query/AllInCollectionIT.java | 2 +- .../persistence/query/AllInConnectionIT.java | 2 +- .../query/AllInConnectionNoTypeIT.java | 20 +- .../query/IntersectionUnionPagingIT.java | 163 + .../query/MultiOrderByCollectionIT.java | 2 +- .../MultiOrderByComplexUnionCollectionIT.java | 2 +- .../MultiOrderByComplexUnionConnectionIT.java | 2 +- .../query/MultiOrderByConnectionIT.java | 2 +- .../query/NotOrderByCollectionIT.java | 2 +- .../query/NotOrderByConnectionIT.java | 2 +- ...gleOrderByBoundRangeScanAscCollectionIT.java | 2 +- ...gleOrderByBoundRangeScanAscConnectionIT.java | 2 +- ...leOrderByBoundRangeScanDescCollectionIT.java | 2 +- ...leOrderByBoundRangeScanDescConnectionIT.java | 2 +- ...eOrderByComplexIntersectionCollectionIT.java | 2 +- ...eOrderByComplexIntersectionConnectionIT.java | 2 +- .../SingleOrderByComplexUnionCollectionIT.java | 2 +- .../SingleOrderByComplexUnionConnectionIT.java | 2 +- .../SingleOrderByIntersectionCollectionIT.java | 2 +- .../SingleOrderByIntersectionConnectionIT.java | 2 +- .../SingleOrderByLessThanLimitCollectionIT.java | 2 +- .../SingleOrderByLessThanLimitConnectionIT.java | 2 +- .../SingleOrderByMaxLimitCollectionIT.java | 2 +- .../SingleOrderByMaxLimitConnectionIT.java | 2 +- ...SingleOrderByNoIntersectionCollectionIT.java | 2 +- ...SingleOrderByNoIntersectionConnectionIT.java | 2 +- .../query/SingleOrderByNotCollectionIT.java | 2 +- .../query/SingleOrderByNotConnectionIT.java | 2 +- ...OrderBySameRangeScanGreaterCollectionIT.java | 2 +- ...OrderBySameRangeScanGreaterConnectionIT.java | 2 +- ...meRangeScanGreaterThanEqualCollectionIT.java | 2 +- ...gleOrderBySameRangeScanLessCollectionIT.java | 2 +- ...gleOrderBySameRangeScanLessConnectionIT.java | 2 +- ...ySameRangeScanLessThanEqualCollectionIT.java | 2 +- ...ySameRangeScanLessThanEqualConnectionIT.java | 2 +- .../query/ir/result/AbstractScanColumnTest.java | 84 + .../query/ir/result/UnionIteratorTest.java | 154 +- .../persistence/query/tree/GrammarTreeTest.java | 35 + stack/mongo-emulator/pom.xml | 2 +- stack/pom.xml | 4 +- stack/rest/pom.xml | 12 +- .../applications/assets/AssetsResource.java | 25 +- .../rest/applications/users/UserResource.java | 6 +- .../rest/management/ManagementResource.java | 18 +- .../rest/management/users/UserResource.java | 2 +- .../queues/AbstractQueueResourceIT.java | 30 +- .../rest/management/ManagementResourceIT.java | 13 +- stack/services/pom.xml | 14 +- .../services/AbstractConnectionsService.java | 13 +- stack/test-utils/pom.xml | 2 +- .../usergrid/cassandra/AvailablePortFinder.java | 30 +- .../usergrid/cassandra/CassandraResource.java | 22 +- stack/tools/pom.xml | 2 +- stack/websocket/pom.xml | 2 +- 103 files changed, 12769 insertions(+), 1889 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ebc5f18d/stack/pom.xml ----------------------------------------------------------------------
