You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2015/05/12 16:46:05 UTC

[8/8] tomee git commit: Merge branch 'master' into fb_tomee2_owb16

Merge branch 'master' into fb_tomee2_owb16


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fc120745
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fc120745
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fc120745

Branch: refs/heads/fb_tomee2_owb16
Commit: fc12074507a6db69e93923a01c953b23077892fe
Parents: 478671a 25207a0
Author: Mark Struberg <st...@apache.org>
Authored: Tue May 12 16:45:38 2015 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Tue May 12 16:45:38 2015 +0200

----------------------------------------------------------------------
 .../apache/openejb/arquillian/common/Setup.java | 33 ++++++++++++--
 .../remote/RemoteTomEEConfiguration.java        | 20 ++++++++
 .../arquillian/remote/RemoteTomEEContainer.java | 27 +++++++++--
 .../openejb/arquillian/AdditionalLibsTest.java  |  6 +--
 .../arquillian/javaagent/JavaagentTest.java     | 48 ++++++++++++++++++++
 .../src/test/resources/arquillian.xml           |  5 +-
 6 files changed, 125 insertions(+), 14 deletions(-)
----------------------------------------------------------------------