GitHub-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

SEC-1184: Moved ACL cache classes and interface out of jdbc package.

3.0.x
Luke Taylor 17 years ago
parent
6236858356
commit
0d7b990e0a
12 changed files with 24 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java
  2. 1
      acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java
  3. 1
      acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java
  4. 5
      acl/src/main/java/org/springframework/security/acls/model/AclCache.java
  5. 1
      acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java
  6. 1
      acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java
  7. 1
      acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java
  8. 2
      acl/src/test/resources/jdbcMutableAclServiceTests-context.xml
  9. 19
      config/src/main/java/org/springframework/security/config/BeanIds.java
  10. 2
      config/src/main/java/org/springframework/security/config/http/FilterChainOrder.java
  11. 2
      samples/contacts/src/main/resources/applicationContext-common-authorization.xml
  12. 2
      samples/dms/src/main/resources/applicationContext-dms-secure.xml

6
acl/src/main/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCache.java → acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java
Unescape View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.security.acls.jdbc; package org.springframework.security.acls.domain;
import java.io.Serializable; import java.io.Serializable;
@ -20,9 +20,7 @@ import net.sf.ehcache.CacheException;
import net.sf.ehcache.Ehcache; import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element; import net.sf.ehcache.Element;
import org.springframework.security.acls.domain.AclAuthorizationStrategy; import org.springframework.security.acls.model.AclCache;
import org.springframework.security.acls.domain.AclImpl;
import org.springframework.security.acls.domain.AuditLogger;
import org.springframework.security.acls.model.MutableAcl; import org.springframework.security.acls.model.MutableAcl;
import org.springframework.security.acls.model.ObjectIdentity; import org.springframework.security.acls.model.ObjectIdentity;
import org.springframework.security.util.FieldUtils; import org.springframework.security.util.FieldUtils;

1
acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java
Unescape View File

@ -43,6 +43,7 @@ import org.springframework.security.acls.domain.ObjectIdentityImpl;
import org.springframework.security.acls.domain.PrincipalSid; import org.springframework.security.acls.domain.PrincipalSid;
import org.springframework.security.acls.model.AccessControlEntry; import org.springframework.security.acls.model.AccessControlEntry;
import org.springframework.security.acls.model.Acl; import org.springframework.security.acls.model.Acl;
import org.springframework.security.acls.model.AclCache;
import org.springframework.security.acls.model.MutableAcl; import org.springframework.security.acls.model.MutableAcl;
import org.springframework.security.acls.model.NotFoundException; import org.springframework.security.acls.model.NotFoundException;
import org.springframework.security.acls.model.ObjectIdentity; import org.springframework.security.acls.model.ObjectIdentity;

1
acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java
Unescape View File

@ -28,6 +28,7 @@ import org.springframework.security.acls.domain.ObjectIdentityImpl;
import org.springframework.security.acls.domain.PrincipalSid; import org.springframework.security.acls.domain.PrincipalSid;
import org.springframework.security.acls.model.AccessControlEntry; import org.springframework.security.acls.model.AccessControlEntry;
import org.springframework.security.acls.model.Acl; import org.springframework.security.acls.model.Acl;
import org.springframework.security.acls.model.AclCache;
import org.springframework.security.acls.model.AlreadyExistsException; import org.springframework.security.acls.model.AlreadyExistsException;
import org.springframework.security.acls.model.ChildrenExistException; import org.springframework.security.acls.model.ChildrenExistException;
import org.springframework.security.acls.model.MutableAcl; import org.springframework.security.acls.model.MutableAcl;

5
acl/src/main/java/org/springframework/security/acls/jdbc/AclCache.java → acl/src/main/java/org/springframework/security/acls/model/AclCache.java
Unescape View File

@ -12,10 +12,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.security.acls.jdbc; package org.springframework.security.acls.model;
import org.springframework.security.acls.model.MutableAcl; import org.springframework.security.acls.jdbc.JdbcAclService;
import org.springframework.security.acls.model.ObjectIdentity;
import java.io.Serializable; import java.io.Serializable;

1
acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java
Unescape View File

