Cleanup

tools/src/main/java/org/thingsboard/client/tools/MqttSslClient.java

@@ -77,7 +77,7 @@ public class MqttSslClient {
             client.connect(options);
             Thread.sleep(3000);
             MqttMessage message = new MqttMessage();
-            message.setPayload("{\"key1\":\"zaloopa\", \"key2\":true, \"key3\": 3.0, \"key4\": 4}".getBytes());
+            message.setPayload("{\"key1\":\"value1\", \"key2\":true, \"key3\": 3.0, \"key4\": 4}".getBytes());
             client.publish("v1/devices/me/telemetry", message);
             client.disconnect();
             System.out.println("Disconnected");

tools/src/main/shell/keygen.properties

@@ -15,7 +15,6 @@
 #
 
 DOMAIN_SUFFIX="$(hostname)"
-
 ORGANIZATIONAL_UNIT=Thingsboard
 ORGANIZATION=Thingsboard
 CITY=Piscataway
@@ -32,7 +31,6 @@ SERVER_KEYSTORE_DIR="../../../../application/src/main/resources/keystore/"
 CLIENT_KEYSTORE_PASSWORD=client_ks_password
 CLIENT_KEY_PASSWORD=client_key_password
 
-CLIENT_TRUSTSTORE="client_truststore"
 CLIENT_KEY_ALIAS="clientalias"
 CLIENT_FILE_PREFIX="mqttclient"
 

tools/src/main/shell/server.keygen.sh

@@ -19,8 +19,8 @@ usage() {
     echo "This script generates thingsboard server's ssl certificate"
     echo "and optionally copies it to the server's resource directory."
     echo "usage: ./server.keygen.sh [-c flag] [-d directory] [-p file]"
-    echo "    -c | --copy flag                  Set if copy keystore to server directory needed. Default value is true"
-    echo "    -d | --dir directory              Server keystore directory, where the generated keystore file will be copied."
+    echo "    -c | --copy flag                  Specifies if the keystore should be copied to the server directory. Defaults to true"
+    echo "    -d | --dir directory              Server keystore directory, where the generated keystore file will be copied. If specified, overrides the value from the properties file"
     echo "                                      Default value is SERVER_KEYSTORE_DIR property from properties file"
     echo "    -p | --props | --properties file  Properties file. default value is ./keygen.properties"
 	echo "    -h | --help | ?                   Show this message"