Merge pull request #278 from tevans/hazelcast-3_5_config

Update default HZ config file to match new schema

src/plugins/hazelcast/changelog.html

@@ -44,6 +44,12 @@
 Hazelcast Clustering Plugin Changelog
 </h1>
 
+<p><b>2.1.1</b> -- August 11, 2015</p>
+<p>Bug fix:</p>
+<ul>
+     <li>Updated default Hazelcast config file to match 3.5 schema</li>
+</ul>
+
 <p><b>2.1.0</b> -- August 7, 2015</p>
 <p>Hazelcast update:</p>
 <ul>

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2008-2013, Hazelcast, Inc. All Rights Reserved.
+  ~ Copyright (c) 2008-2015, Hazelcast, Inc. All Rights Reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.4.xsd"
+<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.5.xsd"
            xmlns="http://www.hazelcast.com/schema/config"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <group>
@@ -47,10 +47,30 @@
         </interfaces>
         <ssl enabled="false"/>
         <socket-interceptor enabled="false"/>
-        <symmetric-encryption enabled="false"/>
-        <asymmetric-encryption enabled="false"/>
+        <symmetric-encryption enabled="false">
+            <!--
+               encryption algorithm such as
+               DES/ECB/PKCS5Padding,
+               PBEWithMD5AndDES,
+               AES/CBC/PKCS5Padding,
+               Blowfish,
+               DESede
+            -->
+            <algorithm>PBEWithMD5AndDES</algorithm>
+            <!-- salt value to use when generating the secret key -->
+            <salt>thesalt</salt>
+            <!-- pass phrase to use when generating the secret key -->
+            <password>thepass</password>
+            <!-- iteration count to use when generating the secret key -->
+            <iteration-count>19</iteration-count>
+        </symmetric-encryption>
     </network>
     <partition-group enabled="false"/>
+    <executor-service name="default">
+        <pool-size>16</pool-size>
+        <!--Queue capacity. 0 means Integer.MAX_VALUE.-->
+        <queue-capacity>0</queue-capacity>
+    </executor-service>
     <queue name="default">
         <!--
             Maximum size of the queue. When a JVM's local queue size reaches the maximum,
@@ -73,11 +93,6 @@
         <async-backup-count>0</async-backup-count>
 
         <empty-queue-ttl>-1</empty-queue-ttl>
-        <!--
-            Name of the map configuration that will be used for the backing distributed
-            map for this queue.
-        -->
-        <backing-map-ref>default</backing-map-ref>
     </queue>
     <!--
     	Default Hazelcast cache configuration for Openfire. 
@@ -136,7 +151,7 @@
             Any integer between 0 and Integer.MAX_VALUE. 0 means
             Integer.MAX_VALUE. Default is 0.
         -->
-        <max-size policy="per_partition">100000</max-size>
+        <max-size policy="PER_NODE">100000</max-size>
         <!--
             When max. size is reached, specified percentage of
             the map will be evicted. Any integer between 0 and 100.
@@ -212,6 +227,20 @@
         <async-backup-count>0</async-backup-count>
     </semaphore>
 
+    <reliable-topic name="default">
+        <read-batch-size>10</read-batch-size>
+        <topic-overload-policy>BLOCK</topic-overload-policy>
+        <statistics-enabled>true</statistics-enabled>
+    </reliable-topic>
+    
+    <ringbuffer name="default">
+        <capacity>10000</capacity>
+        <backup-count>1</backup-count>
+        <async-backup-count>0</async-backup-count>
+        <time-to-live-seconds>30</time-to-live-seconds>
+        <in-memory-format>BINARY</in-memory-format>
+    </ringbuffer>
+
     <serialization>
         <portable-version>0</portable-version>
     </serialization>
@@ -289,13 +318,13 @@
     
     <map name="POP3 Authentication">
         <backup-count>1</backup-count>
-        <max-size policy="per_partition">10000</max-size>
+        <max-size policy="PER_NODE">10000</max-size>
         <time-to-live-seconds>3600</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     <map name="LDAP Authentication">
         <backup-count>1</backup-count>
-        <max-size policy="per_partition">10000</max-size>
+        <max-size policy="PER_NODE">10000</max-size>
         <time-to-live-seconds>7200</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
@@ -306,7 +335,7 @@
     </map>
     <map name="File Transfer Cache">
         <backup-count>1</backup-count>
-        <max-size policy="per_partition">10000</max-size>
+        <max-size policy="PER_NODE">10000</max-size>
         <time-to-live-seconds>600</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