@ -22,6 +22,7 @@ import org.springframework.security.acls.domain.AclAuthorizationStrategy;
import org.springframework.security.acls.domain.AclAuthorizationStrategyImpl; import org.springframework.security.acls.domain.AclAuthorizationStrategyImpl;
import org.springframework.security.acls.domain.BasePermission; import org.springframework.security.acls.domain.BasePermission;
import org.springframework.security.acls.domain.ConsoleAuditLogger; import org.springframework.security.acls.domain.ConsoleAuditLogger;
import org.springframework.security.acls.domain.EhCacheBasedAclCache;
import org.springframework.security.acls.domain.ObjectIdentityImpl; import org.springframework.security.acls.domain.ObjectIdentityImpl;
import org.springframework.security.acls.domain.PrincipalSid; import org.springframework.security.acls.domain.PrincipalSid;
import org.springframework.security.acls.model.Acl; import org.springframework.security.acls.model.Acl;

1
acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java
Unescape View File

@ -22,6 +22,7 @@ import org.springframework.security.acls.domain.AclAuthorizationStrategy;
import org.springframework.security.acls.domain.AclAuthorizationStrategyImpl; import org.springframework.security.acls.domain.AclAuthorizationStrategyImpl;
import org.springframework.security.acls.domain.AclImpl; import org.springframework.security.acls.domain.AclImpl;
import org.springframework.security.acls.domain.ConsoleAuditLogger; import org.springframework.security.acls.domain.ConsoleAuditLogger;
import org.springframework.security.acls.domain.EhCacheBasedAclCache;
import org.springframework.security.acls.domain.ObjectIdentityImpl; import org.springframework.security.acls.domain.ObjectIdentityImpl;
import org.springframework.security.acls.model.MutableAcl; import org.springframework.security.acls.model.MutableAcl;
import org.springframework.security.acls.model.ObjectIdentity; import org.springframework.security.acls.model.ObjectIdentity;

1
acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java
Unescape View File

@ -35,6 +35,7 @@ import org.springframework.security.acls.domain.ObjectIdentityImpl;
import org.springframework.security.acls.domain.PrincipalSid; import org.springframework.security.acls.domain.PrincipalSid;
import org.springframework.security.acls.model.AccessControlEntry; import org.springframework.security.acls.model.AccessControlEntry;
import org.springframework.security.acls.model.Acl; import org.springframework.security.acls.model.Acl;
import org.springframework.security.acls.model.AclCache;
import org.springframework.security.acls.model.AlreadyExistsException; import org.springframework.security.acls.model.AlreadyExistsException;
import org.springframework.security.acls.model.ChildrenExistException; import org.springframework.security.acls.model.ChildrenExistException;
import org.springframework.security.acls.model.MutableAcl; import org.springframework.security.acls.model.MutableAcl;

2
acl/src/test/resources/jdbcMutableAclServiceTests-context.xml
Unescape View File

@ -14,7 +14,7 @@
<property name="dataSource" ref="dataSource"/> <property name="dataSource" ref="dataSource"/>
</bean> </bean>
<bean id="aclCache" class="org.springframework.security.acls.jdbc.EhCacheBasedAclCache"> <bean id="aclCache" class="org.springframework.security.acls.domain.EhCacheBasedAclCache">
<constructor-arg> <constructor-arg>
<bean class="org.springframework.cache.ehcache.EhCacheFactoryBean"> <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
<property name="cacheManager"> <property name="cacheManager">

19
config/src/main/java/org/springframework/security/config/BeanIds.java
Unescape View File

