Merge remote-tracking branch 'origin/jetty-9.4.x'

jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java

@@ -46,7 +46,7 @@ import org.eclipse.jetty.util.log.Logger;
  * 
  * Runs a HouseKeeper thread to periodically check for expired Sessions.
  * 
- * @See HouseKeeper
+ * @see HouseKeeper
  */
 public class DefaultSessionIdManager extends AbstractLifeCycle implements SessionIdManager
 {

jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java

@@ -580,6 +580,7 @@ public class Session implements SessionHandler.SessionIf
      * @see javax.servlet.http.HttpSession#getSessionContext()
      */
     @Override
+    @Deprecated
     public HttpSessionContext getSessionContext()
     {
         checkValidForRead();
@@ -654,6 +655,7 @@ public class Session implements SessionHandler.SessionIf
      * @see javax.servlet.http.HttpSession#getValue(java.lang.String)
      */
     @Override
+    @Deprecated
     public Object getValue(String name)
     {
         try (Lock lock = _lock.lockIfNotHeld())
@@ -758,6 +760,7 @@ public class Session implements SessionHandler.SessionIf
      * @see javax.servlet.http.HttpSession#putValue(java.lang.String, java.lang.Object)
      */
     @Override
+    @Deprecated
     public void putValue(String name, Object value)
     {
         setAttribute(name,value);
@@ -782,6 +785,7 @@ public class Session implements SessionHandler.SessionIf
      * @see javax.servlet.http.HttpSession#removeValue(java.lang.String)
      */
     @Override
+    @Deprecated
     public void removeValue(String name)
     {
        setAttribute(name, null);

jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionCache.java

@@ -80,14 +80,14 @@ public interface SessionCache extends LifeCycle
      * @param id
      * @param time
      * @param maxInactiveMs
-     * @return
+     * @return a new Session 
      */
     Session newSession (HttpServletRequest request, String id,  long time, long maxInactiveMs);
     
     /**
-     * Re-inflate a Session that has previously existed.
+     * Re-materialize a Session that has previously existed.
      * @param data
-     * @return
+     * @return a Session object for the data supplied
      */
     Session newSession (SessionData data);
     
@@ -97,7 +97,7 @@ public interface SessionCache extends LifeCycle
      * 
      * @param oldId
      * @param newId
-     * @return
+     * @return the Session after changing its id
      * @throws Exception
      */
     Session renewSessionId (String oldId, String newId) throws Exception;
@@ -108,7 +108,7 @@ public interface SessionCache extends LifeCycle
      * the session from the configured SessionDataStore.
      * 
      * @param id
-     * @return
+     * @return the Session if one exists, null otherwise
      * @throws Exception
      */
     Session get(String id) throws Exception;
@@ -144,7 +144,7 @@ public interface SessionCache extends LifeCycle
      * SessionDataStore.
      * 
      * @param id
-     * @return
+     * @return true if the session exists, false otherwise
      * @throws Exception
      */
     boolean exists (String id) throws Exception;
@@ -155,7 +155,7 @@ public interface SessionCache extends LifeCycle
      * cache and the SessionDataStore.
      * 
      * @param id
-     * @return
+     * @return the Session that was removed, null otherwise
      * @throws Exception
      */
     Session delete (String id) throws Exception;
@@ -199,7 +199,7 @@ public interface SessionCache extends LifeCycle
      * <li>evicted after a configurable period of inactivity</li>
      * </ul>
      * 
-     * @param -1 is never evict; 0 is evict-on-exit; and any other positive
+     * @param policy -1 is never evict; 0 is evict-on-exit; and any other positive
      * value is the time in seconds that a session can be idle before it can
      * be evicted.
      */

tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ProxySerializationTest.java

@@ -47,7 +47,7 @@ public class ProxySerializationTest extends AbstractProxySerializationTest
        FileTestServer.teardown();
     }
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractProxySerializationTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractProxySerializationTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy )

tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java

@@ -52,7 +52,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
     }
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(java.lang.String, java.lang.String)
+     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(WebAppContext, java.lang.String, java.lang.String)
      */
     @Override
     public boolean verifyChange(WebAppContext context, String oldSessionId, String newSessionId)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudTestServer.java

@@ -35,7 +35,7 @@ public class GCloudTestServer extends AbstractTestServer
      * @param port
      * @param maxInactivePeriod
      * @param scavengePeriod
-     * @param sessionIdMgrConfig
+     * @param evictionPolicy
      */
     public GCloudTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy)
     {
@@ -45,7 +45,7 @@ public class GCloudTestServer extends AbstractTestServer
 
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractTestServer#newSessionHandler(org.eclipse.jetty.server.SessionManager)
+     * @see org.eclipse.jetty.server.session.AbstractTestServer#newSessionHandler()
      */
     @Override
     public SessionHandler newSessionHandler()

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ImmortalSessionTest.java

@@ -40,7 +40,7 @@ public class ImmortalSessionTest extends AbstractImmortalSessionTest
         GCloudTestSuite.__testSupport.deleteSessions();
     }
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractImmortalSessionTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractImmortalSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java

@@ -42,7 +42,7 @@ public class InvalidationSessionTest extends AbstractInvalidationSessionTest
     }
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractInvalidationSessionTest#createServer(int)
+     * @see org.eclipse.jetty.server.session.AbstractInvalidationSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy)
@@ -50,7 +50,7 @@ public class InvalidationSessionTest extends AbstractInvalidationSessionTest
         GCloudTestServer server =  new GCloudTestServer(port, maxInactive, scavengeInterval, evictionPolicy) 
         {
             /** 
-             * @see org.eclipse.jetty.gcloud.session.GCloudTestServer#newSessionManager()
+             * @see org.eclipse.jetty.gcloud.session.GCloudTestServer#newSessionHandler()
              */
             @Override
             public SessionHandler newSessionHandler()

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/LastAccessTimeTest.java

@@ -39,7 +39,7 @@ public class LastAccessTimeTest extends AbstractLastAccessTimeTest
         GCloudTestSuite.__testSupport.deleteSessions();
     }
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractLastAccessTimeTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractLastAccessTimeTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/LocalSessionScavengingTest.java

