From d52a1701ad0f09bc9c25e87f1033652691ddfb68 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Wed, 8 Jun 2016 15:00:32 +1000
Subject: [PATCH] Add module for session data cache

---
 jetty-distribution/pom.xml                    |  5 ++++
 .../etc/sessions/gcloud/session-store.xml     |  2 +-
 .../etc/sessions/infinispan/default.xml       |  2 +-
 .../config/etc/sessions/infinispan/remote.xml |  2 +-
 .../jetty-memcached-sessions/pom.xml          |  1 +
 .../session-data-cache/xmemcached.xml         | 10 ++++++++
 .../session-data-cache/xmemcached.mod         | 22 +++++++++++++++++
 .../MemcachedSessionDataMapFactory.java       |  4 ++--
 .../etc/sessions/mongo/session-store.xml      |  2 +-
 .../etc/sessions/file/session-store.xml       |  2 +-
 .../etc/sessions/jdbc/session-store.xml       |  2 +-
 .../session-caching-store.xml                 | 24 +++++++++++++++++++
 .../config/modules/session-store-cache.mod    | 24 +++++++++++++++++++
 13 files changed, 94 insertions(+), 8 deletions(-)
 create mode 100644 jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml
 create mode 100644 jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
 create mode 100644 jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml
 create mode 100644 jetty-server/src/main/config/modules/session-store-cache.mod

diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index f68e7294c9d..73bd7458865 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -793,5 +793,10 @@
       <artifactId>jetty-nosql</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.memcached</groupId>
+      <artifactId>jetty-memcached-sessions</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 </project>
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
index f56510075ce..b36ecda743d 100644
--- 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
@@ -9,7 +9,7 @@
   <!-- ===================================================================== -->
   <Call name="addBean">
    <Arg>
-    <New class="org.eclipse.jetty.gcloud.session.GCloudSessionDataStoreFactory">      
+    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.gcloud.session.GCloudSessionDataStoreFactory">      
        <Set name="gCloudConfiguration"><Ref id="gconf"/></Set>
        <Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
        <Set name="maxRetries"><Property name="jetty.gcloudSession.maxRetries" default="5"/></Set>
diff --git a/jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml b/jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml
index 818248a62b7..755137daeb5 100644
--- a/jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml
+++ b/jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml
@@ -18,7 +18,7 @@
   <!-- ===================================================================== -->
   <Call name="addBean">
    <Arg>
-    <New class="org.eclipse.jetty.server.session.InfinispanSessionStoreFactory">
+    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.server.session.InfinispanSessionStoreFactory">
        <Set name="cache"><Ref id="cache"/></Set>
        <Set name="infinispanIdleTimeoutSec"><Property name="jetty.session.infinispanIdleTimeout.seconds" default="0" /></Set>
        <Set name="gracePeriod"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
diff --git a/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote.xml b/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote.xml
index 309c61c0d32..0f55ad09ab1 100644
--- a/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote.xml
+++ b/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote.xml
@@ -20,7 +20,7 @@
   <!-- ===================================================================== -->
   <Call name="addBean">
    <Arg>
-    <New class="org.eclipse.jetty.server.session.InfinispanSessionStoreFactory">
+    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.server.session.InfinispanSessionStoreFactory">
        <Set name="cache"><Ref id="remoteCache"/></Set>
        <Set name="infinispanIdleTimeoutSec"><Property name="jetty.session.infinispanIdleTimeout.seconds" default="0" /></Set>
        <Set name="gracePeriod"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml
index 6655864b0c2..0f517077c41 100644
--- a/jetty-memcached/jetty-memcached-sessions/pom.xml
+++ b/jetty-memcached/jetty-memcached-sessions/pom.xml
@@ -25,6 +25,7 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
       <version>1.7.9</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml b/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml
new file mode 100644
index 00000000000..2b957f62760
--- /dev/null
+++ b/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+    <New id="sessionDataMapFactory" class="org.eclipse.jetty.memcached.session.MemcachedSessionDataMapFactory">
+      <Set name="host"><Property name="jetty.session.memcache.host" default="localhost"/></Set>
+      <Set name="port"><Property name="jetty.session.memcache.port" default="11211"/></Set>
+      <Set name="expirySec"><Property name="etty.session.memcache.expirySec" default="0"/></Set>
+    </New>
+</Configure>
diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod b/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
new file mode 100644
index 00000000000..a4fcc564cab
--- /dev/null
+++ b/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
@@ -0,0 +1,22 @@
+[description]
+Memcache cache for SessionData
+
+[depends]
+session-store
+
+[files]
+maven://com.googlecode.xmemcached/xmemcached/2.0.0|lib/xmemcached/xmemcached-2.0.0.jar
+maven://org.slf4j/slf4j-api/1.6.6|lib/xmemcached/slf4j-api-1.6.6.jar
+
+[lib]
+lib/jetty-memcached-sessions-${jetty.version}.jar
+lib/xmemcached
+
+[license]
+Xmemcached is an open source project hosted on Github and released under the Apache 2.0 license.
+https://github.com/killme2008/xmemcached
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+[xml]
+etc/sessions/session-data-cache/xmemcached.xml
diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/java/org/eclipse/jetty/memcached/session/MemcachedSessionDataMapFactory.java b/jetty-memcached/jetty-memcached-sessions/src/main/java/org/eclipse/jetty/memcached/session/MemcachedSessionDataMapFactory.java
index 7991285b53b..e67bef94516 100644
--- a/jetty-memcached/jetty-memcached-sessions/src/main/java/org/eclipse/jetty/memcached/session/MemcachedSessionDataMapFactory.java
+++ b/jetty-memcached/jetty-memcached-sessions/src/main/java/org/eclipse/jetty/memcached/session/MemcachedSessionDataMapFactory.java
@@ -60,13 +60,13 @@ public class MemcachedSessionDataMapFactory implements SessionDataMapFactory
 
 
 
