JWt 4.10.0

emweb · May 31, 2023 · cea33e3 · cea33e3
1 parent ee7bd9a
commit cea33e3
Show file tree

Hide file tree

Showing 286 changed files with 2,913 additions and 3,161 deletions.
diff --git a/.classpath b/.classpath
@@ -12,7 +12,6 @@
 	<classpathentry kind="lib" path="lib/http/httpclient-4.1.2.jar"/>
 	<classpathentry kind="lib" path="lib/http/httpcore-4.1.2.jar"/>
 	<classpathentry kind="lib" path="lib/jpa/geronimo-jpa_2.0_spec-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/servlet-api/servlet-api-3.0.jar"/>
 	<classpathentry kind="lib" path="lib/vt-password/bcprov-jdk15-1.45.jar"/>
 	<classpathentry kind="lib" path="lib/vt-password/commons-cli-1.2.jar"/>
 	<classpathentry kind="lib" path="lib/vt-password/commons-logging-1.1.1.jar"/>
@@ -28,6 +27,7 @@
 	<classpathentry kind="lib" path="lib/jogl/jogl-all.jar"/>
 	<classpathentry kind="lib" path="lib/jogl/gluegen-rt.jar"/>
 	<classpathentry kind="lib" path="lib/antlr-runtime-4.7.2.jar"/>
-	<classpathentry kind="lib" path="lib/servlet-api/javax.websocket-api-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/servlet-api/jakarta.servlet-api-4.0.4.jar"/>
+	<classpathentry kind="lib" path="lib/servlet-api/jakarta.websocket-api-1.1.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build.xml b/build.xml
@@ -1,7 +1,7 @@
 <project name="jwt" default="all" basedir=".">
   <!-- Name of project and version -->
   <property name="proj.name" value="jwt"/>
-  <property name="proj.version" value="4.9.1"/>
+  <property name="proj.version" value="4.10.0"/>
 
   <!-- Global properties for this build -->
   <property name="src.java.dir" value="src"/>
@@ -104,6 +104,7 @@
 	<include name="eu/webtoolkit/jwt/auth/*.xml"/>
 	<include name="eu/webtoolkit/jwt/auth/jpa/*.java"/>
 	<include name="eu/webtoolkit/jwt/utils/*.java"/>
+	<include name="eu/webtoolkit/jwt/utils/whatwg/*.java"/>
       </fileset>
     </copy>
   </target>
@@ -222,7 +223,7 @@
     <jar  destfile="dist/jwt-${proj.version}.jar" 
           basedir="${build.dir}" 
           defaultexcludes="yes" 
-          includes="eu/webtoolkit/jwt/* eu/webtoolkit/jwt/servlet/* eu/webtoolkit/jwt/chart/* eu/webtoolkit/jwt/render/* eu/webtoolkit/jwt/utils/* net/n3/nanoxml/* eu/webtoolkit/jwt/skeletons/* eu/webtoolkit/jwt/wt-resources/**/*">
+    includes="eu/webtoolkit/jwt/* eu/webtoolkit/jwt/servlet/* eu/webtoolkit/jwt/chart/* eu/webtoolkit/jwt/render/* eu/webtoolkit/jwt/utils/* eu/webtoolkit/jwt/utils/whatwg/* net/n3/nanoxml/* eu/webtoolkit/jwt/skeletons/* eu/webtoolkit/jwt/wt-resources/**/*">
       <metainf dir="${build.dir}" includes="resources/wt-resources/**/*"/>
     </jar>
     <jar  destfile="dist/jwt-auth-${proj.version}.jar" 
@@ -247,6 +248,7 @@
 	<include name="eu/webtoolkit/jwt/chart/*.java"/>
 	<include name="eu/webtoolkit/jwt/render/*.java"/>
 	<include name="eu/webtoolkit/jwt/utils/*.java"/>
+	<include name="eu/webtoolkit/jwt/utils/whatwg/*.java"/>
       </fileset>
     </jar>
     <jar jarfile="dist/jwt-auth-${proj.version}-sources.jar">

