From 4d714b33e0eb0119a9826dd40c3b43642c55d7dd Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Mon, 14 Apr 2008 06:50:01 +0000
Subject: [PATCH] SEC-770: Mark old org.springframework.security.acl module as
 @deprecated.

---
 .../main/java/org/springframework/security/acl/AclEntry.java    | 1 +
 .../main/java/org/springframework/security/acl/AclManager.java  | 1 +
 .../main/java/org/springframework/security/acl/AclProvider.java | 1 +
 .../org/springframework/security/acl/AclProviderManager.java    | 1 +
 .../security/acl/basic/AbstractBasicAclEntry.java               | 1 +
 .../springframework/security/acl/basic/AclObjectIdentity.java   | 1 +
 .../security/acl/basic/AclObjectIdentityAware.java              | 1 +
 .../org/springframework/security/acl/basic/BasicAclDao.java     | 1 +
 .../org/springframework/security/acl/basic/BasicAclEntry.java   | 1 +
 .../springframework/security/acl/basic/BasicAclEntryCache.java  | 1 +
 .../springframework/security/acl/basic/BasicAclExtendedDao.java | 1 +
 .../springframework/security/acl/basic/BasicAclProvider.java    | 1 +
 .../security/acl/basic/EffectiveAclsResolver.java               | 1 +
 .../acl/basic/GrantedAuthorityEffectiveAclsResolver.java        | 1 +
 .../security/acl/basic/NamedEntityObjectIdentity.java           | 1 +
 .../org/springframework/security/acl/basic/SimpleAclEntry.java  | 1 +
 .../security/acl/basic/cache/BasicAclEntryHolder.java           | 1 +
 .../security/acl/basic/cache/EhCacheBasedAclEntryCache.java     | 1 +
 .../security/acl/basic/cache/NullAclEntryCache.java             | 1 +
 .../springframework/security/acl/basic/jdbc/JdbcDaoImpl.java    | 1 +
 .../security/acl/basic/jdbc/JdbcExtendedDaoImpl.java            | 1 +
 ...BasicAclEntryAfterInvocationCollectionFilteringProvider.java | 1 +
 .../afterinvocation/BasicAclEntryAfterInvocationProvider.java   | 2 ++
 .../org/springframework/security/vote/BasicAclEntryVoter.java   | 1 +
 .../org/springframework/security/vote/LabelBasedAclVoter.java   | 1 +
 25 files changed, 26 insertions(+)

