infinispan 0.11.0 → 0.12.0

package/lib/protostream/query.proto

@@ -5,7 +5,7 @@
  *         Actually used range is: [4400 .. 4403]                                                                     *
  *********************************************************************************************************************/
 syntax = "proto2";
-import "Protos/message-wrapping.proto";
+import "message-wrapping.proto";
 
 package org.infinispan.query.remote.client;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "infinispan",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Infinispan Javascript client",
   "main": "index",
   "typings": "./types",
@@ -30,13 +30,12 @@
     "buffer-xor": "^2.0.2",
     "log4js": "^6.4.6",
     "protobufjs": "^7.0.0",
-    "underscore": "^1.13.3"
+    "underscore": "^1.13.3",
+    "urllib": "^3.23.0"
   },
   "devDependencies": {
     "eslint": "^8.26.0",
-    "growl": "^1.10.5",
-    "jasmine-node": "^3.0.0",
-    "jsdoc": "^3.6.10",
-    "request": "^2.88.0"
+    "jasmine-node": "^1.16.0",
+    "long": "^5.2.3"
   }
 }

package/run-servers.sh

@@ -9,7 +9,7 @@ else
 fi
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SERVER_VERSION="${SERVER_VERSION:-"13.0.0.Final"}"
+SERVER_VERSION="${SERVER_VERSION:-"14.0.27.Final"}"
 SERVER_HOME=${SCRIPT_DIR}/server/original-server
 SERVER_ZIP=${SCRIPT_DIR}/server/${SERVER_VERSION}.zip
 CLUSTER_SIZE_MAIN="$SERVER_HOME/bin/cli.sh -c http://admin:pass@localhost:11322 -f batch "
@@ -30,6 +30,7 @@ EOF
   MEMBERS_MAIN=''
   while [ "$MEMBERS_MAIN" != '3' ];
   do
+    echo $CLUSTER_SIZE_MAIN
     MEMBERS_MAIN=$($CLUSTER_SIZE_MAIN | grep cluster_size | cut -d':' -f2 | sed 's/.$//' | sed -e 's/^[[:space:]]*//')
     echo "Waiting for clusters to form (main: $MEMBERS_MAIN)"
     sleep 20
@@ -78,6 +79,18 @@ function prepareServerDir()
 
     echo "Infinispan configuration file ${confPath} copied to server ${dirName}."
 
+    #Installing nashorn engine before server startup
+    # If java > 15
+    if [ $(javap -verbose java.lang.String | grep "major version" | cut -d " " -f5) -ge 60 ];  then
+        mkdir -p ${SERVER_TMP}/${dirName}/lib
+        ${SERVER_TMP}/bin/cli.sh install org.openjdk.nashorn:nashorn-core:15.4 --server-root=${dirName}
+        ${SERVER_TMP}/bin/cli.sh install org.ow2.asm:asm:9.4  --server-root=${dirName}
+        ${SERVER_TMP}/bin/cli.sh install org.ow2.asm:asm-commons:9.4  --server-root=${dirName}
+        ${SERVER_TMP}/bin/cli.sh install org.ow2.asm:asm-tree:9.4  --server-root=${dirName}
+        ${SERVER_TMP}/bin/cli.sh install org.ow2.asm:asm-util:9.4  --server-root=${dirName}
+        echo Nashorn script engine installed for ${dirName}
+    fi
+
     if [[ ${isSsl} = "true" && ${IS_SSL_PROCESSED} = 0 ]]; then
         ./make-ssl.sh
         echo "Generate TLS/SSL certificates"
@@ -112,6 +125,8 @@ function startServer()
         portStr="-p ${port}"
     fi
 
