Author: markt
Date: Tue Nov 4 10:27:47 2014
New Revision: 1636534
URL: http://svn.apache.org/r1636534
Log:
Remove deprecated code from Manager interface
Modified:
tomcat/trunk/java/org/apache/catalina/Manager.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/Manager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Manager.java?rev=1636534&r1=1636533&r2=1636534&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Manager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Manager.java Tue Nov 4 10:27:47 2014
@@ -46,29 +46,6 @@ public interface Manager {
// ------------------------------------------------------------- Properties
-
- /**
- * Return the Container with which this Manager is associated.
- *
- * @deprecated Use {@link #getContext()}. This method will be removed in
- * Tomcat 9 onwards.
- */
- @Deprecated
- public Container getContainer();
-
-
- /**
- * Set the Container with which this Manager is associated.
- *
- * @param container The newly associated Container
- *
- * @deprecated Use {@link #setContext(Context)}. This method will be
removed in
- * Tomcat 9 onwards.
- */
- @Deprecated
- public void setContainer(Container container);
-
-
/**
* Return the Context with which this Manager is associated.
*/
@@ -131,32 +108,6 @@ public interface Manager {
/**
- * Gets the session id length (in bytes) of Sessions created by
- * this Manager.
- *
- * @deprecated Use {@link SessionIdGenerator#getSessionIdLength()}.
- * This method will be removed in Tomcat 9 onwards.
- *
- * @return The session id length
- */
- @Deprecated
- public int getSessionIdLength();
-
-
- /**
- * Sets the session id length (in bytes) for Sessions created by this
- * Manager.
- *
- * @deprecated Use {@link SessionIdGenerator#setSessionIdLength(int)}.
- * This method will be removed in Tomcat 9 onwards.
- *
- * @param idLength The session id length
- */
- @Deprecated
- public void setSessionIdLength(int idLength);
-
-
- /**
* Returns the total number of sessions created by this manager.
*
* @return Total number of sessions created by this manager.
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1636534&r1=1636533&r2=1636534&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Tue Nov 4
10:27:47 2014
@@ -215,25 +215,6 @@ public abstract class ManagerBase extend
// ------------------------------------------------------------- Properties
@Override
- @Deprecated
- public Container getContainer() {
- return getContext();
- }
-
-
- @Override
- @Deprecated
- public void setContainer(Container container) {
-
- if (container instanceof Context || container == null) {
- setContext((Context) container);
- } else {
- log.warn(sm.getString("managerBase.container.noop"));
- }
- }
-
-
- @Override
public Context getContext() {
return context;
}
@@ -249,8 +230,6 @@ public abstract class ManagerBase extend
Context oldContext = this.context;
this.context = context;
support.firePropertyChange("context", oldContext, this.context);
- // TODO - delete the line below in Tomcat 9 onwards
- support.firePropertyChange("container", oldContext, this.context);
// Register with the new Context (if any)
if (this.context != null) {
@@ -328,46 +307,6 @@ public abstract class ManagerBase extend
/**
- * Gets the session id length (in bytes) of Sessions created by
- * this Manager.
- *
- * @deprecated Use {@link SessionIdGenerator#getSessionIdLength()}.
- * This method will be removed in Tomcat 9 onwards.
- *
- * @return The session id length
- */
- @Override
- @Deprecated
- public int getSessionIdLength() {
-
- return (this.sessionIdLength);
-
- }
-
-
- /**
- * Sets the session id length (in bytes) for Sessions created by this
- * Manager.
- *
- * @deprecated Use {@link SessionIdGenerator#setSessionIdLength(int)}.
- * This method will be removed in Tomcat 9 onwards.
- *
- * @param idLength The session id length
- */
- @Override
- @Deprecated
- public void setSessionIdLength(int idLength) {
-
- int oldSessionIdLength = this.sessionIdLength;
- this.sessionIdLength = idLength;
- support.firePropertyChange("sessionIdLength",
- Integer.valueOf(oldSessionIdLength),
- Integer.valueOf(this.sessionIdLength));
-
- }
-
-
- /**
* Gets the session id generator.
*
* @return The session id generator
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
