From 9ebdd7a28514b634e29f8b26eada2fb56e4fb3ab Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Wed, 14 Sep 2016 17:07:56 +1000
Subject: [PATCH] Issue #914

Regularize infinispan session store property names.
---
 .../src/main/config/etc/sessions/infinispan/default.xml       | 2 +-
 .../src/main/config/etc/sessions/infinispan/remote.xml        | 4 ++--
 .../main/config/modules/session-store-infinispan-remote.mod   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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 3bcc7940bad..20b844dd47a 100644
--- a/jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml
+++ b/jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml
@@ -20,7 +20,7 @@
    <Arg>
     <New id="sessionDataStoreFactory" class="org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory">
        <Set name="cache"><Ref id="cache"/></Set>
-       <Set name="infinispanIdleTimeoutSec"><Property name="jetty.session.infinispanIdleTimeout.seconds" default="0" /></Set>
+       <Set name="infinispanIdleTimeoutSec"><Property name="jetty.session.infinispan.idleTimeout.seconds" default="0" /></Set>
        <Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
     </New>
    </Arg>
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 6a533945817..f91df1d4b37 100644
--- a/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote.xml
+++ b/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote.xml
@@ -10,7 +10,7 @@
   <!-- ===================================================================== -->
   <New id="hotrodMgr" class="org.infinispan.client.hotrod.RemoteCacheManager">
     <Call id="remoteCache" name="getCache">
-      <Arg><Property name="jetty.session.remoteInfinispanCache.name" default="sessions"/></Arg>
+      <Arg><Property name="jetty.session.infinispan.remoteCacheName" default="sessions"/></Arg>
     </Call>
   </New>
   
@@ -22,7 +22,7 @@
    <Arg>
     <New id="sessionDataStoreFactory" class="org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory">
        <Set name="cache"><Ref id="remoteCache"/></Set>
-       <Set name="infinispanIdleTimeoutSec"><Property name="jetty.session.infinispanIdleTimeout.seconds" default="0" /></Set>
+       <Set name="infinispanIdleTimeoutSec"><Property name="jetty.session.infinispan.idleTimeout.seconds" default="0" /></Set>
        <Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
     </New>
    </Arg>
diff --git a/jetty-infinispan/src/main/config/modules/session-store-infinispan-remote.mod b/jetty-infinispan/src/main/config/modules/session-store-infinispan-remote.mod
index 12ff46de108..f9c398a5b1e 100644
--- a/jetty-infinispan/src/main/config/modules/session-store-infinispan-remote.mod
+++ b/jetty-infinispan/src/main/config/modules/session-store-infinispan-remote.mod
@@ -22,6 +22,6 @@ http://www.apache.org/licenses/LICENSE-2.0.html
 
 
 [ini-template]
-#jetty.session.remoteInfinispanCache.name=sessions
-#jetty.session.infinispanIdleTimeout.seconds=0
+#jetty.session.infinispan.remoteCacheName=sessions
+#jetty.session.infinispan.idleTimeout.seconds=0
 #jetty.session.gracePeriod.seconds=3600