+    echo 'Cleaning data dir in '$SERVER_TMP''
+    rm -rf $SERVER_TMP/data/*
     echo 'Run server '$nodeName' in '$SERVER_TMP''
 
     if [[ ${isCi} = "--ci" ]]; then

package/spec/configs/clean/infinispan.xml

@@ -6,7 +6,7 @@
         xmlns:server="urn:infinispan:server:12.0">
 
     <cache-container>
-        <transport cluster="${infinispan.cluster.name}" stack="${infinispan.cluster.stack:tcp}"/>
+        <transport cluster="${infinispan.cluster.name:cluster}" stack="${infinispan.cluster.stack:tcp}"/>
     </cache-container>
 
     <server xmlns="urn:infinispan:server:12.0">
@@ -28,7 +28,7 @@
                     <!-- server-identities>
                        <ssl>
                           <keystore path="application.keystore" relative-to="infinispan.server.config.path"
-                                    keystore-password="password" alias="server" key-password="password"
+                                    password="password" alias="server" key-password="password"
                                     generate-self-signed-certificate-host="localhost"/>
                        </ssl>
                     </server-identities-->
@@ -52,4 +52,4 @@
             <!-- memcached-connector socket-binding="memcached" / -->
         </endpoints>
     </server>
-</infinispan>
+</infinispan>

package/spec/configs/infinispan-clustered.xml

@@ -9,7 +9,7 @@
 <!--        <security>-->
 <!--            <authorization/>-->
 <!--        </security>-->
-        <transport cluster="${infinispan.cluster.name}" stack="${infinispan.cluster.stack:tcp}" node-name="${infinispan.node.name:}"/>
+        <transport cluster="${infinispan.cluster.name:cluster}" stack="${infinispan.cluster.stack:tcp}" node-name="${infinispan.node.name:}"/>
         <!--<global-state/>-->
         <metrics accurate-size="true"/>
         <distributed-cache name="default" segments="20" remote-timeout="30000">
@@ -36,7 +36,7 @@
                     <!-- server-identities>
                        <ssl>
                           <keystore path="application.keystore" relative-to="infinispan.server.config.path"
-                                    keystore-password="password" alias="server" key-password="password"
+                                    password="password" alias="server" key-password="password"
                                     generate-self-signed-certificate-host="localhost"/>
                        </ssl>
                     </server-identities-->

package/spec/configs/infinispan-ssl.xml

@@ -46,7 +46,7 @@
                 <security-realm name="default">
                     <server-identities>
                         <ssl>
-                            <keystore path="server.p12" keystore-password="secret" alias="server"/>
+                            <keystore path="server.p12" password="secret" alias="server"/>
                         </ssl>
                     </server-identities>
                     <properties-realm groups-attribute="Roles">
@@ -57,33 +57,33 @@
                 <security-realm name="client-cert">
                     <server-identities>
                         <ssl>
-                            <keystore path="server.p12" keystore-password="secret" alias="server"/>
+                            <keystore path="server.p12" password="secret" alias="server"/>
                         </ssl>
                     </server-identities>
                     <properties-realm groups-attribute="Roles">
                         <user-properties path="users.properties"/>
                         <group-properties path="groups.properties"/>
                     </properties-realm>
-                    <!--truststore-realm path="client.p12" keystore-password="secret"/-->
+                    <!--truststore-realm path="client.p12" password="secret"/-->
                 </security-realm>
                 <security-realm name="Trust1Realm">
                     <server-identities>
                         <ssl>
-                            <keystore path="trust1.p12" keystore-password="secret"/>
+                            <keystore path="trust1.p12" password="secret"/>
                         </ssl>
                     </server-identities>
                 </security-realm>
                 <security-realm name="Trust2Realm">
                     <server-identities>
                         <ssl>
-                            <keystore path="trust2.p12" keystore-password="secret"/>
+                            <keystore path="trust2.p12" password="secret"/>
                         </ssl>
                     </server-identities>
                 </security-realm>
                 <security-realm name="UntrustRealm">
                     <server-identities>
                         <ssl>
-                            <keystore path="untrust.p12" keystore-password="secret"/>
+                            <keystore path="untrust.p12" password="secret"/>
                         </ssl>
                     </server-identities>
                 </security-realm>

package/spec/configs/infinispan-xsite-EARTH.xml

@@ -19,9 +19,7 @@
                  mcast_recv_buf_size="25m"
                  ip_ttl="${jgroups.ip_ttl:2}"
                  thread_naming_pattern="pl"
-                 enable_diagnostics="false"
                  bundler_type="no-bundler"
-                 max_bundle_size="8500"
 
                  thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
                  thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
@@ -49,7 +47,7 @@
                       xmit_table_msgs_per_row="1024"
                       xmit_table_max_compaction_time="30000"
             />
-            <pbcast.STABLE stability_delay="500"
+            <pbcast.STABLE 
                            desired_avg_gossip="5000"
                            max_bytes="1M"
             />
@@ -74,9 +72,7 @@
                  mcast_recv_buf_size="25m"
                  ip_ttl="${jgroups.ip_ttl:2}"
                  thread_naming_pattern="pl"
-                 enable_diagnostics="false"
                  bundler_type="no-bundler"
-                 max_bundle_size="8500"
 
                  thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
                  thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
@@ -104,7 +100,7 @@
                       xmit_table_msgs_per_row="1024"
                       xmit_table_max_compaction_time="30000"
             />
-            <pbcast.STABLE stability_delay="500"
+            <pbcast.STABLE 
                            desired_avg_gossip="5000"
                            max_bytes="1M"
             />
@@ -161,7 +157,7 @@
                     <!-- server-identities>
                        <ssl>
                           <keystore path="application.keystore" relative-to="infinispan.server.config.path"
-                                    keystore-password="password" alias="server" key-password="password"
+                                    password="password" alias="server" key-password="password"
                                     generate-self-signed-certificate-host="localhost"/>
                        </ssl>
                     </server-identities-->

package/spec/configs/infinispan-xsite-MOON.xml

@@ -19,9 +19,7 @@
                  mcast_recv_buf_size="25m"
                  ip_ttl="${jgroups.ip_ttl:2}"
                  thread_naming_pattern="pl"
-                 enable_diagnostics="false"
                  bundler_type="no-bundler"
-                 max_bundle_size="8500"
 
                  thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
                  thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
@@ -49,7 +47,7 @@
                       xmit_table_msgs_per_row="1024"
                       xmit_table_max_compaction_time="30000"
             />
-            <pbcast.STABLE stability_delay="500"
+            <pbcast.STABLE 
                            desired_avg_gossip="5000"
                            max_bytes="1M"
             />
@@ -74,9 +72,7 @@
                  mcast_recv_buf_size="25m"
                  ip_ttl="${jgroups.ip_ttl:2}"
                  thread_naming_pattern="pl"
-                 enable_diagnostics="false"
                  bundler_type="no-bundler"
-                 max_bundle_size="8500"
 
                  thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
                  thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
@@ -104,7 +100,7 @@
                       xmit_table_msgs_per_row="1024"
                       xmit_table_max_compaction_time="30000"
             />
-            <pbcast.STABLE stability_delay="500"
+            <pbcast.STABLE 
                            desired_avg_gossip="5000"
                            max_bytes="1M"
             />
@@ -163,7 +159,7 @@
                     <!-- server-identities>
                        <ssl>
                           <keystore path="application.keystore" relative-to="infinispan.server.config.path"
-                                    keystore-password="password" alias="server" key-password="password"
+                                    password="password" alias="server" key-password="password"
                                     generate-self-signed-certificate-host="localhost"/>
                        </ssl>
                     </server-identities-->

package/spec/configs/infinispan.xml

@@ -50,7 +50,7 @@
                <!-- server-identities>
                   <ssl>
                      <keystore path="application.keystore" relative-to="infinispan.server.config.path"
-                               keystore-password="password" alias="server" key-password="password"
+                               password="password" alias="server" key-password="password"
                                generate-self-signed-certificate-host="localhost"/>
                   </ssl>
                </server-identities-->

package/spec/infinispan_ssl_spec.js

@@ -27,7 +27,7 @@ describe('Infinispan TLS/SSL client', function() {
   );
 
   it('fails to operate if default server name (SNI) does not match default server realm',
-     testError(expectContainsError("self signed certificate in certificate chain"),
+     testError(expectContainsAnyErrors(["self signed certificate in certificate chain", "self-signed certificate in certificate chain"]),
                sslSniDefault())
   );
 
@@ -37,6 +37,7 @@ describe('Infinispan TLS/SSL client', function() {
          ['CERT_SIGNATURE_FAILURE'
            , 'certificate signature failure'
            , 'self signed certificate in certificate chain'
+           , 'self-signed certificate in certificate chain'
          ])
        , sslSniUntrusted()
      )
@@ -53,7 +54,7 @@ describe('Infinispan TLS/SSL client', function() {
   );
 
   it('fails to operate if no encrypted transport is provided',
-      testError(expectAnyExactErrors(['self signed certificate in certificate chain']),
+      testError(expectAnyExactErrors(['self signed certificate in certificate chain',  'self-signed certificate in certificate chain']),
                 sslStoreNoCryptoStore())
   );
 
@@ -78,7 +79,7 @@ describe('Infinispan TLS/SSL client', function() {
   // );
 
   it('fails to operate if trusted certificate is missing for authenticated encrypted transport',
-      testError(expectAnyExactErrors(['self signed certificate in certificate chain']),
+      testError(expectAnyExactErrors(['self signed certificate in certificate chain', 'self-signed certificate in certificate chain']),
                 sslAuthWithMissingTrustCertificate())
   );
 
@@ -253,10 +254,10 @@ describe('Infinispan TLS/SSL client', function() {
     }
   }
 
-  function expectContainsError(msg) {
+  function expectContainsAnyErrors(msg) {
     return function(done) {
       return function(err) {
-        toContainAnyOf([msg], err, done);
+        toContainAnyOf(msg, err, done);
       }
     }
   }

package/spec/utils/testing.js

@@ -1,3 +1,4 @@
+/* eslint-disable require-jsdoc */
 // Commons functions
 
 var _ = require('underscore');
