You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/05/28 16:44:16 UTC
[tomee] 01/03: Merge branch 'jaxrs-filter-example' of
github.com:ShermanMarshall/tomee into pr460
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 81cf513e5237d7aed8080a7cb895237ba226a19b
Merge: 4a5956b db76818
Author: Jonathan Gallimore <jg...@tomitribe.com>
AuthorDate: Tue May 28 15:48:49 2019 +0100
Merge branch 'jaxrs-filter-example' of github.com:ShermanMarshall/tomee into pr460
examples/applet/README.txt | 2 +-
.../java/org/superbiz/applet/CalculatorApplet.java | 14 +++++--
.../bval-evaluation-redeployment/WebApp1/pom.xml | 1 +
.../bval-evaluation-redeployment/WebApp2/pom.xml | 1 +
examples/bval-evaluation-redeployment/pom.xml | 2 -
.../bval-evaluation-redeployment/runner/pom.xml | 5 ++-
.../runner/src/test/java/RedeploymentTest.java | 44 +++++++++++++++-------
.../java-modules/src/main/webapp/WEB-INF/web.xml | 7 ++++
examples/java-modules/src/main/webapp/index.jsp | 5 +++
examples/jaxrs-filter/README.adoc | 2 +-
.../org/superbiz/filterexample/ExampleServlet.java | 16 ++++++++
.../org/superbiz/filterexample/InboundFilter.java | 16 ++++++++
examples/pom.xml | 6 +++
13 files changed, 100 insertions(+), 21 deletions(-)
diff --cc examples/pom.xml
index 3a9998b,94db7b9..30aea46
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@@ -106,14 -110,14 +109,17 @@@
<module>mp-config-source-database</module>
<module>mp-faulttolerance-fallback</module>
<module>mp-faulttolerance-retry</module>
+ <module>mp-jwt-bean-validation</module>
+ <module>mp-jwt-bean-validation-strongly-typed</module>
<module>mp-metrics-counted</module>
<module>mp-metrics-histogram</module>
- <module>mp-metrics-metered</module>
<module>mp-metrics-timed</module>
+ <module>mp-metrics-gauge</module>
++ <module>mp-metrics-metered</module>
+ <module>mp-opentracing-traced</module>
<module>mp-rest-jwt</module>
<module>mp-rest-jwt-jwk</module>
+ <module>mp-rest-jwt-principal</module>
<module>mp-rest-jwt-public-key</module>
<module>mtom</module>
<module>multi-jpa-provider-testing</module>