Issue #6329 Remove defaults from session-store-gcloud.xml

jetty · Jun 9, 2021 · 3ff27cc · 3ff27cc
1 parent ffffa5a
commit 3ff27cc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 39 deletions.
diff --git a/...tty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml b/...tty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml
@@ -17,45 +17,19 @@
        <Set name="namespace" property="jetty.session.gcloud.namespace"/>  
        <Set name="entityDataModel">
           <New class="org.eclipse.jetty.gcloud.session.GCloudSessionDataStore$EntityDataModel">
-              <Set name="kind">
-                <Property name="jetty.session.gcloud.model.kind" default="GCloudSession" />
-              </Set>
-              <Set name="id">
-                <Property name="jetty.session.gcloud.model.id" default="id" />
-              </Set>
-             <Set name="contextPath">
-                <Property name="jetty.session.gcloud.model.contextPath" default="contextPath" />
-              </Set>
-              <Set name="vhost">
-                <Property name="jetty.session.gcloud.model.vhost" default="vhost" />
-              </Set>
-              <Set name="accessed">
-                <Property name="jetty.session.gcloud.model.accessed" default="accessed" />
-              </Set>
-              <Set name="lastAccessed">
-                <Property name="jetty.session.gcloud.model.lastAccessed" default="lastAccessed" />
-              </Set>
-              <Set name="createTime">
-                <Property name="jetty.session.gcloud.model.createTime" default="createTime" />
-              </Set>
-              <Set name="cookieSetTime">
-                <Property name="jetty.session.gcloud.model.cookieSetTime" default="cookieSetTime" />
-              </Set>
-              <Set name="lastNode">
-                <Property name="jetty.session.gcloud.model.lastNode" default="lastNode" />
-              </Set>
-              <Set name="lastSaved">
-                <Property name="jetty.session.gcloud.model.lastSaved" default="lastSaved" />
-              </Set>
-              <Set name="expiry">
-                <Property name="jetty.session.gcloud.model.expiry" default="expiry" />
-              </Set>
-              <Set name="maxInactive">
-                <Property name="jetty.session.gcloud.model.maxInactive" default="maxInactive" />
-              </Set>
-              <Set name="attributes">
-                <Property name="jetty.session.gcloud.model.attributes" default="attributes" />
-              </Set>
+              <Set name="kind" property="jetty.session.gcloud.model.kind"/>
+              <Set name="id" property="jetty.session.gcloud.model.id"/>
+              <Set name="contextPath" property="jetty.session.gcloud.model.contextPath"/>
+              <Set name="vhost" property="jetty.session.gcloud.model.vhost"/>
+              <Set name="accessed" property="jetty.session.gcloud.model.accessed"/>
+              <Set name="lastAccessed" property="jetty.session.gcloud.model.lastAccessed"/>
+              <Set name="createTime" property="jetty.session.gcloud.model.createTime"/>
+              <Set name="cookieSetTime" property="jetty.session.gcloud.model.cookieSetTime"/>
+              <Set name="lastNode" property="jetty.session.gcloud.model.lastNode"/>
+              <Set name="lastSaved" property="jetty.session.gcloud.model.lastSaved"/>
+              <Set name="expiry" property="jetty.session.gcloud.model.expiry"/>
+              <Set name="maxInactive" property="jetty.session.gcloud.model.maxInactive"/>
+              <Set name="attributes" property="jetty.session.gcloud.model.attributes"/>
           </New>
        </Set>
     </New>

diff --git a/...ud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod b/...ud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod
@@ -42,6 +42,7 @@ etc/sessions/gcloud/session-store.xml
 #jetty.session.gcloud.model.createTime=createTime
 #jetty.session.gcloud.model.cookieSetTime=cookieSetTime
 #jetty.session.gcloud.model.lastNode=lastNode
+#jetty.session.gcloud.model.lastSaved=lastSaved
 #jetty.session.gcloud.model.expiry=expiry
 #jetty.session.gcloud.model.maxInactive=maxInactive
 #jetty.session.gcloud.model.attributes=attributes