diff --git a/xpages-runtime-example/pom.xml b/xpages-runtime-example/pom.xml index f1cddea..1f9c5de 100644 --- a/xpages-runtime-example/pom.xml +++ b/xpages-runtime-example/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.openntf.xpages xpages-runtime-example - 1.5.0 + 2.0.0 war @@ -17,6 +17,11 @@ javax.servlet javax.servlet-api 4.0.0 + + + jakarta.servlet + jakarta.servlet-api + 5.0.0 provided diff --git a/xpages-webapp-support/pom.xml b/xpages-webapp-support/pom.xml index 1269ff7..9e5c0c1 100644 --- a/xpages-webapp-support/pom.xml +++ b/xpages-webapp-support/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.openntf.xpages xpages-webapp-support - 1.5.0 + 2.0.0 pom 2019 @@ -51,6 +51,14 @@ + + + artifactory.openntf.org + artifactory.openntf.org + https://artifactory.openntf.org/openntf + + + artifactory.openntf.org @@ -61,10 +69,20 @@ + + javax.servlet + javax.servlet-api + 4.0.1 + jakarta.servlet jakarta.servlet-api - 4.0.4 + 5.0.0 + + + org.openntf.xsp + org.openntf.xsp.jakartaee.commons + 2.1.0 @@ -303,7 +321,7 @@ Jesse Gallagher - 2021 + 2022 SLASHSTAR_STYLE diff --git a/xpages-webapp-support/xpages-runtime-domino/pom.xml b/xpages-webapp-support/xpages-runtime-domino/pom.xml index 3fa2430..9e1c31c 100644 --- a/xpages-webapp-support/xpages-runtime-domino/pom.xml +++ b/xpages-webapp-support/xpages-runtime-domino/pom.xml @@ -7,7 +7,7 @@ org.openntf.xpages xpages-webapp-support - 1.5.0 + 2.0.0 xpages-runtime-domino @@ -18,11 +18,19 @@ ${project.version} + + javax.servlet + javax.servlet-api + jakarta.servlet jakarta.servlet-api provided + + org.openntf.xsp + org.openntf.xsp.jakartaee.commons + diff --git a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/JakartaDominoContextListener.java b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/JakartaDominoContextListener.java index def4d28..6626044 100644 --- a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/JakartaDominoContextListener.java +++ b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/JakartaDominoContextListener.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,12 +23,13 @@ import java.net.URLStreamHandlerFactory; import java.security.AccessController; import java.security.PrivilegedAction; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; import org.openntf.xpages.runtime.domino.platform.JakartaDominoPlatform; import org.openntf.xpages.runtime.wrapper.JakartaServletContextWrapper; +import org.openntf.xsp.jakartaee.servlet.ServletUtil; import com.ibm.commons.util.StringUtil; import com.ibm.domino.napi.c.C; @@ -43,7 +44,7 @@ public void contextInitialized(ServletContextEvent sce) { NotesThread t = new NotesThread(() -> { C.initLibrary(null); - JakartaDominoPlatform.initContext(new JakartaServletContextWrapper(sce.getServletContext())); + JakartaDominoPlatform.initContext(new JakartaServletContextWrapper(ServletUtil.newToOld(sce.getServletContext()))); final URLStreamHandlerFactory delegate = AccessController.doPrivileged((PrivilegedAction) () -> { URLStreamHandlerFactory d; diff --git a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/JakartaDominoXPagesServlet.java b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/JakartaDominoXPagesServlet.java index b14fa91..bae9eee 100644 --- a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/JakartaDominoXPagesServlet.java +++ b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/JakartaDominoXPagesServlet.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,17 +25,18 @@ import com.ibm.xsp.acl.NoAccessSignal; import com.ibm.xsp.webapp.DesignerFacesServlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.openntf.xpages.runtime.domino.adapter.ServletHttpServletResponseAdapter; import org.openntf.xpages.runtime.domino.adapter.ServletHttpSessionAdapter; import org.openntf.xpages.runtime.domino.wrapper.JakartaDominoServletRequestWrapper; import org.openntf.xpages.runtime.wrapper.JakartaServletRequestWrapper; +import org.openntf.xsp.jakartaee.servlet.ServletUtil; import java.io.IOException; @@ -69,7 +70,11 @@ public void init(ServletConfig config) throws ServletException { this.lcdEnvironment = LCDEnvironment.getInstance(); this.delegate = new DesignerFacesServlet(); - delegate.init(config); + try { + delegate.init(ServletUtil.newToOld(config)); + } catch (javax.servlet.ServletException e) { + throw new ServletException(e); + } } @Override @@ -83,19 +88,25 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws String contextPath = StringUtil.toString(req.getContextPath()); String path = pathInfo.substring(contextPath.length()); RequestContext requestContext = new RequestContext(contextPath, path); - HttpSessionAdapter sessionAdapter = new ServletHttpSessionAdapter(req.getSession()); - HttpServletRequestAdapter requestAdapter = new JakartaDominoServletRequestWrapper(req); - HttpServletResponseAdapter responseAdapter = new ServletHttpServletResponseAdapter(resp); + HttpSessionAdapter sessionAdapter = new ServletHttpSessionAdapter(ServletUtil.newToOld(req.getSession())); + HttpServletRequestAdapter requestAdapter = new JakartaDominoServletRequestWrapper(ServletUtil.newToOld(req)); + HttpServletResponseAdapter responseAdapter = new ServletHttpServletResponseAdapter(ServletUtil.newToOld(resp)); try { lcdEnvironment.service(requestContext, sessionAdapter, requestAdapter, responseAdapter); } catch(NoAccessSignal s) { // TODO see if this can signal the container for form-based auth resp.setHeader("WWW-Authenticate", "Basic realm=\"XPagesRuntime\""); //$NON-NLS-1$ //$NON-NLS-2$ resp.sendError(HttpServletResponse.SC_UNAUTHORIZED, "You must log in"); //$NON-NLS-1$ + } catch (javax.servlet.ServletException e) { + throw new ServletException(e); } } else { // In-app XPage - delegate.service(new JakartaServletRequestWrapper(req), resp); + try { + delegate.service(new JakartaServletRequestWrapper(ServletUtil.newToOld(req)), ServletUtil.newToOld(resp)); + } catch (javax.servlet.ServletException e) { + throw new ServletException(e); + } } } diff --git a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/adapter/ServletHttpServletResponseAdapter.java b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/adapter/ServletHttpServletResponseAdapter.java index 6eec748..d8bba52 100644 --- a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/adapter/ServletHttpServletResponseAdapter.java +++ b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/adapter/ServletHttpServletResponseAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/adapter/ServletHttpSessionAdapter.java b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/adapter/ServletHttpSessionAdapter.java index 8449c27..e140573 100644 --- a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/adapter/ServletHttpSessionAdapter.java +++ b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/adapter/ServletHttpSessionAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/platform/JakartaDominoPlatform.java b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/platform/JakartaDominoPlatform.java index a09f146..ce89f5b 100644 --- a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/platform/JakartaDominoPlatform.java +++ b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/platform/JakartaDominoPlatform.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/platform/JakartaDominoPlatformFactory.java b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/platform/JakartaDominoPlatformFactory.java index 9343dbc..6a368b7 100644 --- a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/platform/JakartaDominoPlatformFactory.java +++ b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/platform/JakartaDominoPlatformFactory.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/wrapper/JakartaDominoServletRequestWrapper.java b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/wrapper/JakartaDominoServletRequestWrapper.java index d8d7012..4beba2d 100644 --- a/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/wrapper/JakartaDominoServletRequestWrapper.java +++ b/xpages-webapp-support/xpages-runtime-domino/src/main/java/org/openntf/xpages/runtime/domino/wrapper/JakartaDominoServletRequestWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/pom.xml b/xpages-webapp-support/xpages-runtime/pom.xml index 6d72be5..e88e967 100644 --- a/xpages-webapp-support/xpages-runtime/pom.xml +++ b/xpages-webapp-support/xpages-runtime/pom.xml @@ -5,16 +5,24 @@ org.openntf.xpages xpages-webapp-support - 1.5.0 + 2.0.0 xpages-runtime + + javax.servlet + javax.servlet-api + jakarta.servlet jakarta.servlet-api provided + + org.openntf.xsp + org.openntf.xsp.jakartaee.commons + diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/com/ibm/xsp/dojo/factory/JakartaDojoLibraryFactory.java b/xpages-webapp-support/xpages-runtime/src/main/java/com/ibm/xsp/dojo/factory/JakartaDojoLibraryFactory.java index dd77317..9df8d05 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/com/ibm/xsp/dojo/factory/JakartaDojoLibraryFactory.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/com/ibm/xsp/dojo/factory/JakartaDojoLibraryFactory.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaAppExecutionContext.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaAppExecutionContext.java index 47efc35..4933b89 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaAppExecutionContext.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaAppExecutionContext.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaApplication.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaApplication.java index 71b1ea2..b40ddf0 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaApplication.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaApplication.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaFacesApplication.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaFacesApplication.java index 44f8c65..4b1ded0 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaFacesApplication.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaFacesApplication.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaFacesApplicationFactory.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaFacesApplicationFactory.java index b05664f..5fb39dc 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaFacesApplicationFactory.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaFacesApplicationFactory.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaGlobalFacesResourceServlet.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaGlobalFacesResourceServlet.java index cf12e5b..7f3d1e4 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaGlobalFacesResourceServlet.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaGlobalFacesResourceServlet.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,21 +17,28 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebServlet; +import org.openntf.xsp.jakartaee.servlet.ServletUtil; + +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.ibm.xsp.webapp.DesignerGlobalResourceServlet; @WebServlet(urlPatterns="/xsp/.ibmxspres/*") -public class JakartaGlobalFacesResourceServlet extends DesignerGlobalResourceServlet { +public class JakartaGlobalFacesResourceServlet extends HttpServlet { private static final long serialVersionUID = 1L; + private final DesignerGlobalResourceServlet delegate = new DesignerGlobalResourceServlet(); + @Override public void service(ServletRequest var1, ServletResponse var2) throws ServletException, IOException { try { - super.service(var1, var2); + delegate.service(ServletUtil.newToOld((HttpServletRequest)var1), ServletUtil.newToOld((HttpServletResponse)var2)); } catch(IOException e) { if("Broken pipe".equals(e.getMessage())) { //$NON-NLS-1$ // Ignore @@ -44,10 +51,10 @@ public void service(ServletRequest var1, ServletResponse var2) throws ServletExc if("Broken pipe".equals(t.getCause().getMessage())) { //$NON-NLS-1$ // Ignore } else { - throw t; + throw new ServletException(t); } } else { - throw t; + throw new ServletException(t); } } } diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaXPagesServlet.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaXPagesServlet.java index c61bd3a..5536315 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaXPagesServlet.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/JakartaXPagesServlet.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,15 +17,16 @@ import java.io.IOException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.openntf.xpages.runtime.platform.JakartaPlatform; import org.openntf.xpages.runtime.wrapper.JakartaServletConfigWrapper; import org.openntf.xpages.runtime.wrapper.JakartaServletRequestWrapper; +import org.openntf.xsp.jakartaee.servlet.ServletUtil; import com.ibm.xsp.webapp.DesignerFacesServlet; @@ -46,15 +47,23 @@ public void init(ServletConfig config) throws ServletException { this.delegate = new DesignerFacesServlet(); - ServletConfig conf = new JakartaServletConfigWrapper(config); + javax.servlet.ServletConfig conf = new JakartaServletConfigWrapper(ServletUtil.newToOld(config)); JakartaPlatform.initContext(conf.getServletContext()); - delegate.init(conf); + try { + delegate.init(conf); + } catch (javax.servlet.ServletException e) { + throw new ServletException(e); + } } @Override protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - HttpServletRequest wrap = new JakartaServletRequestWrapper(req); - delegate.service(wrap, resp); + javax.servlet.http.HttpServletRequest wrap = new JakartaServletRequestWrapper(ServletUtil.newToOld(req)); + try { + delegate.service(wrap, ServletUtil.newToOld(resp)); + } catch (javax.servlet.ServletException | IOException e) { + throw new ServletException(e); + } } @Override diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/context/JakartaExternalContext.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/context/JakartaExternalContext.java index 15c11b5..8043c46 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/context/JakartaExternalContext.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/context/JakartaExternalContext.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/context/JakartaFacesContext.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/context/JakartaFacesContext.java index 7b79383..6a510b1 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/context/JakartaFacesContext.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/context/JakartaFacesContext.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/context/JakartaFacesContextFactory.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/context/JakartaFacesContextFactory.java index c44d102..34ccf32 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/context/JakartaFacesContextFactory.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/context/JakartaFacesContextFactory.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/interpreter/DynamicPageDriver.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/interpreter/DynamicPageDriver.java index ff5377f..5aaf82e 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/interpreter/DynamicPageDriver.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/interpreter/DynamicPageDriver.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/listener/JakartaConfigureCoreListener.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/listener/JakartaConfigureCoreListener.java index acb84e1..115ad44 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/listener/JakartaConfigureCoreListener.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/listener/JakartaConfigureCoreListener.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,29 +15,29 @@ */ package org.openntf.xpages.runtime.listener; -import com.ibm.xsp.config.BootStrap; -import com.ibm.xsp.config.ConfigureCoreListener; - -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.annotation.WebListener; - import org.openntf.xpages.runtime.wrapper.JakartaServletContextWrapper; import org.openntf.xpages.runtime.xsp.JakartaBootStrap; +import org.openntf.xsp.jakartaee.servlet.ServletUtil; + +import com.ibm.xsp.config.BootStrap; + +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; @WebListener -public class JakartaConfigureCoreListener extends ConfigureCoreListener { +public class JakartaConfigureCoreListener implements ServletContextListener { BootStrap bootstrap; @Override public void contextInitialized(ServletContextEvent servletContextEvent) { - ServletContext context = new JakartaServletContextWrapper(servletContextEvent.getServletContext()); + javax.servlet.ServletContext context = new JakartaServletContextWrapper(ServletUtil.newToOld(servletContextEvent.getServletContext())); bootstrap = new JakartaBootStrap(context); bootstrap.init(context); } @Override public void contextDestroyed(ServletContextEvent servletContextEvent) { - bootstrap.destroy(new JakartaServletContextWrapper(servletContextEvent.getServletContext())); + bootstrap.destroy(new JakartaServletContextWrapper(ServletUtil.newToOld(servletContextEvent.getServletContext()))); } } diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/listener/JakartaContextListener.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/listener/JakartaContextListener.java index 0a51987..daf1b38 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/listener/JakartaContextListener.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/listener/JakartaContextListener.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,17 +15,18 @@ */ package org.openntf.xpages.runtime.listener; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; import org.openntf.xpages.runtime.platform.JakartaPlatform; import org.openntf.xpages.runtime.wrapper.JakartaServletContextWrapper; +import org.openntf.xsp.jakartaee.servlet.ServletUtil; @WebListener public class JakartaContextListener implements ServletContextListener { @Override public void contextInitialized(ServletContextEvent sce) { - JakartaPlatform.initContext(new JakartaServletContextWrapper(sce.getServletContext())); + JakartaPlatform.initContext(new JakartaServletContextWrapper(ServletUtil.newToOld(sce.getServletContext()))); } } diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/ActivatorNameProvider.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/ActivatorNameProvider.java index 7ff5e5a..513acde 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/ActivatorNameProvider.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/ActivatorNameProvider.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/DefaultActivatorNameProvider.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/DefaultActivatorNameProvider.java index 471151a..43e5088 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/DefaultActivatorNameProvider.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/DefaultActivatorNameProvider.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/MockBundle.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/MockBundle.java index d78dd4f..458b88d 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/MockBundle.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/MockBundle.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/MockBundleContext.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/MockBundleContext.java index 4ff950e..fa0b2dc 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/MockBundleContext.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/MockBundleContext.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/OSGiEnvironmentListener.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/OSGiEnvironmentListener.java index 612d12b..be1a044 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/OSGiEnvironmentListener.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/OSGiEnvironmentListener.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,9 +18,9 @@ import java.security.AccessController; import java.security.PrivilegedAction; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; @WebListener public class OSGiEnvironmentListener implements ServletContextListener { diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/OSGiPatcher.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/OSGiPatcher.java index 408f057..9222b8e 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/OSGiPatcher.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/osgi/OSGiPatcher.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/platform/JakartaPlatform.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/platform/JakartaPlatform.java index 5e3acc5..fc14de0 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/platform/JakartaPlatform.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/platform/JakartaPlatform.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/platform/JakartaPlatformFactory.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/platform/JakartaPlatformFactory.java index c8bc75d..37aa903 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/platform/JakartaPlatformFactory.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/platform/JakartaPlatformFactory.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/runtime/JakartaFacesController.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/runtime/JakartaFacesController.java index 86d129e..3b5a1ed 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/runtime/JakartaFacesController.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/runtime/JakartaFacesController.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/runtime/JakartaFacesControllerFactory.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/runtime/JakartaFacesControllerFactory.java index 263ecb8..795d4a3 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/runtime/JakartaFacesControllerFactory.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/runtime/JakartaFacesControllerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/servlet/JakartaFacesServlet.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/servlet/JakartaFacesServlet.java index 7b81793..cd02962 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/servlet/JakartaFacesServlet.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/servlet/JakartaFacesServlet.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/servlet/JakartaServlet.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/servlet/JakartaServlet.java index 0aaf9b5..c8aa828 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/servlet/JakartaServlet.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/servlet/JakartaServlet.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,17 +18,18 @@ import java.io.IOException; import java.io.InputStream; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.openntf.xpages.runtime.platform.JakartaPlatform; import org.openntf.xpages.runtime.wrapper.JakartaServletConfigWrapper; import org.openntf.xpages.runtime.wrapper.JakartaServletRequestWrapper; import org.openntf.xpages.runtime.wrapper.JakartaServletResponseWrapper; +import org.openntf.xsp.jakartaee.servlet.ServletUtil; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -62,13 +63,17 @@ public void init(ServletConfig config) throws ServletException { this.delegate = new JakartaFacesServlet(); - ServletConfig conf = new JakartaServletConfigWrapper(config); + javax.servlet.ServletConfig conf = new JakartaServletConfigWrapper(ServletUtil.newToOld(config)); JakartaPlatform.initContext(conf.getServletContext()); - delegate.init(conf); + try { + delegate.init(conf); + } catch (javax.servlet.ServletException e) { + throw new ServletException(e); + } resources.addResourceProvider(new JavaResourceProvider("") { //$NON-NLS-1$ @Override - protected String getResourcePath(HttpServletRequest req, String path) { + protected String getResourcePath(javax.servlet.http.HttpServletRequest req, String path) { if(!"/".equals(path) && Thread.currentThread().getContextClassLoader().getResourceAsStream(path) != null) { //$NON-NLS-1$ return path; } else { @@ -81,7 +86,11 @@ protected boolean shouldCacheResources() { return !ExtLibUtil.isDevelopmentMode(); } }); - resources.init(conf); + try { + resources.init(conf); + } catch (javax.servlet.ServletException e) { + throw new ServletException(e); + } } @Override @@ -91,15 +100,23 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws // Check the welcome-file-list path = PathUtil.concat("/", getIndex(), '/'); //$NON-NLS-1$ } - HttpServletResponse resWrap = new JakartaServletResponseWrapper(resp); + javax.servlet.http.HttpServletResponse resWrap = new JakartaServletResponseWrapper(ServletUtil.newToOld(resp)); int xspIndex = path.indexOf(".xsp"); //$NON-NLS-1$ if(xspIndex > -1) { String pathInfo = path.substring(xspIndex+4); - HttpServletRequest wrap = new JakartaServletRequestWrapper(req, path.substring(0, xspIndex+4), pathInfo.isEmpty() ? null : pathInfo); - delegate.service(wrap, resWrap); + javax.servlet.http.HttpServletRequest wrap = new JakartaServletRequestWrapper(ServletUtil.newToOld(req), path.substring(0, xspIndex+4), pathInfo.isEmpty() ? null : pathInfo); + try { + delegate.service(wrap, resWrap); + } catch (javax.servlet.ServletException | IOException e) { + throw new ServletException(e); + } } else { - HttpServletRequest wrap = new JakartaServletRequestWrapper(req, "/", path); //$NON-NLS-1$ - resources.service(wrap, resWrap); + javax.servlet.http.HttpServletRequest wrap = new JakartaServletRequestWrapper(ServletUtil.newToOld(req), "/", path); //$NON-NLS-1$ + try { + resources.service(wrap, resWrap); + } catch (javax.servlet.ServletException | IOException e) { + throw new ServletException(e); + } } } diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/servlet/ModuleResourceServlet.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/servlet/ModuleResourceServlet.java index c229046..78f8dd4 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/servlet/ModuleResourceServlet.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/servlet/ModuleResourceServlet.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,11 +15,55 @@ */ package org.openntf.xpages.runtime.servlet; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebServlet; + +import java.io.IOException; + +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import org.openntf.xsp.jakartaee.servlet.ServletUtil; import com.ibm.xsp.webapp.DesignerModuleResourceServlet; @WebServlet(urlPatterns="/xsp/.ibmmodres/*") -public class ModuleResourceServlet extends DesignerModuleResourceServlet { +public class ModuleResourceServlet extends HttpServlet { private static final long serialVersionUID = 1L; + + private final DesignerModuleResourceServlet delegate = new DesignerModuleResourceServlet(); + + @Override + public void init() throws ServletException { + super.init(); + try { + delegate.init(); + } catch (javax.servlet.ServletException e) { + throw new ServletException(e); + } + } + + @Override + public void init(ServletConfig config) throws ServletException { + super.init(config); + + try { + delegate.init(ServletUtil.newToOld(config)); + } catch (javax.servlet.ServletException e) { + throw new ServletException(e); + } + } + + @Override + public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException { + try { + delegate.service(ServletUtil.newToOld((HttpServletRequest)req), ServletUtil.newToOld((HttpServletResponse)res)); + } catch (javax.servlet.ServletException e) { + throw new ServletException(e); + } + } } diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/util/XSPUtil.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/util/XSPUtil.java index 0f923b8..4c8f5b9 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/util/XSPUtil.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/util/XSPUtil.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/vfs/ClasspathVFS.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/vfs/ClasspathVFS.java index ff354f5..0eebdd6 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/vfs/ClasspathVFS.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/vfs/ClasspathVFS.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/vfs/NopVFSFile.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/vfs/NopVFSFile.java index ee9f355..edcac50 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/vfs/NopVFSFile.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/vfs/NopVFSFile.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/vfs/UrlVFSFile.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/vfs/UrlVFSFile.java index 4b0eb30..63f2095 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/vfs/UrlVFSFile.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/vfs/UrlVFSFile.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaPrintWriterWrapper.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaPrintWriterWrapper.java index 8e5bb5a..73956d3 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaPrintWriterWrapper.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaPrintWriterWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletConfigWrapper.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletConfigWrapper.java index 626a4e4..ff04bb0 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletConfigWrapper.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletConfigWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletContextWrapper.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletContextWrapper.java index 57b7a80..c346ea9 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletContextWrapper.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletContextWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletContextWrapperWrapper.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletContextWrapperWrapper.java index db95958..eec80b5 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletContextWrapperWrapper.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletContextWrapperWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletOutputStreamWrapper.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletOutputStreamWrapper.java index 061edcb..6521691 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletOutputStreamWrapper.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletOutputStreamWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletRequestWrapper.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletRequestWrapper.java index 25d64bd..a43a083 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletRequestWrapper.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletRequestWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletResponseWrapper.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletResponseWrapper.java index 5679e74..afdb01c 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletResponseWrapper.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/wrapper/JakartaServletResponseWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaBootStrap.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaBootStrap.java index e24cc99..0347828 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaBootStrap.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaBootStrap.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaFacesClassLoader.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaFacesClassLoader.java index ce5c298..ff6def7 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaFacesClassLoader.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaFacesClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaFacesPageDriver.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaFacesPageDriver.java index 2da426c..77064ef 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaFacesPageDriver.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaFacesPageDriver.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaFactoryLookup.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaFactoryLookup.java index 1b7e4e4..e973ce1 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaFactoryLookup.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaFactoryLookup.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaSourceFileManager.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaSourceFileManager.java index f2c56ac..6185f61 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaSourceFileManager.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaSourceFileManager.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaViewHandler.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaViewHandler.java index 1a27cc6..e5f4c60 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaViewHandler.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaViewHandler.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaXspSourceClassLoader.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaXspSourceClassLoader.java index 7b5a764..b4801f8 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaXspSourceClassLoader.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/JakartaXspSourceClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/LibraryWeightComparator.java b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/LibraryWeightComparator.java index ac292a2..b1f3b25 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/LibraryWeightComparator.java +++ b/xpages-webapp-support/xpages-runtime/src/main/java/org/openntf/xpages/runtime/xsp/LibraryWeightComparator.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2021 Jesse Gallagher + * Copyright © 2019-2022 Jesse Gallagher * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xpages-webapp-support/xpages-runtime/src/main/resources/META-INF/jakarta-faces-config.xml b/xpages-webapp-support/xpages-runtime/src/main/resources/META-INF/jakarta-faces-config.xml index e3b02c4..0312992 100644 --- a/xpages-webapp-support/xpages-runtime/src/main/resources/META-INF/jakarta-faces-config.xml +++ b/xpages-webapp-support/xpages-runtime/src/main/resources/META-INF/jakarta-faces-config.xml @@ -1,7 +1,7 @@