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

Posted to commits@tomee.apache.org by jg...@apache.org on 2019/02/22 14:48:55 UTC

[tomee] 02/10: Merge remote-tracking branch 'apache/master'

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

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

commit ea73c5e19f249ef6ebafaac6e7593287dae8403f
Merge: 14bb843 7d705da
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Thu Feb 21 10:32:35 2019 +0000

    Merge remote-tracking branch 'apache/master'

 .../remote/RemoteTomEEConfiguration.java           |   3 +-
 docs/tomee-directory-structure.adoc                |   6 +-
 examples/application-composer/README.md            |   6 +-
 examples/cdi-realm/README.adoc                     | 181 ++++++++++
 examples/concurrency-utils/README.adoc             | 380 +++++++++++++++++++++
 examples/multiple-tomee-arquillian/README.adoc     |  57 ++++
 examples/rest-cdi/README.md                        |   4 +-
 examples/rest-xml-json/README.md                   |   4 +-
 examples/simple-rest/README.md                     |   4 +-
 .../README.adoc                                    |  87 +++++
 .../server/groovy/BeanManagerHelperTest.java       |   4 +-
 .../org/apache/openejb/server/cxf/FeatureTest.java |   4 +-
 .../server/cxf/GlobalFeatureConfigTest.java        |   4 +-
 .../ServletContextListenerRegistrationTest.java    |   4 +-
 14 files changed, 727 insertions(+), 21 deletions(-)