From 42dac144eefa4991b95b3c100eff272c0dc2aaaf Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Sat, 30 Apr 2016 11:26:28 +1000 Subject: [PATCH] Improved session configuration naming --- .../{jetty-gcloud-embedded.xml => embedded.xml} | 0 .../gcloud/{jetty-gcloud-local.xml => local.xml} | 0 .../gcloud/{jetty-gcloud-remote.xml => remote.xml} | 0 .../session-store.xml} | 0 .../gcloud/{gcloud-embedded.mod => embedded.mod} | 2 +- .../sessions/gcloud/{gcloud-local.mod => local.mod} | 2 +- .../gcloud/{gcloud-remote.mod => remote.mod} | 2 +- ...ud-session-store.mod => session-store-gcloud.mod} | 5 ++++- .../infinispan/{default-store.xml => default.xml} | 0 .../infinispan/{remote-store.xml => remote.xml} | 0 ...ession-store.mod => session-store-infinispan.mod} | 2 +- .../{infinispan-session-default.mod => default.mod} | 2 +- .../{infinispan-session-remote.mod => remote.mod} | 2 +- .../{mongo-session-store.xml => session-store.xml} | 0 ...ngo-session-store.mod => session-store-mongo.mod} | 2 +- .../session-store.xml} | 0 .../{session-id-manager.xml => id-manager.xml} | 0 .../{session-store-datasource.xml => datasource.xml} | 0 .../jdbc/{session-store-driver.xml => driver.xml} | 0 .../session-store.xml} | 0 ...hash-session-cache.mod => session-cache-hash.mod} | 0 .../src/main/config/modules/session-cache.mod | 11 ----------- ...file-session-store.mod => session-store-file.mod} | 2 +- ...jdbc-session-store.mod => session-store-jdbc.mod} | 10 +++++----- .../src/main/config/modules/session-store.mod | 12 ------------ jetty-server/src/main/config/modules/sessions.mod | 2 +- .../main/config/modules/sessions/jdbc/datasource.mod | 2 +- .../src/main/config/modules/sessions/jdbc/driver.mod | 2 +- 28 files changed, 20 insertions(+), 40 deletions(-) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/{jetty-gcloud-embedded.xml => embedded.xml} (100%) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/{jetty-gcloud-local.xml => local.xml} (100%) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/{jetty-gcloud-remote.xml => remote.xml} (100%) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/{gcloud-session-store.xml => gcloud/session-store.xml} (100%) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/{gcloud-embedded.mod => embedded.mod} (65%) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/{gcloud-local.mod => local.mod} (69%) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/{gcloud-remote.mod => remote.mod} (68%) rename jetty-gcloud/jetty-gcloud-session-manager/src/main/config/{modules/gcloud-session-store.mod => session-store-gcloud.mod} (98%) rename jetty-infinispan/src/main/config/etc/sessions/infinispan/{default-store.xml => default.xml} (100%) rename jetty-infinispan/src/main/config/etc/sessions/infinispan/{remote-store.xml => remote.xml} (100%) rename jetty-infinispan/src/main/config/modules/{infinispan-session-store.mod => session-store-infinispan.mod} (95%) rename jetty-infinispan/src/main/config/modules/sessions/infinispan/{infinispan-session-default.mod => default.mod} (63%) rename jetty-infinispan/src/main/config/modules/sessions/infinispan/{infinispan-session-remote.mod => remote.mod} (87%) rename jetty-nosql/src/main/config/etc/sessions/mongo/{mongo-session-store.xml => session-store.xml} (100%) rename jetty-nosql/src/main/config/modules/{mongo-session-store.mod => session-store-mongo.mod} (93%) rename jetty-server/src/main/config/etc/sessions/{file-session-store.xml => file/session-store.xml} (100%) rename jetty-server/src/main/config/etc/sessions/{session-id-manager.xml => id-manager.xml} (100%) rename jetty-server/src/main/config/etc/sessions/jdbc/{session-store-datasource.xml => datasource.xml} (100%) rename jetty-server/src/main/config/etc/sessions/jdbc/{session-store-driver.xml => driver.xml} (100%) rename jetty-server/src/main/config/etc/sessions/{jdbc-session-store.xml => jdbc/session-store.xml} (100%) rename jetty-server/src/main/config/modules/{hash-session-cache.mod => session-cache-hash.mod} (100%) delete mode 100644 jetty-server/src/main/config/modules/session-cache.mod rename jetty-server/src/main/config/modules/{file-session-store.mod => session-store-file.mod} (86%) rename jetty-server/src/main/config/modules/{jdbc-session-store.mod => session-store-jdbc.mod} (94%) delete mode 100644 jetty-server/src/main/config/modules/session-store.mod diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/jetty-gcloud-embedded.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/embedded.xml similarity index 100% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/jetty-gcloud-embedded.xml rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/embedded.xml diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/jetty-gcloud-local.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/local.xml similarity index 100% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/jetty-gcloud-local.xml rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/local.xml diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/jetty-gcloud-remote.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/remote.xml similarity index 100% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/jetty-gcloud-remote.xml rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/gcloud/remote.xml diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/sessions/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/sessions/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/modules/sessions/gcloud/gcloud-embedded.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/embedded.mod similarity index 65% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-embedded.mod rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/embedded.mod index 2d551d86596..878e8e77d52 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-embedded.mod +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/embedded.mod @@ -2,4 +2,4 @@ Enables session storage when running inside the cloud. [xml] -etc/sessions/gcloud/gcloud-embedded.xml +etc/sessions/gcloud/embedded.xml diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-local.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/local.mod similarity index 69% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-local.mod rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/local.mod index 81a3c3781a1..a2f6e855c0b 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-local.mod +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/local.mod @@ -2,4 +2,4 @@ Enables session storage on a local GCloudDataStore dev server. [xml] -etc/sessions/gcloud/gcloud-local.xml +etc/sessions/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/remote.mod similarity index 68% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/gcloud-remote.mod rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/remote.mod index 0e94b825a6a..d39d12c1ce9 100644 --- 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/remote.mod @@ -2,5 +2,5 @@ Enables session storage on a remote GCloudDataStore service. [xml] -etc/sessions/gcloud/gcloud-remote.xml +etc/sessions/gcloud/remote.xml 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/session-store-gcloud.mod similarity index 98% rename from jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-session-store.mod rename to jetty-gcloud/jetty-gcloud-session-manager/src/main/config/session-store-gcloud.mod index a3dfd7dbbca..62f89e08a7a 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/session-store-gcloud.mod @@ -8,7 +8,7 @@ session-store annotations webapp sessions -sessions/gcloud/gcloud-${type} +sessions/gcloud/${type} [files] maven://com.google.gcloud/gcloud-java-datastore/0.0.7|lib/gcloud/gcloud-java-datastore-0.0.7.jar @@ -47,6 +47,9 @@ 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 +[xml] +sessions/gcloud/session-store.xml + [license] GCloudDatastore is an open source project hosted on Github and released under the Apache 2.0 license. https://github.com/GoogleCloudPlatform/gcloud-java diff --git a/jetty-infinispan/src/main/config/etc/sessions/infinispan/default-store.xml b/jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml similarity index 100% rename from jetty-infinispan/src/main/config/etc/sessions/infinispan/default-store.xml rename to jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml diff --git a/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote-store.xml b/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote.xml similarity index 100% rename from jetty-infinispan/src/main/config/etc/sessions/infinispan/remote-store.xml rename to jetty-infinispan/src/main/config/etc/sessions/infinispan/remote.xml diff --git a/jetty-infinispan/src/main/config/modules/infinispan-session-store.mod b/jetty-infinispan/src/main/config/modules/session-store-infinispan.mod similarity index 95% rename from jetty-infinispan/src/main/config/modules/infinispan-session-store.mod rename to jetty-infinispan/src/main/config/modules/session-store-infinispan.mod index 89eb99daeda..f666b2a1d64 100644 --- a/jetty-infinispan/src/main/config/modules/infinispan-session-store.mod +++ b/jetty-infinispan/src/main/config/modules/session-store-infinispan.mod @@ -6,7 +6,7 @@ session-store [depend] session -sessions/infinispan/infinispan-session-${cache-type} +sessions/infinispan/${cache-type} [files] maven://org.infinispan/infinispan-core/7.1.1.Final|lib/infinispan/infinispan-core-7.1.1.Final.jar diff --git a/jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-default.mod b/jetty-infinispan/src/main/config/modules/sessions/infinispan/default.mod similarity index 63% rename from jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-default.mod rename to jetty-infinispan/src/main/config/modules/sessions/infinispan/default.mod index f15609e61ab..f1906db6c96 100644 --- a/jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-default.mod +++ b/jetty-infinispan/src/main/config/modules/sessions/infinispan/default.mod @@ -2,5 +2,5 @@ Enable use of DefaultCache for session data storage [xml] -etc/sessions/infinispan/default-store.xml +etc/sessions/infinispan/default.xml diff --git a/jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-remote.mod b/jetty-infinispan/src/main/config/modules/sessions/infinispan/remote.mod similarity index 87% rename from jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-remote.mod rename to jetty-infinispan/src/main/config/modules/sessions/infinispan/remote.mod index 78ca6e7c412..f0a2b524805 100644 --- a/jetty-infinispan/src/main/config/modules/sessions/infinispan/infinispan-session-remote.mod +++ b/jetty-infinispan/src/main/config/modules/sessions/infinispan/remote.mod @@ -5,5 +5,5 @@ Enable use of HotRod remote cache for session data storage 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/sessions/infinispan/remote-store.xml +etc/sessions/infinispan/remote.xml diff --git a/jetty-nosql/src/main/config/etc/sessions/mongo/mongo-session-store.xml b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store.xml similarity index 100% rename from jetty-nosql/src/main/config/etc/sessions/mongo/mongo-session-store.xml rename to jetty-nosql/src/main/config/etc/sessions/mongo/session-store.xml diff --git a/jetty-nosql/src/main/config/modules/mongo-session-store.mod b/jetty-nosql/src/main/config/modules/session-store-mongo.mod similarity index 93% rename from jetty-nosql/src/main/config/modules/mongo-session-store.mod rename to jetty-nosql/src/main/config/modules/session-store-mongo.mod index f6ec90ebc63..493aad48f2e 100644 --- a/jetty-nosql/src/main/config/modules/mongo-session-store.mod +++ b/jetty-nosql/src/main/config/modules/session-store-mongo.mod @@ -20,7 +20,7 @@ http://www.mongodb.org/ http://www.apache.org/licenses/LICENSE-2.0.html [xml] -etc/sessions/mongo/mongo-session-store.xml +etc/sessions/mongo/session-store.xml [ini-template] #jetty.session.dbName=HttpSessions diff --git a/jetty-server/src/main/config/etc/sessions/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/sessions/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/sessions/session-id-manager.xml b/jetty-server/src/main/config/etc/sessions/id-manager.xml similarity index 100% rename from jetty-server/src/main/config/etc/sessions/session-id-manager.xml rename to jetty-server/src/main/config/etc/sessions/id-manager.xml diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/session-store-datasource.xml b/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml similarity index 100% rename from jetty-server/src/main/config/etc/sessions/jdbc/session-store-datasource.xml rename to jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/session-store-driver.xml b/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml similarity index 100% rename from jetty-server/src/main/config/etc/sessions/jdbc/session-store-driver.xml rename to jetty-server/src/main/config/etc/sessions/jdbc/driver.xml diff --git a/jetty-server/src/main/config/etc/sessions/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/sessions/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/modules/hash-session-cache.mod b/jetty-server/src/main/config/modules/session-cache-hash.mod similarity index 100% rename from jetty-server/src/main/config/modules/hash-session-cache.mod rename to jetty-server/src/main/config/modules/session-cache-hash.mod diff --git a/jetty-server/src/main/config/modules/session-cache.mod b/jetty-server/src/main/config/modules/session-cache.mod deleted file mode 100644 index b12e763940a..00000000000 --- a/jetty-server/src/main/config/modules/session-cache.mod +++ /dev/null @@ -1,11 +0,0 @@ -[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/file-session-store.mod b/jetty-server/src/main/config/modules/session-store-file.mod similarity index 86% rename from jetty-server/src/main/config/modules/file-session-store.mod rename to jetty-server/src/main/config/modules/session-store-file.mod index b2d143f96e5..61ab04fd82d 100644 --- a/jetty-server/src/main/config/modules/file-session-store.mod +++ b/jetty-server/src/main/config/modules/session-store-file.mod @@ -8,7 +8,7 @@ session-store sessions [xml] -etc/sessions/file-session-store.xml +etc/sessions/file/session-store.xml [files] sessions/ diff --git a/jetty-server/src/main/config/modules/jdbc-session-store.mod b/jetty-server/src/main/config/modules/session-store-jdbc.mod similarity index 94% rename from jetty-server/src/main/config/modules/jdbc-session-store.mod rename to jetty-server/src/main/config/modules/session-store-jdbc.mod index ed7d078beee..1ad0ceca689 100644 --- a/jetty-server/src/main/config/modules/jdbc-session-store.mod +++ b/jetty-server/src/main/config/modules/session-store-jdbc.mod @@ -9,7 +9,7 @@ sessions sessions/jdbc/${db-connection-type} [xml] -etc/sessions/jdbc-session-store.xml +etc/sessions/jdbc/session-store.xml [ini] db-connection-type=datasource @@ -23,15 +23,15 @@ db-connection-type=datasource #jetty.session.deleteUnloadables=false #jetty.session.loadAttempts=-1 +## Connection type:Datasource +db-connection-type=datasource +#jetty.session.datasourceName=/jdbc/sessions + ## Connection type:driver #db-connection-type=driver #jetty.session.driverClass= #jetty.session.driverUrl= -## Connection type:Datasource -#db-connection-type=datasource -#jetty.session.datasourceName=/jdbc/sessions - ## Session table schema #jetty.sessionTableSchema.accessTimeColumn=accessTime #jetty.sessionTableSchema.contextPathColumn=contextPath diff --git a/jetty-server/src/main/config/modules/session-store.mod b/jetty-server/src/main/config/modules/session-store.mod deleted file mode 100644 index c56bf8ad553..00000000000 --- a/jetty-server/src/main/config/modules/session-store.mod +++ /dev/null @@ -1,12 +0,0 @@ -[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 632d9cf1741..2b9a69285cf 100644 --- a/jetty-server/src/main/config/modules/sessions.mod +++ b/jetty-server/src/main/config/modules/sessions.mod @@ -9,7 +9,7 @@ use sessions, but their management cannot be configured. server [xml] -etc/sessions/session-id-manager.xml +etc/sessions/id-manager.xml [ini-template] ## The name to uniquely identify this server instance 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 9e884e795fe..c4d003b0469 100644 --- a/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod +++ b/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod @@ -2,4 +2,4 @@ JDBC Datasource connections for session storage [xml] -etc/sessions/jdbc/session-store-datasource.xml +etc/sessions/jdbc/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 f8e8efe089a..efd084a668b 100644 --- a/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod +++ b/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod @@ -2,4 +2,4 @@ JDBC Driver connections for session storage [xml] -etc/sessions/jdbc/session-store-driver.xml +etc/sessions/jdbc/driver.xml