diff --git a/src/docbkx/authorization-common.xml b/src/docbkx/authorization-common.xml
index fbd86b988e..0aadb002a7 100644
--- a/src/docbkx/authorization-common.xml
+++ b/src/docbkx/authorization-common.xml
@@ -93,21 +93,18 @@
AccessDecisionManager to control all aspects of
authorization, Spring Security includes several
AccessDecisionManager implementations that are
- based on voting. Figure 4 illustrates the relevant classes.
-
-
+ based on voting. illustrates the relevant classes.
+
+ Voting Decision Manager
+
-
-
- Figure 4: Voting Decision Manager
-
-
-
+
+ Using this approach, a series of
AccessDecisionVoter implementations are polled on
an authorization decision. The
@@ -265,21 +262,23 @@ boolean supports(Class clazz);
several concrete implementations that integrate with its ACL
capabilities.
- Figure 5 illustrates Spring Security's
+ illustrates Spring Security's
AfterInvocationManager and its concrete
- implementations.
-
-
-
-
+ implementations.
+
+
+ After Invocation Implementation
+
+
+
-
-
+
+
-
- Figure 5: After Invocation Implementation
-
-
+
+
+
+ Like many other parts of Spring Security,
AfterInvocationManager has a single concrete
@@ -315,7 +314,6 @@ boolean supports(Class clazz);
ROLE_AUTHENTICATED configuration attributeACL-Aware AfterInvocationProviders
-
PLEASE NOTE: Acegi Security 1.0.3 contains a preview of a new
ACL module. The new ACL module is a significant rewrite of the
diff --git a/src/docbkx/domain-acls-old.xml b/src/docbkx/domain-acls-old.xml
index da729e82a7..e1acfc152e 100644
--- a/src/docbkx/domain-acls-old.xml
+++ b/src/docbkx/domain-acls-old.xml
@@ -104,21 +104,21 @@
The org.springframework.security.acl package
is very simple, comprising only a handful of interfaces and a single
- class, as shown in Figure 6. It provides the basic foundation for
- access control list (ACL) lookups.
+ class, as shown in . It provides the basic foundation for
+ access control list (ACL) lookups.
-
-
-
+
+ Access Control List Manager
+
+
+
-
-
- Figure 6: Access Control List Manager
-
-
+
+
+ The central interface is AclManager, which is
defined by two methods:
@@ -166,20 +166,19 @@ public AclEntry[] getAcls(java.lang.Object domainInstance, Authentication authen
implementation.
Spring Security includes a production-quality ACL provider
- implementation, which is shown in Figure 7.
+ implementation, which is shown in .
-
+
+ Basic ACL Manager
+
-
-
- Figure 7: Basic ACL Manager
-
-
+
+
The implementation is based on integer masking, which is
commonly used for ACL permissions given its flexibility and speed.
@@ -462,6 +461,8 @@ END;
GrantedAuthority[]s. Please refer to the JavaDocs
for more information.
+
+ ACL Instantiation Approach
@@ -469,13 +470,10 @@ END;
-
-
- Figure 8: ACL Instantiation Approach
-
+
- The above figure explains the key relationships between objects
+ explains the key relationships between objects
in the Basic ACL package.
\ No newline at end of file
diff --git a/src/docbkx/technical-overview.xml b/src/docbkx/technical-overview.xml
index d378bb2ca0..536633e02b 100644
--- a/src/docbkx/technical-overview.xml
+++ b/src/docbkx/technical-overview.xml
@@ -472,19 +472,20 @@ if (obj instanceof UserDetails) {
Because AbstractSecurityInterceptor is the
central template class, it seems fitting that the first figure should
- be devoted to it.
-
-
+ be devoted to it.
+
+
+ The key "secure object" model
+
-
- Figure 1: The key "secure object" model
-
-
+
+
+
Only developers contemplating an entirely new way of
intercepting and authorizing requests would need to use secure objects