This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new e1cb6c8e EMPIREDB-408 Updated MyFaces from 2.2.14 to 2.3.10
e1cb6c8e is described below
commit e1cb6c8ea549a6c78fafd848c297e7ad017f1fcf
Author: Rainer Döbele <[email protected]>
AuthorDate: Mon Apr 3 17:00:24 2023 +0200
EMPIREDB-408
Updated MyFaces from 2.2.14 to 2.3.10
---
.../empire/jsf2/websample/web/AppExceptionHandler.java | 15 ++++-----------
.../jsf2/websample/web/AppExceptionHandlerFactory.java | 12 ++----------
pom.xml | 4 ++--
3 files changed, 8 insertions(+), 23 deletions(-)
diff --git
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/AppExceptionHandler.java
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/AppExceptionHandler.java
index 2a7ace27..3e4d2cac 100644
---
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/AppExceptionHandler.java
+++
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/AppExceptionHandler.java
@@ -38,23 +38,16 @@ import
org.apache.empire.jsf2.websample.web.pages.SamplePages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/*
+ * AppExceptionHandler
+ */
public class AppExceptionHandler extends ExceptionHandlerWrapper
{
-
private static final Logger log =
LoggerFactory.getLogger(AppExceptionHandler.class);
- private final ExceptionHandler wrapped;
-
public AppExceptionHandler(ExceptionHandler delegate)
{
- // super(delegate);
- this.wrapped = delegate;
- }
-
- @Override
- public javax.faces.context.ExceptionHandler getWrapped()
- {
- return this.wrapped;
+ super(delegate);
}
@Override
diff --git
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/AppExceptionHandlerFactory.java
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/AppExceptionHandlerFactory.java
index 98cf4e0c..b44d295f 100644
---
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/AppExceptionHandlerFactory.java
+++
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/AppExceptionHandlerFactory.java
@@ -26,17 +26,9 @@ import javax.faces.context.ExceptionHandlerFactory;
*/
public class AppExceptionHandlerFactory extends ExceptionHandlerFactory
{
- ExceptionHandlerFactory delegateFactory;
-
- public AppExceptionHandlerFactory(ExceptionHandlerFactory delegateFactory)
- {
- this.delegateFactory = delegateFactory;
- }
-
- @Override
- public ExceptionHandlerFactory getWrapped()
+ public AppExceptionHandlerFactory(ExceptionHandlerFactory delegate)
{
- return delegateFactory;
+ super(delegate);
}
@Override
diff --git a/pom.xml b/pom.xml
index d14cc0d4..f8d2b0e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -360,12 +360,12 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>2.2.14</version>
+ <version>2.3.10</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>2.2.14</version>
+ <version>2.3.10</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>