diff --git a/examples/bobsmith/.classpath b/examples/bobsmith/.classpath
@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/servlet-api/servlet-api-3.0.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jwt-4.9.1.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/servlet-api/jakarta.servlet-api-4.0.4.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jwt-4.10.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-fileupload-1.3.3.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-io-1.4.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/slf4j-api-1.7.25.jar"/>

diff --git a/examples/bobsmith/WebRoot/META-INF/context.xml b/examples/bobsmith/WebRoot/META-INF/context.xml
diff --git a/examples/bobsmith/WebRoot/WEB-INF/context.xml b/examples/bobsmith/WebRoot/WEB-INF/context.xml
diff --git a/examples/bobsmith/WebRoot/WEB-INF/jetty6-web.xml b/examples/bobsmith/WebRoot/WEB-INF/jetty6-web.xml
diff --git a/examples/bobsmith/WebRoot/WEB-INF/jetty7-web.xml b/examples/bobsmith/WebRoot/WEB-INF/jetty7-web.xml
diff --git a/examples/bobsmith/WebRoot/WEB-INF/web.xml b/examples/bobsmith/WebRoot/WEB-INF/web.xml
@@ -1,31 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-   <listener>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+  <listener>
     <listener-class>eu.webtoolkit.jwt.ServletInit</listener-class>
   </listener>
-
-  <!-- For Tomcat
-  <filter>
-    <filter-name>SetCharacterEncoding</filter-name>
-    <filter-class>org.apache.catalina.filters.SetCharacterEncodingFilter</filter-class>
-    <init-param>
-      <param-name>encoding</param-name>
-      <param-value>UTF-8</param-value>
-    </init-param>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>SetCharacterEncoding</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-   End for Tomcat -->
-
-  <!-- This applies only to servlet 3.0 -->
-   <session-config>
-    <tracking-mode>URL</tracking-mode>
-  </session-config>
 
   <servlet>
     <servlet-name>BobSmith</servlet-name>

diff --git a/examples/chart3d/WebRoot/META-INF/context.xml b/examples/chart3d/WebRoot/META-INF/context.xml
diff --git a/examples/chart3d/WebRoot/WEB-INF/context.xml b/examples/chart3d/WebRoot/WEB-INF/context.xml
diff --git a/examples/chart3d/WebRoot/WEB-INF/jetty6-web.xml b/examples/chart3d/WebRoot/WEB-INF/jetty6-web.xml
diff --git a/examples/chart3d/WebRoot/WEB-INF/jetty7-web.xml b/examples/chart3d/WebRoot/WEB-INF/jetty7-web.xml
diff --git a/examples/chart3d/WebRoot/WEB-INF/web.xml b/examples/chart3d/WebRoot/WEB-INF/web.xml
@@ -1,31 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-   <listener>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+  <listener>
     <listener-class>eu.webtoolkit.jwt.ServletInit</listener-class>
   </listener>
-
-  <!-- For Tomcat
-  <filter>
-    <filter-name>SetCharacterEncoding</filter-name>
-    <filter-class>org.apache.catalina.filters.SetCharacterEncodingFilter</filter-class>
-    <init-param>
-      <param-name>encoding</param-name>
-      <param-value>UTF-8</param-value>
-    </init-param>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>SetCharacterEncoding</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-   End for Tomcat -->
-
-  <!-- This applies only to servlet 3.0 -->
-   <session-config>
-    <tracking-mode>URL</tracking-mode>
-  </session-config>
 
   <servlet>
     <servlet-name>Chart3D</servlet-name>

diff --git a/examples/charts/.classpath b/examples/charts/.classpath
@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/servlet-api-3.0.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jwt-4.9.1.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jakarta.servlet-api-4.0.4.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jwt-4.10.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-fileupload-1.3.3.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-io-1.4.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/slf4j-api-1.7.25.jar"/>

