You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by db...@apache.org on 2021/05/03 01:47:30 UTC

[tomee] 04/04: Merge branch 'master' of github.com:apache/tomee

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

dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit e962c4ca97eb3b1c9784681ad365f9b6735c6356
Merge: 8e9c2a7 009fbc2
Author: David Blevins <da...@gmail.com>
AuthorDate: Sun May 2 18:47:12 2021 -0700

    Merge branch 'master' of github.com:apache/tomee

 .../openejb/assembler/classic/WebAppInfo.java      |  1 +
 .../org/apache/openejb/config/AppInfoBuilder.java  |  2 ++
 .../apache/openejb/config/DeploymentLoader.java    |  1 +
 .../org/apache/openejb/config/ReadDescriptors.java |  2 ++
 .../java/org/apache/openejb/config/WebModule.java  |  9 ++++++
 .../java/org/apache/openejb/jee/WebApp$JAXB.java   | 13 +++++++++
 .../main/java/org/apache/openejb/jee/WebApp.java   | 16 +++++++++++
 .../test/java/org/apache/openejb/jee/JeeTest.java  |  4 +++
 .../src/test/resources/web_5-example-expected.xml  | 32 ++++++++++++++++++++++
 .../src/test/resources/web_5-example.xml           | 32 ++++++++++++++++++++++
 .../apache/tomee/catalina/TomcatWebAppBuilder.java | 18 ++++++++++--
 11 files changed, 127 insertions(+), 3 deletions(-)