@@ -40,7 +40,7 @@ public class LocalSessionScavengingTest extends AbstractLocalSessionScavengingTe
     }
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractLocalSessionScavengingTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractLocalSessionScavengingTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/NewSessionTest.java

@@ -47,7 +47,7 @@ public class NewSessionTest extends AbstractNewSessionTest
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/OrphanedSessionTest.java

@@ -41,7 +41,7 @@ public class OrphanedSessionTest extends AbstractOrphanedSessionTest
     
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractOrphanedSessionTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractOrphanedSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ReentrantRequestSessionTest.java

@@ -40,7 +40,7 @@ public class ReentrantRequestSessionTest extends AbstractReentrantRequestSession
     }
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int)
+     * @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port,int max, int scavengePeriod,int evictionPolicy)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/RemoveSessionTest.java

@@ -43,7 +43,7 @@ public class RemoveSessionTest extends AbstractRemoveSessionTest
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractRemoveSessionTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractRemoveSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionExpiryTest.java

@@ -45,7 +45,7 @@ public class SessionExpiryTest extends AbstractSessionExpiryTest
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionExpiryTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractSessionExpiryTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionInvalidateAndCreateTest.java

@@ -40,7 +40,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd
 
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionInvalidateAndCreateTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractSessionInvalidateAndCreateTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionMigrationTest.java

@@ -40,7 +40,7 @@ public class SessionMigrationTest extends AbstractSessionMigrationTest
 
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionMigrationTest#createServer(int)
+     * @see org.eclipse.jetty.server.session.AbstractSessionMigrationTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionRenewTest.java

@@ -44,7 +44,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
     }
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
@@ -60,7 +60,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
     }
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(java.lang.String, java.lang.String)
+     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(WebAppContext, java.lang.String, java.lang.String)
      */
     @Override
     public boolean verifyChange(WebAppContext context, String oldSessionId, String newSessionId)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionValueSavingTest.java

@@ -39,7 +39,7 @@ public class SessionValueSavingTest extends AbstractSessionValueSavingTest
     }
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionValueSavingTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractSessionValueSavingTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)

tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/StopSessionManagerPreserveSessionTest.java

@@ -42,7 +42,7 @@ public class StopSessionManagerPreserveSessionTest extends AbstractStopSessionMa
     }
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractStopSessionManagerPreserveSessionTest#checkSessionPersisted(boolean)
+     * @see org.eclipse.jetty.server.session.AbstractStopSessionManagerPreserveSessionTest#checkSessionPersisted(String, boolean)
      */
     @Override
     public void checkSessionPersisted(String id, boolean expected)

tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java

@@ -43,7 +43,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
     }
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(java.lang.String, java.lang.String)
+     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(WebAppContext, java.lang.String, java.lang.String)
      */
     @Override
     public boolean verifyChange(WebAppContext context ,String oldSessionId, String newSessionId)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java

@@ -53,7 +53,7 @@ public class ImmortalSessionTest extends AbstractImmortalSessionTest
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractImmortalSessionTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractImmortalSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LocalSessionScavengingTest.java

@@ -48,7 +48,7 @@ public class LocalSessionScavengingTest extends AbstractLocalSessionScavengingTe
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractLocalSessionScavengingTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractLocalSessionScavengingTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java

@@ -47,7 +47,7 @@ public class NewSessionTest extends AbstractNewSessionTest
     }
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java

@@ -46,7 +46,7 @@ public class ReentrantRequestSessionTest extends AbstractReentrantRequestSession
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int)
+     * @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port,int maxInactive, int scavenge, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SameNodeLoadTest.java

@@ -48,7 +48,7 @@ public class SameNodeLoadTest extends AbstractSameNodeLoadTest
     }
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSameNodeLoadTest#createServer(int)
+     * @see org.eclipse.jetty.server.session.AbstractSameNodeLoadTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port,int maxInactive, int scavenge, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java

@@ -47,7 +47,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionInvalidateAndCreateTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractSessionInvalidateAndCreateTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java

