usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [09/15] git commit: Merge branch 'two-dot-o' into eventsystem
Date Wed, 01 Oct 2014 16:32:13 GMT
Merge branch 'two-dot-o' into eventsystem


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9c63ce63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9c63ce63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9c63ce63

Branch: refs/heads/two-dot-o
Commit: 9c63ce63fd23445d46d0371d8728b17e276bde12
Parents: 1060478 9e2743d
Author: Todd Nine <toddnine@apache.org>
Authored: Mon Sep 29 14:52:25 2014 -0600
Committer: Todd Nine <toddnine@apache.org>
Committed: Mon Sep 29 14:52:25 2014 -0600

----------------------------------------------------------------------
 portal/js/global/ug-service.js                  | 1100 +++--
 portal/js/libs/usergrid.sdk.js                  | 4264 +++++++++---------
 stack/core/pom.xml                              |   10 -
 .../corepersistence/CpEntityManager.java        |    1 +
 .../corepersistence/CpEntityManagerFactory.java |  184 +-
 .../corepersistence/CpRelationManager.java      |   58 +-
 .../HybridEntityManagerFactory.java             |   10 +
 .../mq/cassandra/io/AbstractSearch.java         |   17 +-
 .../persistence/EntityManagerFactory.java       |    4 +
 .../cassandra/EntityManagerFactoryImpl.java     |   51 +
 .../persistence/PerformanceEntityReadTest.java  |    2 +
 .../persistence/PerformanceEntityWriteTest.java |    2 +
 .../cassandra/QueryProcessorTest.java           |    2 -
 stack/core/src/test/resources/log4j.properties  |    1 +
 .../index/impl/EsEntityIndexImpl.java           |  122 +-
 .../persistence/index/impl/EsQueryVistor.java   |  150 +-
 .../index/impl/ElasticSearchTest.java           |  274 --
 .../impl/EntityConnectionIndexImplTest.java     |    2 -
 .../index/impl/EntityIndexMapUtils.java         |   12 +-
 .../persistence/index/impl/EntityIndexTest.java |   77 +-
 .../apache/usergrid/rest/AbstractRestIT.java    |    6 +-
 .../usergrid/rest/ConcurrentRestITSuite.java    |   54 +-
 .../apache/usergrid/rest/NotificationsIT.java   |  162 +-
 .../org/apache/usergrid/rest/RestITSuite.java   |   45 +-
 .../ApplicationRequestCounterIT.java            |   97 -
 .../rest/applications/DevicesResourceIT.java    |   87 -
 .../collection/BadGrammarQueryTest.java         |   79 -
 .../collection/CollectionsResourceIT.java       |  205 +
 .../collection/PagingResourceIT.java            |  283 --
 .../activities/ActivityResourceIT.java          |  188 +
 .../collection/activities/AndOrQueryTest.java   |  203 -
 .../collection/activities/OrderByTest.java      |  172 -
 .../activities/PagingEntitiesTest.java          |  141 -
 .../collection/devices/DevicesResourceIT.java   |   87 +
 .../collection/groups/GeoPagingTest.java        |  133 -
 .../collection/groups/GroupResourceIT.java      |  295 ++
 .../collection/paging/PagingEntitiesTest.java   |  141 +
 .../collection/paging/PagingResourceIT.java     |  301 ++
 .../users/ConnectionResourceTest.java           |  271 ++
 .../collection/users/OwnershipResourceIT.java   |  379 ++
 .../collection/users/PermissionsResourceIT.java |  768 ++++
 .../collection/users/RetrieveUsersTest.java     |   87 +
 .../collection/users/UserResourceIT.java        | 1418 ++++++
 .../users/extensions/TestResource.java          |   51 +
 .../events/ApplicationRequestCounterIT.java     |   97 +
 .../applications/queries/AndOrQueryTest.java    |  203 +
 .../queries/BadGrammarQueryTest.java            |   79 +
 .../applications/queries/GeoPagingTest.java     |  133 +
 .../applications/queries/MatrixQueryTests.java  |  202 +
 .../rest/applications/queries/OrderByTest.java  |  172 +
 .../applications/users/ActivityResourceIT.java  |  188 -
 .../users/CollectionsResourceIT.java            |  205 -
 .../users/ConnectionResourceTest.java           |  271 --
 .../applications/users/GroupResourceIT.java     |  295 --
 .../applications/users/MatrixQueryTests.java    |  202 -
 .../applications/users/OwnershipResourceIT.java |  379 --
 .../users/PermissionsResourceIT.java            |  768 ----
 .../applications/users/RetrieveUsersTest.java   |   87 -
 .../rest/applications/users/UserResourceIT.java | 1418 ------
 .../users/extensions/TestResource.java          |   51 -
 .../usergrid/rest/management/AccessTokenIT.java |  350 ++
 .../usergrid/rest/management/AdminUsersIT.java  |  807 ++++
 .../rest/management/ManagementResourceIT.java   |  397 +-
 .../rest/management/OrganizationsIT.java        |  378 ++
 .../organizations/OrganizationResourceIT.java   |   90 -
 .../organizations/OrganizationsResourceIT.java  |  322 --
 .../rest/management/users/MUUserResourceIT.java |  654 ---
 .../UsersOrganizationsResourceIT.java           |   72 -
 stack/rest/src/test/resources/log4j.properties  |    7 +-
 .../notifications/ApplicationQueueManager.java  |   40 +-
 .../notifications/NotificationsService.java     |    7 +-
 .../notifications/NotificationsTaskManager.java |   33 -
 .../services/notifications/QueueListener.java   |   71 +-
 .../services/notifications/QueueManager.java    |    4 -
 .../notifications/SingleQueueTaskManager.java   |   63 +-
 .../services/notifications/TaskTracker.java     |    4 +-
 .../resources/usergrid-services-context.xml     |    9 +-
 .../apns/NotificationsServiceIT.java            |    6 +-
 .../gcm/NotificationsServiceIT.java             |    9 +-
 stack/tools/README.md                           |   18 +
 .../org/apache/usergrid/tools/IndexRebuild.java |   99 +-
 .../org/apache/usergrid/tools/ToolBase.java     |   26 +-
 82 files changed, 10302 insertions(+), 9910 deletions(-)
----------------------------------------------------------------------



Mime
View raw message