release 118 (last changes)

drogatkin · May 4, 2022 · 8feb2bc · 8feb2bc
1 parent 6c0483d
commit 8feb2bc
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/1.x/bee.xml b/1.x/bee.xml
@@ -1443,8 +1443,8 @@ for Jasper enabled application [-nohup -p 80 -dataSource datasource.properties]?
       <parameter>50</parameter>
       <parameter>-sh</parameter>
       <!--parameter value="-nka"/-->
-      <parameter value="-acceptorImpl"/>
-      <parameter value="Acme.Serve.SelectorAcceptor"/> 
+      <!--parameter value="-acceptorImpl"/>
+      <parameter value="Acme.Serve.SelectorAcceptor"/--> 
       <!--parameter value="-j"/>
       <parameter value="org.apache.jasper.servlet.JspServlet"/>
       <parameter value="-org.apache.jasper.servlet.JspServlet.classpath"/>

diff --git a/1.x/html/wskt-notes.html b/1.x/html/wskt-notes.html
@@ -1,12 +1,12 @@
   <html>
 <body>
-<h2>TJWS Websocket (JSR 356) extension module version 1.0</h2>
+<h2>TJWS Websocket (JSR 356) extension module version 1.2</h2>
 <h3>Release notes</h3>
-<p>This is first release of JSR 356 implementation in scope of TJWS. The implementation is provided as a TJWS extension module and 
-generally optional. It introduces extra dependency as fast classpath scan library which is used for end points deployment. The library
+<p>This is a maintenance release of JSR 356 implementation in scope of the TJWS. The implementation is provided as a TJWS extension module and 
+generally optional. It introduces extra dependency as fast classpath scan library which is used for endpoints deployment. The library
  is forked at <a href="https://github.com/drogatkin/fast-classpath-scanner">GitHub</a>. You can find its license notes there.
- 7Bee scripts are provided in the fork. End points
- deployment is provided as in scope of .war deployed applications as in main container (when enabled). It allows using pure websocket
+ 7Bee scripts are provided in the fork. Endpoints
+ deployment is provided as in a scope of .war deployed applications as in the main container (when enabled). It allows using pure websocket
  implementation without servlets. Since websocket
  uses non blocking IO, they work only with SelectorAcceptor, and SSLSelectorAcceptor acceptors. Error code SC_NOT_IMPLEMENTED (501) will be returned
  at handshake for other types of acceptors.
@@ -17,8 +17,8 @@ <h3>Known problems and limitations</h3>
 <li>No asynchronous send timeout</li>
 </ol>
 <h3>Build Notes</h3>
-<p>If you prefer build everything yourself, for example for a specific Java version, then you need also obtain source code of JSR 356 API.
-Use the command: <code>svn checkout https://svn.java.net/svn/websocket-spec~source-code-repository</code>, 7Bee build scripts for 
-the API can be obtained from <a href="https://github.com/drogatkin/7Bee/tree/master/examples/jsr356api">examples/jsr356api</a> of 7Bee distribution.</p>WebSocket API can be also pulled from Maven repository. env.xml reflects that.
+<p>If you prefer build everything yourself, for example for a specific Java version, then you need also obtain JSR 356 API binaries.
+Take them from <a href="https://mvnrepository.com/artifact/javax.websocket/javax.websocket-api/1.1">Maven repository</a></p>
+<p>env.xml provides required dependencies directly from the Maven repository.</p>
 </body>
 </html>  
diff --git a/1.x/notes/118/changelog.txt b/1.x/notes/118/changelog.txt
@@ -3,9 +3,9 @@ TJWS  version 1.118
 1. Improved performance of file upload operations
 2. Added web.xml less an app deployment based on annotations only
 3. Made error pages a mobile friendly
-4. Corrected parsing URL templates for websockets when special
-   symbols and national characters are used in URLs
+4. Corrected parsing URL templates for websocket when special
+   symbols and national characters are used in URL components
 5. Redirected system out in a log
 6. JSR356 extension allowing access a servlet context and
-   a request in websocket environment
+   a request in a websocket environment
 7. Improved robustness of the JSR356 implementation
diff --git a/1.x/notes/118/notes.txt b/1.x/notes/118/notes.txt
@@ -2,7 +2,7 @@ TJWS release 1.118
 
 TJWS is currently in a maintenance mode with a 6 months cadence of
 bug fixing releases. There are some new features mostly from the backlog 
-of not implemented features due a low demand. Check the change log
+of not implemented traits due a low demand. Check the change log
 to see if something worth of your interest is there. Java 11 or higher
  is preferred for running the server. However the server wasn't tested
  on Java 18 yet.
diff --git a/1.x/src/Acme/Serve/Serve.java b/1.x/src/Acme/Serve/Serve.java
@@ -1732,7 +1732,7 @@ public void run() {
     public static interface Identification {
 	public static final String serverName = "D. Rogatkin's TJWS (+Android, JSR340, JSR356, Java 17) https://github.com/drogatkin/TJWS2.git";
 
-	public static final String serverVersion = "Version 1.118 (nightly)";
+	public static final String serverVersion = "Version 1.118";
 
 	public static final String serverUrl = "http://tjws.sourceforge.net";
 

diff --git a/1.x/src/Acme/Utils.java b/1.x/src/Acme/Utils.java
@@ -87,6 +87,8 @@ public class Utils {
 	public static final int COPY_BUF_SIZE = 4096 * 2;
 
 	public final static String ISO_8859_1 = "ISO-8859-1";
+
+	public final static String UTF_8 = "UTF-8";
 
 	public static final Class[] EMPTY_CLASSES = {};
 

diff --git a/1.x/src/rogatkin/wskt/SimpleConfigurator.java b/1.x/src/rogatkin/wskt/SimpleConfigurator.java
@@ -48,6 +48,7 @@ public <T> T getEndpointInstance(Class<T> arg0) throws InstantiationException {
 
 	@Override
 	public List<Extension> getNegotiatedExtensions(List<Extension> installed, List<Extension> requested) {
+		// or use retainAll of a mutable copy
 		return Arrays.asList(firstMatch(installed, requested));
 	}