Minor changes to v1.2.7

jpaulm · Dec 21, 2020 · 2e035bd · 2e035bd
1 parent a525483
commit 2e035bd
Show file tree

Hide file tree

Showing 14 changed files with 118 additions and 74 deletions.
diff --git a/build.gradle b/build.gradle
@@ -35,7 +35,7 @@ apply plugin: 'java-library'
 
 }
 
-version = '1.2.7'
+version = '1.2.8'
 
 group = 'com.jpaulmorrison'
 
@@ -141,7 +141,7 @@ description = "Create default maven directory structure"
 
             groupId = 'com.jpaulmorrison'
             artifactId = 'javafbp-websockets'       
-            version = '1.2.7'
+            version = '1.2.8'
 
             from components.java
 

diff --git a/build/libs/javafbp-websockets-1.2.7-javadoc.jar.asc b/build/libs/javafbp-websockets-1.2.7-javadoc.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABCgAGBQJf05jXAAoJEIoqalWqx6kewn4H/1SpJP5GiNAyF4sT/7rKUpem
+DxjDYwK7PJjJ91BlJ1yndvqLTboCJKWwO2lDkRasHQ0dp6yz7SXHO3w0OagmZMKe
+Ue6PhZ/9kpDbrLe4nwFu/GYc7dFKKIegmo57TIzDzQY8qWa/1SvxbPLI8ZjvjOa6
+gZzhb27A0uamKcHA04l2aJH/wuoazZvL7nwKrwiVkuhpy45XJ+B3gNBih67GBQyA
+pOUmwQ6ONU1oAsl1GM17cQJZ3w53aS4hU0F74Nu557LgJir9FRCX7twHrPls2khM
+apVz1f7Qa+0VsGtQfORqdbLYL93YlZMdpf5+/3tzBCg6TFNM/ZbtbjOULOYy+7A=
+=h/FY
+-----END PGP SIGNATURE-----
diff --git a/build/libs/javafbp-websockets-1.2.7-sources.jar.asc b/build/libs/javafbp-websockets-1.2.7-sources.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABCgAGBQJf05jXAAoJEIoqalWqx6keJ/UIAK+9tNY7jPsATb496lhI4D2j
+z/W2SVPBwXX+deddRIl+A0nFxOW2AU3vMvQq//wI/SLovIRhsuLDfBOGcAccnr5X
+kE4XGeGbMKvcEy/3DsqkdCBuWSJnYvSR0AUW+5n4d2v8jKHa4xicR1MNTe1kxnD5
+ju0fC1WHA+ZovoqpvTIM963VnZGm+5xjDCVnwiS4+VxNvFlymPtxNxfrfznuz4tj
+F00+UscIAgDIJvOZbb9X+DLhYVw8eBxQhlySrrEnd40WhwE6If6imPwabGYYuCu6
+l+vLiFrNYD17Gv4fyRPMFvrCTYkLJe89eBpt9qG1bkz+5ANie1VB4aI5ceTUdYU=
+=hU/L
+-----END PGP SIGNATURE-----
diff --git a/build/libs/javafbp-websockets-1.2.7.jar.asc b/build/libs/javafbp-websockets-1.2.7.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABCgAGBQJf05jXAAoJEIoqalWqx6keNPEH/R2/3veMeQIAe6Gy7K6A2U0m
+MW1oLsqtqc+YoS+dfb8mYnMOiBJydZ4xNf7N2Xu7YoKp79LG973ou4nkt8YMzIO/
+atViWBWDM3jmcPn6GLwRouyPtI3AT4Gf70C250vjt/2rDHHfKlom1VNecthzLiUY
+zQtX9ynH+IiMACGIJF3JVVmEi8sAdew/x+5YauPf+OPdEEWkfBh4KCqXUjY/k9L/
+TiROZ+eLEe0+4uUE49M/B7JGWvAm650vw4Bq5dSolmM70HThxEFUZJ1C9XEQK/3k
+IQ7iTjkyKx8ZNFATwyw+GJvtDpIkyIbKxKiYE6u810aW9THXe9wY1PD+MlhKObA=
+=kxt/
+-----END PGP SIGNATURE-----
diff --git a/build/publications/mavenJava/module.json b/build/publications/mavenJava/module.json
@@ -3,15 +3,15 @@
   "component": {
     "group": "com.jpaulmorrison",
     "module": "javafbp-websockets",
-    "version": "1.2.6",
+    "version": "1.2.7",
     "attributes": {
       "org.gradle.status": "release"
     }
   },
   "createdBy": {
     "gradle": {
       "version": "6.5.1",
-      "buildId": "xjqz4xngpvckrp2ekzcd3i7zde"
+      "buildId": "z2mnwlljlbfkbkskwi7gu4f2wq"
     }
   },
   "variants": [
@@ -26,13 +26,13 @@
       },
       "files": [
         {
-          "name": "javafbp-websockets-1.2.6.jar",
-          "url": "javafbp-websockets-1.2.6.jar",
-          "size": 469899,
-          "sha512": "ede6b41fb0f0a82e7265131ecdb389702dc7bcb56e7af216277537ed2bf3b98647e0eb2d18c93e1ef9e6af2b93b55db2bf675ad47bad17d88d11274cf88a4c8c",
-          "sha256": "1f8c52398a7640834c208cf803b3a9c1bbf017281308d46505191829cff38b6a",
-          "sha1": "a0828f1c5f69d6b1b67445ae3df4105dc16a56a3",
-          "md5": "d34ad81c89acc8b3db76acce201379c8"
+          "name": "javafbp-websockets-1.2.7.jar",
+          "url": "javafbp-websockets-1.2.7.jar",
+          "size": 2506714,
+          "sha512": "635ad9c78981232cfce6a41c1f96d869783dcd070412e96040d8e6e858c0e8248c4a1e0346f622aa5a978917f7edf2db017beb4374b3ff11c1fb4b32c81e9327",
+          "sha256": "9384a6eebda285a9f97135d342467c13b317274b0d02e8c17bc8d4b888bdb54a",
+          "sha1": "fc1dd5fc5c53f3ba533745e44bcb914af875276d",
+          "md5": "f5ac6b8fa3cedb5da90036c47dd5e54c"
         }
       ]
     },
