Merge remote-tracking branch 'upstream/master' into executor-example
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/113644b6 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/113644b6 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/113644b6 Branch: refs/heads/master Commit: 113644b665415b0908b0948cb323be4ef40251ef Parents: 40b41a3 1ff8ad8 Author: brunobat <[email protected]> Authored: Wed Dec 26 12:34:48 2018 +0000 Committer: brunobat <[email protected]> Committed: Wed Dec 26 12:34:48 2018 +0000 ---------------------------------------------------------------------- .../arquillian/tests/filter/AllFilterTest.java | 1 - .../tests/realm/CdiLazyRealmTOMEE1490Test.java | 4 +- arquillian/arquillian-tomee-tests/pom.xml | 39 ++ docs/configuration.adoc | 2 +- docs/embedded-and-remotable.adoc | 2 +- docs/embedding.adoc | 2 +- docs/faq.adoc | 2 +- docs/getting-started.adoc | 2 +- docs/installation.adoc | 2 +- docs/local-server.adoc | 2 +- docs/manual-installation.adoc | 2 +- docs/property-overriding.adoc | 2 +- docs/remote-server.adoc | 2 +- docs/securing-a-web-service.adoc | 2 +- docs/system-properties-files.adoc | 2 +- docs/telnet-console.adoc | 2 +- docs/validation-tool.adoc | 2 +- examples/jpa-hibernate/README.md | 15 +- examples/moviefun-rest/README.md | 404 +++++++++++++++++++ examples/mp-custom-healthcheck/README.adoc | 146 +++++++ examples/mp-custom-healthcheck/pom.xml | 94 +++++ .../java/org/superbiz/WeatherApiStatus.java | 52 +++ .../main/java/org/superbiz/WeatherEndpoint.java | 45 +++ .../java/org/superbiz/WeatherException.java | 27 ++ .../main/java/org/superbiz/WeatherGateway.java | 63 +++ .../org/superbiz/WeatherServiceHealthCheck.java | 48 +++ .../src/main/resources/beans.xml | 7 + .../org/superbiz/test/WeatherServiceTest.java | 124 ++++++ .../src/test/resources/arquillian.xml | 29 ++ examples/mp-faulttolerance-fallback/README.adoc | 121 ++++++ examples/mp-faulttolerance-fallback/pom.xml | 107 +++++ .../rest/WeatherDayStatusFallbackHandler.java | 34 ++ .../org/superbiz/rest/WeatherException.java | 20 + .../java/org/superbiz/rest/WeatherService.java | 60 +++ .../org/superbiz/rest/WeatherServiceTest.java | 74 ++++ .../src/test/resources/arquillian.xml | 30 ++ .../src/test/resources/beans.xml | 7 + examples/mp-opentracing-traced/README.adoc | 64 +++ 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/persistence-fragment/README.md | 6 +- examples/pom.xml | 3 + .../META-INF/org.apache.openejb.extension | 1 - owasp-dc-suppression.xml | 80 ++++ pom.xml | 61 ++- .../apache/openejb/server/rest/RESTService.java | 7 +- .../apache-tomee/src/main/resources/service.bat | 2 +- tomee/tomee-plume-webapp/pom.xml | 3 +- tomee/tomee-plus-webapp/pom.xml | 3 +- 59 files changed, 2242 insertions(+), 52 deletions(-) ----------------------------------------------------------------------
