From 66f242191c1e8e996450e8e7a1d921b5d5c3b04b Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Sat, 30 Apr 2016 09:19:38 +1000 Subject: [PATCH] Issue #515 Alternate start modules Used alternate modules for new session architecture --- .../src/main/config/modules/apache-jsp.mod | 3 --- .../src/main/config/modules/apache-jstl.mod | 3 --- .../modules/alpn-impl/alpn-1.8.0_91.mod | 3 --- .../modules/alpn-impl/alpn-1.8.0_92.mod | 3 --- .../gcloud-session-store.xml} | 0 .../gcloud}/jetty-gcloud-embedded.xml | 0 .../gcloud}/jetty-gcloud-local.xml | 0 .../gcloud}/jetty-gcloud-remote.xml | 0 .../src/main/config/modules/gcloud-remote.mod | 15 ----------- .../config/modules/gcloud-session-store.mod | 26 ++++++++++++------- .../{ => sessions/gcloud}/gcloud-embedded.mod | 6 +---- .../{ => sessions/gcloud}/gcloud-local.mod | 6 +---- .../modules/sessions/gcloud/gcloud-remote.mod | 6 +++++ .../infinispan/default-store.xml} | 0 .../infinispan/remote-store.xml} | 0 .../modules/infinispan-session-default.mod | 10 ------- .../modules/infinispan-session-store.mod | 9 ++++--- .../infinispan/infinispan-session-default.mod | 6 +++++ .../infinispan}/infinispan-session-remote.mod | 5 +--- .../mongo/mongo-session-store.xml} | 0 .../config/modules/mongo-session-store.mod | 13 ++++------ .../file-session-store.xml} | 0 .../hash-session-cache.xml} | 0 .../jdbc-session-store.xml} | 0 .../jdbc/session-store-datasource.xml} | 0 .../jdbc/session-store-driver.xml} | 0 .../session-id-manager.xml} | 0 .../config/modules/default-session-cache.mod | 16 ------------ .../config/modules/file-session-store.mod | 17 +++++------- .../config/modules/hash-session-cache.mod | 18 +++++++++++++ .../config/modules/jdbc-session-store.mod | 21 +++++---------- .../src/main/config/modules/session-cache.mod | 11 ++++++++ .../src/main/config/modules/session-store.mod | 12 +++++++++ .../src/main/config/modules/sessions.mod | 17 ++++++------ .../modules/sessions/jdbc/datasource.mod | 6 +---- .../config/modules/sessions/jdbc/driver.mod | 6 +---- jetty-server/src/main/config/modules/ssl.mod | 3 --- .../src/main/config/modules/spring.mod | 3 --- 38 files changed, 105 insertions(+), 139 deletions(-) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/{jetty-gcloud-session-store.xml => sessions/gcloud-session-store.xml} (100%) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/{ => sessions/gcloud}/jetty-gcloud-embedded.xml (100%) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/{ => sessions/gcloud}/jetty-gcloud-local.xml (100%) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/{ => sessions/gcloud}/jetty-gcloud-remote.xml (100%) delete mode 100644 jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-remote.mod rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/{ => sessions/gcloud}/gcloud-embedded.mod (58%) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/{ => sessions/gcloud}/gcloud-local.mod (63%) create mode 100644 jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-remote.mod rename jetty-infinispan/src/main/config/etc/{jetty-default-infinispan-store.xml => sessions/infinispan/default-store.xml} (100%) rename jetty-infinispan/src/main/config/etc/{jetty-remote-infinispan-store.xml => sessions/infinispan/remote-store.xml} (100%) delete mode 100644 jetty-infinispan/src/main/config/modules/infinispan-session-default.mod create mode 100644 jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-default.mod rename jetty-infinispan/src/main/config/modules/{ => sessions/infinispan}/infinispan-session-remote.mod (78%) rename jetty-nosql/src/main/config/etc/{jetty-mongo-session-store.xml => sessions/mongo/mongo-session-store.xml} (100%) rename jetty-server/src/main/config/etc/{jetty-file-session-store.xml => sessions/file-session-store.xml} (100%) rename jetty-server/src/main/config/etc/{jetty-default-session-cache.xml => sessions/hash-session-cache.xml} (100%) rename jetty-server/src/main/config/etc/{jetty-jdbc-session-store.xml => sessions/jdbc-session-store.xml} (100%) rename jetty-server/src/main/config/etc/{jetty-jdbc-session-store-datasource.xml => sessions/jdbc/session-store-datasource.xml} (100%) rename jetty-server/src/main/config/etc/{jetty-jdbc-session-store-driver.xml => sessions/jdbc/session-store-driver.xml} (100%) rename jetty-server/src/main/config/etc/{jetty-sessions.xml => sessions/session-id-manager.xml} (100%) delete mode 100644 jetty-server/src/main/config/modules/default-session-cache.mod create mode 100644 jetty-server/src/main/config/modules/hash-session-cache.mod create mode 100644 jetty-server/src/main/config/modules/session-cache.mod create mode 100644 jetty-server/src/main/config/modules/session-store.mod diff --git a/apache-jsp/src/main/config/modules/apache-jsp.mod b/apache-jsp/src/main/config/modules/apache-jsp.mod index c816f61c049..5fa57f7c85c 100644 --- a/apache-jsp/src/main/config/modules/apache-jsp.mod +++ b/apache-jsp/src/main/config/modules/apache-jsp.mod @@ -1,9 +1,6 @@ [description] Enables use of the apache implementation of JSP -[name] -apache-jsp - [lib] lib/apache-jsp/*.jar diff --git a/apache-jstl/src/main/config/modules/apache-jstl.mod b/apache-jstl/src/main/config/modules/apache-jstl.mod index d7c703e7ea9..37e6f7757f5 100644 --- a/apache-jstl/src/main/config/modules/apache-jstl.mod +++ b/apache-jstl/src/main/config/modules/apache-jstl.mod @@ -1,8 +1,5 @@ [description] Enables the apache version of JSTL -[name] -apache-jstl - [lib] lib/apache-jstl/*.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_91.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_91.mod index 3628757cbfd..47bc2df34c1 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_91.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_91.mod @@ -1,6 +1,3 @@ -[name] -protonego-boot - [files] http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.7.v20160121/alpn-boot-8.1.7.v20160121.jar|lib/alpn/alpn-boot-8.1.7.v20160121.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_92.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_92.mod index 1be27521261..10d83db2181 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_92.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_92.mod @@ -1,6 +1,3 @@ -[name] -protonego-boot - [files] http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.8.v20160420/alpn-boot-8.1.8.v20160420.jar|lib/alpn/alpn-boot-8.1.8.v20160420.jar diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-session-store.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud-session-store.xml similarity index 100% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-session-store.xml rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud-session-store.xml diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-embedded.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/jetty-gcloud-embedded.xml similarity index 100% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-embedded.xml rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/jetty-gcloud-embedded.xml diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-local.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/jetty-gcloud-local.xml similarity index 100% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-local.xml rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/jetty-gcloud-local.xml diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-remote.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/jetty-gcloud-remote.xml similarity index 100% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-remote.xml rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/jetty-gcloud-remote.xml diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-remote.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-remote.mod deleted file mode 100644 index af26bf05e33..00000000000 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-remote.mod +++ /dev/null @@ -1,15 +0,0 @@ -[description] -Enables session storage on a remote GCloudDataStore service. - -[name] -gcloud-remote - - -[xml] -etc/jetty-gcloud-remote.xml - -[ini-template] -#jetty.gcloudSession.projectId= -#jetty.gcloudSession.p12File= -#jetty.gcloudSession.serviceAccount= -#jetty.gcloudSession.password= \ No newline at end of file diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-session-store.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-session-store.mod index f799b652300..a3dfd7dbbca 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-session-store.mod +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-session-store.mod @@ -1,14 +1,14 @@ [description] -Enables GCloudDatastore session management. +Enables GCloudDatastore session management. -[name] -gcloud-session-store +[provides] +session-store -[depend] +[depends] annotations webapp sessions -gcloud-${type} +sessions/gcloud/gcloud-${type} [files] maven://com.google.gcloud/gcloud-java-datastore/0.0.7|lib/gcloud/gcloud-java-datastore-0.0.7.jar @@ -47,23 +47,21 @@ maven://com.google.apis/google-api-services-datastore/v1beta2-rev23-1.19.0|lib/g lib/jetty-gcloud-session-manager-${jetty.version}.jar lib/gcloud/*.jar - [license] GCloudDatastore is an open source project hosted on Github and released under the Apache 2.0 license. https://github.com/GoogleCloudPlatform/gcloud-java http://www.apache.org/licenses/LICENSE-2.0.html - [ini] type=remote [ini-template] -#type=local -#type=embedded - ## GCloudDatastore Session config + +## Remote datastore +type=remote ## The gcloud projectId ## Set this property to connect to remote gcloud datastore. ## Or, set the DATASTORE_DATASET System property/env variable instead. @@ -80,3 +78,11 @@ type=remote ## The password (can be obfuscated). ## Set this property only when connecting to remote gcloud datastore #jetty.gcloudSession.password= + + +## Local datastore +#type=local + + +## Embedded datastore +#type=embedded diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-embedded.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-embedded.mod similarity index 58% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-embedded.mod rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-embedded.mod index 3b72a751d04..2d551d86596 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-embedded.mod +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-embedded.mod @@ -1,9 +1,5 @@ [description] Enables session storage when running inside the cloud. -[name] -gcloud-embedded - - [xml] -etc/jetty-gcloud-embedded.xml \ No newline at end of file +etc/sessions/gcloud/gcloud-embedded.xml diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-local.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-local.mod similarity index 63% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-local.mod rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-local.mod index 57076792b83..81a3c3781a1 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-local.mod +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-local.mod @@ -1,9 +1,5 @@ [description] Enables session storage on a local GCloudDataStore dev server. -[name] -gcloud-local - - [xml] -etc/jetty-gcloud-local.xml \ No newline at end of file +etc/sessions/gcloud/gcloud-local.xml diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-remote.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-remote.mod new file mode 100644 index 00000000000..0e94b825a6a --- /dev/null +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-remote.mod @@ -0,0 +1,6 @@ +[description] +Enables session storage on a remote GCloudDataStore service. + +[xml] +etc/sessions/gcloud/gcloud-remote.xml + diff --git a/jetty-infinispan/src/main/config/etc/jetty-default-infinispan-store.xml b/jetty-infinispan/src/main/config/etc/sessions/infinispan/default-store.xml similarity index 100% rename from jetty-infinispan/src/main/config/etc/jetty-default-infinispan-store.xml rename to jetty-infinispan/src/main/config/etc/sessions/infinispan/default-store.xml diff --git a/jetty-infinispan/src/main/config/etc/jetty-remote-infinispan-store.xml b/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote-store.xml similarity index 100% rename from jetty-infinispan/src/main/config/etc/jetty-remote-infinispan-store.xml rename to jetty-infinispan/src/main/config/etc/sessions/infinispan/remote-store.xml diff --git a/jetty-infinispan/src/main/config/modules/infinispan-session-default.mod b/jetty-infinispan/src/main/config/modules/infinispan-session-default.mod deleted file mode 100644 index 7905eb7f511..00000000000 --- a/jetty-infinispan/src/main/config/modules/infinispan-session-default.mod +++ /dev/null @@ -1,10 +0,0 @@ -[description] -Enable use of DefaultCache for session data storage - -[name] -infinispan-session-default - - -[xml] -etc/jetty-default-infinispan-session-store.xml - diff --git a/jetty-infinispan/src/main/config/modules/infinispan-session-store.mod b/jetty-infinispan/src/main/config/modules/infinispan-session-store.mod index 5af50036d97..89eb99daeda 100644 --- a/jetty-infinispan/src/main/config/modules/infinispan-session-store.mod +++ b/jetty-infinispan/src/main/config/modules/infinispan-session-store.mod @@ -1,12 +1,12 @@ [description] Enables session data store in a remote Infinispan cache -[name] -infinispan-session-store +[provides] +session-store [depend] session -infinispan-session-${cache-type} +sessions/infinispan/infinispan-session-${cache-type} [files] maven://org.infinispan/infinispan-core/7.1.1.Final|lib/infinispan/infinispan-core-7.1.1.Final.jar @@ -19,7 +19,6 @@ maven://org.jboss.logging/jboss-logging/3.1.2.GA|lib/infinispan/jboss-logging-3. lib/jetty-infinispan-${jetty.version}.jar lib/infinispan/*.jar - [license] Infinispan is an open source project hosted on Github and released under the Apache 2.0 license. http://infinispan.org/ @@ -30,6 +29,8 @@ http://www.apache.org/licenses/LICENSE-2.0.html cache-type=default [ini-template] +cache-type=default + #cache-type=remote #jetty.session.remoteInfinispanCache.name=sessions #jetty.session.infinispanIdleTimeout.seconds=0 diff --git a/jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-default.mod b/jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-default.mod new file mode 100644 index 00000000000..f15609e61ab --- /dev/null +++ b/jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-default.mod @@ -0,0 +1,6 @@ +[description] +Enable use of DefaultCache for session data storage + +[xml] +etc/sessions/infinispan/default-store.xml + diff --git a/jetty-infinispan/src/main/config/modules/infinispan-session-remote.mod b/jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-remote.mod similarity index 78% rename from jetty-infinispan/src/main/config/modules/infinispan-session-remote.mod rename to jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-remote.mod index 905a31668bd..78ca6e7c412 100644 --- a/jetty-infinispan/src/main/config/modules/infinispan-session-remote.mod +++ b/jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-remote.mod @@ -1,12 +1,9 @@ [description] Enable use of HotRod remote cache for session data storage -[name] -infinispan-session-remote - [files] https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-infinispan/src/main/infinispan-resources/hotrod-client.properties?id=${jetty.tag.version}|resources/hotrod-client.properties [xml] -etc/jetty-remote-infinispan-session-store.xml +etc/sessions/infinispan/remote-store.xml diff --git a/jetty-nosql/src/main/config/etc/jetty-mongo-session-store.xml b/jetty-nosql/src/main/config/etc/sessions/mongo/mongo-session-store.xml similarity index 100% rename from jetty-nosql/src/main/config/etc/jetty-mongo-session-store.xml rename to jetty-nosql/src/main/config/etc/sessions/mongo/mongo-session-store.xml diff --git a/jetty-nosql/src/main/config/modules/mongo-session-store.mod b/jetty-nosql/src/main/config/modules/mongo-session-store.mod index 9b4b79e76f7..f6ec90ebc63 100644 --- a/jetty-nosql/src/main/config/modules/mongo-session-store.mod +++ b/jetty-nosql/src/main/config/modules/mongo-session-store.mod @@ -1,8 +1,8 @@ [description] Enables NoSql session management with a MongoDB driver. -[name] -mongo-session-store +[provides] +session-store [depend] sessions @@ -14,18 +14,15 @@ maven://org.mongodb/mongo-java-driver/2.6.1|lib/nosql/mongo-java-driver-2.6.1.ja lib/jetty-nosql-${jetty.version}.jar lib/nosql/*.jar - [license] The java driver for the MongoDB document-based database system is hosted on GitHub and released under the Apache 2.0 license. http://www.mongodb.org/ http://www.apache.org/licenses/LICENSE-2.0.html - [xml] -etc/jetty-mongo-session-store.xml +etc/sessions/mongo/mongo-session-store.xml - -[ini] +[ini-template] #jetty.session.dbName=HttpSessions #jetty.session.collectionName=jettySessions -#jetty.session.gracePeriod.seconds=3600 \ No newline at end of file +#jetty.session.gracePeriod.seconds=3600 diff --git a/jetty-server/src/main/config/etc/jetty-file-session-store.xml b/jetty-server/src/main/config/etc/sessions/file-session-store.xml similarity index 100% rename from jetty-server/src/main/config/etc/jetty-file-session-store.xml rename to jetty-server/src/main/config/etc/sessions/file-session-store.xml diff --git a/jetty-server/src/main/config/etc/jetty-default-session-cache.xml b/jetty-server/src/main/config/etc/sessions/hash-session-cache.xml similarity index 100% rename from jetty-server/src/main/config/etc/jetty-default-session-cache.xml rename to jetty-server/src/main/config/etc/sessions/hash-session-cache.xml diff --git a/jetty-server/src/main/config/etc/jetty-jdbc-session-store.xml b/jetty-server/src/main/config/etc/sessions/jdbc-session-store.xml similarity index 100% rename from jetty-server/src/main/config/etc/jetty-jdbc-session-store.xml rename to jetty-server/src/main/config/etc/sessions/jdbc-session-store.xml diff --git a/jetty-server/src/main/config/etc/jetty-jdbc-session-store-datasource.xml b/jetty-server/src/main/config/etc/sessions/jdbc/session-store-datasource.xml similarity index 100% rename from jetty-server/src/main/config/etc/jetty-jdbc-session-store-datasource.xml rename to jetty-server/src/main/config/etc/sessions/jdbc/session-store-datasource.xml diff --git a/jetty-server/src/main/config/etc/jetty-jdbc-session-store-driver.xml b/jetty-server/src/main/config/etc/sessions/jdbc/session-store-driver.xml similarity index 100% rename from jetty-server/src/main/config/etc/jetty-jdbc-session-store-driver.xml rename to jetty-server/src/main/config/etc/sessions/jdbc/session-store-driver.xml diff --git a/jetty-server/src/main/config/etc/jetty-sessions.xml b/jetty-server/src/main/config/etc/sessions/session-id-manager.xml similarity index 100% rename from jetty-server/src/main/config/etc/jetty-sessions.xml rename to jetty-server/src/main/config/etc/sessions/session-id-manager.xml diff --git a/jetty-server/src/main/config/modules/default-session-cache.mod b/jetty-server/src/main/config/modules/default-session-cache.mod deleted file mode 100644 index 22dcd4b64a7..00000000000 --- a/jetty-server/src/main/config/modules/default-session-cache.mod +++ /dev/null @@ -1,16 +0,0 @@ -[description] -Always in memory session objects. - - -[name] -default-session-cache - - - -[xml] -etc/jetty-default-session-cache.xml - - -[ini-template] -#jetty.session.idlePassivationTimeout.seconds=0 -#jetty.session.passivateOnComplete=false \ No newline at end of file diff --git a/jetty-server/src/main/config/modules/file-session-store.mod b/jetty-server/src/main/config/modules/file-session-store.mod index cec6ce0d3a0..873a22df715 100644 --- a/jetty-server/src/main/config/modules/file-session-store.mod +++ b/jetty-server/src/main/config/modules/file-session-store.mod @@ -1,21 +1,16 @@ [description] -Enables session storage in files. - - -[name] -file-session-store +Enables session persistent storage in files. +[provides] +session-store +[depends] +sessions [xml] -etc/jetty-file-session-store.xml - - -[depend] -sessions +etc/sessions/file-session-store.xml [ini-template] #jetty.session.storeDir= #jetty.session.deleteUnrestorableFiles=false - diff --git a/jetty-server/src/main/config/modules/hash-session-cache.mod b/jetty-server/src/main/config/modules/hash-session-cache.mod new file mode 100644 index 00000000000..2c2b178dc61 --- /dev/null +++ b/jetty-server/src/main/config/modules/hash-session-cache.mod @@ -0,0 +1,18 @@ +[description] +Enable first level session cache in ConcurrentHashMap. +If not enabled, sessions will use a HashSessionCache by default, so enabling +via this module is only needed if the configuration properties need to be +changed. + +[provides] +session-cache + +[depends] +sessions + +[xml] +etc/sessions/hash-session-cache.xml + +[ini-template] +#jetty.session.idlePassivationTimeout.seconds=0 +#jetty.session.passivateOnComplete=false diff --git a/jetty-server/src/main/config/modules/jdbc-session-store.mod b/jetty-server/src/main/config/modules/jdbc-session-store.mod index b0acc672d7d..ed7d078beee 100644 --- a/jetty-server/src/main/config/modules/jdbc-session-store.mod +++ b/jetty-server/src/main/config/modules/jdbc-session-store.mod @@ -1,27 +1,20 @@ [description] -Enables JDBC session storage. - - -[name] -jdbc-session-store - - - -[xml] -etc/jetty-jdbc-session-store.xml +Enables JDBC peristent/distributed session storage. +[provides] +session-store [depend] sessions sessions/jdbc/${db-connection-type} - +[xml] +etc/sessions/jdbc-session-store.xml [ini] db-connection-type=datasource - - +[ini-template] ## ##JDBC Session properties ## @@ -47,7 +40,7 @@ db-connection-type=datasource #jetty.sessionTableSchema.expiryTimeColumn=expiryTime #jetty.sessionTableSchema.lastAccessTimeColumn=lastAccessTime #jetty.sessionTableSchema.lastSavedTimeColumn=lastSavedTime -#jetty.sessionTableSchema.idColumn="sessionId +#jetty.sessionTableSchema.idColumn=sessionId #jetty.sessionTableSchema.lastNodeColumn=lastNode #jetty.sessionTableSchema.virtualHostColumn=virtualHost #jetty.sessionTableSchema.maxIntervalColumn=maxInterval diff --git a/jetty-server/src/main/config/modules/session-cache.mod b/jetty-server/src/main/config/modules/session-cache.mod new file mode 100644 index 00000000000..b12e763940a --- /dev/null +++ b/jetty-server/src/main/config/modules/session-cache.mod @@ -0,0 +1,11 @@ +[description] +The default session cache. This module is typically never +explictly enabled and is only used transitively when no other +session cache module is enabled. It does not configure anything +and defers the default behaviour to the SessionHandler + +[provides] +session-cache + +[depends] +sessions diff --git a/jetty-server/src/main/config/modules/session-store.mod b/jetty-server/src/main/config/modules/session-store.mod new file mode 100644 index 00000000000..c56bf8ad553 --- /dev/null +++ b/jetty-server/src/main/config/modules/session-store.mod @@ -0,0 +1,12 @@ +[description] +The default session store. This module is typically never +explictly enabled and is only used transitively when no other +session store module is enabled. It does not configure anything +and defers the default behaviour to the SessionHandler + +[provides] +session-store + +[depends] +sessions + diff --git a/jetty-server/src/main/config/modules/sessions.mod b/jetty-server/src/main/config/modules/sessions.mod index 8ec1997ce76..632d9cf1741 100644 --- a/jetty-server/src/main/config/modules/sessions.mod +++ b/jetty-server/src/main/config/modules/sessions.mod @@ -1,18 +1,17 @@ [description] -Enables session id management and scavenging. - - -[name] -sessions - +The session management. By enabling this module, it allows +session management to be configured via the ini templates +created or by enabling other session-cache or session-store +modules. Without this module enabled, the server may still +use sessions, but their management cannot be configured. +[depends] +server [xml] -etc/jetty-sessions.xml - +etc/sessions/session-id-manager.xml [ini-template] - ## The name to uniquely identify this server instance #jetty.sessionIdManager.workerName=node1 diff --git a/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod b/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod index b9a831c405b..9e884e795fe 100644 --- a/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod +++ b/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod @@ -1,9 +1,5 @@ [description] JDBC Datasource connections for session storage -[name] -datasource - - [xml] -etc/jetty-jdbc-session-store-datasource.xml +etc/sessions/jdbc/session-store-datasource.xml diff --git a/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod b/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod index e66fae41fb8..f8e8efe089a 100644 --- a/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod +++ b/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod @@ -1,9 +1,5 @@ [description] JDBC Driver connections for session storage -[name] -driver - - [xml] -etc/jetty-jdbc-session-store-driver.xml +etc/sessions/jdbc/session-store-driver.xml diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod index 2d414268583..1fbab5c6a63 100644 --- a/jetty-server/src/main/config/modules/ssl.mod +++ b/jetty-server/src/main/config/modules/ssl.mod @@ -3,9 +3,6 @@ Enables a TLS(SSL) Connector on the server. This may be used for HTTPS and/or HTTP2 by enabling the associated support modules. -[name] -ssl - [depend] server diff --git a/jetty-spring/src/main/config/modules/spring.mod b/jetty-spring/src/main/config/modules/spring.mod index f6419b791b3..cd52a5dd70e 100644 --- a/jetty-spring/src/main/config/modules/spring.mod +++ b/jetty-spring/src/main/config/modules/spring.mod @@ -2,9 +2,6 @@ Enable spring configuration processing so all jetty style xml files can optionally be written as spring beans -[name] -spring - [depend] server