Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/496a8029 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/496a8029 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/496a8029 Branch: refs/heads/master Commit: 496a80291178f973a695d8a5714e4b4e718884fe Parents: 1b843f8 337176e Author: Michael P. Redlich <[email protected]> Authored: Mon Dec 17 07:50:19 2018 -0500 Committer: Michael P. Redlich <[email protected]> Committed: Mon Dec 17 07:50:19 2018 -0500 ---------------------------------------------------------------------- .gitignore | 1 + examples/access-timeout-meta/README.adoc | 281 +++++++++++++++++++ examples/access-timeout-meta/README.md | 253 ----------------- examples/access-timeout/README.adoc | 216 ++++++++++++++ examples/access-timeout/README.md | 199 ------------- examples/github-stylesheet.css | 4 + examples/mp-config-example/README.adoc | 67 +++++ examples/mp-config-example/README.md | 46 --- examples/mp-faulttolerance-retry/README.md | 4 + examples/mp-metrics-metered/pom.xml | 70 +++++ .../java/org/superbiz/rest/WeatherService.java | 33 +++ examples/mp-rest-jwt/README.md | 4 + .../java/org/superbiz/moviefun/MoviesTest.java | 5 +- examples/pom.xml | 6 +- .../MPJWTSecurityAnnotationsInterceptor.java | 9 +- .../server/cxf/rs/ApplicationFeatureTest.java | 87 ++++++ .../apache/openejb/server/rest/RESTService.java | 2 + 17 files changed, 781 insertions(+), 506 deletions(-) ----------------------------------------------------------------------
