From c2ecad7b3c71072bf6cc59d895186ced3a240876 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Tue, 3 May 2022 18:45:43 +0200 Subject: [PATCH] WIP move session tests to ee9 --- jetty-ee9/pom.xml | 2 +- .../pom.xml | 18 +++++++++--------- .../test-ee9-file-sessions}/pom.xml | 12 ++++++------ .../session/ClusteredOrphanedSessionTest.java | 0 .../test/resources/jetty-logging.properties | 0 .../test-ee9-gcloud-sessions}/pom.xml | 12 ++++++------ .../session/ClusteredOrphanedSessionTest.java | 0 .../ClusteredSessionScavengingTest.java | 0 .../session/GCloudSessionDataStoreTest.java | 0 .../session/GCloudSessionTestSupport.java | 0 .../session/InvalidationSessionTest.java | 0 .../test/resources/simplelogger.properties | 0 .../test-ee9-hazelcast-sessions}/pom.xml | 12 ++++++------ .../session/ClusteredOrphanedSessionTest.java | 0 .../ClusteredSessionScavengingTest.java | 0 ...lcastClusteredInvalidationSessionTest.java | 0 .../HazelcastSessionDataStoreTest.java | 0 .../session/HazelcastTestHelper.java | 0 .../client/ClientOrphanedSessionTest.java | 0 .../client/ClientSessionScavengingTest.java | 0 .../client/HazelcastSessionDataStoreTest.java | 0 .../test/resources/jetty-logging.properties | 0 .../test-ee9-infinispan-sessions}/pom.xml | 12 ++++++------ .../session/ClusteredOrphanedSessionTest.java | 0 ...steredSerializedSessionScavengingTest.java | 0 .../ClusteredSessionScavengingTest.java | 0 .../InfinispanFileSessionDataStoreTest.java | 0 .../InfinispanSessionDataStoreTest.java | 0 .../jetty/session/InfinispanTestSupport.java | 0 .../eclipse/jetty/session/LoggingUtil.java | 0 ...ializedInfinispanSessionDataStoreTest.java | 0 ...emoteClusteredInvalidationSessionTest.java | 0 .../RemoteClusteredSessionScavengingTest.java | 0 .../RemoteInfinispanSessionDataStoreTest.java | 0 .../remote/RemoteInfinispanTestSupport.java | 0 .../src/test/resources/config.yaml | 0 .../test/resources/jetty-logging.properties | 0 .../test/resources/simplelogger.properties | 0 .../test-ee9-jdbc-sessions}/pom.xml | 12 ++++++------ .../ClusteredInvalidationSessionTest.java | 0 .../session/ClusteredOrphanedSessionTest.java | 0 .../ClusteredSessionMigrationTest.java | 0 .../ClusteredSessionScavengingTest.java | 0 .../session/JDBCSessionDataStoreTest.java | 0 .../eclipse/jetty/session/JdbcTestHelper.java | 0 .../ReloadedSessionMissingClassTest.java | 0 .../jetty/session/SessionTableSchemaTest.java | 0 .../session/WebAppObjectInSessionTest.java | 0 .../src/test/resources/foobar.jar | Bin .../src/test/resources/foobarNOfoo.jar | Bin .../test/resources/jetty-logging.properties | 0 .../test/resources/simplelogger.properties | 0 .../test-ee9-memcached-sessions}/pom.xml | 10 +++++----- .../sessions/CachingSessionDataStoreTest.java | 0 .../sessions/MemcachedTestHelper.java | 0 .../test/resources/jetty-logging.properties | 0 .../test/resources/simplelogger.properties | 0 .../test-ee9-mongodb-sessions}/pom.xml | 13 +++++++------ .../nosql/mongodb/AttributeNameTest.java | 0 .../ClusteredInvalidateSessionTest.java | 0 .../mongodb/ClusteredOrphanedSessionTest.java | 0 .../ClusteredSessionScavengingTest.java | 0 .../mongodb/MongoSessionDataStoreTest.java | 0 .../jetty/nosql/mongodb/MongoTestHelper.java | 0 .../test/resources/jetty-logging.properties | 0 .../src/test/resources/realm.properties | 0 .../test/resources/simplelogger.properties | 0 .../test-ee9-sessions-common}/pom.xml | 8 ++++---- ...tractClusteredInvalidationSessionTest.java | 0 .../AbstractClusteredOrphanedSessionTest.java | 0 ...bstractClusteredSessionScavengingTest.java | 0 .../session/AbstractSessionTestBase.java | 0 .../AbstractWebAppObjectInSessionTest.java | 0 .../java/org/eclipse/jetty/session/Foo.java | 0 .../jetty/session/FooInvocationHandler.java | 0 .../jetty/session/SessionTestSupport.java | 0 .../org/eclipse/jetty/session/TestFoo.java | 0 .../session/TestHttpSessionListener.java | 0 .../jetty/session/TestSessionDataStore.java | 0 .../session/TestSessionDataStoreFactory.java | 0 .../session/WebAppObjectInSessionServlet.java | 0 .../org/eclipse/jetty/session/AsyncTest.java | 0 .../ClientCrossContextSessionTest.java | 0 .../jetty/session/ConcurrencyTest.java | 0 .../eclipse/jetty/session/CreationTest.java | 0 .../session/DeleteUnloadableSessionTest.java | 0 .../jetty/session/DuplicateCookieTest.java | 0 .../jetty/session/IdleSessionTest.java | 0 .../ModifyMaxInactiveIntervalTest.java | 0 .../NonClusteredSessionScavengingTest.java | 0 .../jetty/session/RedirectSessionTest.java | 0 .../session/ReentrantRequestSessionTest.java | 0 .../jetty/session/RemoveSessionTest.java | 0 .../session/RequestDispatchedSessionTest.java | 0 .../session/RequestScopedSessionSaveTest.java | 0 .../SameContextForwardedSessionTest.java | 0 .../SessionInvalidateCreateScavengeTest.java | 0 .../session/SessionInvalidationTest.java | 0 .../jetty/session/SessionRenewTest.java | 0 .../test/resources/jetty-logging.properties | 0 100 files changed, 56 insertions(+), 55 deletions(-) rename jetty-ee9/{test-sessions => test-ee9-sessions}/pom.xml (66%) rename jetty-ee9/{test-sessions/test-file-sessions => test-ee9-sessions/test-ee9-file-sessions}/pom.xml (86%) rename jetty-ee9/{test-sessions/test-file-sessions => test-ee9-sessions/test-ee9-file-sessions}/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-file-sessions => test-ee9-sessions/test-ee9-file-sessions}/src/test/resources/jetty-logging.properties (100%) rename jetty-ee9/{test-sessions/test-gcloud-sessions => test-ee9-sessions/test-ee9-gcloud-sessions}/pom.xml (88%) rename jetty-ee9/{test-sessions/test-gcloud-sessions => test-ee9-sessions/test-ee9-gcloud-sessions}/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-gcloud-sessions => test-ee9-sessions/test-ee9-gcloud-sessions}/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java (100%) rename jetty-ee9/{test-sessions/test-gcloud-sessions => test-ee9-sessions/test-ee9-gcloud-sessions}/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java (100%) rename jetty-ee9/{test-sessions/test-gcloud-sessions => test-ee9-sessions/test-ee9-gcloud-sessions}/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java (100%) rename jetty-ee9/{test-sessions/test-gcloud-sessions => test-ee9-sessions/test-ee9-gcloud-sessions}/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-gcloud-sessions => test-ee9-sessions/test-ee9-gcloud-sessions}/src/test/resources/simplelogger.properties (100%) rename jetty-ee9/{test-sessions/test-hazelcast-sessions => test-ee9-sessions/test-ee9-hazelcast-sessions}/pom.xml (93%) rename jetty-ee9/{test-sessions/test-hazelcast-sessions => test-ee9-sessions/test-ee9-hazelcast-sessions}/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-hazelcast-sessions => test-ee9-sessions/test-ee9-hazelcast-sessions}/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java (100%) rename jetty-ee9/{test-sessions/test-hazelcast-sessions => test-ee9-sessions/test-ee9-hazelcast-sessions}/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastClusteredInvalidationSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-hazelcast-sessions => test-ee9-sessions/test-ee9-hazelcast-sessions}/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java (100%) rename jetty-ee9/{test-sessions/test-hazelcast-sessions => test-ee9-sessions/test-ee9-hazelcast-sessions}/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastTestHelper.java (100%) rename jetty-ee9/{test-sessions/test-hazelcast-sessions => test-ee9-sessions/test-ee9-hazelcast-sessions}/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-hazelcast-sessions => test-ee9-sessions/test-ee9-hazelcast-sessions}/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java (100%) rename jetty-ee9/{test-sessions/test-hazelcast-sessions => test-ee9-sessions/test-ee9-hazelcast-sessions}/src/test/java/org/eclipse/jetty/hazelcast/session/client/HazelcastSessionDataStoreTest.java (100%) rename jetty-ee9/{test-sessions/test-hazelcast-sessions => test-ee9-sessions/test-ee9-hazelcast-sessions}/src/test/resources/jetty-logging.properties (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/pom.xml (95%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/java/org/eclipse/jetty/session/ClusteredSerializedSessionScavengingTest.java (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/java/org/eclipse/jetty/session/InfinispanFileSessionDataStoreTest.java (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/java/org/eclipse/jetty/session/InfinispanSessionDataStoreTest.java (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/java/org/eclipse/jetty/session/InfinispanTestSupport.java (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/java/org/eclipse/jetty/session/LoggingUtil.java (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/java/org/eclipse/jetty/session/SerializedInfinispanSessionDataStoreTest.java (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredInvalidationSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredSessionScavengingTest.java (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanSessionDataStoreTest.java (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanTestSupport.java (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/resources/config.yaml (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/resources/jetty-logging.properties (100%) rename jetty-ee9/{test-sessions/test-infinispan-sessions => test-ee9-sessions/test-ee9-infinispan-sessions}/src/test/resources/simplelogger.properties (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/pom.xml (90%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/java/org/eclipse/jetty/session/ClusteredInvalidationSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/java/org/eclipse/jetty/session/ClusteredSessionMigrationTest.java (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/java/org/eclipse/jetty/session/JDBCSessionDataStoreTest.java (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/java/org/eclipse/jetty/session/JdbcTestHelper.java (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/java/org/eclipse/jetty/session/ReloadedSessionMissingClassTest.java (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/java/org/eclipse/jetty/session/SessionTableSchemaTest.java (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/java/org/eclipse/jetty/session/WebAppObjectInSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/resources/foobar.jar (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/resources/foobarNOfoo.jar (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/resources/jetty-logging.properties (100%) rename jetty-ee9/{test-sessions/test-jdbc-sessions => test-ee9-sessions/test-ee9-jdbc-sessions}/src/test/resources/simplelogger.properties (100%) rename jetty-ee9/{test-sessions/test-memcached-sessions => test-ee9-sessions/test-ee9-memcached-sessions}/pom.xml (89%) rename jetty-ee9/{test-sessions/test-memcached-sessions => test-ee9-sessions/test-ee9-memcached-sessions}/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java (100%) rename jetty-ee9/{test-sessions/test-memcached-sessions => test-ee9-sessions/test-ee9-memcached-sessions}/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java (100%) rename jetty-ee9/{test-sessions/test-memcached-sessions => test-ee9-sessions/test-ee9-memcached-sessions}/src/test/resources/jetty-logging.properties (100%) rename jetty-ee9/{test-sessions/test-memcached-sessions => test-ee9-sessions/test-ee9-memcached-sessions}/src/test/resources/simplelogger.properties (100%) rename jetty-ee9/{test-sessions/test-mongodb-sessions => test-ee9-sessions/test-ee9-mongodb-sessions}/pom.xml (92%) rename jetty-ee9/{test-sessions/test-mongodb-sessions => test-ee9-sessions/test-ee9-mongodb-sessions}/src/test/java/org/eclipse/jetty/nosql/mongodb/AttributeNameTest.java (100%) rename jetty-ee9/{test-sessions/test-mongodb-sessions => test-ee9-sessions/test-ee9-mongodb-sessions}/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredInvalidateSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-mongodb-sessions => test-ee9-sessions/test-ee9-mongodb-sessions}/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredOrphanedSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-mongodb-sessions => test-ee9-sessions/test-ee9-mongodb-sessions}/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredSessionScavengingTest.java (100%) rename jetty-ee9/{test-sessions/test-mongodb-sessions => test-ee9-sessions/test-ee9-mongodb-sessions}/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStoreTest.java (100%) rename jetty-ee9/{test-sessions/test-mongodb-sessions => test-ee9-sessions/test-ee9-mongodb-sessions}/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java (100%) rename jetty-ee9/{test-sessions/test-mongodb-sessions => test-ee9-sessions/test-ee9-mongodb-sessions}/src/test/resources/jetty-logging.properties (100%) rename jetty-ee9/{test-sessions/test-mongodb-sessions => test-ee9-sessions/test-ee9-mongodb-sessions}/src/test/resources/realm.properties (100%) rename jetty-ee9/{test-sessions/test-mongodb-sessions => test-ee9-sessions/test-ee9-mongodb-sessions}/src/test/resources/simplelogger.properties (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/pom.xml (91%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/AbstractClusteredInvalidationSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/AbstractClusteredOrphanedSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/AbstractClusteredSessionScavengingTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/AbstractSessionTestBase.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/AbstractWebAppObjectInSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/Foo.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/FooInvocationHandler.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/SessionTestSupport.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/TestFoo.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/TestHttpSessionListener.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/TestSessionDataStore.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/TestSessionDataStoreFactory.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/main/java/org/eclipse/jetty/session/WebAppObjectInSessionServlet.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/AsyncTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/ClientCrossContextSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/ConcurrencyTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/CreationTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/DeleteUnloadableSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/DuplicateCookieTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/IdleSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/ModifyMaxInactiveIntervalTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/NonClusteredSessionScavengingTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/RedirectSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/ReentrantRequestSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/RemoveSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/RequestDispatchedSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/RequestScopedSessionSaveTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/SameContextForwardedSessionTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/SessionInvalidateCreateScavengeTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/SessionInvalidationTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/java/org/eclipse/jetty/session/SessionRenewTest.java (100%) rename jetty-ee9/{test-sessions/test-sessions-common => test-ee9-sessions/test-ee9-sessions-common}/src/test/resources/jetty-logging.properties (100%) diff --git a/jetty-ee9/pom.xml b/jetty-ee9/pom.xml index dd9699a918a..042f2fa2ec5 100644 --- a/jetty-ee9/pom.xml +++ b/jetty-ee9/pom.xml @@ -70,7 +70,7 @@ jetty-ee9-bom - test-sessions + test-ee9-sessions diff --git a/jetty-ee9/test-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/pom.xml similarity index 66% rename from jetty-ee9/test-sessions/pom.xml rename to jetty-ee9/test-ee9-sessions/pom.xml index a720b4eb099..d5f5b4180bc 100644 --- a/jetty-ee9/test-sessions/pom.xml +++ b/jetty-ee9/test-ee9-sessions/pom.xml @@ -7,18 +7,18 @@ 12.0.0-SNAPSHOT ../pom.xml - test-sessions + test-ee9-sessions Jetty EE9 Tests :: Sessions :: Parent pom - test-sessions-common - - - - - - - + test-ee9-sessions-common + + + + + + + diff --git a/jetty-ee9/test-sessions/test-file-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-file-sessions/pom.xml similarity index 86% rename from jetty-ee9/test-sessions/test-file-sessions/pom.xml rename to jetty-ee9/test-ee9-sessions/test-ee9-file-sessions/pom.xml index 9c32a2de278..5d396599282 100644 --- a/jetty-ee9/test-sessions/test-file-sessions/pom.xml +++ b/jetty-ee9/test-ee9-sessions/test-ee9-file-sessions/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - org.eclipse.jetty.tests - test-sessions + org.eclipse.jetty.ee9 + jetty-ee9 12.0.0-SNAPSHOT - test-file-sessions - Jetty Tests :: Sessions :: File + test-ee9-file-sessions + Jetty EE9 Tests :: Sessions :: File ${project.groupId}.sessions.file @@ -40,8 +40,8 @@ test - org.eclipse.jetty.tests - test-sessions-common + org.eclipse.jetty.ee9 + test-ee9-sessions-common test diff --git a/jetty-ee9/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-file-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-file-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java diff --git a/jetty-ee9/test-sessions/test-file-sessions/src/test/resources/jetty-logging.properties b/jetty-ee9/test-ee9-sessions/test-ee9-file-sessions/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-ee9/test-sessions/test-file-sessions/src/test/resources/jetty-logging.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-file-sessions/src/test/resources/jetty-logging.properties diff --git a/jetty-ee9/test-sessions/test-gcloud-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/pom.xml similarity index 88% rename from jetty-ee9/test-sessions/test-gcloud-sessions/pom.xml rename to jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/pom.xml index 38771237fc3..baa32256b7d 100644 --- a/jetty-ee9/test-sessions/test-gcloud-sessions/pom.xml +++ b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - org.eclipse.jetty.tests - test-sessions + org.eclipse.jetty.ee9 + test-ee9-sessions 12.0.0-SNAPSHOT - test-gcloud-sessions - Jetty Tests :: Sessions :: GCloud + test-ee9-gcloud-sessions + Jetty EE9 Tests :: Sessions :: GCloud ${project.groupId}.sessions.gcloud @@ -40,8 +40,8 @@ test - org.eclipse.jetty.tests - test-sessions-common + org.eclipse.jetty.ee9 + test-ee9-sessions-common test diff --git a/jetty-ee9/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java diff --git a/jetty-ee9/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java diff --git a/jetty-ee9/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java diff --git a/jetty-ee9/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java similarity index 100% rename from jetty-ee9/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java rename to jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java diff --git a/jetty-ee9/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java diff --git a/jetty-ee9/test-sessions/test-gcloud-sessions/src/test/resources/simplelogger.properties b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/resources/simplelogger.properties similarity index 100% rename from jetty-ee9/test-sessions/test-gcloud-sessions/src/test/resources/simplelogger.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/resources/simplelogger.properties diff --git a/jetty-ee9/test-sessions/test-hazelcast-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml similarity index 93% rename from jetty-ee9/test-sessions/test-hazelcast-sessions/pom.xml rename to jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml index df34ded7157..c48b3b3e8ef 100644 --- a/jetty-ee9/test-sessions/test-hazelcast-sessions/pom.xml +++ b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - org.eclipse.jetty.tests - test-sessions + org.eclipse.jetty.ee9 + test-ee9-sessions 12.0.0-SNAPSHOT - test-hazelcast-sessions - Jetty Tests :: Sessions :: Hazelcast + test-ee9-hazelcast-sessions + Jetty EE9 Tests :: Sessions :: Hazelcast ${project.groupId}.sessions.hazelcast @@ -76,8 +76,8 @@ test - org.eclipse.jetty.tests - test-sessions-common + org.eclipse.jetty.ee9 + test-ee9-sessions-common test diff --git a/jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java diff --git a/jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java diff --git a/jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastClusteredInvalidationSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastClusteredInvalidationSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastClusteredInvalidationSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastClusteredInvalidationSessionTest.java diff --git a/jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java diff --git a/jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastTestHelper.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastTestHelper.java similarity index 100% rename from jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastTestHelper.java rename to jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastTestHelper.java diff --git a/jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java diff --git a/jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java diff --git a/jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/HazelcastSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/HazelcastSessionDataStoreTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/HazelcastSessionDataStoreTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/HazelcastSessionDataStoreTest.java diff --git a/jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-ee9/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/resources/jetty-logging.properties diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml similarity index 95% rename from jetty-ee9/test-sessions/test-infinispan-sessions/pom.xml rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml index 47cf40b3a52..b8da6b1d34d 100644 --- a/jetty-ee9/test-sessions/test-infinispan-sessions/pom.xml +++ b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - org.eclipse.jetty.tests - test-sessions + org.eclipse.jetty.ee9 + test-ee9-sessions 12.0.0-SNAPSHOT - test-infinispan-sessions - Jetty Tests :: Sessions :: Infinispan + test-ee9-infinispan-sessions + Jetty EE9 Tests :: Sessions :: Infinispan ${project.groupId}.sessions.infinispan @@ -84,8 +84,8 @@ test - org.eclipse.jetty.tests - test-sessions-common + org.eclipse.jetty.ee9 + test-ee9-sessions-common test diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSerializedSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSerializedSessionScavengingTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSerializedSessionScavengingTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSerializedSessionScavengingTest.java diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanFileSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanFileSessionDataStoreTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanFileSessionDataStoreTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanFileSessionDataStoreTest.java diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanSessionDataStoreTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanSessionDataStoreTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanSessionDataStoreTest.java diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanTestSupport.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanTestSupport.java similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanTestSupport.java rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanTestSupport.java diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/LoggingUtil.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/LoggingUtil.java similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/LoggingUtil.java rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/LoggingUtil.java diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/SerializedInfinispanSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/SerializedInfinispanSessionDataStoreTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/SerializedInfinispanSessionDataStoreTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/SerializedInfinispanSessionDataStoreTest.java diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredInvalidationSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredInvalidationSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredInvalidationSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredInvalidationSessionTest.java diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredSessionScavengingTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredSessionScavengingTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredSessionScavengingTest.java diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanSessionDataStoreTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanSessionDataStoreTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanSessionDataStoreTest.java diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanTestSupport.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanTestSupport.java similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanTestSupport.java rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanTestSupport.java diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/resources/config.yaml b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/resources/config.yaml similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/resources/config.yaml rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/resources/config.yaml diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/resources/jetty-logging.properties b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/resources/jetty-logging.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/resources/jetty-logging.properties diff --git a/jetty-ee9/test-sessions/test-infinispan-sessions/src/test/resources/simplelogger.properties b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/resources/simplelogger.properties similarity index 100% rename from jetty-ee9/test-sessions/test-infinispan-sessions/src/test/resources/simplelogger.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/resources/simplelogger.properties diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/pom.xml similarity index 90% rename from jetty-ee9/test-sessions/test-jdbc-sessions/pom.xml rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/pom.xml index 34da9551b1e..ee2c45c7d65 100644 --- a/jetty-ee9/test-sessions/test-jdbc-sessions/pom.xml +++ b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - org.eclipse.jetty.tests - test-sessions + org.eclipse.jetty.ee9 + test-ee9-sessions 12.0.0-SNAPSHOT - test-jdbc-sessions - Jetty Tests :: Sessions :: JDBC + test-ee9-jdbc-sessions + Jetty EE9 Tests :: Sessions :: JDBC ${project.groupId}.sessions.jdbc @@ -49,8 +49,8 @@ test - org.eclipse.jetty.tests - test-sessions-common + org.eclipse.jetty.ee9 + test-ee9-sessions-common test diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredInvalidationSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredInvalidationSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredInvalidationSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredInvalidationSessionTest.java diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionMigrationTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionMigrationTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionMigrationTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionMigrationTest.java diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/JDBCSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/JDBCSessionDataStoreTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/JDBCSessionDataStoreTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/JDBCSessionDataStoreTest.java diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/JdbcTestHelper.java b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/JdbcTestHelper.java similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/JdbcTestHelper.java rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/JdbcTestHelper.java diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ReloadedSessionMissingClassTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ReloadedSessionMissingClassTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ReloadedSessionMissingClassTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ReloadedSessionMissingClassTest.java diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/SessionTableSchemaTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/SessionTableSchemaTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/SessionTableSchemaTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/SessionTableSchemaTest.java diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/WebAppObjectInSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/WebAppObjectInSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/session/WebAppObjectInSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/WebAppObjectInSessionTest.java diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/resources/foobar.jar b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/resources/foobar.jar similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/resources/foobar.jar rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/resources/foobar.jar diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/resources/foobarNOfoo.jar b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/resources/foobarNOfoo.jar similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/resources/foobarNOfoo.jar rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/resources/foobarNOfoo.jar diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/resources/jetty-logging.properties b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/resources/jetty-logging.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/resources/jetty-logging.properties diff --git a/jetty-ee9/test-sessions/test-jdbc-sessions/src/test/resources/simplelogger.properties b/jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/resources/simplelogger.properties similarity index 100% rename from jetty-ee9/test-sessions/test-jdbc-sessions/src/test/resources/simplelogger.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/resources/simplelogger.properties diff --git a/jetty-ee9/test-sessions/test-memcached-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/pom.xml similarity index 89% rename from jetty-ee9/test-sessions/test-memcached-sessions/pom.xml rename to jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/pom.xml index 90bbf09acf6..f97414f3822 100644 --- a/jetty-ee9/test-sessions/test-memcached-sessions/pom.xml +++ b/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - org.eclipse.jetty.tests - test-sessions + org.eclipse.jetty.ee9 + test-ee9-sessions 12.0.0-SNAPSHOT - test-memcached-sessions - Jetty Tests :: Sessions :: Memcached + test-ee9-memcached-sessions + Jetty EE9 Tests :: Sessions :: Memcached ${project.groupId}.sessions.memcached @@ -41,7 +41,7 @@ org.eclipse.jetty.tests - test-sessions-common + test-ee9-sessions-common test diff --git a/jetty-ee9/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java diff --git a/jetty-ee9/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java b/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java similarity index 100% rename from jetty-ee9/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java rename to jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java diff --git a/jetty-ee9/test-sessions/test-memcached-sessions/src/test/resources/jetty-logging.properties b/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-ee9/test-sessions/test-memcached-sessions/src/test/resources/jetty-logging.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/resources/jetty-logging.properties diff --git a/jetty-ee9/test-sessions/test-memcached-sessions/src/test/resources/simplelogger.properties b/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/resources/simplelogger.properties similarity index 100% rename from jetty-ee9/test-sessions/test-memcached-sessions/src/test/resources/simplelogger.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/resources/simplelogger.properties diff --git a/jetty-ee9/test-sessions/test-mongodb-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/pom.xml similarity index 92% rename from jetty-ee9/test-sessions/test-mongodb-sessions/pom.xml rename to jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/pom.xml index df3965daba5..334daad4750 100644 --- a/jetty-ee9/test-sessions/test-mongodb-sessions/pom.xml +++ b/jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/pom.xml @@ -2,12 +2,13 @@ 4.0.0 - org.eclipse.jetty.tests - test-sessions + org.eclipse.jetty.ee9 + test-ee9-sessions 12.0.0-SNAPSHOT + ../pom.xml - test-mongodb-sessions - Jetty Tests :: Sessions :: Mongo + test-ee9-mongodb-sessions + Jetty EE9 Tests :: Sessions :: Mongo ${project.groupId}.sessions.mongo localhost @@ -76,8 +77,8 @@ test - org.eclipse.jetty.tests - test-sessions-common + org.eclipse.jetty.ee9 + test-ee9-sessions-common test diff --git a/jetty-ee9/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/AttributeNameTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/AttributeNameTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/AttributeNameTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/AttributeNameTest.java diff --git a/jetty-ee9/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredInvalidateSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredInvalidateSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredInvalidateSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredInvalidateSessionTest.java diff --git a/jetty-ee9/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredOrphanedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredOrphanedSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredOrphanedSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredOrphanedSessionTest.java diff --git a/jetty-ee9/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredSessionScavengingTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredSessionScavengingTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredSessionScavengingTest.java diff --git a/jetty-ee9/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStoreTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStoreTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStoreTest.java diff --git a/jetty-ee9/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java b/jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java similarity index 100% rename from jetty-ee9/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java rename to jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java diff --git a/jetty-ee9/test-sessions/test-mongodb-sessions/src/test/resources/jetty-logging.properties b/jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-ee9/test-sessions/test-mongodb-sessions/src/test/resources/jetty-logging.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/resources/jetty-logging.properties diff --git a/jetty-ee9/test-sessions/test-mongodb-sessions/src/test/resources/realm.properties b/jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/resources/realm.properties similarity index 100% rename from jetty-ee9/test-sessions/test-mongodb-sessions/src/test/resources/realm.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/resources/realm.properties diff --git a/jetty-ee9/test-sessions/test-mongodb-sessions/src/test/resources/simplelogger.properties b/jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/resources/simplelogger.properties similarity index 100% rename from jetty-ee9/test-sessions/test-mongodb-sessions/src/test/resources/simplelogger.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-mongodb-sessions/src/test/resources/simplelogger.properties diff --git a/jetty-ee9/test-sessions/test-sessions-common/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/pom.xml similarity index 91% rename from jetty-ee9/test-sessions/test-sessions-common/pom.xml rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/pom.xml index 6f0a1b6209a..597ada80061 100644 --- a/jetty-ee9/test-sessions/test-sessions-common/pom.xml +++ b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/pom.xml @@ -2,13 +2,13 @@ 4.0.0 - org.eclipse.jetty.tests - test-sessions + org.eclipse.jetty.ee9 + test-ee9-sessions 12.0.0-SNAPSHOT ../pom.xml - test-sessions-common - Jetty Tests :: Sessions :: Common + test-ee9-sessions-common + Jetty EE9 Tests :: Sessions :: Common ${project.groupId}.sessions.common 5.0.2 diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractClusteredInvalidationSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractClusteredInvalidationSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractClusteredInvalidationSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractClusteredInvalidationSessionTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractClusteredOrphanedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractClusteredOrphanedSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractClusteredOrphanedSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractClusteredOrphanedSessionTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractClusteredSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractClusteredSessionScavengingTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractClusteredSessionScavengingTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractClusteredSessionScavengingTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractSessionTestBase.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractSessionTestBase.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractSessionTestBase.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractSessionTestBase.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractWebAppObjectInSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractWebAppObjectInSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractWebAppObjectInSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/AbstractWebAppObjectInSessionTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/Foo.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/Foo.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/Foo.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/Foo.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/FooInvocationHandler.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/FooInvocationHandler.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/FooInvocationHandler.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/FooInvocationHandler.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/SessionTestSupport.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/SessionTestSupport.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/SessionTestSupport.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/SessionTestSupport.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/TestFoo.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/TestFoo.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/TestFoo.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/TestFoo.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/TestHttpSessionListener.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/TestHttpSessionListener.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/TestHttpSessionListener.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/TestHttpSessionListener.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/TestSessionDataStore.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/TestSessionDataStore.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/TestSessionDataStore.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/TestSessionDataStore.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/TestSessionDataStoreFactory.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/TestSessionDataStoreFactory.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/TestSessionDataStoreFactory.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/TestSessionDataStoreFactory.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/WebAppObjectInSessionServlet.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/WebAppObjectInSessionServlet.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/session/WebAppObjectInSessionServlet.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/session/WebAppObjectInSessionServlet.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/AsyncTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/AsyncTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/AsyncTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/AsyncTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/ClientCrossContextSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/ClientCrossContextSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/ClientCrossContextSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/ClientCrossContextSessionTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/ConcurrencyTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/ConcurrencyTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/ConcurrencyTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/ConcurrencyTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/CreationTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/CreationTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/CreationTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/CreationTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/DeleteUnloadableSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/DeleteUnloadableSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/DeleteUnloadableSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/DeleteUnloadableSessionTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/DuplicateCookieTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/DuplicateCookieTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/DuplicateCookieTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/DuplicateCookieTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/IdleSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/IdleSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/IdleSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/IdleSessionTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/ModifyMaxInactiveIntervalTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/ModifyMaxInactiveIntervalTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/ModifyMaxInactiveIntervalTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/ModifyMaxInactiveIntervalTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/NonClusteredSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/NonClusteredSessionScavengingTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/NonClusteredSessionScavengingTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/NonClusteredSessionScavengingTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/RedirectSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/RedirectSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/RedirectSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/RedirectSessionTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/ReentrantRequestSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/ReentrantRequestSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/ReentrantRequestSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/ReentrantRequestSessionTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/RemoveSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/RemoveSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/RemoveSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/RemoveSessionTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/RequestDispatchedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/RequestDispatchedSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/RequestDispatchedSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/RequestDispatchedSessionTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/RequestScopedSessionSaveTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/RequestScopedSessionSaveTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/RequestScopedSessionSaveTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/RequestScopedSessionSaveTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/SameContextForwardedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/SameContextForwardedSessionTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/SameContextForwardedSessionTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/SameContextForwardedSessionTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/SessionInvalidateCreateScavengeTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/SessionInvalidateCreateScavengeTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/SessionInvalidateCreateScavengeTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/SessionInvalidateCreateScavengeTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/SessionInvalidationTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/SessionInvalidationTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/SessionInvalidationTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/SessionInvalidationTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/SessionRenewTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/SessionRenewTest.java similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/session/SessionRenewTest.java rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/java/org/eclipse/jetty/session/SessionRenewTest.java diff --git a/jetty-ee9/test-sessions/test-sessions-common/src/test/resources/jetty-logging.properties b/jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-ee9/test-sessions/test-sessions-common/src/test/resources/jetty-logging.properties rename to jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/test/resources/jetty-logging.properties