@@ -66,17 +66,31 @@
           "version": {
             "requires": "1.7.25"
           }
+        },
+        {
+          "group": "org.apache.logging.log4j",
+          "module": "log4j-api",
+          "version": {
+            "requires": "2.14.0"
+          }
+        },
+        {
+          "group": "org.apache.logging.log4j",
+          "module": "log4j-core",
+          "version": {
+            "requires": "2.14.0"
+          }
         }
       ],
       "files": [
         {
-          "name": "javafbp-websockets-1.2.6.jar",
-          "url": "javafbp-websockets-1.2.6.jar",
-          "size": 469899,
-          "sha512": "ede6b41fb0f0a82e7265131ecdb389702dc7bcb56e7af216277537ed2bf3b98647e0eb2d18c93e1ef9e6af2b93b55db2bf675ad47bad17d88d11274cf88a4c8c",
-          "sha256": "1f8c52398a7640834c208cf803b3a9c1bbf017281308d46505191829cff38b6a",
-          "sha1": "a0828f1c5f69d6b1b67445ae3df4105dc16a56a3",
-          "md5": "d34ad81c89acc8b3db76acce201379c8"
+          "name": "javafbp-websockets-1.2.7.jar",
+          "url": "javafbp-websockets-1.2.7.jar",
+          "size": 2506714,
+          "sha512": "635ad9c78981232cfce6a41c1f96d869783dcd070412e96040d8e6e858c0e8248c4a1e0346f622aa5a978917f7edf2db017beb4374b3ff11c1fb4b32c81e9327",
+          "sha256": "9384a6eebda285a9f97135d342467c13b317274b0d02e8c17bc8d4b888bdb54a",
+          "sha1": "fc1dd5fc5c53f3ba533745e44bcb914af875276d",
+          "md5": "f5ac6b8fa3cedb5da90036c47dd5e54c"
         }
       ]
     },
