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/03/25 15:09:45 UTC

[tomee] 03/03: 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 ad848e664842e21f2afca94e8469a18259dcff20
Merge: 5561c7b 5b823a8
Author: David Blevins <da...@gmail.com>
AuthorDate: Thu Mar 25 08:09:19 2021 -0700

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

 container/openejb-junit5/pom.xml                   |   3 +-
 .../junit5-arquillian-multiple-tomee/README.adoc   |  60 ++++++++
 examples/junit5-arquillian-multiple-tomee/pom.xml  | 150 +++++++++++++++++++
 .../arquillian/multiple/MultipleTomEETest.java     |  73 ++++++++++
 .../src/test/resources/arquillian.xml              |  42 ++++++
 .../README.adoc                                    |  19 +++
 .../junit5-arquillian-simple-websockets/pom.xml    | 160 +++++++++++++++++++++
 .../org/superbiz/websockets/WebSocketResource.java |  38 +++++
 .../src/main/resources/META-INF/beans.xml          |  21 +++
 .../src/main/webapp/WEB-INF/web.xml                |  25 ++++
 .../websockets/MyWebSocketClientObject.java        |  44 ++++++
 .../superbiz/websockets/WebSocketResourceTest.java |  94 ++++++++++++
 .../src/test/java/resources/arquillian.xml         |  35 +++++
 examples/pom.xml                                   |   2 +
 14 files changed, 765 insertions(+), 1 deletion(-)