usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [33/36] usergrid git commit: Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/usergrid into selectiveIndexingCherryPicked
Date Fri, 08 Apr 2016 20:21:20 GMT
Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/usergrid into selectiveIndexingCherryPicked

# By Michael Russo (2) and Mike Dunker (1)
# Via Michael Russo
* 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/usergrid:
  Fix cache invalidation issues.
  Introduce an in-memory cache for Shiro.
  Remove extra update of token access time in OAuth2AccessTokenSecurityFilter.


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

Branch: refs/heads/release-2.1.1
Commit: e5ae2a57d15a5bae44d96ff41e167a70df353790
Parents: fc312bd 43d8559
Author: George Reyes <grey@apache.org>
Authored: Fri Apr 1 12:28:48 2016 -0700
Committer: George Reyes <grey@apache.org>
Committed: Fri Apr 1 12:28:48 2016 -0700

----------------------------------------------------------------------
 .../main/resources/usergrid-default.properties  | 10 +++
 .../rest/applications/ServiceResource.java      |  5 +-
 .../OAuth2AccessTokenSecurityFilter.java        |  3 +-
 .../rest/applications/ApplicationCreateIT.java  |  3 +-
 .../collection/users/PermissionsResourceIT.java |  2 +
 .../rest/test/resource/AbstractRestIT.java      |  1 +
 .../cassandra/ManagementServiceImpl.java        | 16 +++-
 .../usergrid/security/shiro/ShiroCache.java     | 41 ++++++++--
 .../security/shiro/ShiroCacheManager.java       | 15 +++-
 .../security/shiro/utils/LocalShiroCache.java   | 80 ++++++++++++++++++++
 .../usergrid/security/tokens/TokenService.java  |  3 +
 .../tokens/cassandra/TokenServiceImpl.java      | 40 ++++++----
 .../usergrid/services/AbstractService.java      |  3 +
 .../usergrid/services/groups/GroupsService.java |  4 +
 .../usergrid/services/roles/RolesService.java   |  2 +
 .../usergrid/services/users/UsersService.java   |  2 +
 .../services/users/roles/RolesService.java      |  4 +
 .../resources/usergrid-services-context.xml     | 11 ++-
 .../resources/usergrid-custom-test.properties   |  1 +
 19 files changed, 209 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/e5ae2a57/stack/config/src/main/resources/usergrid-default.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/e5ae2a57/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/e5ae2a57/stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java
----------------------------------------------------------------------


Mime
View raw message