From e87557e5270a4b67f25ec1f6c4317c78b270eb8b Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Thu, 18 Aug 2016 11:18:20 +1000 Subject: [PATCH] Move index.yaml for gcloud datastore sessions to jetty.base/etc --- .../src/main/config/modules/session-store-gcloud.mod | 5 +++-- .../src/main/config/modules/sessions/gcloud/embedded.mod | 5 ----- .../src/main/config/modules/sessions/gcloud/local.mod | 5 ----- .../src/main/config/modules/sessions/gcloud/remote.mod | 6 ------ 4 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/embedded.mod delete mode 100644 jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/local.mod delete mode 100644 jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/remote.mod diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/session-store-gcloud.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/session-store-gcloud.mod index f9f9b443018..418d0cd92bc 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/session-store-gcloud.mod +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/session-store-gcloud.mod @@ -12,6 +12,7 @@ jcl-api jcl-impl [files] +basehome:etc/sessions/gcloud/index.yaml|etc/index.yaml maven://com.google.cloud/gcloud-java-datastore/0.2.3|lib/gcloud/gcloud-java-datastore-0.2.3.jar maven://com.google.cloud/gcloud-java-core/0.2.3|lib/gcloud/gcloud-java-core-0.2.3.jar maven://com.google.auth/google-auth-library-credentials/0.3.1|lib/gcloud/google-auth-library-credentials-0.3.1.jar @@ -61,6 +62,6 @@ http://www.apache.org/licenses/LICENSE-2.0.html [ini-template] ## GCloudDatastore Session config -#jetty.gcloudSession.maxRetries= -#jetty.gcloudSession.backoffMs= +#jetty.gcloudSession.maxRetries=5 +#jetty.gcloudSession.backoffMs=1000 diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/embedded.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/embedded.mod deleted file mode 100644 index 878e8e77d52..00000000000 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/embedded.mod +++ /dev/null @@ -1,5 +0,0 @@ -[description] -Enables session storage when running inside the cloud. - -[xml] -etc/sessions/gcloud/embedded.xml diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/local.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/local.mod deleted file mode 100644 index a2f6e855c0b..00000000000 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/local.mod +++ /dev/null @@ -1,5 +0,0 @@ -[description] -Enables session storage on a local GCloudDataStore dev server. - -[xml] -etc/sessions/gcloud/local.xml diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/remote.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/remote.mod deleted file mode 100644 index d39d12c1ce9..00000000000 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/remote.mod +++ /dev/null @@ -1,6 +0,0 @@ -[description] -Enables session storage on a remote GCloudDataStore service. - -[xml] -etc/sessions/gcloud/remote.xml -