Migrate OLFS code from JavaEE 8 to Jakarta EE 9 for Tomcat 11

aggregation-build.xml

@@ -150,7 +150,7 @@
 
     <property name="junit.lib" value="junit-4.4.jar"/>
     <property name="jdom.lib" value="jdom-1.1.1.jar"/>
-    <property name="urlRewrite.lib" value="urlrewrite-3.2.0.jar"/>
+    <property name="urlRewrite.lib" value="urlrewritefilter-5.1.3.jar"/>
 
 
     <property name="slf4j.lib" value="slf4j-api-1.7.32.jar"/>

ant_convert_build.gradle

@@ -75,15 +75,14 @@ dependencies {
 //    implementation group: 'ch.qos.logback', name: 'logback-core', version: '0.9.26'
     implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.1.11'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.9'
-    implementation group: 'org.tuckey', name: 'urlrewritefilter', version: '3.2.0'
+    implementation group: 'org.tuckey', name: 'urlrewritefilter', version: '5.1.3'
     implementation group: 'org.owasp.encoder', name: 'encoder-jsp', version: '1.2.2'
     implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
 //    implementation group: 'xalan', name: 'xalan', version: '2.7.1'
     implementation group: 'xalan', name: 'xalan', version: '2.7.2'
 //    providedCompile group: 'org.apache.tomcat', name: 'catalina', version: '6.0.14'
     providedCompile group: 'org.apache.tomcat', name: 'catalina', version: '6.0.53'
-    providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
-    providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
+    providedCompile group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.1'
     // ---- NGAP libraries -----
     //AmazonElastiCacheClusterClient-no-version.jar
     implementation group: 'com.amazonaws', name: 'elasticache-java-cluster-client', version: '1.1.2'
@@ -101,8 +100,10 @@ dependencies {
     implementation group: 'de.javakaffee.msm', name: 'msm-kryo-serializer', version: '2.3.2'
     //objenesis-3.2.jar
     testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.2'
-    //redisson-all-3.5.5.jar
-    implementation group: 'org.redisson', name: 'redisson-all', version: '3.11.6'
+
+    implementation group: 'org.redisson', name: 'redisson-all', version: '3.50.0'
+    implementation group: 'org.redisson', name: 'redisson-tomcat-11', version: '3.50.0'
+
     implementation group: 'com.esotericsoftware', name: 'reflectasm', version: '1.11.9'
 }
 

build-for-snyk.gradle

@@ -69,15 +69,14 @@ dependencies {
 //    implementation group: 'ch.qos.logback', name: 'logback-core', version: '0.9.26'
     implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.1.11'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.9'
-    implementation group: 'org.tuckey', name: 'urlrewritefilter', version: '3.2.0'
+    implementation group: 'org.tuckey', name: 'urlrewritefilter', version: '5.1.3'
     implementation group: 'org.owasp.encoder', name: 'encoder-jsp', version: '1.2.2'
     implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
 //    implementation group: 'xalan', name: 'xalan', version: '2.7.1'
     implementation group: 'xalan', name: 'xalan', version: '2.7.2'
 //    providedCompile group: 'org.apache.tomcat', name: 'catalina', version: '6.0.14'
     providedCompile group: 'org.apache.tomcat', name: 'catalina', version: '6.0.53'
-    providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
-    providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
+    providedCompile group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.1'
     // ---- NGAP libraries -----
     //AmazonElastiCacheClusterClient-no-version.jar
     implementation group: 'com.amazonaws', name: 'elasticache-java-cluster-client', version: '1.1.2'
@@ -95,8 +94,10 @@ dependencies {
     implementation group: 'de.javakaffee.msm', name: 'msm-kryo-serializer', version: '2.3.2'
     //objenesis-3.2.jar
     testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.2'
-    //redisson-all-3.5.5.jar
-    implementation group: 'org.redisson', name: 'redisson-all', version: '3.11.6'
+
+    implementation group: 'org.redisson', name: 'redisson-all', version: '3.50.0'
+    implementation group: 'org.redisson', name: 'redisson-tomcat-11', version: '3.50.0'
+
     implementation group: 'com.esotericsoftware', name: 'reflectasm', version: '1.11.9'
 
 }

build.gradle

@@ -163,7 +163,9 @@ sourceSets {
             implementation group: 'de.javakaffee.msm', name: 'msm-kryo-serializer', version: '2.3.2'
             // DO NOT use redisson-all, that will include all of the redisson's deps and that
             // will break our code. Use the lib with a version number.
-            implementation group: 'org.redisson', name: 'redisson', version: '3.11.6'
+            implementation group: 'org.redisson', name: 'redisson-all', version: '3.50.0'
+            implementation group: 'org.redisson', name: 'redisson-tomcat-11', version: '3.50.0'
+
             implementation group: 'com.esotericsoftware', name: 'reflectasm', version: '1.11.9'
         }
 
@@ -194,18 +196,18 @@ dependencies {
     testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.2'
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.6'
 
-    providedCompile group: 'org.apache.tomcat', name: 'catalina', version: '6.0.53'
-    providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
-    providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
+    providedCompile group: 'org.apache.tomcat', name: 'catalina', version: '11.0.7'
+    providedCompile group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.1.0'
     providedCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
 
     implementation group: 'org.jdom', name: 'jdom', version: '1.1.3'
 
-    implementation group: 'org.tuckey', name: 'urlrewritefilter', version: '3.2.0'
+    implementation group: 'org.tuckey', name: 'urlrewritefilter', version: '5.1.3'
     implementation group: 'junit', name: 'junit', version: '4.13.2'
     implementation group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
 
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.9'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.13.1'
+    implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
 
     // Including logback-classic will transitively include logback-core and slf4j-api 01/23/25 - ndp
     implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.16'
@@ -246,8 +248,6 @@ dependencies {
     implementation group: 'org.owasp.encoder', name: 'encoder', version: '1.2'
     implementation group: 'org.owasp.encoder', name: 'encoder-jsp', version: '1.2.2'
 
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.3'
-    implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
 
     /// WCS libs
     implementation group: 'org.jvnet.ogc', name: 'wcs-v_2_0', version: '2.6.1'
@@ -285,7 +285,10 @@ dependencies {
     ngapDep implementation("com.esotericsoftware:minlog:1.3.0")
     ngapDep implementation("com.esotericsoftware:reflectasm:1.11.9")
 
-    ngapDep implementation( "org.redisson:redisson:3.22.0")
+    ngapDep implementation( "org.redisson:redisson-all:3.50.0")
+    ngapDep implementation( "org.redisson:redisson-tomcat-11:3.50.0")
+    // https://mvnrepository.com/artifact/de.ruedigermoeller/fst
+    implementation("de.ruedigermoeller:fst:2.57")
 
     // This form:
     //    implementation group: 'org.redisson', name: 'redisson', version: '3.22.0'

build.xml

@@ -233,13 +233,16 @@
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       Libraries
     -->
-    <property name="json.lib" value="gson-2.8.9.jar"/>
+    <!-- property name="json.lib" value="gson-2.8.9.jar"/ -->
+    <property name="json.lib" value="gson-2.13.1.jar"/>
+
+    <property name="sjson.lib" value="json-simple-1.1.1.jar"/>
 
 
     <property name="junit.lib" value="junit-4.13.2.jar"/>
     <property name="hamcrest-all.lib" value="hamcrest-all-1.3.jar"/>
     <property name="jdom.lib" value="jdom-1.1.1.jar"/>
-    <property name="urlRewrite.lib" value="urlrewrite-3.2.0.jar"/>
+    <property name="urlRewrite.lib" value="urlrewritefilter-5.1.3.jar"/>
 
 
     <property name="slf4j.lib" value="slf4j-api-2.0.16.jar"/> <!-- updated version 01/23/25 - ndp -->
@@ -267,10 +270,9 @@
     <property name="saxon-s9api.lib" value="saxon-9.1.0.5-s9api.jar"/>
     <property name="saxon.lib" value="saxon-9.1.0.5.jar"/>
 
-    <property name="catalina.lib" value="catalina-6.0.53.jar"/>
-    <property name="servlet-api.lib" value="servlet-api-3.0.jar"/>
+    <property name="catalina.lib" value="catalina-11.0.7.jar"/>
+    <property name="servlet-api.lib" value="jakarta-servlet-api-6.1.jar"/>
 
-    <property name="sjson.lib" value="json-simple-1.1.1.jar"/>
 
     <property name="owasp-encoder.lib" value="encoder-1.2.2.jar"/>
     <property name="owasp-encoder-jsp.lib" value="encoder-jsp-1.2.2.jar"/>
@@ -895,12 +897,13 @@
             <fileset dir="${ngapResources.dir}/lib">
 
                 <!-- We exclude these because they get placed into
-                $CATALINA_HOM/lib when the Docker containers are built.-->
+                $CATALINA_HOME/lib when the Docker containers are built.-->
                 <exclude name="elasticache-java-cluster-client-1.1.2.jar"/>
                 <exclude name="memcached-session-manager-2.3.2.jar"/>
                 <exclude name="memcached-session-manager-tc9-2.3.2.jar"/>
-                <exclude name="redisson-all-3.22.0.jar"/>
-                <exclude name="redisson-tomcat-9-3.22.0.jar"/>
+                <exclude name="redisson-all-3.50.0.jar"/>
+                <exclude name="redisson-tomcat-11-3.50.0.jar"/>
+                <exclude name="fst-2.57.jar"/>
 
             </fileset>
 

pdpservice-build.xml

@@ -199,7 +199,7 @@
 
     <property name="junit.lib" value="junit-4.4.jar"/>
     <property name="jdom.lib" value="jdom-1.1.1.jar"/>
-    <property name="urlRewrite.lib" value="urlrewrite-3.2.0.jar"/>
+    <property name="urlRewrite.lib" value="urlrewritefilter-5.1.3.jar"/>
 
 
     <property name="slf4j.lib" value="slf4j-api-1.7.32.jar"/>

resources/hyrax/WEB-INF/conf/user-access.xml

@@ -38,8 +38,6 @@
     </EnableAuthenticationControls>
     <MaxSessionLife units="days">7</MaxSessionLife>
     <ShowUserInfoOnProfilePage />
-    <UseReturnToUrlPostLogout />
-
     <!-- EnableGuestProfile / -->
     <!-- EveryOneMustHaveId / -->
 
@@ -51,6 +49,7 @@
         <UrsClientPublicKeys>EDL_CLIENT_PUBLIC_KEYS</UrsClientPublicKeys>
         <UrsUrl>EDL_SSO_ENDPOINT_URL</UrsUrl>
         <!-- RejectUnsupportedAuthzSchemes / -->
+        <!-- UseReturnToUrlPostLogout / -->
     </IdProvider>
 
 

resources/ngap/logback.xml

@@ -70,6 +70,23 @@
         <MaxSize>512</MaxSize>
     </appender>
 
+
+    <appender name="RedissonLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <File>${logdir}/redisson.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+            <FileNamePattern>${logdir}/redisson.%i.log.zip</FileNamePattern>
+            <MinIndex>1</MinIndex>
+            <MaxIndex>3</MaxIndex>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <MaxFileSize>5MB</MaxFileSize>
+        </triggeringPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!-- pattern>{ "date": "%d{yyyy-MM-dd'T'HH:mm:ss.SSS Z}", "thread": "%t", "rel_time": %r, "log_level": "%-5p", "logger_id": "%c.%M", "message": "%m"}%n</pattern -->
+            <pattern>|&amp;|date: "%d{yyyy-MM-dd'T'HH:mm:ss.SSS Z}"|&amp;|thread: %t|&amp;|rel_time: %r|&amp;|log_level: %-5p|&amp;|logger_id: "%c.%M"|&amp;|message: "%m"%n</pattern>
+        </encoder>
+    </appender>
+
     <appender name="ErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <File>${logdir}/HyraxErrors.log</File>
         <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
@@ -207,6 +224,13 @@
         <appender-ref ref="ErrorLog"/>
     </logger>
 
+    <logger name="org.redission" level="all">
+        <appender-ref ref="RedissonLog"/>
+    </logger>
+
+
+
+
     <logger name="HyraxAccess" level="info">
         <appender-ref ref="HyraxAccessLog"/>
     </logger>

resources/ngap/web.xml

@@ -274,7 +274,7 @@
         <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
         <init-param>
             <param-name>logLevel</param-name>
-            <param-value>sysout:DEBUG</param-value>
+            <param-value>sysout:ERROR</param-value>
         </init-param>
         <init-param>
             <param-name>RewriteLog</param-name>

src/opendap/aggregation/AggregationServlet.java

@@ -45,11 +45,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.text.NumberFormat;
 import java.util.Enumeration;

src/opendap/auth/ApacheIdP.java

@@ -33,9 +33,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 
 /**
@@ -144,7 +144,7 @@ public boolean doLogin(HttpServletRequest request, HttpServletResponse response)
             session.setAttribute(IdFilter.USER_PROFILE, up);
 
             */
-            redirectUrl = (String) session.getAttribute(IdFilter.RETURN_TO_URL);
+            redirectUrl = Util.stringFromJson( (String) session.getAttribute(IdFilter.RETURN_TO_URL));
         }
         if(redirectUrl==null){
             // Since the request may come from other deployment contexts we check the request for the context.
@@ -174,7 +174,7 @@ public void doLogout(HttpServletRequest request, HttpServletResponse response)
         HttpSession session = request.getSession(false);
         if( session != null )
         {
-            String returnToUrl =  (String) session.getAttribute(IdFilter.RETURN_TO_URL);
+            String returnToUrl = Util.stringFromJson( (String) session.getAttribute(IdFilter.RETURN_TO_URL));
             if(returnToUrl!=null)
                 redirectUrl = returnToUrl;
             session.invalidate();

src/opendap/auth/AuthenticatedHttpRequest.java

@@ -26,8 +26,8 @@
 
 package opendap.auth;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import java.security.Principal;
 
 /**

src/opendap/auth/AuthenticationControls.java

@@ -32,7 +32,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.security.Principal;
 
 /**

src/opendap/auth/EarthDataLoginAccessToken.java

@@ -171,29 +171,18 @@ public String toString() {
     public String toString(String indent, String indent_inc){
         StringBuilder sb = new StringBuilder();
         String l1i = indent +indent_inc;
-        sb.append(indent).append("\"").append(this.getClass().getName()).append("\" : {\n");
-        sb.append(l1i).append("\"creationTime\" : \"").append(creationTime).append("\",\n");
-        sb.append(l1i).append("\"").append(ACCESS_TOKEN_KEY).append("\" : \"").append(accessToken).append("\",\n");
-        sb.append(l1i).append("\"").append(ENDPOINT_KEY).append("\" : \"").append(endPoint).append("\",\n");
-        sb.append(l1i).append("\"").append(EXPIRES_IN_KEY).append("\" : \"").append(expiresIn).append("\",\n");
-        sb.append(l1i).append("\"").append(TOKEN_TYPE_KEY).append("\" : \"").append(tokenType).append("\",\n");
-        sb.append(l1i).append("\"").append(REFRESH_TOKEN_KEY).append("\" : \"").append(refreshToken).append("\"\n");
-        sb.append(indent).append("}\n");
+        sb.append(indent).append(this.getClass().getName()).append(": \n");
+        sb.append(l1i).append("creationTime: ").append(creationTime).append("\n");
+        sb.append(l1i).append(ACCESS_TOKEN_KEY).append(": ").append(accessToken).append("\n");
+        sb.append(l1i).append(ENDPOINT_KEY).append(": ").append(endPoint).append("\n");
+        sb.append(l1i).append(EXPIRES_IN_KEY).append(": ").append(expiresIn).append("\n");
+        sb.append(l1i).append(TOKEN_TYPE_KEY).append(": ").append(tokenType).append("\n");
+        sb.append(l1i).append(REFRESH_TOKEN_KEY).append(": ").append(refreshToken).append("\"\n");
         return sb.toString();
     }
 
-
-
-    public String getEchoTokenValue(){
-        return  getAccessToken() + ":" + getEdlClientAppId();
-    }
-
     public String getAuthorizationHeaderValue(){
         return  getTokenType() + " " + getAccessToken();
     }
 
-
-
-
-
 }