From 475c9b1eb612cc0bb5db34abc5221e0043455b20 Mon Sep 17 00:00:00 2001 From: Paul Morrison Date: Wed, 14 Oct 2020 11:51:01 -0400 Subject: [PATCH] =?UTF-8?q?Changes=20to=20reflect=20new=20Java-WebSocket?= =?UTF-8?q?=20and=20support=20wss:=20(working=20with=20Chrome)=EF=BB=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .classpath | 9 +- .settings/org.eclipse.m2e.core.prefs | 2 +- build.gradle | 10 +- build/docs/javadoc/allclasses-frame.html | 2 +- build/docs/javadoc/allclasses-noframe.html | 2 +- .../fbp/components/VersionAndTimestamp.html | 4 +- .../fbp/components/WebSocketReceive.html | 4 +- .../fbp/components/WebSocketRespond.html | 4 +- .../fbp/components/package-frame.html | 2 +- .../fbp/components/package-summary.html | 4 +- .../fbp/components/package-tree.html | 4 +- .../examples/components/WebSocketSimProc.html | 4 +- .../examples/components/package-frame.html | 2 +- .../examples/components/package-summary.html | 4 +- .../fbp/examples/components/package-tree.html | 4 +- .../fbp/examples/networks/TestWebSockets.html | 4 +- .../fbp/examples/networks/package-frame.html | 2 +- .../examples/networks/package-summary.html | 4 +- .../fbp/examples/networks/package-tree.html | 4 +- build/docs/javadoc/constant-values.html | 4 +- build/docs/javadoc/deprecated-list.html | 4 +- build/docs/javadoc/help-doc.html | 4 +- build/docs/javadoc/index-all.html | 4 +- build/docs/javadoc/index.html | 2 +- build/docs/javadoc/overview-frame.html | 2 +- build/docs/javadoc/overview-summary.html | 6 +- build/docs/javadoc/overview-tree.html | 4 +- build/publications/mavenJava/module.json | 66 +++++------ build/publications/mavenJava/module.json.asc | 14 +-- build/publications/mavenJava/pom-default.xml | 6 +- .../mavenJava/pom-default.xml.asc | 14 +-- build/scripts/javafbp-websockets | 2 +- build/scripts/javafbp-websockets.bat | 2 +- docs/ClientServer.png | Bin 15032 -> 23344 bytes pom.xml | 2 +- .../fbp/components/VersionAndTimestamp.java | 4 +- .../fbp/components/WebSocketReceive.java | 110 +++++++++++++----- .../fbp/components/WebSocketRespond.java | 17 ++- .../fbp/examples/networks/TestWebSockets.java | 5 +- src/main/resources/scripts/chat1.html | 11 +- src/main/resources/scripts/chat2.html | 28 +++-- src/main/resources/simplelogger.properties | 2 +- 42 files changed, 239 insertions(+), 149 deletions(-) diff --git a/.classpath b/.classpath index 2456854..2013d58 100644 --- a/.classpath +++ b/.classpath @@ -13,6 +13,7 @@ + @@ -22,6 +23,10 @@ - - + + + + + + diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs index 7f6f4be..b079cfc 100644 --- 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 index 8339cd3..f7169aa 100644 --- 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 index 2f7da9c..19b1ed0 100644 --- a/build/docs/javadoc/allclasses-frame.html +++ b/build/docs/javadoc/allclasses-frame.html @@ -3,7 +3,7 @@ -All Classes (javafbp-websockets 1.2.4 API) +All Classes (javafbp-websockets 1.2.5 API) diff --git a/build/docs/javadoc/allclasses-noframe.html b/build/docs/javadoc/allclasses-noframe.html index 4877877..c77224b 100644 --- a/build/docs/javadoc/allclasses-noframe.html +++ b/build/docs/javadoc/allclasses-noframe.html @@ -3,7 +3,7 @@ -All Classes (javafbp-websockets 1.2.4 API) +All Classes (javafbp-websockets 1.2.5 API) diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/components/VersionAndTimestamp.html b/build/docs/javadoc/com/jpaulmorrison/fbp/components/VersionAndTimestamp.html index 9e6f70d..668d1a2 100644 --- a/build/docs/javadoc/com/jpaulmorrison/fbp/components/VersionAndTimestamp.html +++ b/build/docs/javadoc/com/jpaulmorrison/fbp/components/VersionAndTimestamp.html @@ -3,7 +3,7 @@ -VersionAndTimestamp (javafbp-websockets 1.2.4 API) +VersionAndTimestamp (javafbp-websockets 1.2.5 API) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ diff --git a/build/docs/javadoc/com/jpaulmorrison/fbp/components/package-summary.html b/build/docs/javadoc/com/jpaulmorrison/fbp/components/package-summary.html index 461fd9a..57cab66 100644 --- a/build/docs/javadoc/com/jpaulmorrison/fbp/components/package-summary.html +++ b/build/docs/javadoc/com/jpaulmorrison/fbp/components/package-summary.html @@ -3,7 +3,7 @@ -com.jpaulmorrison.fbp.components (javafbp-websockets 1.2.4 API) +com.jpaulmorrison.fbp.components (javafbp-websockets 1.2.5 API) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ 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 index 21d6a5e..a431a8a 100644 --- 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,7 +3,7 @@ -com.jpaulmorrison.fbp.examples.components (javafbp-websockets 1.2.4 API) +com.jpaulmorrison.fbp.examples.components (javafbp-websockets 1.2.5 API) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ 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 index 912e688..0956abc 100644 --- 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,7 +3,7 @@ -com.jpaulmorrison.fbp.examples.networks (javafbp-websockets 1.2.4 API) +com.jpaulmorrison.fbp.examples.networks (javafbp-websockets 1.2.5 API) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ diff --git a/build/docs/javadoc/overview-summary.html b/build/docs/javadoc/overview-summary.html index e562905..f1044d0 100644 --- a/build/docs/javadoc/overview-summary.html +++ b/build/docs/javadoc/overview-summary.html @@ -3,7 +3,7 @@ -Overview (javafbp-websockets 1.2.4 API) +Overview (javafbp-websockets 1.2.5 API) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@