diff --git a/examples/charts/WebRoot/META-INF/context.xml b/examples/charts/WebRoot/META-INF/context.xml
diff --git a/examples/charts/WebRoot/WEB-INF/context.xml b/examples/charts/WebRoot/WEB-INF/context.xml
diff --git a/examples/charts/WebRoot/WEB-INF/jetty6-web.xml b/examples/charts/WebRoot/WEB-INF/jetty6-web.xml
diff --git a/examples/charts/WebRoot/WEB-INF/jetty7-web.xml b/examples/charts/WebRoot/WEB-INF/jetty7-web.xml
diff --git a/examples/charts/WebRoot/WEB-INF/web.xml b/examples/charts/WebRoot/WEB-INF/web.xml
@@ -1,32 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-   <listener>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+  <listener>
     <listener-class>eu.webtoolkit.jwt.ServletInit</listener-class>
   </listener>
 
-  <!-- For Tomcat
-  <filter>
-    <filter-name>SetCharacterEncoding</filter-name>
-    <filter-class>org.apache.catalina.filters.SetCharacterEncodingFilter</filter-class>
-    <init-param>
-      <param-name>encoding</param-name>
-      <param-value>UTF-8</param-value>
-    </init-param>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>SetCharacterEncoding</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-   End for Tomcat -->
-
-  <!-- This applies only to servlet 3.0 -->
-   <session-config>
-    <tracking-mode>URL</tracking-mode>
-  </session-config>
-
   <servlet>
     <servlet-name>Charts</servlet-name>
     <display-name>JWt Charts example</display-name>

diff --git a/examples/composer/.classpath b/examples/composer/.classpath
@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/servlet-api/servlet-api-3.0.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jwt-4.9.1.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/servlet-api/jakarta.servlet-api-4.0.4.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jwt-4.10.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-fileupload-1.3.3.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-io-1.4.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/slf4j-api-1.7.25.jar"/>

diff --git a/examples/composer/WebRoot/META-INF/context.xml b/examples/composer/WebRoot/META-INF/context.xml
diff --git a/examples/composer/WebRoot/WEB-INF/context.xml b/examples/composer/WebRoot/WEB-INF/context.xml
diff --git a/examples/composer/WebRoot/WEB-INF/jetty6-web.xml b/examples/composer/WebRoot/WEB-INF/jetty6-web.xml
diff --git a/examples/composer/WebRoot/WEB-INF/jetty7-web.xml b/examples/composer/WebRoot/WEB-INF/jetty7-web.xml
diff --git a/examples/composer/WebRoot/WEB-INF/web.xml b/examples/composer/WebRoot/WEB-INF/web.xml
@@ -1,32 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-   <listener>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+  <listener>
     <listener-class>eu.webtoolkit.jwt.ServletInit</listener-class>
   </listener>
 
-  <!-- For Tomcat
-  <filter>
-    <filter-name>SetCharacterEncoding</filter-name>
-    <filter-class>org.apache.catalina.filters.SetCharacterEncodingFilter</filter-class>
-    <init-param>
-      <param-name>encoding</param-name>
-      <param-value>UTF-8</param-value>
-    </init-param>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>SetCharacterEncoding</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-   End for Tomcat -->
-
-  <!-- This applies only to servlet 3.0 -->
-   <session-config>
-    <tracking-mode>URL</tracking-mode>
-  </session-config>
-
   <servlet>
     <servlet-name>Composer</servlet-name>
     <display-name>JWt Composer example</display-name>

diff --git a/examples/dialog/.classpath b/examples/dialog/.classpath
@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/servlet-api/servlet-api-3.0.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jwt-4.9.1.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/servlet-api/jakarta.servlet-api-4.0.4.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jwt-4.10.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-fileupload-1.3.3.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-io-1.4.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/slf4j-api-1.7.25.jar"/>

diff --git a/examples/dialog/WebRoot/META-INF/context.xml b/examples/dialog/WebRoot/META-INF/context.xml
diff --git a/examples/dialog/WebRoot/WEB-INF/context.xml b/examples/dialog/WebRoot/WEB-INF/context.xml
diff --git a/examples/dialog/WebRoot/WEB-INF/jetty6-web.xml b/examples/dialog/WebRoot/WEB-INF/jetty6-web.xml
diff --git a/examples/dialog/WebRoot/WEB-INF/jetty7-web.xml b/examples/dialog/WebRoot/WEB-INF/jetty7-web.xml