SEC-1158: Decoupling of Pre/Post annotations implementation from Spring EL.

samples/contacts/src/main/java/sample/contact/AdminPermissionController.java

@@ -9,13 +9,13 @@ import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceAware;
 import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.dao.DataAccessException;
-import org.springframework.security.acls.Acl;
-import org.springframework.security.acls.AclService;
-import org.springframework.security.acls.Permission;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
-import org.springframework.security.acls.sid.PrincipalSid;
-import org.springframework.security.acls.sid.Sid;
+import org.springframework.security.acls.domain.ObjectIdentityImpl;
+import org.springframework.security.acls.domain.PrincipalSid;
+import org.springframework.security.acls.model.Acl;
+import org.springframework.security.acls.model.AclService;
+import org.springframework.security.acls.model.Permission;
+import org.springframework.security.acls.model.Sid;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.BindingResult;

samples/contacts/src/main/java/sample/contact/ContactManager.java

@@ -14,10 +14,10 @@
  */
 package sample.contact;
 
-import org.springframework.security.access.expression.annotation.PostFilter;
-import org.springframework.security.access.expression.annotation.PreAuthorize;
-import org.springframework.security.acls.Permission;
-import org.springframework.security.acls.sid.Sid;
+import org.springframework.security.access.prepost.PostFilter;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.acls.model.Permission;
+import org.springframework.security.acls.model.Sid;
 
 import java.util.List;
 

samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java

@@ -15,16 +15,16 @@
 package sample.contact;
 
 
-import org.springframework.security.acls.AccessControlEntry;
-import org.springframework.security.acls.MutableAcl;
-import org.springframework.security.acls.MutableAclService;
-import org.springframework.security.acls.NotFoundException;
-import org.springframework.security.acls.Permission;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.acls.objectidentity.ObjectIdentity;
-import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
-import org.springframework.security.acls.sid.PrincipalSid;
-import org.springframework.security.acls.sid.Sid;
+import org.springframework.security.acls.domain.ObjectIdentityImpl;
+import org.springframework.security.acls.domain.PrincipalSid;
+import org.springframework.security.acls.model.AccessControlEntry;
+import org.springframework.security.acls.model.MutableAcl;
+import org.springframework.security.acls.model.MutableAclService;
+import org.springframework.security.acls.model.NotFoundException;
+import org.springframework.security.acls.model.ObjectIdentity;
+import org.springframework.security.acls.model.Permission;
+import org.springframework.security.acls.model.Sid;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

samples/contacts/src/main/java/sample/contact/DataSourcePopulator.java

@@ -20,14 +20,14 @@ import javax.sql.DataSource;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.security.acls.MutableAcl;
-import org.springframework.security.acls.MutableAclService;
-import org.springframework.security.acls.Permission;
 import org.springframework.security.acls.domain.AclImpl;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.acls.objectidentity.ObjectIdentity;
-import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
-import org.springframework.security.acls.sid.PrincipalSid;
+import org.springframework.security.acls.domain.ObjectIdentityImpl;
+import org.springframework.security.acls.domain.PrincipalSid;
+import org.springframework.security.acls.model.MutableAcl;
+import org.springframework.security.acls.model.MutableAclService;
+import org.springframework.security.acls.model.ObjectIdentity;
+import org.springframework.security.acls.model.Permission;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.AuthorityUtils;

samples/contacts/src/main/java/sample/contact/IndexController.java

@@ -5,10 +5,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.expression.PermissionEvaluator;
-import org.springframework.security.acls.Permission;
+import org.springframework.security.access.PermissionEvaluator;
+import org.springframework.security.acls.AclPermissionEvaluator;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.acls.expression.AclPermissionEvaluator;
+import org.springframework.security.acls.model.Permission;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;

samples/contacts/src/main/webapp/WEB-INF/applicationContext-security.xml

@@ -12,9 +12,9 @@
     xmlns:b="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.5.xsd">
+                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
 
-    <global-method-security expression-annotations="enabled">
+    <global-method-security pre-post-annotations="enabled">
         <expression-handler ref="expressionHandler"/>
     </global-method-security>
 
@@ -48,12 +48,11 @@
        <b:property name="targetUrl" value="/secure/index.htm"/>
     </b:bean>
 
-    <b:bean id="expressionHandler" class="org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler">
-        <b:property name="permissionEvaluator" ref="permissionEvaluator" />
+    <b:bean id="expressionHandler" class="org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler">
+        <b:property name="permissionEvaluator">
+            <b:bean class="org.springframework.security.acls.AclPermissionEvaluator">
+                <b:constructor-arg ref="aclService"/>
+            </b:bean>
+        </b:property>
     </b:bean>
-
-    <b:bean id="permissionEvaluator" class="org.springframework.security.acls.expression.AclPermissionEvaluator">
-        <b:constructor-arg ref="aclService"/>
-    </b:bean>
-
 </b:beans>

samples/contacts/src/test/java/sample/contact/ContactManagerTests.java

@@ -24,7 +24,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.acls.sid.PrincipalSid;
+import org.springframework.security.acls.domain.PrincipalSid;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

samples/contacts/src/test/resources/applicationContext-contacts-test.xml

@@ -11,25 +11,23 @@
     xmlns:b="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.5.xsd">
+                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
 
-    <global-method-security expression-annotations="enabled">
+    <global-method-security pre-post-annotations="enabled">
         <expression-handler ref="expressionHandler"/>
     </global-method-security>
 
-   <!-- ======================== AUTHENTICATION ======================= -->
-
     <authentication-provider>
         <password-encoder hash="md5"/>
         <jdbc-user-service data-source-ref="dataSource"/>
     </authentication-provider>
 
-    <b:bean id="expressionHandler" class="org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler">
-        <b:property name="permissionEvaluator" ref="permissionEvaluator" />
-    </b:bean>
-
-    <b:bean id="permissionEvaluator" class="org.springframework.security.acls.expression.AclPermissionEvaluator">
-        <b:constructor-arg ref="aclService"/>
+    <b:bean id="expressionHandler" class="org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler">
+        <b:property name="permissionEvaluator">
+            <b:bean class="org.springframework.security.acls.AclPermissionEvaluator">
+                <b:constructor-arg ref="aclService"/>
+            </b:bean>
+        </b:property>
     </b:bean>
 
 </b:beans>