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/06/25 10:24:55 UTC

[tomee] 02/21: Merge remote-tracking branch 'upstream/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 d4311e5980b786345ba5218570b617a421410afe
Merge: 7c299a6 0411888
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Tue Jun 25 09:45:34 2019 +0100

    Merge remote-tracking branch 'upstream/master'

 examples/xa-datasource/.gitignore                  |   3 +
 examples/xa-datasource/README.md                   | 114 ++++++++
 examples/xa-datasource/grinder.sh                  |  28 ++
 examples/xa-datasource/pom.xml                     | 322 +++++++++++++++++++++
 examples/xa-datasource/src/assembly/tests.xml      |  32 ++
 .../java/org/superbiz/injection/jpa/Movies.java    |   9 +-
 .../java/org/superbiz/injection/jpa/MoviesXA.java  |   4 -
 .../main/java/org/superbiz/rest/MovieService.java  |  88 ++++++
 .../src/main/resources/META-INF/persistence.xml    |   1 +
 .../src/main/webapp/WEB-INF/resources.xml          |  46 +++
 .../org/superbiz/injection/jpa/MoviesXATest.java   |   1 +
 .../test/java/org/superbiz/perf/DBTestPerf.java    |  56 ++++
 .../xa-datasource/src/test/resources/grinder.py    |  18 ++
 13 files changed, 716 insertions(+), 6 deletions(-)