You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/24 13:20:26 UTC
[03/16] git commit: Merge branch 'master' of
https://github.com/usergrid/usergrid
Merge branch 'master' of https://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/1150e47d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1150e47d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1150e47d
Branch: refs/pull/29/merge
Commit: 1150e47da5e1094ef26cb051cade57591b925fc6
Parents: 0c19ebd 5217213
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jan 17 13:43:00 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jan 17 13:43:00 2014 -0500
----------------------------------------------------------------------
sdks/html5-javascript/examples/test/test.js | 94 +-
sdks/html5-javascript/usergrid.js | 3726 +++++++++---------
sdks/nodejs/changelog.md | 6 +
sdks/nodejs/lib/usergrid.js | 72 +-
sdks/nodejs/package.json | 2 +-
sdks/nodejs/readme.md | 2 +-
sdks/nodejs/test.js | 175 +-
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 | 10 +
.../query/ir/result/IntersectionIterator.java | 5 +-
.../query/ir/result/SliceIterator.java | 56 +-
.../query/ir/result/UnionIterator.java | 203 +-
.../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/UnionIteratorTest.java | 84 +-
.../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 | 2 +-
.../rest/management/users/UserResource.java | 2 +-
.../queues/AbstractQueueResourceIT.java | 30 +-
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 +-
85 files changed, 2950 insertions(+), 2397 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1150e47d/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------