This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit e68e001bd4242cb431be6a9067520b445777e5cb
Merge: 32c97029f 8093909e1
Author: Thomas Andraschko <tandrasc...@apache.org>
AuthorDate: Sun Jan 21 23:19:24 2024 +0100
Merge pull request #141 from shadogray/master
schema declarations to EE10, add warning for ambiguous EntityManager
resolution
.../src/main/webapp/WEB-INF/faces-config.xml | 9 ++++----
.../data-examples/src/main/webapp/WEB-INF/web.xml | 6 +++---
.../src/main/webapp/WEB-INF/faces-config.xml | 9 ++++----
.../jpa-examples/src/main/webapp/WEB-INF/web.xml | 6 +++---
.../src/main/webapp/WEB-INF/faces-config.xml | 9 ++++----
.../jsf-examples/src/main/webapp/WEB-INF/web.xml | 6 +++---
.../src/main/webapp/WEB-INF/faces-config.xml | 10 ++++-----
.../jsf-playground/src/main/webapp/WEB-INF/web.xml | 6 +++---
.../src/main/webapp/WEB-INF/faces-config.xml | 8 +++----
.../src/main/webapp/WEB-INF/web.xml | 6 +++---
.../src/main/webapp/WEB-INF/faces-config.xml | 8 +++----
.../src/main/webapp/WEB-INF/web.xml | 6 +++---
.../QualifierBackedEntityManagerResolver.java | 25 +++++++++++++++++-----
.../src/main/resources/META-INF/faces-config.xml | 9 ++++----
.../resources/default/WEB-INF/faces-config.xml | 10 ++++-----
.../src/test/resources/default/WEB-INF/web.xml | 7 +++---
16 files changed, 79 insertions(+), 61 deletions(-)