@@ -5,7 +6,7 @@ var _ = require('underscore');
 var log4js = require('log4js');
 
 var readFile = require('fs').readFile;
-var httpRequest = require('request');
+var httpRequest = require('urllib');
 var util = require('util');
 
 var f = require('../../lib/functional');
@@ -719,65 +720,36 @@ function getClusterMembers(port) {
 
     return invokeDmrHttpGet('GET', opUrl, port)
       .then(function(response) {
-        logger.debugf("Server '%s' replied with cluster members: %s", port, response.cluster_size);
+        logger.debugf('Server %s replied with cluster members: %s', port, response.cluster_size);
         var members = response.cluster_size;
-        logger.debugf("Members are: %s", members);
+        logger.debugf('Members are: %s', members);
         return members;
       });
-  }
+  };
 }
 
 function invokeDmrHttp(op, port) {
-  return new Promise(function(fulfil, reject) {
-    httpRequest({
-      method: 'POST',
-      url: 'http://localhost:' + port + '/rest/v2',
-      auth: {
-        user: 'admin',
-        pass: 'pass',
-        sendImmediately: false
-      },
-      headers: {
-        'Content-Type' : 'application/json'
-      },
-      body: JSON.stringify(op)
-    }, function(error, response, body) {
-      if (!error && response.statusCode == 200) {
-        fulfil(JSON.parse(body));
-      } else {
-        reject(util.format('Error (%s), body (%s), response(%s)',
-          error, body, JSON.stringify(response)));
-      }
-    });
-  });
+   return httpRequest.request(`http://localhost:${port}/rest/v2`,
+                              {method:'POST',
+                              digestAuth: 'admin:pass',
+                              headers:{
+                                 'Content-Type': 'application/json',
+                                 'body': op
+                               }}).then(res => res.statusCode==200 ? JSON.parse(res.data) : {},
+                                        error => (util.format('Error (%s)', error)));
 }
 
 function invokeDmrHttpGet(method, opUrl, port) {
-    return new Promise(function(fulfil, reject) {
-        httpRequest({
-            method: method,
-            url: 'http://localhost:' + port + '/rest/v2' + opUrl,
-            auth: {
-                user: 'admin',
-                pass: 'pass',
-                sendImmediately: false
-            },
-            headers: {
-                'Content-Type' : 'application/json'
-            }
-        }, function(error, response, body) {
-            if (!error && response.statusCode >= 200 && response.statusCode <= 204) {
-              var resp = "";
-              if (body) {
-                resp = JSON.parse(body);
-              }
-              fulfil(resp);
-            } else {
-                reject(util.format('Error (%s), body (%s), response(%s)',
-                    error, body, JSON.stringify(response)));
-            }
-        });
-    });
+
+   logger.debugf(`URL http://localhost:${port}/rest/v2${opUrl}`);
+   return httpRequest.request(`http://localhost:${port}/rest/v2${opUrl}`, {
+                   method: method,
+                   digestAuth: 'admin:pass',
+                   headers: {
+                       'Content-Type' : 'application/json'
+                     }
+               }).then( res => res.statusCode==200 ? JSON.parse(res.data) : {},
+                        error => (util.format('Error (%s)', error)));
 }
 
 function readFileAsync(path) {