@@ -90,13 +104,13 @@
       },
       "files": [
         {
-          "name": "javafbp-websockets-1.2.6-sources.jar",
-          "url": "javafbp-websockets-1.2.6-sources.jar",
-          "size": 12671,
-          "sha512": "b01fa6398708398bb18e8ccad9a2da1b108cfdbfe99e3e412b5124ff148dc00d79145613dc7d13f38f336813283292c6c097a4de1d0fd6ce9756f8f5693beaae",
-          "sha256": "743f512a9da6e41cd5aea039437e347756b2d8a738191037a89b4afafb6b4fbd",
-          "sha1": "eecc535a7c87e29d9b6bb3beba2f40f8534c3899",
-          "md5": "ecd705d1098530e9ef1d9ef0262dd3b8"
+          "name": "javafbp-websockets-1.2.7-sources.jar",
+          "url": "javafbp-websockets-1.2.7-sources.jar",
+          "size": 13334,
+          "sha512": "8b7b42fa2932d590e64e0df4705d902a1695acc6859ea1b2df039b0c17a5a1ee597113bebe6ddb3701024bbf9724c9fab9d17c7c08bc2a9e29490a1b0e4a7c9a",
+          "sha256": "28c56d5c33a3f62fe1ab3546ddd0ac6f884775dc7208e32591560ccb13e3a7ac",
+          "sha1": "6868c671709d34a72358b5d86333277d2d94c363",
+          "md5": "3d136168d88989fbd3d52bf13bae306a"
         }
       ]
     },
@@ -110,13 +124,13 @@
       },
       "files": [
         {
-          "name": "javafbp-websockets-1.2.6-javadoc.jar",
-          "url": "javafbp-websockets-1.2.6-javadoc.jar",
-          "size": 42720,
-          "sha512": "ae314f05ede9b49bc550f0a36cc1021e6ca25da223898f530a246764aca1b5c761cad3947a50cd1b0e5f7e0112cd77853f1c9aff1946664a8da65d464169243e",
-          "sha256": "2e93a43236736ff2fb2c441986e8193e88a0bc84702af86ff6220facfb0a5666",
-          "sha1": "cfe6ece57803ba972ae39d72a7c9a077c5bbdfd0",
-          "md5": "2fb9cf6b43665f91d32e29a52a643c68"
+          "name": "javafbp-websockets-1.2.7-javadoc.jar",
+          "url": "javafbp-websockets-1.2.7-javadoc.jar",
+          "size": 42721,
+          "sha512": "1a74c62974aeb4d6cd9335ee61a524feb640c69fc2caf9bbd705104190cb3a849feb77755a2c2b7eb7b465e7d99cc9d462180004f9ead9ecd3f886de470e7883",
+          "sha256": "2f6537309c72e2044ab8daa5ad5b7282bb86e2c3ac59a18c6a33f18e798217bc",
+          "sha1": "0814a6441d7cc8360832cabe35cafa3f002673fe",
+          "md5": "575a52fbc4f690b829be549699d23d98"
         }
       ]
     }

diff --git a/build/publications/mavenJava/module.json.asc b/build/publications/mavenJava/module.json.asc
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: BCPG v1.64
 
-iQEcBAABCgAGBQJfrEkxAAoJEIoqalWqx6keVSwIAJxT2KJqqX5ivXPoTPpW+U0u
-jvnyvsA+xC6+NQ4PKTLxGuipp44271PLdMFUP1ncUjTWHgfAPeRWZHBb2uApCraC
-tRtdt8ONKQDYzL5yJew0dRhlmoYTXTQwJ5uhzDSKw7t43998CjafDoOTwd+BqHdU
-/ev+90F2Whk/PR1UIpbYaa67ocR4+m/FugCeQ8XwYAAex0uVQaJ17eLoyJ3Q4D7f
-o1Ra1AkjfNQ6BqmqERc/SVOkno20WDjPWLjY/p7AxVquzFZB5Doq+fs8Hl9ma5Qx
-I32ih8J7hvhVdPoEryYmhvM/R+Ak0yaaIn4h76FjOgQhQll+NnV9mV2z4Tkc6BU=
-=Bvxh
+iQEcBAABCgAGBQJf05jXAAoJEIoqalWqx6ke0wYH/2tytK2WbbucBq+2Fm4btfk+
+T4eRtu81D8C6c138LkomD8nFMYZrgZEqM1ESN++TSvUgQdoslQU8mj9fgSPOLDPX
+LI74EpWFaFYv2u3nMa7fTEofG9YZcGez3nv5VMCzUL1wwayg1AIaj9VvpUuWeKF8
+dCjCQgEa1MUo67uat3gdfzXuj2IAw/80Xl0D1A0XjbqNsLbbLSZ4MrkqrTl+8lqC
+BadrK3XcVO03ST4TlVxsFpichYaxJ/5q9LpP8wOWo5kX28QCRXaTOpczxAtn6DoX
+f6QZAHVqseARKrt+jzmTQln7BnEfda8eD/pLpMSvE9WnCbh3U4cd8K6/+KDtIYA=
+=IFHD
 -----END PGP SIGNATURE-----
