From 133d584b94f7d7ca2e44c9dad549eb7e27a592a9 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Thu, 22 Sep 2016 15:29:27 +1000 Subject: [PATCH 1/3] Issue #941 Make scavenger thread able to be disabled. --- .../session/GCloudSessionDataStore.java | 5 - .../jetty/server/session/HouseKeeper.java | 159 ++++++++++++------ .../server/session/NullSessionCache.java | 12 ++ .../ClientCrossContextSessionTest.java | 2 +- .../jetty/server/session/FileTestServer.java | 2 +- .../server/session/ForwardedSessionTest.java | 2 +- .../jetty/server/session/IdleSessionTest.java | 2 +- .../server/session/ImmediateSaveTest.java | 2 +- .../server/session/ImmortalSessionTest.java | 2 +- .../jetty/server/session/NewSessionTest.java | 2 +- .../server/session/OrphanedSessionTest.java | 2 +- .../session/ProxySerializationTest.java | 2 +- .../session/ReentrantRequestSessionTest.java | 2 +- .../server/session/RemoveSessionTest.java | 2 +- .../server/session/ScatterGunLoadTest.java | 2 +- .../ServerCrossContextSessionTest.java | 2 +- .../server/session/SessionCookieTest.java | 2 +- .../SessionInvalidateAndCreateTest.java | 2 +- .../server/session/SessionRenewTest.java | 2 +- .../session/SessionValueSharedSaving.java | 2 +- .../ClientCrossContextSessionTest.java | 2 +- .../gcloud/session/ForwardedSessionTest.java | 2 +- .../gcloud/session/GCloudTestServer.java | 3 +- .../gcloud/session/ImmediateSaveTest.java | 2 +- .../gcloud/session/ImmortalSessionTest.java | 2 +- .../session/InvalidationSessionTest.java | 2 +- .../gcloud/session/LastAccessTimeTest.java | 2 +- .../session/LocalSessionScavengingTest.java | 2 +- .../jetty/gcloud/session/NewSessionTest.java | 2 +- .../gcloud/session/OrphanedSessionTest.java | 2 +- .../session/ReentrantRequestSessionTest.java | 2 +- .../gcloud/session/RemoveSessionTest.java | 2 +- .../gcloud/session/SameNodeLoadTest.java | 2 +- .../ServerCrossContextSessionTest.java | 2 +- .../gcloud/session/SessionExpiryTest.java | 2 +- .../SessionInvalidateAndCreateTest.java | 2 +- .../gcloud/session/SessionMigrationTest.java | 2 +- .../gcloud/session/SessionRenewTest.java | 2 +- .../session/SessionValueSavingTest.java | 2 +- ...StopSessionManagerPreserveSessionTest.java | 2 +- .../ClientCrossContextSessionTest.java | 2 +- .../server/session/EvictionFailureTest.java | 2 +- .../jetty/server/session/HashTestServer.java | 2 +- .../server/session/ImmortalSessionTest.java | 2 +- .../jetty/server/session/NewSessionTest.java | 2 +- .../session/ReentrantRequestSessionTest.java | 2 +- .../server/session/RemoveSessionTest.java | 2 +- .../server/session/ScatterGunLoadTest.java | 2 +- .../ServerCrossContextSessionTest.java | 2 +- .../server/session/SessionCookieTest.java | 2 +- .../SessionInvalidateAndCreateTest.java | 2 +- .../server/session/SessionRenewTest.java | 2 +- .../session/SessionValueSharedSaving.java | 2 +- .../ClientCrossContextSessionTest.java | 2 +- .../server/session/ForwardedSessionTest.java | 2 +- .../server/session/ImmediateSaveTest.java | 2 +- .../server/session/ImmortalSessionTest.java | 2 +- .../session/InfinispanTestSessionServer.java | 2 +- .../server/session/LastAccessTimeTest.java | 2 +- .../session/LocalSessionScavengingTest.java | 2 +- .../jetty/server/session/NewSessionTest.java | 2 +- .../session/ReentrantRequestSessionTest.java | 2 +- .../server/session/RemoveSessionTest.java | 2 +- .../server/session/SameNodeLoadTest.java | 2 +- .../server/session/SessionExpiryTest.java | 2 +- .../SessionInvalidateAndCreateTest.java | 2 +- .../server/session/SessionMigrationTest.java | 2 +- .../server/session/SessionRenewTest.java | 2 +- .../RemoteClientCrossContextSessionTest.java | 2 +- .../remote/RemoteForwardedSessionTest.java | 2 +- .../remote/RemoteImmediateSaveTest.java | 2 +- .../remote/RemoteImmortalSessionTest.java | 2 +- .../remote/RemoteInvalidationSessionTest.java | 2 +- .../remote/RemoteLastAccessTimeTest.java | 2 +- .../RemoteLocalSessionScavengingTest.java | 2 +- .../session/remote/RemoteNewSessionTest.java | 2 +- .../RemoteReentrantRequestSessionTest.java | 2 +- .../remote/RemoteRemoveSessionTest.java | 2 +- .../remote/RemoteSameNodeLoadTest.java | 2 +- .../remote/RemoteSessionExpiryTest.java | 2 +- .../RemoteSessionInvalidateAndCreateTest.java | 2 +- .../remote/RemoteSessionMigrationTest.java | 2 +- .../remote/RemoteSessionRenewTest.java | 2 +- .../ClientCrossContextSessionTest.java | 2 +- .../server/session/ForwardedSessionTest.java | 2 +- .../server/session/ImmediateSaveTest.java | 2 +- .../server/session/ImmortalSessionTest.java | 2 +- .../session/InvalidationSessionTest.java | 2 +- .../jetty/server/session/JdbcTestServer.java | 4 +- .../server/session/LastAccessTimeTest.java | 2 +- .../session/LocalSessionScavengingTest.java | 9 +- .../jetty/server/session/NewSessionTest.java | 2 +- .../server/session/OrphanedSessionTest.java | 2 +- .../session/ProxySerializationTest.java | 2 +- .../session/ReentrantRequestSessionTest.java | 2 +- .../ServerCrossContextSessionTest.java | 2 +- .../server/session/SessionExpiryTest.java | 2 +- .../SessionInvalidateAndCreateTest.java | 2 +- .../server/session/SessionMigrationTest.java | 2 +- .../server/session/SessionRenewTest.java | 2 +- .../session/SessionValueSavingTest.java | 2 +- ...StopSessionManagerPreserveSessionTest.java | 2 +- .../session/WebAppObjectInSessionTest.java | 2 +- .../sessions/CachingSessionDataStoreTest.java | 2 +- .../sessions/MemcachedTestServer.java | 2 +- .../ClientCrossContextSessionTest.java | 2 +- .../mongodb/CreateAndInvalidateTest.java | 2 +- .../nosql/mongodb/ForwardedSessionTest.java | 2 +- .../jetty/nosql/mongodb/IdleSessionTest.java | 2 +- .../nosql/mongodb/ImmediateSaveTest.java | 2 +- .../nosql/mongodb/ImmortalSessionTest.java | 2 +- .../nosql/mongodb/InvalidateSessionTest.java | 2 +- .../nosql/mongodb/LastAccessTimeTest.java | 2 +- .../mongodb/LocalSessionScavengingTest.java | 2 +- .../jetty/nosql/mongodb/MongoTestServer.java | 4 +- .../jetty/nosql/mongodb/NewSessionTest.java | 2 +- .../nosql/mongodb/OrphanedSessionTest.java | 2 +- .../mongodb/ReentrantRequestSessionTest.java | 2 +- .../nosql/mongodb/RemoveSessionTest.java | 2 +- .../nosql/mongodb/ScatterGunLoadTest.java | 2 +- .../ServerCrossContextSessionTest.java | 2 +- .../nosql/mongodb/SessionExpiryTest.java | 2 +- .../SessionInvalidateAndCreateTest.java | 2 +- .../nosql/mongodb/SessionMigrationTest.java | 2 +- .../jetty/nosql/mongodb/SessionRenewTest.java | 2 +- .../nosql/mongodb/SessionSavingValueTest.java | 2 +- .../AbstractLocalSessionScavengingTest.java | 85 ++++++++++ .../server/session/AbstractTestBase.java | 2 +- .../server/session/AbstractTestServer.java | 4 +- 129 files changed, 344 insertions(+), 181 deletions(-) diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java index 64edcee1e9a..36af3f7b658 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java @@ -108,11 +108,6 @@ public class GCloudSessionDataStore extends AbstractSessionDataStore protected String _maxInactive = MAXINACTIVE; protected String _attributes = ATTRIBUTES; - - public EntityDataModel() - { - System.err.println("NEW CALLED"); - } private void checkNotNull(String s) { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java index e1bbb481e70..3078e6eeccc 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java @@ -44,7 +44,8 @@ public class HouseKeeper extends AbstractLifeCycle protected Scheduler.Task _task; //scavenge task protected Runner _runner; protected boolean _ownScheduler = false; - private long _intervalMs = DEFAULT_PERIOD_MS; + private long _intervalMs = 0; + @@ -93,27 +94,86 @@ public class HouseKeeper extends AbstractLifeCycle if (_sessionIdManager == null) throw new IllegalStateException ("No SessionIdManager for Housekeeper"); - - if (_sessionIdManager instanceof DefaultSessionIdManager) - { - //try and use a common scheduler, fallback to own - _scheduler = ((DefaultSessionIdManager)_sessionIdManager).getServer().getBean(Scheduler.class); - } - - if (_scheduler == null) - { - _scheduler = new ScheduledExecutorScheduler(); - _ownScheduler = true; - _scheduler.start(); - } - else if (!_scheduler.isStarted()) - throw new IllegalStateException("Shared scheduler not started"); - setIntervalSec(getIntervalSec()); super.doStart(); } + + /** + * Get a scheduler. First try a common scheduler, failing that + * create our own. + * + * @throws Exception + */ + protected void findScheduler () throws Exception + { + if (_scheduler == null) + { + if (_sessionIdManager instanceof DefaultSessionIdManager) + { + //try and use a common scheduler, fallback to own + _scheduler = ((DefaultSessionIdManager)_sessionIdManager).getServer().getBean(Scheduler.class); + } + + if (_scheduler == null) + { + _scheduler = new ScheduledExecutorScheduler(); + _ownScheduler = true; + _scheduler.start(); + if (LOG.isDebugEnabled()) LOG.debug("Using own scheduler for scavenging"); + } + else if (!_scheduler.isStarted()) + throw new IllegalStateException("Shared scheduler not started"); + } + } + + /** + * If scavenging is not scheduled, schedule it. + * @throws Exception + */ + protected void startScavenging() throws Exception + { + synchronized (this) + { + if (_scheduler != null) + { + //cancel any previous task + if (_task!=null) + _task.cancel(); + if (_runner == null) + _runner = new Runner(); + LOG.info("Scavenging every {}ms", _intervalMs); + _task = _scheduler.schedule(_runner,_intervalMs,TimeUnit.MILLISECONDS); + } + } + } + + /** + * If scavenging is scheduled, stop it. + * + * @throws Exception + */ + protected void stopScavenging() throws Exception + { + synchronized (this) + { + if (_task!=null) + { + _task.cancel(); + LOG.info("Stopped scavenging"); + } + _task = null; + if (_ownScheduler) + { + _scheduler.stop(); + _scheduler = null; + } + } + _runner = null; + } + + /** * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop() */ @@ -122,13 +182,8 @@ public class HouseKeeper extends AbstractLifeCycle { synchronized(this) { - if (_task != null) - _task.cancel(); - _task=null; - if (_ownScheduler && _scheduler !=null) - _scheduler.stop(); + stopScavenging(); _scheduler = null; - _runner = null; } super.doStop(); } @@ -137,37 +192,43 @@ public class HouseKeeper extends AbstractLifeCycle /** * Set the period between scavenge cycles * @param sec the interval (in seconds) + * @throws Exception */ - public void setIntervalSec (long sec) + public void setIntervalSec (long sec) throws Exception { - if (sec<=0) - sec=60; - - long old_period=_intervalMs; - long period=sec*1000L; - - _intervalMs=period; - - //add a bit of variability into the scavenge time so that not all - //nodes with the same scavenge interval sync up - long tenPercent = _intervalMs/10; - if ((System.currentTimeMillis()%2) == 0) - _intervalMs += tenPercent; - - if (LOG.isDebugEnabled()) - LOG.debug("Scavenging every "+_intervalMs+" ms"); - - synchronized (this) + if (isStarted() || isStarting()) { - if (_scheduler != null && (period!=old_period || _task==null)) + if (sec <= 0) { - if (_task!=null) - _task.cancel(); - if (_runner == null) - _runner = new Runner(); - _task = _scheduler.schedule(_runner,_intervalMs,TimeUnit.MILLISECONDS); + _intervalMs = 0L; + LOG.info("Scavenging disabled"); + stopScavenging(); + } + else + { + if (sec < 10) + LOG.warn("Short interval of {}sec for session scavenging.", sec); + + _intervalMs=sec*1000L; + + //add a bit of variability into the scavenge time so that not all + //nodes with the same scavenge interval sync up + long tenPercent = _intervalMs/10; + if ((System.currentTimeMillis()%2) == 0) + _intervalMs += tenPercent; + + if (isStarting() || isStarted()) + { + findScheduler(); + startScavenging(); + } } } + else + { + _intervalMs=sec*1000L; + } + } @@ -183,6 +244,8 @@ public class HouseKeeper extends AbstractLifeCycle } + + /** * Periodically do session housekeeping diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCache.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCache.java index 846d47919ce..f4df822343a 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCache.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCache.java @@ -37,6 +37,7 @@ public class NullSessionCache extends AbstractSessionCache public NullSessionCache(SessionHandler handler) { super(handler); + super.setEvictionPolicy(EVICT_ON_SESSION_EXIT); } /** @@ -104,4 +105,15 @@ public class NullSessionCache extends AbstractSessionCache return null; } + /** + * @see org.eclipse.jetty.server.session.AbstractSessionCache#setEvictionPolicy(int) + */ + @Override + public void setEvictionPolicy(int evictionTimeout) + { + LOG.warn("Ignoring eviction setting:"+evictionTimeout); + } + + + } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java index 3e48304032d..01397dcb72f 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java @@ -42,7 +42,7 @@ public class ClientCrossContextSessionTest extends AbstractClientCrossContextSes @Override - public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) + public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) throws Exception { return new FileTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/FileTestServer.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/FileTestServer.java index a64dde27dda..30c13ded244 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/FileTestServer.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/FileTestServer.java @@ -122,7 +122,7 @@ public class FileTestServer extends AbstractTestServer - public FileTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod) + public FileTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod) throws Exception { super(port, maxInactivePeriod, scavengePeriod, idlePassivatePeriod); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java index 2843c7b4296..08f0ec008e7 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java @@ -45,7 +45,7 @@ public class ForwardedSessionTest extends AbstractForwardedSessionTest @Override - public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) + public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) throws Exception { return new FileTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/IdleSessionTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/IdleSessionTest.java index 5ce7b4c7855..179e94348cd 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/IdleSessionTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/IdleSessionTest.java @@ -47,7 +47,7 @@ public class IdleSessionTest extends AbstractIdleSessionTest * @see org.eclipse.jetty.server.session.AbstractIdleSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) + public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) throws Exception { return new FileTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java index d7db65d3e63..87a5ecdf5f2 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java @@ -43,7 +43,7 @@ public class ImmediateSaveTest extends AbstractImmediateSaveTest } - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new FileTestServer(port, max, scavenge, evictionPolicy) { public SessionHandler newSessionHandler() diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java index c813ccf65de..82babfef651 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java @@ -37,7 +37,7 @@ public class ImmortalSessionTest extends AbstractImmortalSessionTest @Override - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new FileTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java index e643088577a..87977468646 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java @@ -40,7 +40,7 @@ public class NewSessionTest extends AbstractNewSessionTest FileTestServer.teardown(); } - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new FileTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/OrphanedSessionTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/OrphanedSessionTest.java index b16dd46cf33..f4d1470d691 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/OrphanedSessionTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/OrphanedSessionTest.java @@ -39,7 +39,7 @@ public class OrphanedSessionTest extends AbstractOrphanedSessionTest FileTestServer.teardown(); } - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new FileTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ProxySerializationTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ProxySerializationTest.java index 94851aa8b04..1a87412a175 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ProxySerializationTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ProxySerializationTest.java @@ -50,7 +50,7 @@ public class ProxySerializationTest extends AbstractProxySerializationTest * @see org.eclipse.jetty.server.session.AbstractProxySerializationTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy ) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy ) throws Exception { return new FileTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java index 16ebd57df3c..86eb9851393 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java @@ -41,7 +41,7 @@ public class ReentrantRequestSessionTest extends AbstractReentrantRequestSession } - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new FileTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java index 2626506be13..c1ebae9522b 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java @@ -38,7 +38,7 @@ public class RemoveSessionTest extends AbstractRemoveSessionTest } - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new FileTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ScatterGunLoadTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ScatterGunLoadTest.java index be1aa346c71..da192a10622 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ScatterGunLoadTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ScatterGunLoadTest.java @@ -43,7 +43,7 @@ public class ScatterGunLoadTest extends AbstractScatterGunLoadTest @Override - public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) + public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) throws Exception { return new FileTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java index 6afeda77f84..d5719045621 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java @@ -40,7 +40,7 @@ public class ServerCrossContextSessionTest extends AbstractServerCrossContextSes @Override - public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) + public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) throws Exception { return new FileTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionCookieTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionCookieTest.java index f5ffeb83f11..8b4d9cf6246 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionCookieTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionCookieTest.java @@ -40,7 +40,7 @@ public class SessionCookieTest extends AbstractSessionCookieTest @Override - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new FileTestServer(port, max, scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java index 5589d933746..344a8f09e3c 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java @@ -38,7 +38,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd } @Override - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new FileTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java index ee7a942d244..3020b81061b 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java @@ -40,7 +40,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest } @Override - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new FileTestServer(port, max, scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSharedSaving.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSharedSaving.java index e71b2d59952..f1cce48fbab 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSharedSaving.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSharedSaving.java @@ -38,7 +38,7 @@ public class SessionValueSharedSaving extends AbstractSessionValueSavingTest @Override - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new FileTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClientCrossContextSessionTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClientCrossContextSessionTest.java index bd776456335..643f401ab75 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClientCrossContextSessionTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClientCrossContextSessionTest.java @@ -41,7 +41,7 @@ public class ClientCrossContextSessionTest extends AbstractClientCrossContextSes } @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) throws Exception { return new GCloudTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ForwardedSessionTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ForwardedSessionTest.java index a1d3e0ef4d0..323bc0fb89b 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ForwardedSessionTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ForwardedSessionTest.java @@ -41,7 +41,7 @@ public class ForwardedSessionTest extends AbstractForwardedSessionTest @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) throws Exception { return new GCloudTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudTestServer.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudTestServer.java index a6fe95b9101..57367872561 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudTestServer.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudTestServer.java @@ -36,8 +36,9 @@ public class GCloudTestServer extends AbstractTestServer * @param maxInactivePeriod * @param scavengePeriod * @param evictionPolicy + * @throws Exception TODO */ - public GCloudTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy) + public GCloudTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy) throws Exception { super(port, maxInactivePeriod, scavengePeriod, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ImmediateSaveTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ImmediateSaveTest.java index 53cf28ae464..ffcfd940600 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ImmediateSaveTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ImmediateSaveTest.java @@ -46,7 +46,7 @@ public class ImmediateSaveTest extends AbstractImmediateSaveTest - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new GCloudTestServer(port, max, scavenge, evictionPolicy) { diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ImmortalSessionTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ImmortalSessionTest.java index 23081a4eaa3..1fba691abb7 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ImmortalSessionTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ImmortalSessionTest.java @@ -43,7 +43,7 @@ public class ImmortalSessionTest extends AbstractImmortalSessionTest * @see org.eclipse.jetty.server.session.AbstractImmortalSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) throws Exception { return new GCloudTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java index aeea9f1f031..7493b8683fe 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java @@ -45,7 +45,7 @@ public class InvalidationSessionTest extends AbstractInvalidationSessionTest * @see org.eclipse.jetty.server.session.AbstractInvalidationSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { GCloudTestServer server = new GCloudTestServer(port, maxInactive, scavengeInterval, evictionPolicy) { diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/LastAccessTimeTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/LastAccessTimeTest.java index c2c37f890d5..333dd43a5a5 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/LastAccessTimeTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/LastAccessTimeTest.java @@ -42,7 +42,7 @@ public class LastAccessTimeTest extends AbstractLastAccessTimeTest * @see org.eclipse.jetty.server.session.AbstractLastAccessTimeTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new GCloudTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/LocalSessionScavengingTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/LocalSessionScavengingTest.java index 8718e3985fe..14094c7cd85 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/LocalSessionScavengingTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/LocalSessionScavengingTest.java @@ -43,7 +43,7 @@ public class LocalSessionScavengingTest extends AbstractLocalSessionScavengingTe * @see org.eclipse.jetty.server.session.AbstractLocalSessionScavengingTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new GCloudTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/NewSessionTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/NewSessionTest.java index a7ab6bf16d6..77b4c99085e 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/NewSessionTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/NewSessionTest.java @@ -50,7 +50,7 @@ public class NewSessionTest extends AbstractNewSessionTest * @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new GCloudTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/OrphanedSessionTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/OrphanedSessionTest.java index 7e193ae2d6b..a0fd7cc3072 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/OrphanedSessionTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/OrphanedSessionTest.java @@ -44,7 +44,7 @@ public class OrphanedSessionTest extends AbstractOrphanedSessionTest * @see org.eclipse.jetty.server.session.AbstractOrphanedSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new GCloudTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ReentrantRequestSessionTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ReentrantRequestSessionTest.java index ce5562653c2..7ab4cf9cb06 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ReentrantRequestSessionTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ReentrantRequestSessionTest.java @@ -43,7 +43,7 @@ public class ReentrantRequestSessionTest extends AbstractReentrantRequestSession * @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port,int max, int scavengePeriod,int evictionPolicy) + public AbstractTestServer createServer(int port,int max, int scavengePeriod,int evictionPolicy) throws Exception { return new GCloudTestServer(port, max, scavengePeriod, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/RemoveSessionTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/RemoveSessionTest.java index f3f87384814..74472d47dda 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/RemoveSessionTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/RemoveSessionTest.java @@ -46,7 +46,7 @@ public class RemoveSessionTest extends AbstractRemoveSessionTest * @see org.eclipse.jetty.server.session.AbstractRemoveSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new GCloudTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SameNodeLoadTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SameNodeLoadTest.java index a677e003cff..0e43e7c770a 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SameNodeLoadTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SameNodeLoadTest.java @@ -44,7 +44,7 @@ public class SameNodeLoadTest extends AbstractSameNodeLoadTest * @see org.eclipse.jetty.server.session.AbstractSameNodeLoadTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new GCloudTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ServerCrossContextSessionTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ServerCrossContextSessionTest.java index 494c8ec4664..946cba171dd 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ServerCrossContextSessionTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ServerCrossContextSessionTest.java @@ -39,7 +39,7 @@ public class ServerCrossContextSessionTest extends AbstractServerCrossContextSes } @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) throws Exception { return new GCloudTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionExpiryTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionExpiryTest.java index 78002217c74..8a768ebc1f0 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionExpiryTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionExpiryTest.java @@ -48,7 +48,7 @@ public class SessionExpiryTest extends AbstractSessionExpiryTest * @see org.eclipse.jetty.server.session.AbstractSessionExpiryTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new GCloudTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionInvalidateAndCreateTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionInvalidateAndCreateTest.java index 9ab1a4fc84d..033d211a0c1 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionInvalidateAndCreateTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionInvalidateAndCreateTest.java @@ -43,7 +43,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd * @see org.eclipse.jetty.server.session.AbstractSessionInvalidateAndCreateTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new GCloudTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionMigrationTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionMigrationTest.java index ed8e900e156..eb6fe7f2e47 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionMigrationTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionMigrationTest.java @@ -43,7 +43,7 @@ public class SessionMigrationTest extends AbstractSessionMigrationTest * @see org.eclipse.jetty.server.session.AbstractSessionMigrationTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) throws Exception { return new GCloudTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionRenewTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionRenewTest.java index 0dd816c5110..092c50bd942 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionRenewTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionRenewTest.java @@ -47,7 +47,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new GCloudTestServer(port,max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionValueSavingTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionValueSavingTest.java index 7b31bd56a57..573bc9ae53f 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionValueSavingTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionValueSavingTest.java @@ -42,7 +42,7 @@ public class SessionValueSavingTest extends AbstractSessionValueSavingTest * @see org.eclipse.jetty.server.session.AbstractSessionValueSavingTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new GCloudTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/StopSessionManagerPreserveSessionTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/StopSessionManagerPreserveSessionTest.java index 8e7569ed76f..b93c36c50ba 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/StopSessionManagerPreserveSessionTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/StopSessionManagerPreserveSessionTest.java @@ -60,7 +60,7 @@ public class StopSessionManagerPreserveSessionTest extends AbstractStopSessionMa @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) throws Exception { return new GCloudTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java index 870802570b1..a8e48f887d2 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java @@ -37,7 +37,7 @@ public class ClientCrossContextSessionTest extends AbstractClientCrossContextSes @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new HashTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/EvictionFailureTest.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/EvictionFailureTest.java index dbcbd52bf58..da0c007a3fb 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/EvictionFailureTest.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/EvictionFailureTest.java @@ -31,7 +31,7 @@ public class EvictionFailureTest extends AbstractSessionEvictionFailureTest * @see org.eclipse.jetty.server.session.AbstractTestBase#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { return new HashTestServer(port, maxInactive, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/HashTestServer.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/HashTestServer.java index 9257d382d68..1090bcc56b8 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/HashTestServer.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/HashTestServer.java @@ -25,7 +25,7 @@ public class HashTestServer extends AbstractTestServer { - public HashTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy) + public HashTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy) throws Exception { super(port, maxInactivePeriod, scavengePeriod, evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java index 4c18b3c72ea..da6b4eb8161 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java @@ -22,7 +22,7 @@ public class ImmortalSessionTest extends AbstractImmortalSessionTest { @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new HashTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java index 07b34f90cef..459d5a3cabb 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java @@ -26,7 +26,7 @@ import org.junit.Test; public class NewSessionTest extends AbstractNewSessionTest { - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new HashTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java index cefb383379f..8093902feca 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java @@ -30,7 +30,7 @@ public class ReentrantRequestSessionTest extends AbstractReentrantRequestSession * @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new HashTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java index 44912267009..2c91400754d 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java @@ -34,7 +34,7 @@ public class RemoveSessionTest extends AbstractRemoveSessionTest * @see org.eclipse.jetty.server.session.AbstractRemoveSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new HashTestServer (port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ScatterGunLoadTest.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ScatterGunLoadTest.java index 2b073d8c0ca..9f706129587 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ScatterGunLoadTest.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ScatterGunLoadTest.java @@ -27,7 +27,7 @@ public class ScatterGunLoadTest extends AbstractScatterGunLoadTest { @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new HashTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java index b5fa1f85079..482656e1b8b 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java @@ -23,7 +23,7 @@ import org.junit.Test; public class ServerCrossContextSessionTest extends AbstractServerCrossContextSessionTest { @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new HashTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionCookieTest.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionCookieTest.java index 166a5c9de4f..0df2c9f0b44 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionCookieTest.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionCookieTest.java @@ -22,7 +22,7 @@ public class SessionCookieTest extends AbstractSessionCookieTest { @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new HashTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java index 8ab67f2940c..12c3b10d599 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java @@ -24,7 +24,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd { @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new HashTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java index bfa01593bf8..4025d79f43b 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java @@ -31,7 +31,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest { @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new HashTestServer(port, max, scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSharedSaving.java b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSharedSaving.java index d2129a4ce85..9d43f6d29b3 100644 --- a/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSharedSaving.java +++ b/tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSharedSaving.java @@ -22,7 +22,7 @@ public class SessionValueSharedSaving extends AbstractSessionValueSavingTest { @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new HashTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java index 439de537865..bad3acd2f20 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java @@ -46,7 +46,7 @@ public class ClientCrossContextSessionTest extends AbstractClientCrossContextSes @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java index d5aa449b4f5..4b78cf6c276 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java @@ -51,7 +51,7 @@ public class ForwardedSessionTest extends AbstractForwardedSessionTest @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java index 94a4e9c20d7..e85f202016b 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java @@ -47,7 +47,7 @@ public class ImmediateSaveTest extends AbstractImmediateSaveTest } - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { _server = new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()) { diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java index 491809b2875..e2fe69c6c05 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java @@ -56,7 +56,7 @@ public class ImmortalSessionTest extends AbstractImmortalSessionTest * @see org.eclipse.jetty.server.session.AbstractImmortalSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanTestSessionServer.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanTestSessionServer.java index 5f615d1072c..ca705937688 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanTestSessionServer.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanTestSessionServer.java @@ -31,7 +31,7 @@ public class InfinispanTestSessionServer extends AbstractTestServer - public InfinispanTestSessionServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy, BasicCache config) + public InfinispanTestSessionServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy, BasicCache config) throws Exception { super(port, maxInactivePeriod, scavengePeriod, evictionPolicy, config); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java index 1a8e927f16e..049a7d64ea6 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java @@ -42,7 +42,7 @@ public class LastAccessTimeTest extends AbstractLastAccessTimeTest @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LocalSessionScavengingTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LocalSessionScavengingTest.java index eb906a96c11..a65d63005ec 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LocalSessionScavengingTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LocalSessionScavengingTest.java @@ -51,7 +51,7 @@ public class LocalSessionScavengingTest extends AbstractLocalSessionScavengingTe * @see org.eclipse.jetty.server.session.AbstractLocalSessionScavengingTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java index 8c7794284a2..8af19c7719f 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java @@ -50,7 +50,7 @@ public class NewSessionTest extends AbstractNewSessionTest * @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java index 8b90772e258..4783d4569fc 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java @@ -49,7 +49,7 @@ public class ReentrantRequestSessionTest extends AbstractReentrantRequestSession * @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port,int maxInactive, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port,int maxInactive, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, maxInactive, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java index 61d4099a924..c5b9f5935f3 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java @@ -43,7 +43,7 @@ public class RemoveSessionTest extends AbstractRemoveSessionTest @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { InfinispanTestSessionServer s = new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); return s; diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SameNodeLoadTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SameNodeLoadTest.java index fff63912b7b..13901cfb140 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SameNodeLoadTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SameNodeLoadTest.java @@ -51,7 +51,7 @@ public class SameNodeLoadTest extends AbstractSameNodeLoadTest * @see org.eclipse.jetty.server.session.AbstractSameNodeLoadTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port,int maxInactive, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port,int maxInactive, int scavenge, int evictionPolicy) throws Exception { InfinispanTestSessionServer server = new InfinispanTestSessionServer(port,maxInactive, scavenge, evictionPolicy, __testSupport.getCache()); return server; diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java index a813da30ff8..51d2b0f22df 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java @@ -42,7 +42,7 @@ public class SessionExpiryTest extends AbstractSessionExpiryTest } @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { InfinispanTestSessionServer server = new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); return server; diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java index f35661bfd0b..3d6078c1ed4 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java @@ -50,7 +50,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd * @see org.eclipse.jetty.server.session.AbstractSessionInvalidateAndCreateTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionMigrationTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionMigrationTest.java index 365e5e26221..68b1f65e595 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionMigrationTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionMigrationTest.java @@ -48,7 +48,7 @@ public class SessionMigrationTest extends AbstractSessionMigrationTest @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java index 7db9b7c64ae..3f92f49e3fc 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java @@ -57,7 +57,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClientCrossContextSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClientCrossContextSessionTest.java index 18cb070cbce..50b46d2d9f3 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClientCrossContextSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClientCrossContextSessionTest.java @@ -55,7 +55,7 @@ public class RemoteClientCrossContextSessionTest extends AbstractClientCrossCont @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteForwardedSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteForwardedSessionTest.java index 19b89769afd..4c5f9095b64 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteForwardedSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteForwardedSessionTest.java @@ -53,7 +53,7 @@ public class RemoteForwardedSessionTest extends AbstractForwardedSessionTest @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteImmediateSaveTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteImmediateSaveTest.java index 5c5db7d3829..56623d2eec5 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteImmediateSaveTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteImmediateSaveTest.java @@ -50,7 +50,7 @@ public class RemoteImmediateSaveTest extends AbstractImmediateSaveTest __testSupport.teardown(); } - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()) { diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteImmortalSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteImmortalSessionTest.java index 7da9e18a05b..41abdf6392f 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteImmortalSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteImmortalSessionTest.java @@ -59,7 +59,7 @@ public class RemoteImmortalSessionTest extends AbstractImmortalSessionTest * @see org.eclipse.jetty.server.session.AbstractImmortalSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteInvalidationSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteInvalidationSessionTest.java index f752f7212d0..df8c7b2029e 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteInvalidationSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteInvalidationSessionTest.java @@ -56,7 +56,7 @@ public class RemoteInvalidationSessionTest extends AbstractInvalidationSessionTe * @see org.eclipse.jetty.server.session.AbstractInvalidationSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int maxInterval, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInterval, int scavengeInterval, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, maxInterval, scavengeInterval, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteLastAccessTimeTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteLastAccessTimeTest.java index 4183e15ccd5..05e942f8fa3 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteLastAccessTimeTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteLastAccessTimeTest.java @@ -52,7 +52,7 @@ public class RemoteLastAccessTimeTest extends AbstractLastAccessTimeTest @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteLocalSessionScavengingTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteLocalSessionScavengingTest.java index 734fcf14303..be80cb6f567 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteLocalSessionScavengingTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteLocalSessionScavengingTest.java @@ -53,7 +53,7 @@ public class RemoteLocalSessionScavengingTest extends AbstractLocalSessionScaven * @see org.eclipse.jetty.server.session.AbstractLocalSessionScavengingTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteNewSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteNewSessionTest.java index 2c58cf5b302..1b85afb18c7 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteNewSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteNewSessionTest.java @@ -53,7 +53,7 @@ public class RemoteNewSessionTest extends AbstractNewSessionTest * @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteReentrantRequestSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteReentrantRequestSessionTest.java index 00f8a645fc0..02d42be4e55 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteReentrantRequestSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteReentrantRequestSessionTest.java @@ -52,7 +52,7 @@ public class RemoteReentrantRequestSessionTest extends AbstractReentrantRequestS * @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, maxInactive, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteRemoveSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteRemoveSessionTest.java index ebbf9a999ce..c55c4ef09dc 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteRemoveSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteRemoveSessionTest.java @@ -46,7 +46,7 @@ public class RemoteRemoveSessionTest extends AbstractRemoveSessionTest @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { InfinispanTestSessionServer s = new InfinispanTestSessionServer(port, max, scavenge,evictionPolicy, __testSupport.getCache()); return s; diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSameNodeLoadTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSameNodeLoadTest.java index 069c10475fb..d5253e37ad9 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSameNodeLoadTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSameNodeLoadTest.java @@ -54,7 +54,7 @@ public class RemoteSameNodeLoadTest extends AbstractSameNodeLoadTest * @see org.eclipse.jetty.server.session.AbstractSameNodeLoadTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavenge, int evictionPolicy) throws Exception { InfinispanTestSessionServer server = new InfinispanTestSessionServer(port, maxInactive, scavenge,evictionPolicy, __testSupport.getCache()); return server; diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionExpiryTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionExpiryTest.java index b0438e68513..4393c1555fa 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionExpiryTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionExpiryTest.java @@ -45,7 +45,7 @@ public class RemoteSessionExpiryTest extends AbstractSessionExpiryTest } @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { InfinispanTestSessionServer server = new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); return server; diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionInvalidateAndCreateTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionInvalidateAndCreateTest.java index c355800f725..a96e854df85 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionInvalidateAndCreateTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionInvalidateAndCreateTest.java @@ -53,7 +53,7 @@ public class RemoteSessionInvalidateAndCreateTest extends AbstractSessionInvalid * @see org.eclipse.jetty.server.session.AbstractSessionInvalidateAndCreateTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionMigrationTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionMigrationTest.java index 8a2b4264e26..0a542bf634c 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionMigrationTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionMigrationTest.java @@ -51,7 +51,7 @@ public class RemoteSessionMigrationTest extends AbstractSessionMigrationTest @Override - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionRenewTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionRenewTest.java index 6ed38f9de8d..8404c59aa3d 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionRenewTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionRenewTest.java @@ -56,7 +56,7 @@ public class RemoteSessionRenewTest extends AbstractSessionRenewTest * @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache()); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java index 52cb5765676..518c880dfe4 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java @@ -31,7 +31,7 @@ public class ClientCrossContextSessionTest extends AbstractClientCrossContextSes { @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { return new JdbcTestServer(port, maxInactive, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java index a7b908585ff..b565a375d51 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java @@ -31,7 +31,7 @@ public class ForwardedSessionTest extends AbstractForwardedSessionTest { @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { return new JdbcTestServer(port, maxInactive, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java index e27c6785e26..fde0200f560 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java @@ -39,7 +39,7 @@ public class ImmediateSaveTest extends AbstractImmediateSaveTest } - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { _server = new JdbcTestServer(port, max, scavenge, evictionPolicy) { diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java index 7403c8e84af..4d85f3f1719 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java @@ -29,7 +29,7 @@ import org.junit.Test; public class ImmortalSessionTest extends AbstractImmortalSessionTest { - public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs, int evictionPolicy) throws Exception { return new JdbcTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/InvalidationSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/InvalidationSessionTest.java index e6ad87d6398..7e4b9a52911 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/InvalidationSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/InvalidationSessionTest.java @@ -28,7 +28,7 @@ import org.junit.Test; public class InvalidationSessionTest extends AbstractInvalidationSessionTest { - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { return new JdbcTestServer(port, maxInactive, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java index c77f561beaf..13cdc12ebdf 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java @@ -79,12 +79,12 @@ public class JdbcTestServer extends AbstractTestServer } - public JdbcTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod, String connectionUrl) + public JdbcTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod, String connectionUrl) throws Exception { super(port, maxInactivePeriod, scavengePeriod, idlePassivatePeriod); } - public JdbcTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod) + public JdbcTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod) throws Exception { super(port, maxInactivePeriod, scavengePeriod, idlePassivatePeriod); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java index a01df927fc4..08d625f575a 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java @@ -26,7 +26,7 @@ import org.junit.Test; */ public class LastAccessTimeTest extends AbstractLastAccessTimeTest { - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new JdbcTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LocalSessionScavengingTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LocalSessionScavengingTest.java index 822ce9e3d24..4c938b2304d 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LocalSessionScavengingTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LocalSessionScavengingTest.java @@ -43,11 +43,18 @@ public class LocalSessionScavengingTest extends AbstractLocalSessionScavengingTe } } - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new JdbcTestServer(port,max,scavenge, evictionPolicy); } + @Test + public void testNoScavenging() throws Exception + { + super.testNoScavenging(); + } + + @Test public void testLocalSessionsScavenging() throws Exception { diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java index 111dce9381f..616549e9b23 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java @@ -29,7 +29,7 @@ public class NewSessionTest extends AbstractNewSessionTest /** * @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int, int) */ - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new JdbcTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/OrphanedSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/OrphanedSessionTest.java index 6f0977bdba7..593aae86d06 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/OrphanedSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/OrphanedSessionTest.java @@ -26,7 +26,7 @@ import org.junit.Test; */ public class OrphanedSessionTest extends AbstractOrphanedSessionTest { - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new JdbcTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ProxySerializationTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ProxySerializationTest.java index bc28cc21597..3c7f25aff68 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ProxySerializationTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ProxySerializationTest.java @@ -35,7 +35,7 @@ public class ProxySerializationTest extends AbstractProxySerializationTest * @see org.eclipse.jetty.server.session.AbstractProxySerializationTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new JdbcTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java index 5ca51a62184..488be8fd9a7 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java @@ -28,7 +28,7 @@ import org.junit.Test; public class ReentrantRequestSessionTest extends AbstractReentrantRequestSessionTest { - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new JdbcTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java index ed8787a62f5..023849e95b4 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java @@ -28,7 +28,7 @@ public class ServerCrossContextSessionTest extends AbstractServerCrossContextSes { @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { return new JdbcTestServer(port, maxInactive, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java index 2fc52c447e4..ca6302063ec 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java @@ -36,7 +36,7 @@ public class SessionExpiryTest extends AbstractSessionExpiryTest * @see org.eclipse.jetty.server.session.AbstractSessionExpiryTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new JdbcTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java index 68281f71af4..75069236fd3 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java @@ -26,7 +26,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd { @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new JdbcTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionMigrationTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionMigrationTest.java index d07155c2b55..939f24d5f1a 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionMigrationTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionMigrationTest.java @@ -28,7 +28,7 @@ public class SessionMigrationTest extends AbstractSessionMigrationTest { @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { return new JdbcTestServer(port, maxInactive, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java index 544597f4230..f26d5389cd7 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java @@ -30,7 +30,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest { @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new JdbcTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSavingTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSavingTest.java index ae06ee18481..f048e4bb263 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSavingTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSavingTest.java @@ -26,7 +26,7 @@ import org.junit.Test; */ public class SessionValueSavingTest extends AbstractSessionValueSavingTest { - public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception { return new JdbcTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/StopSessionManagerPreserveSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/StopSessionManagerPreserveSessionTest.java index 28c5bc04230..844e2a9da7f 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/StopSessionManagerPreserveSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/StopSessionManagerPreserveSessionTest.java @@ -52,7 +52,7 @@ public class StopSessionManagerPreserveSessionTest extends AbstractStopSessionMa } @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { _server = new JdbcTestServer(port, maxInactive, scavengeInterval, evictionPolicy); return _server; diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java index 7025e44ee24..1de0db6149e 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java @@ -30,7 +30,7 @@ import org.junit.Test; public class WebAppObjectInSessionTest extends AbstractWebAppObjectInSessionTest { @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { Resource.setDefaultUseCaches(false); return new JdbcTestServer(port, maxInactive, scavengeInterval, evictionPolicy); diff --git a/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java b/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java index 8b2bd64084f..35a6aa255cb 100644 --- a/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java +++ b/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java @@ -50,7 +50,7 @@ import org.junit.Test; */ public class CachingSessionDataStoreTest { - public AbstractTestServer createServer (int port, int max, int scavenge,int evictionPolicy) + public AbstractTestServer createServer (int port, int max, int scavenge,int evictionPolicy) throws Exception { return new MemcachedTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestServer.java b/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestServer.java index 10024e0d21b..fbd6b31f78d 100644 --- a/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestServer.java +++ b/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestServer.java @@ -148,7 +148,7 @@ public class MemcachedTestServer extends AbstractTestServer * @param scavengePeriod * @param evictionPolicy */ - public MemcachedTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy) + public MemcachedTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy) throws Exception { super(port, maxInactivePeriod, scavengePeriod, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClientCrossContextSessionTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClientCrossContextSessionTest.java index 28ece5e6293..9279f462e2b 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClientCrossContextSessionTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClientCrossContextSessionTest.java @@ -41,7 +41,7 @@ public class ClientCrossContextSessionTest extends AbstractClientCrossContextSes } @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { return new MongoTestServer(port, maxInactive, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/CreateAndInvalidateTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/CreateAndInvalidateTest.java index b2adfae8de7..de3780a4afb 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/CreateAndInvalidateTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/CreateAndInvalidateTest.java @@ -57,7 +57,7 @@ public class CreateAndInvalidateTest extends AbstractCreateAndInvalidateTest * @see org.eclipse.jetty.server.session.AbstractCreateAndInvalidateTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) + public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) throws Exception { return new MongoTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ForwardedSessionTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ForwardedSessionTest.java index 26691b79e99..88c4bab4048 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ForwardedSessionTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ForwardedSessionTest.java @@ -48,7 +48,7 @@ public class ForwardedSessionTest extends AbstractForwardedSessionTest @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { return new MongoTestServer(port,maxInactive, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/IdleSessionTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/IdleSessionTest.java index aa617d3c634..2e70434d3b7 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/IdleSessionTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/IdleSessionTest.java @@ -56,7 +56,7 @@ public class IdleSessionTest extends AbstractIdleSessionTest * @see org.eclipse.jetty.server.session.AbstractIdleSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) + public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) throws Exception { return new MongoTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ImmediateSaveTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ImmediateSaveTest.java index ca28fc1acb2..704e96ad615 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ImmediateSaveTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ImmediateSaveTest.java @@ -52,7 +52,7 @@ public class ImmediateSaveTest extends AbstractImmediateSaveTest - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new MongoTestServer(port, max, scavenge, evictionPolicy) { diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ImmortalSessionTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ImmortalSessionTest.java index 188f237e3d5..8029a4f872f 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ImmortalSessionTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ImmortalSessionTest.java @@ -34,7 +34,7 @@ public class ImmortalSessionTest extends AbstractImmortalSessionTest * @see org.eclipse.jetty.server.session.AbstractTestBase#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { return new MongoTestServer(port, maxInactive, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/InvalidateSessionTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/InvalidateSessionTest.java index 53b96c29f72..d5043b46273 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/InvalidateSessionTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/InvalidateSessionTest.java @@ -42,7 +42,7 @@ public class InvalidateSessionTest extends AbstractInvalidationSessionTest } @Override - public AbstractTestServer createServer(int port, int maxInterval, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInterval, int scavengeInterval, int evictionPolicy) throws Exception { return new MongoTestServer(port, maxInterval, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/LastAccessTimeTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/LastAccessTimeTest.java index ca78ffcd5e5..fba3dde06fd 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/LastAccessTimeTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/LastAccessTimeTest.java @@ -41,7 +41,7 @@ public class LastAccessTimeTest extends AbstractLastAccessTimeTest MongoTestServer.dropCollection(); } - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new MongoTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/LocalSessionScavengingTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/LocalSessionScavengingTest.java index 13a1ea41a19..537a4318081 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/LocalSessionScavengingTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/LocalSessionScavengingTest.java @@ -41,7 +41,7 @@ public class LocalSessionScavengingTest extends AbstractLocalSessionScavengingTe } @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { MongoTestServer mserver=new MongoTestServer(port,max,scavenge, evictionPolicy); diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java index f12a801115e..06a58c0bfbe 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java @@ -57,7 +57,7 @@ public class MongoTestServer extends AbstractTestServer } - public MongoTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod) + public MongoTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod) throws Exception { super(port, maxInactivePeriod, scavengePeriod, idlePassivatePeriod); } @@ -65,7 +65,7 @@ public class MongoTestServer extends AbstractTestServer - public MongoTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod, boolean saveAllAttributes) + public MongoTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod, boolean saveAllAttributes) throws Exception { super(port, maxInactivePeriod, scavengePeriod, idlePassivatePeriod); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/NewSessionTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/NewSessionTest.java index b85f40cde86..9d66c17d27a 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/NewSessionTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/NewSessionTest.java @@ -44,7 +44,7 @@ public class NewSessionTest extends AbstractNewSessionTest } - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new MongoTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/OrphanedSessionTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/OrphanedSessionTest.java index 4ba21f03226..7f1534fb7f8 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/OrphanedSessionTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/OrphanedSessionTest.java @@ -44,7 +44,7 @@ public class OrphanedSessionTest extends AbstractOrphanedSessionTest } - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new MongoTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ReentrantRequestSessionTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ReentrantRequestSessionTest.java index 870f60461a3..cef28824d8e 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ReentrantRequestSessionTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ReentrantRequestSessionTest.java @@ -55,7 +55,7 @@ public class ReentrantRequestSessionTest extends AbstractReentrantRequestSession * @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int, int, int, int) */ @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new MongoTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/RemoveSessionTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/RemoveSessionTest.java index 9d015ec01d9..596be0f1bfa 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/RemoveSessionTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/RemoveSessionTest.java @@ -41,7 +41,7 @@ public class RemoveSessionTest extends AbstractRemoveSessionTest MongoTestServer.dropCollection(); } - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new MongoTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ScatterGunLoadTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ScatterGunLoadTest.java index cc44df46884..a8ad4eff9ed 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ScatterGunLoadTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ScatterGunLoadTest.java @@ -45,7 +45,7 @@ public class ScatterGunLoadTest extends AbstractScatterGunLoadTest @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { return new MongoTestServer(port, maxInactive, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ServerCrossContextSessionTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ServerCrossContextSessionTest.java index e85b7ab2388..05cda713ce1 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ServerCrossContextSessionTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ServerCrossContextSessionTest.java @@ -43,7 +43,7 @@ public class ServerCrossContextSessionTest extends AbstractServerCrossContextSes @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { return new MongoTestServer(port, maxInactive, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionExpiryTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionExpiryTest.java index 2763a65cc26..4739499f516 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionExpiryTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionExpiryTest.java @@ -68,7 +68,7 @@ public class SessionExpiryTest extends AbstractSessionExpiryTest } @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new MongoTestServer(port,max,scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionInvalidateAndCreateTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionInvalidateAndCreateTest.java index e58424619f2..92224e2d5ca 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionInvalidateAndCreateTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionInvalidateAndCreateTest.java @@ -42,7 +42,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd } @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new MongoTestServer(port,max,scavenge,evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionMigrationTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionMigrationTest.java index 21d8c420ac1..50573c0b63e 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionMigrationTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionMigrationTest.java @@ -42,7 +42,7 @@ public class SessionMigrationTest extends AbstractSessionMigrationTest } @Override - public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) + public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception { return new MongoTestServer(port, maxInactive, scavengeInterval, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionRenewTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionRenewTest.java index 54bc507c8b3..6291ec36777 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionRenewTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionRenewTest.java @@ -49,7 +49,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest } @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new MongoTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionSavingValueTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionSavingValueTest.java index 55f5f064dda..fa345eec3f0 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionSavingValueTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionSavingValueTest.java @@ -42,7 +42,7 @@ public class SessionSavingValueTest extends AbstractSessionValueSavingTest } @Override - public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) + public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception { return new MongoTestServer(port, max, scavenge, evictionPolicy); } diff --git a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractLocalSessionScavengingTest.java b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractLocalSessionScavengingTest.java index 7920698b6a8..6f31f17d870 100644 --- a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractLocalSessionScavengingTest.java +++ b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractLocalSessionScavengingTest.java @@ -29,11 +29,14 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSessionEvent; +import javax.servlet.http.HttpSessionListener; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.util.statistic.CounterStatistic; import org.junit.Test; /** @@ -53,6 +56,88 @@ public abstract class AbstractLocalSessionScavengingTest extends AbstractTestBas e.printStackTrace(); } } + + + public static class SessionListener implements HttpSessionListener + { + public CounterStatistic count = new CounterStatistic(); + /** + * @see javax.servlet.http.HttpSessionListener#sessionCreated(javax.servlet.http.HttpSessionEvent) + */ + @Override + public void sessionCreated(HttpSessionEvent se) + { + count.increment(); + } + + /** + * @see javax.servlet.http.HttpSessionListener#sessionDestroyed(javax.servlet.http.HttpSessionEvent) + */ + @Override + public void sessionDestroyed(HttpSessionEvent se) + { + count.decrement(); + } + } + + @Test + public void testNoScavenging() throws Exception + { + String contextPath = ""; + String servletMapping = "/server"; + int inactivePeriod = 3; + int scavengePeriod = 0; + AbstractTestServer server1 = createServer(0, inactivePeriod, scavengePeriod, SessionCache.NEVER_EVICT); + ServletContextHandler context1 = server1.addContext(contextPath); + context1.addServlet(TestServlet.class, servletMapping); + SessionListener listener = new SessionListener(); + context1.getSessionHandler().addEventListener(listener); + + + try + { + server1.start(); + int port1 = server1.getPort(); + + HttpClient client = new HttpClient(); + client.start(); + try + { + String url = "http://localhost:" + port1 + contextPath + servletMapping; + + + // Create the session + ContentResponse response1 = client.GET(url + "?action=init"); + assertEquals(HttpServletResponse.SC_OK,response1.getStatus()); + String sessionCookie = response1.getHeaders().get("Set-Cookie"); + assertTrue(sessionCookie != null); + // Mangle the cookie, replacing Path with $Path, etc. + sessionCookie = sessionCookie.replaceFirst("(\\W)(P|p)ath=", "$1\\$Path="); + SessionHandler m1 = context1.getSessionHandler(); + assertEquals(1, m1.getSessionsCreated()); + + + // Wait a while to ensure that the session should have expired, if the + //scavenger was running + pause(2*inactivePeriod); + + assertEquals(1, m1.getSessionsCreated()); + + + //check a session removed listener did not get called + assertEquals(1, listener.count.getCurrent()); + } + finally + { + client.stop(); + } + } + finally + { + server1.stop(); + } + } + @Test public void testLocalSessionsScavenging() throws Exception diff --git a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractTestBase.java b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractTestBase.java index 6b1f225b6da..07be9f8f5b1 100644 --- a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractTestBase.java +++ b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractTestBase.java @@ -26,5 +26,5 @@ package org.eclipse.jetty.server.session; */ public abstract class AbstractTestBase { - public abstract AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy); + public abstract AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception; } diff --git a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractTestServer.java b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractTestServer.java index 90e85eeb463..8581ed9a583 100644 --- a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractTestServer.java +++ b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractTestServer.java @@ -58,12 +58,12 @@ public abstract class AbstractTestServer return sessionCookie; } - public AbstractTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy) + public AbstractTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy) throws Exception { this (port, maxInactivePeriod, scavengePeriod, evictionPolicy, null); } - public AbstractTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy, Object cfg) + public AbstractTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy, Object cfg) throws Exception { _server = new Server(port); _maxInactivePeriod = maxInactivePeriod; From bc4e65ebf2401aade829cdce7034644650f6f7fb Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Thu, 22 Sep 2016 15:52:11 +1000 Subject: [PATCH 2/3] Issue #941 Return scavenge to on-by-default; make value for scavenge property in session.mod same as default in id-manager.xml. --- jetty-server/src/main/config/modules/sessions.mod | 2 +- .../java/org/eclipse/jetty/server/session/HouseKeeper.java | 2 +- .../java/org/eclipse/jetty/server/session/SessionContext.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jetty-server/src/main/config/modules/sessions.mod b/jetty-server/src/main/config/modules/sessions.mod index 2b9a69285cf..e90cd8aa2bd 100644 --- a/jetty-server/src/main/config/modules/sessions.mod +++ b/jetty-server/src/main/config/modules/sessions.mod @@ -16,4 +16,4 @@ etc/sessions/id-manager.xml #jetty.sessionIdManager.workerName=node1 ## Period between runs of the session scavenger (in seconds) -#jetty.sessionScavengeInterval.seconds=60 +#jetty.sessionScavengeInterval.seconds=600 diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java index 3078e6eeccc..6c87ca97b95 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java @@ -44,7 +44,7 @@ public class HouseKeeper extends AbstractLifeCycle protected Scheduler.Task _task; //scavenge task protected Runner _runner; protected boolean _ownScheduler = false; - private long _intervalMs = 0; + private long _intervalMs = DEFAULT_PERIOD_MS; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionContext.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionContext.java index b8165d034a2..402fe596c7e 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionContext.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionContext.java @@ -43,7 +43,8 @@ public class SessionContext public SessionContext (String workerName, ContextHandler.Context context) { - _sessionHandler = context.getContextHandler().getChildHandlerByClass(SessionHandler.class); + if (context != null) + _sessionHandler = context.getContextHandler().getChildHandlerByClass(SessionHandler.class); _workerName = workerName; _context = context; _canonicalContextPath = canonicalizeContextPath(_context); From 892da7b2da0eb627d0757ea1df35fff65cbfaf8f Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Thu, 22 Sep 2016 17:16:40 +1000 Subject: [PATCH 3/3] Issue #927 Remove debug println. --- .../org/eclipse/jetty/server/session/JDBCSessionDataStore.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java index 6e808257770..ec23c7e200a 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java @@ -546,7 +546,6 @@ public class JDBCSessionDataStore extends AbstractSessionDataStore //make the session table if necessary String tableName = _dbAdaptor.convertIdentifier(getTableName()); String schemaName = _dbAdaptor.convertIdentifier(getSchemaName()); - System.err.println ("Tablename: "+tableName+" SchemaName:"+schemaName); try (ResultSet result = metaData.getTables(null, schemaName, tableName, null)) { if (!result.next())