Merge branch 'release/2.1.0'

jesse-gallagher · Jan 4, 2022 · ea3009e · ea3009e
2 parents acfdb5b + f98b395
commit ea3009e
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 5 deletions.
diff --git a/xpages-runtime-example/pom.xml b/xpages-runtime-example/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 	<groupId>org.openntf.xpages</groupId>
 	<artifactId>xpages-runtime-example</artifactId>
-	<version>2.0.0</version>
+	<version>2.1.0</version>
     <packaging>war</packaging>
 
     <properties>

diff --git a/xpages-webapp-support/pom.xml b/xpages-webapp-support/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openntf.xpages</groupId>
     <artifactId>xpages-webapp-support</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <packaging>pom</packaging>
 
     <inceptionYear>2019</inceptionYear>

diff --git a/xpages-webapp-support/xpages-runtime-domino/pom.xml b/xpages-webapp-support/xpages-runtime-domino/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.openntf.xpages</groupId>
 		<artifactId>xpages-webapp-support</artifactId>
-		<version>2.0.0</version>
+		<version>2.1.0</version>
 	</parent>
 	<artifactId>xpages-runtime-domino</artifactId>
 

diff --git a/xpages-webapp-support/xpages-runtime/pom.xml b/xpages-webapp-support/xpages-runtime/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openntf.xpages</groupId>
 		<artifactId>xpages-webapp-support</artifactId>
-		<version>2.0.0</version>
+		<version>2.1.0</version>
 	</parent>
 	<artifactId>xpages-runtime</artifactId>
 

diff --git a/...s-runtime/src/main/java/org/openntf/xpages/runtime/JakartaGlobalFacesResourceServlet.java b/...s-runtime/src/main/java/org/openntf/xpages/runtime/JakartaGlobalFacesResourceServlet.java
@@ -19,6 +19,7 @@
 
 import org.openntf.xsp.jakartaee.servlet.ServletUtil;
 
+import jakarta.servlet.ServletConfig;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
@@ -35,6 +36,26 @@ public class JakartaGlobalFacesResourceServlet extends HttpServlet {
 
 	private final DesignerGlobalResourceServlet delegate = new DesignerGlobalResourceServlet();
 
+	@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 var1, ServletResponse var2) throws ServletException, IOException {
 		try {
@@ -58,4 +79,10 @@ public void service(ServletRequest var1, ServletResponse var2) throws ServletExc
 			}
 		}
 	}
+
+	@Override
+	public void destroy() {
+		super.destroy();
+		delegate.destroy();
+	}
 }
diff --git a/xpages-webapp-support/xsp-maven-plugin/pom.xml b/xpages-webapp-support/xsp-maven-plugin/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.openntf.xpages</groupId>
 		<artifactId>xpages-webapp-support</artifactId>
-		<version>2.0.0</version>
+		<version>2.1.0</version>
 	</parent>
 	<artifactId>xsp-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>