Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/41f59b07 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/41f59b07 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/41f59b07 Branch: refs/heads/master Commit: 41f59b07516bf3e2458512de651cf5dcba9c383d Parents: dcb8f5b 64ed418 Author: Jean-Louis Monteiro <[email protected]> Authored: Fri Dec 14 22:54:28 2018 +0100 Committer: Jean-Louis Monteiro <[email protected]> Committed: Fri Dec 14 22:54:28 2018 +0100 ---------------------------------------------------------------------- examples/mp-metrics-histogram/README.md | 182 +++++++++++++++++++ examples/mp-metrics-histogram/pom.xml | 109 +++++++++++ .../org/superbiz/histogram/WeatherService.java | 66 +++++++ .../src/main/webapp/WEB-INF/web.xml | 25 +++ .../superbiz/histogram/WeatherServiceTest.java | 167 +++++++++++++++++ .../src/test/resources/arquillian.xml | 30 +++ examples/mp-opentracing-traced/pom.xml | 88 +++++++++ .../src/test/resources/arquillian.xml | 30 +++ examples/pom.xml | 25 ++- 9 files changed, 709 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/41f59b07/examples/pom.xml ---------------------------------------------------------------------- diff --cc examples/pom.xml index 55da481,46bd727..0007646 --- a/examples/pom.xml +++ b/examples/pom.xml @@@ -102,7 -102,9 +102,12 @@@ BROKEN, see TOMEE-214 <module>mbean-auto-registration</module> <module>movies-complete-meta</module> <module>movies-complete</module> ++ <module>mp-config-example</module> ++ <module>mp-faulttolerance-retry</module> + <module>mp-metrics-counted</module> + <module>mp-metrics-histogram</module> + <module>mp-metrics-timed</module> + <module>mp-rest-jwt</module> <module>mtom</module> <module>multi-jpa-provider-testing</module> <module>multiple-arquillian-adapters</module> @@@ -171,7 -174,11 +176,9 @@@ <module>moviefun</module> <module>moviefun-rest</module> <module>resources-jmx-example</module> - <module>mp-metrics-counted</module> + <module>websocket-tls-basic-auth</module> + <module>concurrency-utils</module> + <module>mvc-cxf</module> - <module>mp-faulttolerance-retry</module> - <module>mp-config-example</module> </modules> <dependencies>
