Changes to reflect new Java-WebSocket and support wss: (working with …

…Chrome)
jpaulm · Oct 14, 2020 · 475c9b1 · 475c9b1
1 parent 69568c4
commit 475c9b1
Show file tree

Hide file tree

Showing 42 changed files with 239 additions and 149 deletions.
diff --git a/.classpath b/.classpath
@@ -13,6 +13,7 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -22,6 +23,10 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
@@ -1,4 +1,4 @@
-activeProfiles=org.slf4j\:slf4j-simple\:1.7.25,org.java-websocket\:Java-WebSocket\:1.4.0,com.jpaulmorrison\:javafbp\:4.1.1
+activeProfiles=org.slf4j\:slf4j-simple\:1.7.25,com.jpaulmorrison\:javafbp\:4.1.6,org.java-websocket\:Java-WebSocket\:1.5.1
 eclipse.preferences.version=1
 resolveWorkspaceProjects=false
 version=1
diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,7 @@ apply plugin: 'java-library'
 
 }
 
-version = '1.2.4'
+version = '1.2.5'
 
 group = 'com.jpaulmorrison'
 
@@ -71,14 +71,14 @@ java {
 
 dependencies {		
 
-	implementation  'com.jpaulmorrison:javafbp:4.1.5' 
-	implementation 'org.java-websocket:Java-WebSocket:1.5.0'
+	implementation  'com.jpaulmorrison:javafbp:4.1.6' 
+	implementation 'org.java-websocket:Java-WebSocket:1.5.1'
 	implementation 'org.slf4j:slf4j-simple:1.7.25'
 
 }
 
 jar {
-    //archiveVersion = '1.2.4'
+
     manifest {
        attributes 'Implementation-Title': 'JavaFBP-WebSockets', 
        'Implementation-Version': project.version,             
@@ -144,7 +144,7 @@ description = "Create default maven directory structure"
 
             groupId = 'com.jpaulmorrison'
             artifactId = 'javafbp-websockets'       
-            version = '1.2.4'
+            version = '1.2.5'
 
             from components.java
 

diff --git a/build/docs/javadoc/allclasses-frame.html b/build/docs/javadoc/allclasses-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (javafbp-websockets 1.2.4 API)</title>
+<title>All Classes (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/build/docs/javadoc/allclasses-noframe.html b/build/docs/javadoc/allclasses-noframe.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (javafbp-websockets 1.2.4 API)</title>
+<title>All Classes (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/components/VersionAndTimestamp.html b/build/docs/javadoc/com/jpaulmorrison/fbp/components/VersionAndTimestamp.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>VersionAndTimestamp (javafbp-websockets 1.2.4 API)</title>
+<title>VersionAndTimestamp (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VersionAndTimestamp (javafbp-websockets 1.2.4 API)";
+            parent.document.title="VersionAndTimestamp (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/components/WebSocketReceive.html b/build/docs/javadoc/com/jpaulmorrison/fbp/components/WebSocketReceive.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>WebSocketReceive (javafbp-websockets 1.2.4 API)</title>
+<title>WebSocketReceive (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WebSocketReceive (javafbp-websockets 1.2.4 API)";
+            parent.document.title="WebSocketReceive (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/components/WebSocketRespond.html b/build/docs/javadoc/com/jpaulmorrison/fbp/components/WebSocketRespond.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>WebSocketRespond (javafbp-websockets 1.2.4 API)</title>
+<title>WebSocketRespond (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WebSocketRespond (javafbp-websockets 1.2.4 API)";
+            parent.document.title="WebSocketRespond (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/components/package-frame.html b/build/docs/javadoc/com/jpaulmorrison/fbp/components/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.jpaulmorrison.fbp.components (javafbp-websockets 1.2.4 API)</title>
+<title>com.jpaulmorrison.fbp.components (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/components/package-summary.html b/build/docs/javadoc/com/jpaulmorrison/fbp/components/package-summary.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.jpaulmorrison.fbp.components (javafbp-websockets 1.2.4 API)</title>
+<title>com.jpaulmorrison.fbp.components (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.jpaulmorrison.fbp.components (javafbp-websockets 1.2.4 API)";
+            parent.document.title="com.jpaulmorrison.fbp.components (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/components/package-tree.html b/build/docs/javadoc/com/jpaulmorrison/fbp/components/package-tree.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.jpaulmorrison.fbp.components Class Hierarchy (javafbp-websockets 1.2.4 API)</title>
+<title>com.jpaulmorrison.fbp.components Class Hierarchy (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.jpaulmorrison.fbp.components Class Hierarchy (javafbp-websockets 1.2.4 API)";
+            parent.document.title="com.jpaulmorrison.fbp.components Class Hierarchy (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/examples/components/WebSocketSimProc.html b/build/docs/javadoc/com/jpaulmorrison/fbp/examples/components/WebSocketSimProc.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>WebSocketSimProc (javafbp-websockets 1.2.4 API)</title>
+<title>WebSocketSimProc (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WebSocketSimProc (javafbp-websockets 1.2.4 API)";
+            parent.document.title="WebSocketSimProc (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/examples/components/package-frame.html b/build/docs/javadoc/com/jpaulmorrison/fbp/examples/components/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.jpaulmorrison.fbp.examples.components (javafbp-websockets 1.2.4 API)</title>
+<title>com.jpaulmorrison.fbp.examples.components (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/examples/components/package-summary.html b/build/docs/javadoc/com/jpaulmorrison/fbp/examples/components/package-summary.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.jpaulmorrison.fbp.examples.components (javafbp-websockets 1.2.4 API)</title>
+<title>com.jpaulmorrison.fbp.examples.components (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.jpaulmorrison.fbp.examples.components (javafbp-websockets 1.2.4 API)";
+            parent.document.title="com.jpaulmorrison.fbp.examples.components (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/examples/components/package-tree.html b/build/docs/javadoc/com/jpaulmorrison/fbp/examples/components/package-tree.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.jpaulmorrison.fbp.examples.components Class Hierarchy (javafbp-websockets 1.2.4 API)</title>
+<title>com.jpaulmorrison.fbp.examples.components Class Hierarchy (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.jpaulmorrison.fbp.examples.components Class Hierarchy (javafbp-websockets 1.2.4 API)";
+            parent.document.title="com.jpaulmorrison.fbp.examples.components Class Hierarchy (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/examples/networks/TestWebSockets.html b/build/docs/javadoc/com/jpaulmorrison/fbp/examples/networks/TestWebSockets.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>TestWebSockets (javafbp-websockets 1.2.4 API)</title>
+<title>TestWebSockets (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TestWebSockets (javafbp-websockets 1.2.4 API)";
+            parent.document.title="TestWebSockets (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/examples/networks/package-frame.html b/build/docs/javadoc/com/jpaulmorrison/fbp/examples/networks/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.jpaulmorrison.fbp.examples.networks (javafbp-websockets 1.2.4 API)</title>
+<title>com.jpaulmorrison.fbp.examples.networks (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/examples/networks/package-summary.html b/build/docs/javadoc/com/jpaulmorrison/fbp/examples/networks/package-summary.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.jpaulmorrison.fbp.examples.networks (javafbp-websockets 1.2.4 API)</title>
+<title>com.jpaulmorrison.fbp.examples.networks (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.jpaulmorrison.fbp.examples.networks (javafbp-websockets 1.2.4 API)";
+            parent.document.title="com.jpaulmorrison.fbp.examples.networks (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/examples/networks/package-tree.html b/build/docs/javadoc/com/jpaulmorrison/fbp/examples/networks/package-tree.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>com.jpaulmorrison.fbp.examples.networks Class Hierarchy (javafbp-websockets 1.2.4 API)</title>
+<title>com.jpaulmorrison.fbp.examples.networks Class Hierarchy (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.jpaulmorrison.fbp.examples.networks Class Hierarchy (javafbp-websockets 1.2.4 API)";
+            parent.document.title="com.jpaulmorrison.fbp.examples.networks Class Hierarchy (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/constant-values.html b/build/docs/javadoc/constant-values.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Constant Field Values (javafbp-websockets 1.2.4 API)</title>
+<title>Constant Field Values (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (javafbp-websockets 1.2.4 API)";
+            parent.document.title="Constant Field Values (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/deprecated-list.html b/build/docs/javadoc/deprecated-list.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Deprecated List (javafbp-websockets 1.2.4 API)</title>
+<title>Deprecated List (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (javafbp-websockets 1.2.4 API)";
+            parent.document.title="Deprecated List (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/help-doc.html b/build/docs/javadoc/help-doc.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>API Help (javafbp-websockets 1.2.4 API)</title>
+<title>API Help (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (javafbp-websockets 1.2.4 API)";
+            parent.document.title="API Help (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/index-all.html b/build/docs/javadoc/index-all.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Index (javafbp-websockets 1.2.4 API)</title>
+<title>Index (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (javafbp-websockets 1.2.4 API)";
+            parent.document.title="Index (javafbp-websockets 1.2.5 API)";
         }
     }
     catch(err) {

diff --git a/build/docs/javadoc/index.html b/build/docs/javadoc/index.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>javafbp-websockets 1.2.4 API</title>
+<title>javafbp-websockets 1.2.5 API</title>
 <script type="text/javascript">
     targetPage = "" + window.location.search;
     if (targetPage != "" && targetPage != "undefined")

diff --git a/build/docs/javadoc/overview-frame.html b/build/docs/javadoc/overview-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview List (javafbp-websockets 1.2.4 API)</title>
+<title>Overview List (javafbp-websockets 1.2.5 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>