You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2018/05/04 19:39:41 UTC

[1/2] shiro-site git commit: Manger -> Manager

Repository: shiro-site
Updated Branches:
  refs/heads/master 6817cb0b8 -> 438db9f24


Manger -> Manager


Project: http://git-wip-us.apache.org/repos/asf/shiro-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro-site/commit/64b6ed29
Tree: http://git-wip-us.apache.org/repos/asf/shiro-site/tree/64b6ed29
Diff: http://git-wip-us.apache.org/repos/asf/shiro-site/diff/64b6ed29

Branch: refs/heads/master
Commit: 64b6ed2984eb9ac0590e116295e99146d29f79f1
Parents: d656e5a
Author: ksdev <ks...@gmail.com>
Authored: Mon Jan 29 11:23:04 2018 +0100
Committer: ksdev <ks...@gmail.com>
Committed: Mon Jan 29 11:23:04 2018 +0100

----------------------------------------------------------------------
 cachemanager.md | 4 ++--
 caching.md      | 4 ++--
 realm.md.vtl    | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/shiro-site/blob/64b6ed29/cachemanager.md
----------------------------------------------------------------------
diff --git a/cachemanager.md b/cachemanager.md
index a762386..f793e4e 100644
--- a/cachemanager.md
+++ b/cachemanager.md
@@ -1,4 +1,4 @@
-# Cache Manger
+# Cache Manager
 
 Shiro has three important cache interfaces:
 
@@ -13,7 +13,7 @@ component that implements `CacheManager` will automatically receive a configured
 
 The Shiro [`SecurityManager`](securitymanager.html) implementations and all [`AuthorizingRealm`](static/current/apidocs/org/apache/shiro/realm/AuthorizingRealm.html) implementations implement CacheManagerAware.  If you set the `CacheManager` on the `SecurityManager`, it will in turn set it on the various Realms that implement CacheManagerAware as well (OO delegation).  For example, in shiro.ini:
 
-**example shiro.ini CacheManger configuration**
+**example shiro.ini CacheManager configuration**
 
 ``` ini
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/64b6ed29/caching.md
----------------------------------------------------------------------
diff --git a/caching.md b/caching.md
index 049b0ee..2a6efed 100644
--- a/caching.md
+++ b/caching.md
@@ -19,7 +19,7 @@ component that implements `CacheManagerAware` will automatically receive a confi
 
 The Shiro [SecurityManager](securitymanager.html "SecurityManager") implementations and all [`AuthenticatingRealm`](static/current/apidocs/org/apache/shiro/realm/AuthenticatingRealm.html) and [`AuthorizingRealm`](static/current/apidocs/org/apache/shiro/realm/AuthorizingRealm.html) implementations implement CacheManagerAware. If you set the `CacheManager` on the `SecurityManager`, it will in turn set it on the various Realms that implement CacheManagerAware as well (OO delegation). For example, in shiro.ini:
 
-**example shiro.ini CacheManger configuration**
+**example shiro.ini CacheManager configuration**
 
 ``` ini
 securityManager.realms = $myRealm1, $myRealm2, ..., $myRealmN
@@ -45,7 +45,7 @@ The `MemoryConstrainedCacheManager` manages [`MapCache`](static/current/apidocs/
 
 Because the `MemoryConstrainedCacheManager` can auto-resize itself based on an application's memory profile, it is safe to use in a single-JVM production application as well as for testing needs. However, it does not have more advanced features suche as cache entry Time-to-Live or Time-to-Expire settings. For these more advanced cache management features, you'll likely want to use one of the more advanced `CacheManager` offerings below.
 
-**MemoryConstrainedCacheManger shiro.ini configuration example**
+**MemoryConstrainedCacheManager shiro.ini configuration example**
 
 ``` ini
 ...

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/64b6ed29/realm.md.vtl
----------------------------------------------------------------------
diff --git a/realm.md.vtl b/realm.md.vtl
index 5a5db97..f22729c 100644
--- a/realm.md.vtl
+++ b/realm.md.vtl
@@ -243,8 +243,8 @@ Realm Authorization
 
 When one of the overloaded method hasRoles or checkRoles method is called on Subject
 
-1.	`Subject` delegates to `SecurityManger` for identifying if the given Role is assigned
-2.	`SecurityManger` then delegates to `Authorizer`
+1.	`Subject` delegates to `SecurityManager` for identifying if the given Role is assigned
+2.	`SecurityManager` then delegates to `Authorizer`
 3.	[Authorizer](static/current/apidocs/org/apache/shiro/authz/Authorizer.html) then referrers to all the Authorizing Realms one by one until it found given role assigned to the subject. Deny access by returning false if no none of the Realm grants Subject  given Role
 4.	Authorizing Realm [AuthorizationInfo](static/current/apidocs/org/apache/shiro/authz/AuthorizationInfo.html) getRoles() method to get all Roles assigned to Subject
 5.	Grant access if it found the given Role in list of roles returned from AuthorizationInfo.getRoles call.
@@ -254,8 +254,8 @@ When one of the overloaded method hasRoles or checkRoles method is called on Sub
 
 When one of the overloaded method `isPermitted()` or `checkPermission()` method are called on Subject:
 
-1. `Subject` delegates the task to grant or deny Permission to SecurityManger
-2. `SecurityManger` then delegates to Authorizer
+1. `Subject` delegates the task to grant or deny Permission to SecurityManager
+2. `SecurityManager` then delegates to Authorizer
 3. Authorizer then referrers to all of the Authorizer Realms one by one until it Permission is granted
     If Permission is not granted by any of the Authorizing Realm, Subject is denied Permission
 4. Authorizing Realm does the following in order to check if a Subject is permitted:


[2/2] shiro-site git commit: Merge remote-tracking branch 'origin/pr-36'

Posted by bd...@apache.org.
Merge remote-tracking branch 'origin/pr-36'

Fixes #36


Project: http://git-wip-us.apache.org/repos/asf/shiro-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro-site/commit/438db9f2
Tree: http://git-wip-us.apache.org/repos/asf/shiro-site/tree/438db9f2
Diff: http://git-wip-us.apache.org/repos/asf/shiro-site/diff/438db9f2

Branch: refs/heads/master
Commit: 438db9f246d3ace66d86908019a412e0ab8e32c4
Parents: 6817cb0 64b6ed2
Author: Brian Demers <bd...@apache.org>
Authored: Fri May 4 15:38:01 2018 -0400
Committer: Brian Demers <bd...@apache.org>
Committed: Fri May 4 15:38:01 2018 -0400

----------------------------------------------------------------------
 cachemanager.md | 4 ++--
 caching.md      | 4 ++--
 realm.md.vtl    | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/shiro-site/blob/438db9f2/cachemanager.md
----------------------------------------------------------------------