Conflicts resolved
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7732a4d0 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7732a4d0 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7732a4d0 Branch: refs/heads/master Commit: 7732a4d0a6017829d680a7f8f072e3e3cb60b6d3 Parents: 68653b1 c64d352 Author: josehenriqueventura <[email protected]> Authored: Fri Dec 21 14:31:18 2018 +0000 Committer: josehenriqueventura <[email protected]> Committed: Fri Dec 21 14:31:18 2018 +0000 ---------------------------------------------------------------------- examples/mvc-cxf/README.adoc | 24 ++++ examples/mvc-cxf/README.md | 23 --- examples/mvc-resteasy/README.adoc | 23 +++ examples/mvc-resteasy/pom.xml | 143 +++++++++++++++++++ .../java/org/superbiz/mvc/MVCApplication.java | 22 +++ .../java/org/superbiz/mvc/TomeeController.java | 38 +++++ .../src/main/resources/META-INF/beans.xml | 23 +++ .../src/main/webapp/WEB-INF/views/hello.jsp | 28 ++++ .../src/main/webapp/WEB-INF/web.xml | 28 ++++ examples/mvc-resteasy/src/main/webapp/index.jsp | 28 ++++ .../src/test/java/org/superbiz/mvc/MVCTest.java | 74 ++++++++++ .../src/test/resources/arquillian.xml | 31 ++++ examples/pom.xml | 1 + .../apache-tomee/src/main/resources/service.bat | 2 +- 14 files changed, 464 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/7732a4d0/examples/pom.xml ---------------------------------------------------------------------- diff --cc examples/pom.xml index 4746cc0,ceadb34..04bbf8d --- a/examples/pom.xml +++ b/examples/pom.xml @@@ -180,7 -177,7 +180,8 @@@ BROKEN, see TOMEE-214 <module>concurrency-utils</module> <module>mvc-cxf</module> <module>mp-rest-client</module> + <module>mvc-resteasy</module> + <module>mp-custom-healthcheck</module> </modules> <dependencies>
