diff --git a/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreFactory.java b/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreFactory.java index 7959f8a5072..766920ed9c3 100644 --- a/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreFactory.java +++ b/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreFactory.java @@ -121,6 +121,11 @@ public class HazelcastSessionDataStoreFactory return onlyClient; } + /** + * + * @param onlyClient if true the session manager will only connect to an external Hazelcast instance + * and not use this JVM to start an Hazelcast instance + */ public void setOnlyClient( boolean onlyClient ) { this.onlyClient = onlyClient; diff --git a/tests/test-sessions/test-hazelcast-sessions/pom.xml b/tests/test-sessions/test-hazelcast-sessions/pom.xml index 2bd1287e31e..9ad03019564 100644 --- a/tests/test-sessions/test-hazelcast-sessions/pom.xml +++ b/tests/test-sessions/test-hazelcast-sessions/pom.xml @@ -49,6 +49,15 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + ${project.build.testOutputDirectory}/logging.properties + + + @@ -88,7 +97,6 @@ jetty-test-helper test - diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredLastAccessTimeTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredLastAccessTimeTest.java index aabffb8dfda..204897ee78d 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredLastAccessTimeTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredLastAccessTimeTest.java @@ -20,19 +20,29 @@ package org.eclipse.jetty.hazelcast.session; import org.eclipse.jetty.server.session.AbstractClusteredLastAccessTimeTest; import org.eclipse.jetty.server.session.SessionDataStoreFactory; +import org.junit.After; public class ClusteredLastAccessTimeTest extends AbstractClusteredLastAccessTimeTest { + HazelcastSessionDataStoreFactory factory; + /** * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { - HazelcastSessionDataStoreFactory factory = new HazelcastSessionDataStoreFactory(); + factory = new HazelcastSessionDataStoreFactory(); + factory.setMapName( Long.toString( System.currentTimeMillis() ) ); return factory; } + @After + public void shutdown() + { + factory.getHazelcastInstance().getMap( factory.getMapName() ).clear(); + } + } diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java index e5a0be0a09a..466f430b647 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java @@ -21,6 +21,7 @@ package org.eclipse.jetty.hazelcast.session; import org.eclipse.jetty.server.session.AbstractClusteredOrphanedSessionTest; import org.eclipse.jetty.server.session.SessionDataStoreFactory; +import org.junit.After; /** * ClusteredOrphanedSessionTest @@ -29,6 +30,7 @@ public class ClusteredOrphanedSessionTest extends AbstractClusteredOrphanedSessionTest { + HazelcastSessionDataStoreFactory factory; /** * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() @@ -36,9 +38,14 @@ public class ClusteredOrphanedSessionTest @Override public SessionDataStoreFactory createSessionDataStoreFactory() { - HazelcastSessionDataStoreFactory factory = new HazelcastSessionDataStoreFactory(); + factory = new HazelcastSessionDataStoreFactory(); + factory.setMapName( Long.toString( System.currentTimeMillis() ) ); return factory; } - + @After + public void shutdown() + { + factory.getHazelcastInstance().getMap( factory.getMapName() ).clear(); + } } diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionMigrationTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionMigrationTest.java index b6a310f22ff..361aac257bc 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionMigrationTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionMigrationTest.java @@ -21,6 +21,7 @@ package org.eclipse.jetty.hazelcast.session; import org.eclipse.jetty.server.session.AbstractClusteredSessionMigrationTest; import org.eclipse.jetty.server.session.SessionDataStoreFactory; +import org.junit.After; /** * ClusteredSessionMigrationTest @@ -28,6 +29,7 @@ import org.eclipse.jetty.server.session.SessionDataStoreFactory; public class ClusteredSessionMigrationTest extends AbstractClusteredSessionMigrationTest { + HazelcastSessionDataStoreFactory factory; /** * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() @@ -35,7 +37,14 @@ public class ClusteredSessionMigrationTest @Override public SessionDataStoreFactory createSessionDataStoreFactory() { - HazelcastSessionDataStoreFactory factory = new HazelcastSessionDataStoreFactory(); + factory = new HazelcastSessionDataStoreFactory(); + factory.setMapName( Long.toString( System.currentTimeMillis() ) ); return factory; } + + @After + public void shutdown() + { + factory.getHazelcastInstance().getMap( factory.getMapName() ).clear(); + } } diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java index 0d626c33fa7..e4bd2f8868f 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java @@ -21,6 +21,7 @@ package org.eclipse.jetty.hazelcast.session; import org.eclipse.jetty.server.session.AbstractClusteredSessionScavengingTest; import org.eclipse.jetty.server.session.SessionDataStoreFactory; +import org.junit.After; /** * ClusteredSessionScavengingTest @@ -29,13 +30,22 @@ public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScavengingTest { + HazelcastSessionDataStoreFactory factory; + /** * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { - HazelcastSessionDataStoreFactory factory = new HazelcastSessionDataStoreFactory(); + factory = new HazelcastSessionDataStoreFactory(); + factory.setMapName( Long.toString( System.currentTimeMillis() ) ); return factory; } + + @After + public void shutdown() + { + factory.getHazelcastInstance().getMap( factory.getMapName() ).clear(); + } } diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ModifyMaxInactiveIntervalTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ModifyMaxInactiveIntervalTest.java index 5570d0946ba..68d9a51d468 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ModifyMaxInactiveIntervalTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ModifyMaxInactiveIntervalTest.java @@ -21,6 +21,7 @@ package org.eclipse.jetty.hazelcast.session; import org.eclipse.jetty.server.session.AbstractModifyMaxInactiveIntervalTest; import org.eclipse.jetty.server.session.SessionDataStoreFactory; +import org.junit.After; /** * ModifyMaxInactiveIntervalTest @@ -29,14 +30,23 @@ public class ModifyMaxInactiveIntervalTest extends AbstractModifyMaxInactiveIntervalTest { + HazelcastSessionDataStoreFactory factory; + /** * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { - HazelcastSessionDataStoreFactory factory = new HazelcastSessionDataStoreFactory(); + factory = new HazelcastSessionDataStoreFactory(); + factory.setMapName( Long.toString( System.currentTimeMillis() ) ); return factory; } + @After + public void shutdown() + { + factory.getHazelcastInstance().getMap( factory.getMapName() ).clear(); + } + } diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/NonClusteredSessionScavengingTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/NonClusteredSessionScavengingTest.java index 8c024268b0f..e364bb085ad 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/NonClusteredSessionScavengingTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/NonClusteredSessionScavengingTest.java @@ -21,6 +21,7 @@ package org.eclipse.jetty.hazelcast.session; import org.eclipse.jetty.server.session.AbstractNonClusteredSessionScavengingTest; import org.eclipse.jetty.server.session.SessionDataStoreFactory; +import org.junit.After; import static org.junit.Assert.*; @@ -31,6 +32,8 @@ public class NonClusteredSessionScavengingTest extends AbstractNonClusteredSessionScavengingTest { + HazelcastSessionDataStoreFactory factory; + /** * @see org.eclipse.jetty.server.session.AbstractNonClusteredSessionScavengingTest#assertSession(java.lang.String, boolean) */ @@ -63,7 +66,14 @@ public class NonClusteredSessionScavengingTest @Override public SessionDataStoreFactory createSessionDataStoreFactory() { - HazelcastSessionDataStoreFactory factory = new HazelcastSessionDataStoreFactory(); + factory = new HazelcastSessionDataStoreFactory(); + factory.setMapName( Long.toString( System.currentTimeMillis() ) ); return factory; } + + @After + public void shutdown() + { + factory.getHazelcastInstance().getMap( factory.getMapName() ).clear(); + } } diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/SessionExpiryTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/SessionExpiryTest.java index ae911a0614b..2d51f25109d 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/SessionExpiryTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/SessionExpiryTest.java @@ -21,20 +21,30 @@ package org.eclipse.jetty.hazelcast.session; import org.eclipse.jetty.server.session.AbstractSessionExpiryTest; import org.eclipse.jetty.server.session.SessionDataStoreFactory; +import org.junit.After; import org.junit.Test; public class SessionExpiryTest extends AbstractSessionExpiryTest { + HazelcastSessionDataStoreFactory factory; + /** * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { - HazelcastSessionDataStoreFactory factory = new HazelcastSessionDataStoreFactory(); + factory = new HazelcastSessionDataStoreFactory(); + factory.setMapName( Long.toString( System.currentTimeMillis() ) ); return factory; } + @After + public void shutdown() + { + factory.getHazelcastInstance().getMap( factory.getMapName() ).clear(); + } + } diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/SessionInvalidateCreateScavengeTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/SessionInvalidateCreateScavengeTest.java index c958fb6e6c5..434b11595cb 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/SessionInvalidateCreateScavengeTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/SessionInvalidateCreateScavengeTest.java @@ -21,6 +21,7 @@ package org.eclipse.jetty.hazelcast.session; import org.eclipse.jetty.server.session.AbstractSessionInvalidateCreateScavengeTest; import org.eclipse.jetty.server.session.SessionDataStoreFactory; +import org.junit.After; /** * SessionInvalidateCreateScavengeTest @@ -29,13 +30,22 @@ public class SessionInvalidateCreateScavengeTest extends AbstractSessionInvalidateCreateScavengeTest { + HazelcastSessionDataStoreFactory factory; + /** * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { - HazelcastSessionDataStoreFactory factory = new HazelcastSessionDataStoreFactory(); + factory = new HazelcastSessionDataStoreFactory(); + factory.setMapName( Long.toString( System.currentTimeMillis() ) ); return factory; } + + @After + public void shutdown() + { + factory.getHazelcastInstance().getMap( factory.getMapName() ).clear(); + } } diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientLastAccessTimeTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientLastAccessTimeTest.java index 2078882ee21..f2549d7b964 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientLastAccessTimeTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientLastAccessTimeTest.java @@ -32,7 +32,7 @@ public class ClientLastAccessTimeTest extends AbstractClusteredLastAccessTimeTest { - private static final String MAP_NAME = "jetty_foo_session"; + private static final String MAP_NAME = Long.toString( System.currentTimeMillis() ); private HazelcastInstance hazelcastInstance; diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientModifyMaxInactiveIntervalTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientModifyMaxInactiveIntervalTest.java index f74d05746c9..effcafdecca 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientModifyMaxInactiveIntervalTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientModifyMaxInactiveIntervalTest.java @@ -19,9 +19,15 @@ package org.eclipse.jetty.hazelcast.session.client; +import com.hazelcast.config.Config; +import com.hazelcast.config.MapConfig; +import com.hazelcast.core.Hazelcast; +import com.hazelcast.core.HazelcastInstance; import org.eclipse.jetty.hazelcast.session.HazelcastSessionDataStoreFactory; import org.eclipse.jetty.server.session.AbstractModifyMaxInactiveIntervalTest; import org.eclipse.jetty.server.session.SessionDataStoreFactory; +import org.junit.After; +import org.junit.Before; /** * ModifyMaxInactiveIntervalTest @@ -30,6 +36,27 @@ public class ClientModifyMaxInactiveIntervalTest extends AbstractModifyMaxInactiveIntervalTest { + private static final String MAP_NAME = Long.toString( System.currentTimeMillis() ); + + private HazelcastInstance hazelcastInstance; + + @Before + public void startHazelcast() + throws Exception + { + Config config = new Config().addMapConfig( new MapConfig().setName( MAP_NAME ) ) // + .setInstanceName( "beer" ); + // start Hazelcast instance + hazelcastInstance = Hazelcast.getOrCreateHazelcastInstance( config ); + } + + @After + public void stopHazelcast() + throws Exception + { + hazelcastInstance.shutdown(); + } + /** * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() */ @@ -37,6 +64,8 @@ public class ClientModifyMaxInactiveIntervalTest public SessionDataStoreFactory createSessionDataStoreFactory() { HazelcastSessionDataStoreFactory factory = new HazelcastSessionDataStoreFactory(); + factory.setOnlyClient( true ); + factory.setMapName( MAP_NAME ); return factory; } diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientNonClusteredSessionScavengingTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientNonClusteredSessionScavengingTest.java index e9b00f20433..4abc6b1cedb 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientNonClusteredSessionScavengingTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientNonClusteredSessionScavengingTest.java @@ -60,7 +60,7 @@ public class ClientNonClusteredSessionScavengingTest fail( e.getMessage() ); } } - private static final String MAP_NAME = "jetty_foo_session"; + private static final String MAP_NAME = Long.toString( System.currentTimeMillis() ); private HazelcastInstance hazelcastInstance; diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java index 00943a5f036..2a08debb557 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java @@ -33,7 +33,7 @@ public class ClientOrphanedSessionTest extends AbstractClusteredOrphanedSessionTest { - private static final String MAP_NAME = "jetty_foo_session"; + private static final String MAP_NAME = Long.toString( System.currentTimeMillis() ); private HazelcastInstance hazelcastInstance; diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionExpiryTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionExpiryTest.java index 4533b980d8a..a2fc8a24c37 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionExpiryTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionExpiryTest.java @@ -33,7 +33,7 @@ public class ClientSessionExpiryTest extends AbstractSessionExpiryTest { - private static final String MAP_NAME = "jetty_foo_session"; + private static final String MAP_NAME = Long.toString( System.currentTimeMillis() ); private HazelcastInstance hazelcastInstance; diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionInvalidateCreateScavengeTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionInvalidateCreateScavengeTest.java index 1219907e689..cedd39abcaa 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionInvalidateCreateScavengeTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionInvalidateCreateScavengeTest.java @@ -32,7 +32,7 @@ import org.junit.Before; public class ClientSessionInvalidateCreateScavengeTest extends AbstractSessionInvalidateCreateScavengeTest { - private static final String MAP_NAME = "jetty_foo_session"; + private static final String MAP_NAME = Long.toString( System.currentTimeMillis() ); private HazelcastInstance hazelcastInstance; diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionMigrationTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionMigrationTest.java index e5dc2cc1a9a..ba786895c02 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionMigrationTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionMigrationTest.java @@ -35,7 +35,7 @@ import org.junit.Before; public class ClientSessionMigrationTest extends AbstractClusteredSessionMigrationTest { - private static final String MAP_NAME = "jetty_foo_session"; + private static final String MAP_NAME = Long.toString( System.currentTimeMillis() ); private HazelcastInstance hazelcastInstance; diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java index 06a34569462..e7ca25a3877 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java @@ -33,7 +33,7 @@ public class ClientSessionScavengingTest extends AbstractClusteredSessionScavengingTest { - private static final String MAP_NAME = "jetty_foo_session"; + private static final String MAP_NAME = Long.toString( System.currentTimeMillis() ); private HazelcastInstance hazelcastInstance; diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties b/tests/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties new file mode 100644 index 00000000000..07faa86dbce --- /dev/null +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties @@ -0,0 +1 @@ +org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog \ No newline at end of file diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/resources/logging.properties b/tests/test-sessions/test-hazelcast-sessions/src/test/resources/logging.properties new file mode 100644 index 00000000000..256dbe49265 --- /dev/null +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/resources/logging.properties @@ -0,0 +1,3 @@ +handlers=java.util.logging.ConsoleHandler +.level=INFO +com.hazelcast.level=SEVERE \ No newline at end of file