You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by ta...@apache.org on 2024/01/21 22:19:29 UTC

(deltaspike) branch master updated (32c97029f -> e68e001bd)

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


    from 32c97029f reintroduced jsf-playground
     add 757880336 migrate faces-config.xml to Jakarta-Faces-4
     add 3947e0722 move web.xml to Jakarta EE 10
     add fb77da113 add warning about ambiguous resolution of EntityManager producers
     add 8093909e1 Merge branch 'apache:master' into master
     new e68e001bd Merge pull request #141 from shadogray/master

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../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(-)


(deltaspike) 01/01: Merge pull request #141 from shadogray/master

Posted by ta...@apache.org.
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 <ta...@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(-)