@@ -317,7 +346,7 @@
     </map>
     <map name="Javascript Cache">
         <backup-count>1</backup-count>
-        <max-size policy="per_partition">10000</max-size>
+        <max-size policy="PER_NODE">10000</max-size>
         <time-to-live-seconds>864000</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
@@ -343,7 +372,7 @@
     </map>
     <map name="Last Activity Cache">
         <backup-count>1</backup-count>
-        <max-size policy="per_partition">10000</max-size>
+        <max-size policy="PER_NODE">10000</max-size>
         <time-to-live-seconds>21600</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
@@ -354,37 +383,37 @@
     </map>
     <map name="Multicast Service">
         <backup-count>1</backup-count>
-        <max-size policy="per_partition">10000</max-size>
+        <max-size policy="PER_NODE">10000</max-size>
         <time-to-live-seconds>86400</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     <map name="Offline Message Size">
         <backup-count>1</backup-count>
-        <max-size policy="per_partition">100000</max-size>
+        <max-size policy="PER_NODE">100000</max-size>
         <time-to-live-seconds>43200</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     <map name="Offline Presence Cache">
         <backup-count>1</backup-count>
-        <max-size policy="per_partition">100000</max-size>
+        <max-size policy="PER_NODE">100000</max-size>
         <time-to-live-seconds>21600</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     <map name="Privacy Lists">
         <backup-count>1</backup-count>
-        <max-size policy="per_partition">100000</max-size>
+        <max-size policy="PER_NODE">100000</max-size>
         <time-to-live-seconds>21600</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     <map name="Remote Users Existence">
         <backup-count>1</backup-count>
-        <max-size policy="per_partition">100000</max-size>
+        <max-size policy="PER_NODE">100000</max-size>
         <time-to-live-seconds>600</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     <map name="Remote Server Configurations">
         <backup-count>1</backup-count>
-        <max-size policy="per_partition">100000</max-size>
+        <max-size policy="PER_NODE">100000</max-size>
         <time-to-live-seconds>1800</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
@@ -394,28 +423,28 @@
     <map name="Group Metadata Cache">
         <backup-count>1</backup-count>
         <read-backup-data>true</read-backup-data>
-        <max-size policy="per_partition">100000</max-size>
+        <max-size policy="PER_NODE">100000</max-size>
         <max-idle-seconds>3600</max-idle-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     <map name="Group">
         <backup-count>1</backup-count>
         <read-backup-data>true</read-backup-data>
-        <max-size policy="per_partition">100000</max-size>
+        <max-size policy="PER_NODE">100000</max-size>
         <max-idle-seconds>3600</max-idle-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     <map name="Roster">
         <backup-count>1</backup-count>
         <read-backup-data>true</read-backup-data>
-        <max-size policy="per_partition">100000</max-size>
+        <max-size policy="PER_NODE">100000</max-size>
         <max-idle-seconds>3600</max-idle-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
     <map name="User">
         <backup-count>1</backup-count>
         <read-backup-data>true</read-backup-data>
-        <max-size policy="per_partition">100000</max-size>
+        <max-size policy="PER_NODE">100000</max-size>
         <max-idle-seconds>3600</max-idle-seconds>
         <eviction-policy>LRU</eviction-policy>
     </map>
@@ -425,7 +454,7 @@
     <map name="VCard">
         <backup-count>1</backup-count>
         <read-backup-data>true</read-backup-data>
-        <max-size policy="per_partition">100000</max-size>
+        <max-size policy="PER_NODE">100000</max-size>
         <time-to-live-seconds>21600</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
         <near-cache>
@@ -438,7 +467,7 @@
     <map name="Published Items">
         <backup-count>1</backup-count>
         <read-backup-data>true</read-backup-data>
-        <max-size policy="per_partition">100000</max-size>
+        <max-size policy="PER_NODE">100000</max-size>
         <time-to-live-seconds>900</time-to-live-seconds>
         <eviction-policy>LRU</eviction-policy>
         <near-cache>

src/plugins/hazelcast/plugin.xml

@@ -5,7 +5,7 @@
     <name>${plugin.name}</name>
     <description>${plugin.description}</description>
     <author>Tom Evans</author>
-    <version>2.1.0</version>
-    <date>08/07/2015</date>
+    <version>2.1.1</version>
+    <date>08/11/2015</date>
     <minServerVersion>3.9.4</minServerVersion>
 </plugin>