OF-1210 Correct the cache behaviour for Hazelcast backed caches (#661)

* Ensure that the default cache behaviour for Hazelcast backed caches is
correct.
Also, correct minor error when setting the maxLifetime of a ClusteredCache

* Bump the version number, update the changelog

* Correct the changelog to reference the OF JIRA

* Update plugin.xml

US style dates :(

src/plugins/hazelcast/changelog.html

@@ -44,10 +44,15 @@
 Hazelcast Clustering Plugin Changelog
 </h1>
 
+<p><b>2.2.1</b> -- November 4, 2016</p>
+<ul>
+     <li>[<a href='http://www.igniterealtime.org/issues/browse/OF-1210'>OF-1210</a>] - correct time-to-live-seconds and MaxLifetime settings for hazelcast</li>
+</ul>
+
 <p><b>2.2.0</b> -- October 12, 2015</p>
 <ul>
     <li>[<a href='http://www.igniterealtime.org/issues/browse/OF-953'>OF-953</a>] - Updated JSP libraries.</li>
-    <li>Requires Openfire 3.11.0.</li>
+    <li>Requires Openfire 4.0.0</li>
 </ul>
 
 <p><b>2.1.2</b> -- September 16, 2015</p>

src/plugins/hazelcast/classes/hazelcast-cache-config.xml

@@ -420,6 +420,7 @@
         <read-backup-data>true</read-backup-data>
         <max-size policy="PER_NODE">100000</max-size>
         <max-idle-seconds>3600</max-idle-seconds>
+        <time-to-live-seconds>900</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     <map name="Group">
@@ -427,6 +428,7 @@
         <read-backup-data>true</read-backup-data>
         <max-size policy="PER_NODE">100000</max-size>
         <max-idle-seconds>3600</max-idle-seconds>
+        <time-to-live-seconds>900</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     <map name="Roster">
@@ -434,6 +436,7 @@
         <read-backup-data>true</read-backup-data>
         <max-size policy="PER_NODE">100000</max-size>
         <max-idle-seconds>3600</max-idle-seconds>
+        <time-to-live-seconds>21600</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     <map name="User">
@@ -441,6 +444,7 @@
         <read-backup-data>true</read-backup-data>
         <max-size policy="PER_NODE">100000</max-size>
         <max-idle-seconds>3600</max-idle-seconds>
+        <time-to-live-seconds>1800</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     

src/plugins/hazelcast/plugin.xml

@@ -5,7 +5,7 @@
     <name>${plugin.name}</name>
     <description>${plugin.description}</description>
     <author>Tom Evans</author>
-    <version>2.2.0</version>
-    <date>10/12/2015</date>
+    <version>2.2.1</version>
+    <date>11/04/2016</date>
     <minServerVersion>4.0.0</minServerVersion>
 </plugin>

src/plugins/hazelcast/src/java/org/jivesoftware/openfire/plugin/util/cache/ClusteredCache.java

@@ -160,7 +160,7 @@ public class ClusteredCache implements Cache {
     }
 
     public void setMaxLifetime(long maxLifetime) {
-    	CacheFactory.setMaxSizeProperty(getName(), maxLifetime);
+    	CacheFactory.setMaxLifetimeProperty(getName(), maxLifetime);
     }
 
     public void destroy() {