usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [7/9] incubator-usergrid git commit: Merge branch 'master' of https://github.com/snoopdave/incubator-usergrid
Date Thu, 16 Apr 2015 18:09:31 GMT
Merge branch 'master' of https://github.com/snoopdave/incubator-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/7aabf68f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7aabf68f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7aabf68f

Branch: refs/heads/master
Commit: 7aabf68f24d2d88bf3bd0fbc5afcb6d8257e83f0
Parents: 6d962b7 9a8d5e0
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Thu Apr 16 09:40:33 2015 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Thu Apr 16 09:40:33 2015 -0400

----------------------------------------------------------------------
 .../main/resources/usergrid-default.properties  |   5 +
 .../rest/management/ManagementResource.java     | 260 ++++++++++++++++++-
 .../OAuth2AccessTokenSecurityFilter.java        |   5 +
 .../rest/management/ManagementResourceIT.java   |  71 ++++-
 .../rest/test/PropertiesResourceIT.java         |  23 +-
 .../usergrid/management/ManagementService.java  |   5 +-
 .../cassandra/ManagementServiceImpl.java        |   7 +
 .../apache/usergrid/security/shiro/Realm.java   |  10 +-
 .../usergrid/security/tokens/TokenService.java  |   3 +
 .../tokens/cassandra/TokenServiceImpl.java      |  44 +++-
 .../security/tokens/TokenServiceIT.java         |  42 +++
 11 files changed, 449 insertions(+), 26 deletions(-)
----------------------------------------------------------------------



Mime
View raw message