diff --git a/build/publications/mavenJava/pom-default.xml b/build/publications/mavenJava/pom-default.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jpaulmorrison</groupId>
   <artifactId>javafbp-websockets</artifactId>
-  <version>1.2.6</version>
+  <version>1.2.7</version>
   <name>JavaFBP-WebSockets</name>
   <description>JavaFBP support for web sockets</description>
   <url>https://github.com/jpaulm/javafbp-websockets</url>
@@ -50,5 +50,17 @@
       <version>1.7.25</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>2.14.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>2.14.0</version>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/build/publications/mavenJava/pom-default.xml.asc b/build/publications/mavenJava/pom-default.xml.asc
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: BCPG v1.64
 
-iQEcBAABCgAGBQJfrEkxAAoJEIoqalWqx6kexRsIAISUKwWWbmkzH5hWJaAXjYUq
-Vdbc6JYVs25rjH6R97gvLIhhfOxhIwdIpL01sE2O/vmxhkiB8K9OKDjR6vYFOAxM
-SkpozDDhDtKSHD5tipzMWa4BQj74m0irkxVt32dxrERXpXL33EzxolPJWMEQkxiP
-/NPDs/YwbF5VUZZlQ2p8/evLBbMD+3KkcjtQAaM1Wuw/p9/pkFVFRqJGdcdnGDXm
-0rlJIKd5qd73cXHHGr3eL+fkTa6fhWmVMfwyDo12IvPve3kkMzYKWRxphX7bvyNJ
-p+u/ZTQtmCo0xs7kjcI+RcdvImiA6UGyVZ3VfOl6QPTsz4IJC+/EtYhcykI0trg=
-=9WFc
+iQEcBAABCgAGBQJf05jXAAoJEIoqalWqx6ke/hYH/jNQylwWZmwPt1nzZGGcoo8N
+/C6TxNeabJmsJ6pYOf6yZuD+/JOa3vqYZzb1h1oBZS9ems6xFDCi0nNUOdrkt/F2
+7b873uIiITSMWsHzvJmzuWDkQw76Ra4yE4HaJ/3bf1leJ7nGeHn27O8TTGl7yiog
+qIo9LgwaBSJL5dRVRYsCU2/ALpynT0PSCUUDTatXapmNHzojDP1sHN/Zu43BgV7k
++pEer1Ip6DNhBRkufhsDoPrHu5ax9uuLg2wUxiV6Z1irJHLFcbbWgHOX+fJVS8Gz
+Usejpu12RVYIPunJCDCsSU9fSj4IebJq7lR1yEHxKuNHWbJA8+DJAW4GY1N4pCI=
+=WeJz
 -----END PGP SIGNATURE-----
