usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [05/50] [abbrv] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o-fix-state-transitions
Date Mon, 07 Jul 2014 18:16:22 GMT
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o-fix-state-transitions


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

Branch: refs/heads/two-dot-o
Commit: 5e42dbfaac280ceb9b28655ee63a15e6cd324419
Parents: 96c4ef9 118103c
Author: Furkan Bicak <bicak.cs@safehaus.org>
Authored: Fri Jun 27 16:32:47 2014 +0300
Committer: Furkan Bicak <bicak.cs@safehaus.org>
Committed: Fri Jun 27 16:32:47 2014 +0300

----------------------------------------------------------------------
 sdks/java/pom.xml                               |   8 +-
 stack/core/pom.xml                              |  15 -
 .../apache/usergrid/persistence/Results.java    |   4 +-
 stack/core/src/test/resources/log4j.properties  |   4 +-
 stack/corepersistence/collection/pom.xml        |  18 -
 .../impl/EntityCollectionManagerImpl.java       |   4 +-
 .../graph/impl/GraphManagerImpl.java            |  69 ++--
 stack/corepersistence/pom.xml                   |   2 +-
 stack/corepersistence/queryindex/pom.xml        |   7 -
 stack/launcher/pom.xml                          |   6 +
 .../java/org/apache/usergrid/launcher/App.java  |  10 +-
 stack/pom.xml                                   |   7 +-
 stack/query-validator/pom.xml                   |   4 +-
 .../query/validator/ApiServerRunner.java        |  20 +-
 stack/rest/pom.xml                              |   9 +-
 .../org/apache/usergrid/rest/ApiResponse.java   |  13 +-
 .../rest/JacksonCustomMapperProvider.java       |  21 +-
 .../org/apache/usergrid/rest/RootResource.java  |   4 +-
 .../usergrid/rest/TextToJsonSwapWriter.java     |  17 +-
 .../rest/applications/users/UserResource.java   |   4 +-
 .../usergrid/rest/test/PropertiesResource.java  |   4 +-
 .../apache/usergrid/rest/AbstractRestIT.java    | 128 ++++---
 .../java/org/apache/usergrid/rest/BasicIT.java  |  91 ++---
 .../apache/usergrid/rest/TestContextSetup.java  |   3 +-
 .../ApplicationRequestCounterIT.java            |  10 +-
 .../applications/ApplicationResourceIT.java     | 142 ++++----
 .../rest/applications/DevicesResourceIT.java    |  17 +-
 .../applications/assets/AssetResourceIT.java    |  96 +++---
 .../collection/BadGrammarQueryTest.java         |   5 +-
 .../collection/BrowserCompatibilityTest.java    |   5 +-
 .../collection/PagingResourceIT.java            |  13 +-
 .../collection/activities/AndOrQueryTest.java   |  15 +-
 .../collection/activities/OrderByTest.java      |  11 +-
 .../activities/PagingEntitiesTest.java          |  15 +-
 .../collection/activities/PutTest.java          |   7 +-
 .../collection/groups/GeoPagingTest.java        |  11 +-
 .../collection/groups/UpdateGroupIT.java        |  16 +-
 .../applications/events/EventsResourceIT.java   |  30 +-
 .../queues/AbstractQueueResourceIT.java         |  14 +-
 .../queues/QueueResourceLong1IT.java            |   3 +-
 .../queues/QueueResourceLong2IT.java            |   3 +-
 .../queues/QueueResourceLong3IT.java            |   7 +-
 .../queues/QueueResourceShortIT.java            |  23 +-
 .../applications/users/ActivityResourceIT.java  |   8 +-
 .../users/CollectionsResourceIT.java            |  48 ++-
 .../users/ConnectionResourceTest.java           |  28 +-
 .../applications/users/GroupResourceIT.java     |  64 ++--
 .../applications/users/OwnershipResourceIT.java |  11 +-
 .../users/PermissionsResourceIT.java            | 190 +++++------
 .../applications/users/RetrieveUsersTest.java   |   7 +-
 .../rest/applications/users/UserResourceIT.java | 342 +++++++++----------
 .../rest/applications/utils/TestUtils.java      |   2 +-
 .../rest/applications/utils/UserRepo.java       |  27 +-
 .../rest/management/ExportResourceIT.java       | 124 +++----
 .../rest/management/ManagementResourceIT.java   | 166 ++++-----
 .../rest/management/RegistrationIT.java         |  35 +-
 .../organizations/AdminEmailEncodingIT.java     |   5 +-
 .../organizations/OrganizationResourceIT.java   |  15 +-
 .../organizations/OrganizationsResourceIT.java  |  71 ++--
 .../applications/ApplicationsIT.java            |   5 +-
 .../rest/management/users/MUUserResourceIT.java |  87 +++--
 .../UsersOrganizationsResourceIT.java           |  14 +-
 .../rest/test/resource/EntityResource.java      |  15 +-
 .../rest/test/resource/NamedResource.java       |   6 +-
 .../rest/test/resource/SetResource.java         |   5 +-
 .../rest/test/resource/TestContext.java         |   7 +-
 .../rest/test/resource/ValueResource.java       |  43 ++-
 .../rest/test/resource/app/Application.java     |   9 +-
 .../rest/test/resource/app/UsersCollection.java |   5 +-
 .../rest/test/resource/app/queue/Queue.java     |  19 +-
 .../app/queue/SubscribersCollection.java        |  11 +-
 .../test/resource/app/queue/Transaction.java    |  13 +-
 .../resource/mgmt/ApplicationsCollection.java   |   5 +-
 .../rest/test/resource/mgmt/Management.java     |  18 +-
 .../resource/mgmt/OrganizationsCollection.java  |   5 +-
 .../rest/test/security/TestAdminUser.java       |  17 +-
 .../rest/test/security/TestAppUser.java         |  15 +-
 .../usergrid/rest/test/security/TestUser.java   |   2 +-
 stack/test-utils/pom.xml                        |  30 +-
 .../apache/usergrid/cassandra/Concurrent.java   |   2 +-
 80 files changed, 1197 insertions(+), 1194 deletions(-)
----------------------------------------------------------------------



Mime
View raw message