@@ -54,7 +54,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
@@ -69,7 +69,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
     }
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(java.lang.String, java.lang.String)
+     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(WebAppContext, java.lang.String, java.lang.String)
      */
     @Override
     public boolean verifyChange(WebAppContext context, String oldSessionId, String newSessionId)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteImmortalSessionTest.java

@@ -56,7 +56,7 @@ public class RemoteImmortalSessionTest extends AbstractImmortalSessionTest
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractImmortalSessionTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractImmortalSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteInvalidationSessionTest.java

@@ -53,7 +53,7 @@ public class RemoteInvalidationSessionTest extends AbstractInvalidationSessionTe
     }
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractInvalidationSessionTest#createServer(int)
+     * @see org.eclipse.jetty.server.session.AbstractInvalidationSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int maxInterval, int scavengeInterval, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteLocalSessionScavengingTest.java

@@ -50,7 +50,7 @@ public class RemoteLocalSessionScavengingTest extends AbstractLocalSessionScaven
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractLocalSessionScavengingTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractLocalSessionScavengingTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteNewSessionTest.java

@@ -50,7 +50,7 @@ public class RemoteNewSessionTest extends AbstractNewSessionTest
     }
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteReentrantRequestSessionTest.java

@@ -49,7 +49,7 @@ public class RemoteReentrantRequestSessionTest extends AbstractReentrantRequestS
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int)
+     * @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int maxInactive, int scavenge, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSameNodeLoadTest.java

@@ -51,7 +51,7 @@ public class RemoteSameNodeLoadTest extends AbstractSameNodeLoadTest
     }
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSameNodeLoadTest#createServer(int)
+     * @see org.eclipse.jetty.server.session.AbstractSameNodeLoadTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int maxInactive, int scavenge, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionInvalidateAndCreateTest.java

@@ -50,7 +50,7 @@ public class RemoteSessionInvalidateAndCreateTest extends AbstractSessionInvalid
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionInvalidateAndCreateTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractSessionInvalidateAndCreateTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)

tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionRenewTest.java

@@ -53,7 +53,7 @@ public class RemoteSessionRenewTest extends AbstractSessionRenewTest
     
     
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
@@ -68,7 +68,7 @@ public class RemoteSessionRenewTest extends AbstractSessionRenewTest
     }
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(java.lang.String, java.lang.String)
+     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(WebAppContext, java.lang.String, java.lang.String)
      */
     @Override
     public boolean verifyChange(WebAppContext context, String oldSessionId, String newSessionId)

tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java

@@ -91,7 +91,7 @@ public class JdbcTestServer extends AbstractTestServer
     
  
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractTestServer#newSessionHandler(org.eclipse.jetty.server.SessionManager)
+     * @see org.eclipse.jetty.server.session.AbstractTestServer#newSessionHandler()
      */
     @Override
     public SessionHandler newSessionHandler()

tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java

@@ -27,7 +27,7 @@ import org.junit.Test;
 public class NewSessionTest extends AbstractNewSessionTest
 {
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int, int)
      */
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
     {

tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ProxySerializationTest.java

@@ -32,7 +32,7 @@ public class ProxySerializationTest extends AbstractProxySerializationTest
 {
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractProxySerializationTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractProxySerializationTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)

tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java

@@ -33,7 +33,7 @@ public class SessionExpiryTest extends AbstractSessionExpiryTest
 {
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionExpiryTest#createServer(int, int, int)
+     * @see org.eclipse.jetty.server.session.AbstractSessionExpiryTest#createServer(int, int, int, int)
      */
     @Override
     public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)

tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java

@@ -38,7 +38,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
     
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(java.lang.String, java.lang.String)
+     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(WebAppContext, java.lang.String, java.lang.String)
      */
     @Override
     public boolean verifyChange(WebAppContext context, String oldSessionId, String newSessionId)

tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestServer.java

@@ -146,7 +146,7 @@ public class MemcachedTestServer extends AbstractTestServer
      * @param port
      * @param maxInactivePeriod
      * @param scavengePeriod
-     * @param sessionIdMgrConfig
+     * @param evictionPolicy
      */
     public MemcachedTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy)
     {
@@ -156,7 +156,7 @@ public class MemcachedTestServer extends AbstractTestServer
 
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractTestServer#newSessionHandler(org.eclipse.jetty.server.SessionManager)
+     * @see org.eclipse.jetty.server.session.AbstractTestServer#newSessionHandler()
      */
     @Override
     public SessionHandler newSessionHandler()

tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionRenewTest.java

@@ -61,7 +61,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
     }
 
     /** 
-     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(java.lang.String, java.lang.String)
+     * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#verifyChange(WebAppContext, java.lang.String, java.lang.String)
      */
     @Override
     public boolean verifyChange(WebAppContext context, String oldSessionId, String newSessionId)

tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractIdleSessionTest.java

@@ -57,7 +57,6 @@ public abstract class AbstractIdleSessionTest extends AbstractTestBase
  
 
     /**
-     * @param sessionDir
      * @param sessionId
      */
     public abstract void checkSessionIdled (String sessionId);