Author: markt Date: Sun Mar 13 19:46:24 2016 New Revision: 1734845 URL: http://svn.apache.org/viewvc?rev=1734845&view=rev Log: Remove deprecated code
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1734845&r1=1734844&r2=1734845&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java Sun Mar 13 19:46:24 2016 @@ -76,37 +76,6 @@ public abstract class ClusterManagerBase this.notifyListenersOnReplication = notifyListenersOnReplication; } - /** - * Return the string pattern used for including session attributes - * to replication. - * - * @return the sessionAttributeFilter - * - * @deprecated Use {@link #getSessionAttributeNameFilter()}. Will be removed - * in Tomcat 9.0.x - */ - @Deprecated - public String getSessionAttributeFilter() { - return getSessionAttributeNameFilter(); - } - - /** - * Set the pattern used for including session attributes to replication. - * If not set, all session attributes will be eligible for replication. - * <p> - * E.g. <code>^(userName|sessionHistory)$</code> - * </p> - * - * @param sessionAttributeFilter - * the filter name pattern to set - * - * @deprecated Use {@link #setSessionAttributeNameFilter(String)}. Will be - * removed in Tomcat 9.0.x - */ - @Deprecated - public void setSessionAttributeFilter(String sessionAttributeFilter) { - setSessionAttributeNameFilter(sessionAttributeFilter); - } public boolean isRecordAllActions() { return recordAllActions; @@ -116,21 +85,6 @@ public abstract class ClusterManagerBase this.recordAllActions = recordAllActions; } - /** - * Check whether the given session attribute should be distributed based on - * attribute name only. - * - * @param name The attribute name - * @return <code>true</code> if the attribute should be distributed - * - * @deprecated Use {@link #willAttributeDistribute(String, Object)}. Will be - * removed in Tomcat 9.0.x - */ - @Deprecated - public boolean willAttributeDistribute(String name) { - return willAttributeDistribute(name, null); - } - public static ClassLoader[] getClassLoaders(Context context) { ClassLoader tccl = Thread.currentThread().getContextClassLoader(); Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1734845&r1=1734844&r2=1734845&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Sun Mar 13 19:46:24 2016 @@ -161,19 +161,6 @@ public class StandardSession implements /** - * Set of attribute names which are not allowed to be persisted. - * - * @deprecated Use {@link Constants#excludedAttributeNames} instead. Will be - * removed in Tomcat 9. - */ - @Deprecated - protected static final String[] excludedAttributes = { - Globals.SUBJECT_ATTR, - Globals.GSS_CREDENTIAL_ATTR - }; - - - /** * We are currently processing a session expiration, so bypass * certain IllegalStateException tests. NOTE: This value is not * included in the serialized version of this object. @@ -1718,21 +1705,6 @@ public class StandardSession implements } - /** - * Exclude standard attributes that cannot be serialized. - * @param name the attribute's name - * @return <code>true</code> if the specified attribute should be - * excluded from serialization - * - * @deprecated Use {@link #exclude(String, Object)}. Will be removed in - * Tomcat 9.0.x. - */ - @Deprecated - protected boolean exclude(String name){ - return exclude(name, null); - } - - /** * Should the given session attribute be excluded? This implementation * checks: --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org