diff --git a/build/scripts/javafbp-websockets b/build/scripts/javafbp-websockets
@@ -80,7 +80,7 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/javafbp-websockets-1.2.7.jar:$APP_HOME/lib/javafbp-4.1.11.jar:$APP_HOME/lib/Java-WebSocket-1.5.1.jar:$APP_HOME/lib/slf4j-simple-1.7.25.jar:$APP_HOME/lib/log4j-core-2.14.0.jar:$APP_HOME/lib/log4j-api-2.14.0.jar:$APP_HOME/lib/slf4j-api-1.7.25.jar
+CLASSPATH=$APP_HOME/lib/javafbp-websockets-1.2.8.jar:$APP_HOME/lib/javafbp-4.1.11.jar:$APP_HOME/lib/Java-WebSocket-1.5.1.jar:$APP_HOME/lib/slf4j-simple-1.7.25.jar:$APP_HOME/lib/log4j-core-2.14.0.jar:$APP_HOME/lib/log4j-api-2.14.0.jar:$APP_HOME/lib/slf4j-api-1.7.25.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/build/scripts/javafbp-websockets.bat b/build/scripts/javafbp-websockets.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\javafbp-websockets-1.2.7.jar;%APP_HOME%\lib\javafbp-4.1.11.jar;%APP_HOME%\lib\Java-WebSocket-1.5.1.jar;%APP_HOME%\lib\slf4j-simple-1.7.25.jar;%APP_HOME%\lib\log4j-core-2.14.0.jar;%APP_HOME%\lib\log4j-api-2.14.0.jar;%APP_HOME%\lib\slf4j-api-1.7.25.jar
+set CLASSPATH=%APP_HOME%\lib\javafbp-websockets-1.2.8.jar;%APP_HOME%\lib\javafbp-4.1.11.jar;%APP_HOME%\lib\Java-WebSocket-1.5.1.jar;%APP_HOME%\lib\slf4j-simple-1.7.25.jar;%APP_HOME%\lib\log4j-core-2.14.0.jar;%APP_HOME%\lib\log4j-api-2.14.0.jar;%APP_HOME%\lib\slf4j-api-1.7.25.jar
 
 
 @rem Execute javafbp-websockets
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %JAVAFBP_WEBSOCKETS_OPTS%  -classpath "%CLASSPATH%" com.jpaulmorrison.fbp.examples.networks.TestWebSockets %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %JAVAFBP_WEBSOCKETS_OPTS%  -classpath "%CLASSPATH%" com.jpaulmorrison.fbp.examples.networks.TestWebSockets %*
 
 :end
 @rem End local scope for the variables with windows NT shell

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jpaulmorrison</groupId>
   <artifactId>javafbp-websockets</artifactId>
-  <version>1.2.7</version>
+  <version>1.2.8</version>
    <packaging>jar</packaging>
  <!-- 
   <name>slf4jconfig-log4j</name>

diff --git a/src/log4j2.xml b/src/log4j2.xml
@@ -8,7 +8,7 @@
         </Console>
       </Appenders>
       <Loggers>
-        <Root level="trace">
+        <Root level="info">
           <AppenderRef ref="Console"/>
         </Root>
       </Loggers>

diff --git a/src/main/java/com/jpaulmorrison/fbp/components/VersionAndTimestamp.java b/src/main/java/com/jpaulmorrison/fbp/components/VersionAndTimestamp.java
@@ -22,9 +22,9 @@ public final class VersionAndTimestamp {
 	 *   
 	 */
 
-  private static String version = "JavaFBP-WebSockets - version 1.2.7";
+  private static String version = "JavaFBP-WebSockets - version 1.2.8";
 
-  private static String date = "Nov. 29, 2020";
+  private static String date = "Dec. 11, 2020";
 
   static String getVersion() {
     return version;

diff --git a/src/main/java/com/jpaulmorrison/fbp/components/WebSocketReceive.java b/src/main/java/com/jpaulmorrison/fbp/components/WebSocketReceive.java
@@ -126,7 +126,7 @@ protected void execute() throws Exception {
         String KEYSTORE = "c:\\Users\\" + System.getProperty("user.name") +
        		"\\Appdata\\Local\\JavaFBP-WebSockets\\security\\keystore.jks";        
 
-        System.out.println(KEYSTORE);		
+        //System.out.println(KEYSTORE);		
         String STOREPASSWORD = "storepassword";
         String KEYPASSWORD = "keypassword";
 
@@ -178,7 +178,7 @@ protected void execute() throws Exception {
             if (killsw.get()) {
           	// see also http://stackoverflow.com/questions/4812686/closing-websocket-correctly-html5-javascript
           	outPort.close();
-          	System.out.println("Closed 'outPort'");
+          	//System.out.println("Closed 'outPort'");
             test.stop();
             return;
             }