diff --git a/core/src/main/java/org/springframework/security/acl/AclEntry.java b/core/src/main/java/org/springframework/security/acl/AclEntry.java
index 9e4ca432d1..e174f40ef8 100644
--- a/core/src/main/java/org/springframework/security/acl/AclEntry.java
+++ b/core/src/main/java/org/springframework/security/acl/AclEntry.java
@@ -24,5 +24,6 @@ import java.io.Serializable;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public interface AclEntry extends Serializable {}
diff --git a/core/src/main/java/org/springframework/security/acl/AclManager.java b/core/src/main/java/org/springframework/security/acl/AclManager.java
index b47de0e07c..a33119e9ca 100644
--- a/core/src/main/java/org/springframework/security/acl/AclManager.java
+++ b/core/src/main/java/org/springframework/security/acl/AclManager.java
@@ -24,6 +24,7 @@ import org.springframework.security.Authentication;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public interface AclManager {
     //~ Methods ========================================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/AclProvider.java b/core/src/main/java/org/springframework/security/acl/AclProvider.java
index 0ca606d054..dbe521d8b8 100644
--- a/core/src/main/java/org/springframework/security/acl/AclProvider.java
+++ b/core/src/main/java/org/springframework/security/acl/AclProvider.java
@@ -28,6 +28,7 @@ import org.springframework.security.Authentication;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public interface AclProvider {
     //~ Methods ========================================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/AclProviderManager.java b/core/src/main/java/org/springframework/security/acl/AclProviderManager.java
index e5565d64e2..d7c2b665cf 100644
--- a/core/src/main/java/org/springframework/security/acl/AclProviderManager.java
+++ b/core/src/main/java/org/springframework/security/acl/AclProviderManager.java
@@ -35,6 +35,7 @@ import java.util.List;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public class AclProviderManager implements AclManager, InitializingBean {
     //~ Static fields/initializers =====================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/AbstractBasicAclEntry.java b/core/src/main/java/org/springframework/security/acl/basic/AbstractBasicAclEntry.java
index d802911d24..4fee48147a 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/AbstractBasicAclEntry.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/AbstractBasicAclEntry.java
@@ -28,6 +28,7 @@ import java.util.Arrays;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public abstract class AbstractBasicAclEntry implements BasicAclEntry {
     //~ Static fields/initializers =====================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentity.java b/core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentity.java
index 854a1b8d58..c53f0075c8 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentity.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentity.java
@@ -42,6 +42,7 @@ import java.io.Serializable;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public interface AclObjectIdentity extends Serializable {
     //~ Methods ========================================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentityAware.java b/core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentityAware.java
index bf966c9621..f3414cd4c2 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentityAware.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentityAware.java
@@ -28,6 +28,7 @@ package org.springframework.security.acl.basic;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public interface AclObjectIdentityAware {
     //~ Methods ========================================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/BasicAclDao.java b/core/src/main/java/org/springframework/security/acl/basic/BasicAclDao.java
index 93b6996367..e703add8d2 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/BasicAclDao.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/BasicAclDao.java
@@ -33,6 +33,7 @@ package org.springframework.security.acl.basic;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public interface BasicAclDao {
     //~ Methods ========================================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/BasicAclEntry.java b/core/src/main/java/org/springframework/security/acl/basic/BasicAclEntry.java
index 9a0aff4417..d77c7467be 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/BasicAclEntry.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/BasicAclEntry.java
@@ -23,6 +23,7 @@ import org.springframework.security.acl.AclEntry;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public interface BasicAclEntry extends AclEntry {
     //~ Methods ========================================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/BasicAclEntryCache.java b/core/src/main/java/org/springframework/security/acl/basic/BasicAclEntryCache.java
index ecaa3eb301..60419c6271 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/BasicAclEntryCache.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/BasicAclEntryCache.java
@@ -29,6 +29,7 @@ package org.springframework.security.acl.basic;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public interface BasicAclEntryCache {
     //~ Methods ========================================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/BasicAclExtendedDao.java b/core/src/main/java/org/springframework/security/acl/basic/BasicAclExtendedDao.java
index 77bfa6d669..9757d89bac 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/BasicAclExtendedDao.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/BasicAclExtendedDao.java
@@ -29,6 +29,7 @@ import org.springframework.dao.DataAccessException;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public interface BasicAclExtendedDao extends BasicAclDao {
     //~ Methods ========================================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/BasicAclProvider.java b/core/src/main/java/org/springframework/security/acl/basic/BasicAclProvider.java
index 0c982867ea..0885b265ea 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/BasicAclProvider.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/BasicAclProvider.java
@@ -59,6 +59,7 @@ import java.util.Map;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public class BasicAclProvider implements AclProvider, InitializingBean {
     //~ Static fields/initializers =====================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/EffectiveAclsResolver.java b/core/src/main/java/org/springframework/security/acl/basic/EffectiveAclsResolver.java
index 763d713125..4cc59aa4da 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/EffectiveAclsResolver.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/EffectiveAclsResolver.java
@@ -44,6 +44,7 @@ import org.springframework.security.acl.AclEntry;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public interface EffectiveAclsResolver {
     //~ Methods ========================================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/GrantedAuthorityEffectiveAclsResolver.java b/core/src/main/java/org/springframework/security/acl/basic/GrantedAuthorityEffectiveAclsResolver.java
index 5a6d3bb542..0a1f836230 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/GrantedAuthorityEffectiveAclsResolver.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/GrantedAuthorityEffectiveAclsResolver.java
@@ -44,6 +44,7 @@ import java.util.Vector;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public class GrantedAuthorityEffectiveAclsResolver implements EffectiveAclsResolver {
     //~ Static fields/initializers =====================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/NamedEntityObjectIdentity.java b/core/src/main/java/org/springframework/security/acl/basic/NamedEntityObjectIdentity.java
index 5f3fd14b64..8cd4195181 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/NamedEntityObjectIdentity.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/NamedEntityObjectIdentity.java
@@ -25,6 +25,7 @@ import java.lang.reflect.Method;
 /**
  * Simple implementation of {@link AclObjectIdentity}.<P>Uses <code>String</code>s to store the identity of the
  * domain object instance. Also offers a constructor that uses reflection to build the identity information.</p>
+ * @deprecated Use new spring-security-acl module instead
  */
 public class NamedEntityObjectIdentity implements AclObjectIdentity {
     //~ Instance fields ================================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/SimpleAclEntry.java b/core/src/main/java/org/springframework/security/acl/basic/SimpleAclEntry.java
index 58fffed3d5..26e6d6a47d 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/SimpleAclEntry.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/SimpleAclEntry.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public class SimpleAclEntry extends AbstractBasicAclEntry {
     //~ Static fields/initializers =====================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/cache/BasicAclEntryHolder.java b/core/src/main/java/org/springframework/security/acl/basic/cache/BasicAclEntryHolder.java
index fe177eff76..03240b6f62 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/cache/BasicAclEntryHolder.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/cache/BasicAclEntryHolder.java
@@ -30,6 +30,7 @@ import java.io.Serializable;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public class BasicAclEntryHolder implements Serializable {
     //~ Instance fields ================================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/cache/EhCacheBasedAclEntryCache.java b/core/src/main/java/org/springframework/security/acl/basic/cache/EhCacheBasedAclEntryCache.java
index bb40d9c0ba..e908a58f1b 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/cache/EhCacheBasedAclEntryCache.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/cache/EhCacheBasedAclEntryCache.java
@@ -39,6 +39,7 @@ import org.springframework.util.Assert;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public class EhCacheBasedAclEntryCache implements BasicAclEntryCache, InitializingBean {
     //~ Static fields/initializers =====================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/cache/NullAclEntryCache.java b/core/src/main/java/org/springframework/security/acl/basic/cache/NullAclEntryCache.java
index 7e49f60da4..b3b0d43292 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/cache/NullAclEntryCache.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/cache/NullAclEntryCache.java
@@ -26,6 +26,7 @@ import org.springframework.security.acl.basic.BasicAclEntryCache;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public class NullAclEntryCache implements BasicAclEntryCache {
     //~ Methods ========================================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcDaoImpl.java b/core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcDaoImpl.java
index cafd0a129f..c517b50ad7 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcDaoImpl.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcDaoImpl.java
@@ -48,6 +48,7 @@ import javax.sql.DataSource;
  * If this does not provide enough flexibility, another strategy would be to subclass this class and override the
  * {@link MappingSqlQuery} instance used, via the {@link #initMappingSqlQueries()} extension point.
  * </p>
+ * @deprecated Use new spring-security-acl module instead
  */
 public class JdbcDaoImpl extends JdbcDaoSupport implements BasicAclDao {
     //~ Static fields/initializers =====================================================================================
diff --git a/core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcExtendedDaoImpl.java b/core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcExtendedDaoImpl.java
index a9147f292b..224e7b1f11 100644
--- a/core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcExtendedDaoImpl.java
+++ b/core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcExtendedDaoImpl.java
@@ -58,6 +58,7 @@ import javax.sql.DataSource;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public class JdbcExtendedDaoImpl extends JdbcDaoImpl implements BasicAclExtendedDao {
     //~ Static fields/initializers =====================================================================================
diff --git a/core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java b/core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java
index 8a9bcefd16..83b4860039 100644
--- a/core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java
+++ b/core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java
@@ -65,6 +65,7 @@ import java.util.Iterator;
  * @author Ben Alex
  * @author Paulo Neves
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public class BasicAclEntryAfterInvocationCollectionFilteringProvider implements AfterInvocationProvider,
     InitializingBean {
diff --git a/core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationProvider.java b/core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationProvider.java
index 8c43682106..0b570e1abc 100644
--- a/core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationProvider.java
+++ b/core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationProvider.java
@@ -61,6 +61,8 @@ import java.util.Iterator;
  *  <p>If the provided <code>returnObject</code> is <code>null</code>, permission will always be granted and
  * <code>null</code> will be returned.</p>
  *  <p>All comparisons and prefixes are case sensitive.</p>
+ *  
+ *  @deprecated Use new spring-security-acl module instead
  */
 public class BasicAclEntryAfterInvocationProvider implements AfterInvocationProvider, InitializingBean,
     MessageSourceAware {
diff --git a/core/src/main/java/org/springframework/security/vote/BasicAclEntryVoter.java b/core/src/main/java/org/springframework/security/vote/BasicAclEntryVoter.java
index 80b15621f8..8cdc7dae21 100644
--- a/core/src/main/java/org/springframework/security/vote/BasicAclEntryVoter.java
+++ b/core/src/main/java/org/springframework/security/vote/BasicAclEntryVoter.java
@@ -78,6 +78,7 @@ import java.util.Iterator;
  *
  * @author Ben Alex
  * @version $Id$
+ * @deprecated Use new spring-security-acl module instead
  */
 public class BasicAclEntryVoter extends AbstractAclVoter implements InitializingBean {
     //~ Static fields/initializers =====================================================================================
diff --git a/core/src/main/java/org/springframework/security/vote/LabelBasedAclVoter.java b/core/src/main/java/org/springframework/security/vote/LabelBasedAclVoter.java
index a22fccd2df..18281768da 100644
--- a/core/src/main/java/org/springframework/security/vote/LabelBasedAclVoter.java
+++ b/core/src/main/java/org/springframework/security/vote/LabelBasedAclVoter.java
@@ -49,6 +49,7 @@ import java.util.Map;
  * @version $Id$
  *
  * @see org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor
+ * @deprecated Use new spring-security-acl module instead
  */
 public class LabelBasedAclVoter extends AbstractAclVoter {
     //~ Static fields/initializers =====================================================================================