-    public int getExpiry()
+    public int getExpirySec()
     {
         return _expiry;
     }
 
 
-    public void setExpiry(int expiry)
+    public void setExpirySec(int expiry)
     {
         _expiry = expiry;
     }
diff --git a/jetty-nosql/src/main/config/etc/sessions/mongo/session-store.xml b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store.xml
index c458050b85b..c9176d3a8ca 100644
--- a/jetty-nosql/src/main/config/etc/sessions/mongo/session-store.xml
+++ b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store.xml
@@ -9,7 +9,7 @@
   <!-- ===================================================================== -->
   <Call name="addBean">
    <Arg>
-    <New class="org.eclipse.jetty.server.session.MongoSessionStoreFactory">      
+    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.server.session.MongoSessionStoreFactory">      
        <Set name="dbName"><Property name="jetty.session.dbName" default="HttpSessions" /></Set>
        <Set name="collectionName"><Property name="jetty.session.collectionName" default="jettySessions" /></Set>
        <Set name="gracePeriod"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
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
index e6e3c71b78f..356c9ff1dd3 100644
--- a/jetty-server/src/main/config/etc/sessions/file/session-store.xml
+++ b/jetty-server/src/main/config/etc/sessions/file/session-store.xml
@@ -9,7 +9,7 @@
   <!-- ===================================================================== -->
   <Call name="addBean">
    <Arg>
-    <New class="org.eclipse.jetty.server.session.FileSessionDataStoreFactory">
+    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.server.session.FileSessionDataStoreFactory">
        <Set name="deleteUnrestorableFiles"><Property name="jetty.session.deleteUnrestorableFiles" default="false" /></Set>
        <Set name="storeDir"><Property name="jetty.session.storeDir"/></Set>
     </New>
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
index 9f8f198496c..30fde60af63 100644
--- a/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml
+++ b/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml
@@ -9,7 +9,7 @@
   <!-- ===================================================================== -->
   <Call name="addBean">
    <Arg>
-    <New class="org.eclipse.jetty.server.session.JDBCSessionDataStoreFactory">   
+    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.server.session.JDBCSessionDataStoreFactory">   
       <Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
       <Set name="databaseAdaptor">
         <Ref id="databaseAdaptor"/>
diff --git a/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml b/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml
new file mode 100644
index 00000000000..49561b78766
--- /dev/null
+++ b/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+  <!-- ===================================================================== -->
+  <!-- Configure a factory for CachingSessionDataStores                      -->
+  <!-- ===================================================================== -->
+
+  <Call name="removeBean">
+    <Ref id="sessionDataStoreFactory"/>
+  </Call>
+
+  
+  
+  <Call name="addBean">
+   <Arg>
+    <New class="org.eclipse.jetty.server.session.CachingSessionDataStoreFactory">
+       <Set name="sessionStoreFactory"><Ref id="sessionDataStoreFactory"/></Set>
+       <Set name="sessionDataMapFactory"><Ref id="sessionDataMapFatory"/></Set>
+    </New>
+   </Arg> 
+
+</Configure>
\ No newline at end of file
diff --git a/jetty-server/src/main/config/modules/session-store-cache.mod b/jetty-server/src/main/config/modules/session-store-cache.mod
new file mode 100644
index 00000000000..e9a170b823e
--- /dev/null
+++ b/jetty-server/src/main/config/modules/session-store-cache.mod
@@ -0,0 +1,24 @@
+[description]
+Enables caching of SessionData in front of a SessionDataStore.
+
+
+[depend]
+session-store
+sessions/session-data-cache/${session-data-cache}
+
+
+[xml]
+etc/sessions/session-data-cache/session-caching-store.xml
+
+
+[ini]
+session-data-cache=xmemcached
+
+[ini-template]
+
+## Session Data Cache type: xmemcached
+session-data-cache=xmemcached
+#jetty.session.memcached.host=localhost
+#jetty.session.memcached.port=11211
+#jetty.session.memcached.expirySec=
+