@ -9,20 +9,23 @@ package org.springframework.security.config;
* @version $Id: BeanIds.java 3770 2009-07-15 23:09:47Z ltaylor $ * @version $Id: BeanIds.java 3770 2009-07-15 23:09:47Z ltaylor $
*/ */
public abstract class BeanIds { public abstract class BeanIds {
private static final String PREFIX = "org.springframework.security";
/** The "global" AuthenticationManager instance, registered by the <authentication-manager> element */
public static final String AUTHENTICATION_MANAGER = PREFIX + "authenticationManager";
/** External alias for FilterChainProxy bean, for use in web.xml files */ /** External alias for FilterChainProxy bean, for use in web.xml files */
public static final String SPRING_SECURITY_FILTER_CHAIN = "springSecurityFilterChain"; public static final String SPRING_SECURITY_FILTER_CHAIN = "springSecurityFilterChain";
public static final String CONTEXT_SOURCE_SETTING_POST_PROCESSOR = "_contextSettingPostProcessor"; public static final String CONTEXT_SOURCE_SETTING_POST_PROCESSOR = PREFIX + "contextSettingPostProcessor";
public static final String USER_DETAILS_SERVICE = "_userDetailsService"; public static final String USER_DETAILS_SERVICE = PREFIX + "userDetailsService";
public static final String METHOD_ACCESS_MANAGER = "_defaultMethodAccessManager"; public static final String METHOD_ACCESS_MANAGER = PREFIX + "defaultMethodAccessManager";
public static final String AUTHENTICATION_MANAGER = "_authenticationManager";
public static final String FILTER_CHAIN_PROXY = "_filterChainProxy"; public static final String FILTER_CHAIN_PROXY = PREFIX + "filterChainProxy";
public static final String METHOD_SECURITY_METADATA_SOURCE_ADVISOR = "_methodSecurityMetadataSourceAdvisor"; public static final String METHOD_SECURITY_METADATA_SOURCE_ADVISOR = PREFIX + "methodSecurityMetadataSourceAdvisor";
public static final String EMBEDDED_APACHE_DS = "_apacheDirectoryServerContainer"; public static final String EMBEDDED_APACHE_DS = PREFIX + "apacheDirectoryServerContainer";
public static final String CONTEXT_SOURCE = "_securityContextSource"; public static final String CONTEXT_SOURCE = PREFIX + "securityContextSource";
} }

2
config/src/main/java/org/springframework/security/config/http/FilterChainOrder.java
Unescape View File

@ -37,9 +37,9 @@ abstract class FilterChainOrder {
public static final int SERVLET_API_SUPPORT_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++; public static final int SERVLET_API_SUPPORT_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++;
public static final int REMEMBER_ME_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++; public static final int REMEMBER_ME_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++;
public static final int ANONYMOUS_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++; public static final int ANONYMOUS_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++;
public static final int SESSION_FIXATION_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++;
public static final int EXCEPTION_TRANSLATION_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++; public static final int EXCEPTION_TRANSLATION_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++;
public static final int NTLM_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++; public static final int NTLM_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++;
public static final int SESSION_FIXATION_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++;
public static final int FILTER_SECURITY_INTERCEPTOR = FILTER_CHAIN_FIRST + INTERVAL * i++; public static final int FILTER_SECURITY_INTERCEPTOR = FILTER_CHAIN_FIRST + INTERVAL * i++;
public static final int SWITCH_USER_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++; public static final int SWITCH_USER_FILTER = FILTER_CHAIN_FIRST + INTERVAL * i++;

2
samples/contacts/src/main/resources/applicationContext-common-authorization.xml
Unescape View File

@ -14,7 +14,7 @@
<!-- ========= ACL SERVICE DEFINITIONS ========= --> <!-- ========= ACL SERVICE DEFINITIONS ========= -->
<bean id="aclCache" class="org.springframework.security.acls.jdbc.EhCacheBasedAclCache"> <bean id="aclCache" class="org.springframework.security.acls.domain.EhCacheBasedAclCache">
<constructor-arg> <constructor-arg>
<bean class="org.springframework.cache.ehcache.EhCacheFactoryBean"> <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
<property name="cacheManager"> <property name="cacheManager">

2
samples/dms/src/main/resources/applicationContext-dms-secure.xml
Unescape View File

@ -154,7 +154,7 @@
<!-- ========= ACCESS CONTROL LIST LOOKUP MANAGER DEFINITIONS ========= --> <!-- ========= ACCESS CONTROL LIST LOOKUP MANAGER DEFINITIONS ========= -->
<bean id="aclCache" class="org.springframework.security.acls.jdbc.EhCacheBasedAclCache"> <bean id="aclCache" class="org.springframework.security.acls.domain.EhCacheBasedAclCache">
<constructor-arg> <constructor-arg>
<bean class="org.springframework.cache.ehcache.EhCacheFactoryBean"> <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
<property name="cacheManager"> <property name="cacheManager">

Write Preview
Loading…
Cancel
Save