[1/2] tomee git commit: Moved examples project version to match parent project.
Repository: tomee Updated Branches: refs/heads/master f003c900e -> 1abc5237f http://git-wip-us.apache.org/repos/asf/tomee/blob/1abc5237/examples/simple-ear/moviefun-functional-tests/pom.xml -- diff --git a/examples/simple-ear/moviefun-functional-tests/pom.xml b/examples/simple-ear/moviefun-functional-tests/pom.xml index 4bbf3d8..ff4e805 100644 --- a/examples/simple-ear/moviefun-functional-tests/pom.xml +++ b/examples/simple-ear/moviefun-functional-tests/pom.xml @@ -24,7 +24,7 @@ org.superbiz moviefun-ear-parent -1.1.0-SNAPSHOT +8.0.0-SNAPSHOT 4.0.0 moviefun-functional-test http://git-wip-us.apache.org/repos/asf/tomee/blob/1abc5237/examples/simple-ear/moviefun-webapp/pom.xml -- diff --git a/examples/simple-ear/moviefun-webapp/pom.xml b/examples/simple-ear/moviefun-webapp/pom.xml index cb03986..de60169 100644 --- a/examples/simple-ear/moviefun-webapp/pom.xml +++ b/examples/simple-ear/moviefun-webapp/pom.xml @@ -22,7 +22,7 @@ org.superbiz moviefun-ear-parent -1.1.0-SNAPSHOT +8.0.0-SNAPSHOT moviefun-webapp war http://git-wip-us.apache.org/repos/asf/tomee/blob/1abc5237/examples/simple-ear/pom.xml -- diff --git a/examples/simple-ear/pom.xml b/examples/simple-ear/pom.xml index bcd0596..b0228ae 100644 --- a/examples/simple-ear/pom.xml +++ b/examples/simple-ear/pom.xml @@ -25,7 +25,7 @@ 4.0.0 org.superbiz moviefun-ear-parent - 1.1.0-SNAPSHOT + 8.0.0-SNAPSHOT pom OpenEJB :: Examples :: Simple EAR http://git-wip-us.apache.org/repos/asf/tomee/blob/1abc5237/examples/simple-mdb-and-cdi/pom.xml -- diff --git a/examples/simple-mdb-and-cdi/pom.xml b/examples/simple-mdb-and-cdi/pom.xml index 4741474..c6f12b6 100644 --- a/examples/simple-mdb-and-cdi/pom.xml +++ b/examples/simple-mdb-and-cdi/pom.xml @@ -25,7 +25,7 @@ org.superbiz simple-mdb-and-cdi jar - 1.1.0-SNAPSHOT + 8.0.0-SNAPSHOT OpenEJB :: Examples :: Simple MDB With a CDI Injection UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/1abc5237/examples/simple-mdb-with-descriptor/pom.xml -- diff --git a/examples/simple-mdb-with-descriptor/pom.xml b/examples/simple-mdb-with-descriptor/pom.xml index 1104278..ac69ad5 100644 --- a/examples/simple-mdb-with-descriptor/pom.xml +++ b/examples/simple-mdb-with-descriptor/pom.xml @@ -25,7 +25,7 @@ org.superbiz simple-mdb-with-descriptor jar - 1.1.0-SNAPSHOT + 8.0.0-SNAPSHOT OpenEJB :: Examples :: Simple MDB Using Deployment Descriptor Example UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/1abc5237/examples/simple-mdb/pom.xml -- diff --git a/examples/simple-mdb/pom.xml b/examples/simple-mdb/pom.xml index 1fd9493..91e3c79 100644 --- a/examples/simple-mdb/pom.xml +++ b/examples/simple-mdb/pom.xml @@ -25,7 +25,7 @@ org.superbiz simple-mdb jar - 1.1.0-SNAPSHOT + 8.0.0-SNAPSHOT OpenEJB :: Examples :: Simple MDB Example UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/1abc5237/examples/simple-remote-tomcatusers/pom.xml -- diff --git a/examples/simple-remote-tomcatusers/pom.xml b/examples/simple-remote-tomcatusers/pom.xml index fda230a..c4a4542 100644 --- a/examples/simple-remote-tomcatusers/pom.xml +++ b/examples/simple-remote-tomcatusers/pom.xml @@ -26,7 +26,7 @@ org.superbiz simple-remote-tomcatusers jar - 1.1.0-SNAPSHOT + 8.0.0-SNAPSHOT OpenEJB :: Examples :: Simple Remote tomcat-users.xml http://git-wip-us.apache.org/repos/asf/tomee/blob/1abc5237/examples/simple-rest/pom.xml -- diff --git a/examples/simple-rest/pom.xml b/examples/simple-rest/pom.xml index 40b5ff9..e26a004 100644 --- a/examples/simple-rest/pom.xml +++ b/examples/simple-rest/pom.xml @@ -22,7 +22,7 @@ org.superbiz simple-rest - 1.1.0-SNAPSHOT + 8.0.0-SNAPSHOT OpenEJB :: Examples :: Simple REST http://git-wip-us.apache.org/repos/asf/tomee/blob/1abc5237/examples/simple-singleton/pom.xml -- diff --git a/examples/simple-singleton/pom.xml b/examples/simple-singleton/pom.xml index 7d83dbc..716b5db 100644 --- a/examples/simple-singleton/pom.xml +++ b/examples/simple-singleton/pom.xml @@ -25,7 +25,7 @@ org.superbiz simple-singleton jar - 1.1.0-SNAPSHOT + 8.0.0-SNAPSHOT OpenEJB :: Examples :: Simple Singleton http://git-wip-us.apache.org/repos/asf/tomee/blob/1abc5237/examples/simple-stateful-callbacks/pom.xml
[2/2] tomee git commit: Moved examples project version to match parent project.
Moved examples project version to match parent project. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1abc5237 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1abc5237 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1abc5237 Branch: refs/heads/master Commit: 1abc5237f377c9f493b4dd0e325023bdfbcba578 Parents: f003c90 Author: Roberto Cortez Authored: Tue Oct 2 00:59:24 2018 +0100 Committer: Roberto Cortez Committed: Tue Oct 2 00:59:24 2018 +0100 -- examples/access-timeout-meta/pom.xml | 2 +- examples/access-timeout/pom.xml | 2 +- examples/alternate-descriptors/pom.xml | 2 +- examples/applet/pom.xml | 2 +- examples/application-composer/pom.xml| 2 +- examples/applicationcomposer-jaxws-cdi/pom.xml | 2 +- examples/applicationexception/pom.xml| 2 +- examples/arquillian-jpa/pom.xml | 2 +- examples/async-methods/pom.xml | 2 +- examples/async-postconstruct/pom.xml | 2 +- examples/bean-validation-design-by-contract/pom.xml | 2 +- examples/bval-evaluation-redeployment/WebApp1/pom.xml| 2 +- examples/bval-evaluation-redeployment/WebApp2/pom.xml| 2 +- examples/bval-evaluation-redeployment/pom.xml| 4 ++-- examples/bval-evaluation-redeployment/runner/pom.xml | 2 +- examples/cdi-alternative-and-stereotypes/pom.xml | 2 +- examples/cdi-application-scope/pom.xml | 2 +- examples/cdi-basic/pom.xml | 2 +- examples/cdi-ejbcontext-jaas/pom.xml | 2 +- examples/cdi-events/pom.xml | 2 +- examples/cdi-interceptors/pom.xml| 2 +- examples/cdi-produces-disposes/pom.xml | 2 +- examples/cdi-produces-field/pom.xml | 2 +- examples/cdi-realm/pom.xml | 2 +- examples/cdi-request-scope/pom.xml | 2 +- examples/cdi-session-scope/pom.xml | 2 +- examples/change-jaxws-url/pom.xml| 2 +- examples/client-resource-lookup-preview/pom.xml | 2 +- examples/component-interfaces/pom.xml| 2 +- examples/connector-ear-sample/moviefun-ear/pom.xml | 2 +- examples/cucumber-jvm/pom.xml| 2 +- examples/custom-injection/pom.xml| 2 +- examples/datasource-ciphered-password/pom.xml| 2 +- examples/datasource-definition/pom.xml | 2 +- examples/datasource-versioning/pom.xml | 2 +- examples/decorators/pom.xml | 2 +- examples/deltaspike-configproperty/pom.xml | 2 +- examples/deltaspike-exception-handling/pom.xml | 2 +- examples/deltaspike-fullstack/pom.xml| 2 +- examples/deltaspike-i18n/pom.xml | 2 +- examples/dynamic-dao-implementation/pom.xml | 2 +- examples/dynamic-datasource-routing/pom.xml | 2 +- examples/dynamic-implementation/pom.xml | 2 +- examples/dynamic-proxy-to-access-mbean/pom.xml | 2 +- examples/ear-testing/business-logic/pom.xml | 2 +- examples/ear-testing/business-model/pom.xml | 2 +- examples/ear-testing/pom.xml | 2 +- examples/ejb-examples/pom.xml| 2 +- examples/ejb-webservice/pom.xml | 2 +- examples/groovy-cdi/pom.xml | 2 +- examples/groovy-jpa/pom.xml | 2 +- examples/groovy-spock/pom.xml| 2 +- examples/helloworld-weblogic/pom.xml | 2 +- examples/injection-of-connectionfactory/pom.xml | 2 +- examples/injection-of-datasource/pom.xml | 2 +- examples/injection-of-ejbs/pom.xml | 2 +- examples/injection-of-entitymanager/pom.xml | 2 +- examples/injection-of-env-entry/pom.xml | 2 +- examples/interceptors/pom.xml| 2 +- examples/javamail/pom.xml| 2 +- examples/jpa-eclipselink/pom.xml | 2 +- examples/jpa-enumerated/pom.xml | 2 +- examples/jpa-hibernate/pom.xml | 2 +- examples/jsf-cdi-and-ejb/pom.xml | 2 +- examples/jsf-managedBean-and-ejb/pom.xml | 2 +- examples/lookup-of-ejbs-with-descriptor/pom.xml | 2 +- examples/lookup-of-ejbs/pom.xml | 2 +-
[jira] [Commented] (TOMEE-2239) mp-jwt filter eating exception and returning 200 code instead
[ https://issues.apache.org/jira/browse/TOMEE-2239?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16634439#comment-16634439 ] ASF GitHub Bot commented on TOMEE-2239: --- Github user radcortez commented on the issue: https://github.com/apache/tomee/pull/169 @tveronezi I did rebase the commits to amend the message and include the JIRA issue (it was missing on one of the commit). That changed the hash and the bot is not picking it up to close the PR. Can you do it please? :) > mp-jwt filter eating exception and returning 200 code instead > - > > Key: TOMEE-2239 > URL: https://issues.apache.org/jira/browse/TOMEE-2239 > Project: TomEE > Issue Type: Bug > Components: TomEE Core Server >Affects Versions: 7.1, 7.1.1 >Reporter: Thiago Veronezi >Assignee: Thiago Veronezi >Priority: Major > Labels: pull-request-available > > This filter has a try-catch block that eats all the exceptions from the > chain. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (TOMEE-2239) mp-jwt filter eating exception and returning 200 code instead
[ https://issues.apache.org/jira/browse/TOMEE-2239?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16634342#comment-16634342 ] ASF GitHub Bot commented on TOMEE-2239: --- Github user tveronezi commented on the issue: https://github.com/apache/tomee/pull/169 Oh yeah! > mp-jwt filter eating exception and returning 200 code instead > - > > Key: TOMEE-2239 > URL: https://issues.apache.org/jira/browse/TOMEE-2239 > Project: TomEE > Issue Type: Bug > Components: TomEE Core Server >Affects Versions: 7.1, 7.1.1 >Reporter: Thiago Veronezi >Assignee: Thiago Veronezi >Priority: Major > Labels: pull-request-available > > This filter has a try-catch block that eats all the exceptions from the > chain. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
tomee git commit: This closes pull request #169.
Repository: tomee
Updated Branches:
refs/heads/tomee-7.1.x 5f5847ec6 -> bacef66d0
This closes pull request #169.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bacef66d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bacef66d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bacef66d
Branch: refs/heads/tomee-7.1.x
Commit: bacef66d0b15bc9608154433b74ee323c258034f
Parents: 5f5847e
Author: Jonathan Gallimore
Authored: Mon Oct 1 16:14:13 2018 +0100
Committer: Jonathan Gallimore
Committed: Mon Oct 1 16:14:13 2018 +0100
--
.../main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java| 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/bacef66d/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
--
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
index a11a101..78f059e 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
@@ -271,4 +271,3 @@ public class MPJWTFilter implements Filter {
}
}
-
tomee git commit: This closes #169
Repository: tomee
Updated Branches:
refs/heads/tomee-7.1.x a32354b9d -> 5f5847ec6
This closes #169
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5f5847ec
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5f5847ec
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5f5847ec
Branch: refs/heads/tomee-7.1.x
Commit: 5f5847ec635939be5ee557c8540ef54a325fd023
Parents: a32354b
Author: Jonathan Gallimore
Authored: Mon Oct 1 16:12:20 2018 +0100
Committer: Jonathan Gallimore
Committed: Mon Oct 1 16:12:20 2018 +0100
--
.../main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java| 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/5f5847ec/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
--
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
index 78f059e..a11a101 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
@@ -271,3 +271,4 @@ public class MPJWTFilter implements Filter {
}
}
+
[jira] [Commented] (TOMEE-2239) mp-jwt filter eating exception and returning 200 code instead
[ https://issues.apache.org/jira/browse/TOMEE-2239?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16633858#comment-16633858 ] ASF GitHub Bot commented on TOMEE-2239: --- Github user radcortez commented on the issue: https://github.com/apache/tomee/pull/169 Merged! > mp-jwt filter eating exception and returning 200 code instead > - > > Key: TOMEE-2239 > URL: https://issues.apache.org/jira/browse/TOMEE-2239 > Project: TomEE > Issue Type: Bug > Components: TomEE Core Server >Affects Versions: 7.1, 7.1.1 >Reporter: Thiago Veronezi >Assignee: Thiago Veronezi >Priority: Major > Labels: pull-request-available > > This filter has a try-catch block that eats all the exceptions from the > chain. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (TOMEE-2239) mp-jwt filter eating exception and returning 200 code instead
[ https://issues.apache.org/jira/browse/TOMEE-2239?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16633857#comment-16633857 ] Roberto Cortez commented on TOMEE-2239: --- Merged to 7.1.x. > mp-jwt filter eating exception and returning 200 code instead > - > > Key: TOMEE-2239 > URL: https://issues.apache.org/jira/browse/TOMEE-2239 > Project: TomEE > Issue Type: Bug > Components: TomEE Core Server >Affects Versions: 7.1, 7.1.1 >Reporter: Thiago Veronezi >Assignee: Thiago Veronezi >Priority: Major > Labels: pull-request-available > > This filter has a try-catch block that eats all the exceptions from the > chain. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[2/3] tomee git commit: TOMEE-2239 add try-catch block back but add a final if statement
TOMEE-2239 add try-catch block back but add a final if statement
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cb747b09
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cb747b09
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cb747b09
Branch: refs/heads/tomee-7.1.x
Commit: cb747b0912c7a54866430b56743378d1640ca0b0
Parents: 1bf7963
Author: Thiago Veronezi
Authored: Thu Sep 20 09:43:46 2018 -0400
Committer: Roberto Cortez
Committed: Mon Oct 1 11:33:03 2018 +0100
--
.../apache/tomee/microprofile/jwt/MPJWTFilter.java | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb747b09/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
--
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
index 27b4c57..78f059e 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
@@ -68,7 +68,22 @@ public class MPJWTFilter implements Filter {
final HttpServletRequest httpServletRequest = (HttpServletRequest)
request;
// now wrap the httpServletRequest and override the principal so CXF
can propagate into the SecurityContext
-chain.doFilter(new MPJWTServletRequestWrapper(httpServletRequest,
authContextInfo.get()), response);
+try {
+chain.doFilter(new MPJWTServletRequestWrapper(httpServletRequest,
authContextInfo.get()), response);
+
+} catch (final Exception e) {
+// this is an alternative to the @Provider bellow which requires
registration on the fly
+// or users to add it into their webapp for scanning or into the
Application itself
+if (MPJWTException.class.isInstance(e)) {
+final MPJWTException jwtException =
MPJWTException.class.cast(e);
+
HttpServletResponse.class.cast(response).sendError(jwtException.getStatus(),
jwtException.getMessage());
+} else if (MPJWTException.class.isInstance(e.getCause())) {
+final MPJWTException jwtException =
MPJWTException.class.cast(e.getCause());
+
HttpServletResponse.class.cast(response).sendError(jwtException.getStatus(),
jwtException.getMessage());
+} else {
+throw e;
+}
+}
}
@Override
[3/3] tomee git commit: Updated projects still using 7.1.0 to 7.1.1.
Updated projects still using 7.1.0 to 7.1.1.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a32354b9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a32354b9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a32354b9
Branch: refs/heads/tomee-7.1.x
Commit: a32354b9d84d8412af72d1ca42e0d10aab4d60b7
Parents: cb747b0
Author: Roberto Cortez
Authored: Mon Oct 1 12:03:42 2018 +0100
Committer: Roberto Cortez
Committed: Mon Oct 1 12:03:42 2018 +0100
--
arquillian/arquillian-tomee-tests/pom.xml | 30 ++--
examples/applet/pom.xml | 6 ++--
examples/arquillian-jpa/pom.xml | 2 +-
.../bean-validation-design-by-contract/pom.xml | 2 +-
.../WebApp1/pom.xml | 2 +-
.../WebApp2/pom.xml | 2 +-
examples/bval-evaluation-redeployment/pom.xml | 8 +++---
.../bval-evaluation-redeployment/runner/pom.xml | 4 +--
examples/cdi-realm/pom.xml | 2 +-
examples/change-jaxws-url/pom.xml | 4 +--
.../moviefun/DeployInWebAppsDirectoryTest.java | 2 +-
examples/connector-ear/pom.xml | 2 +-
examples/connector-war/pom.xml | 2 +-
examples/datasource-ciphered-password/pom.xml | 2 +-
examples/datasource-definition/pom.xml | 2 +-
examples/datasource-versioning/pom.xml | 2 +-
examples/deltaspike-fullstack/pom.xml | 2 +-
examples/dynamic-datasource-routing/pom.xml | 2 +-
examples/mbean-auto-registration/pom.xml| 2 +-
examples/moviefun-rest/pom.xml | 2 +-
examples/moviefun/pom.xml | 2 +-
examples/mtom/pom.xml | 2 +-
examples/multi-jpa-provider-testing/pom.xml | 4 +--
examples/multiple-arquillian-adapters/pom.xml | 2 +-
examples/multiple-tomee-arquillian/pom.xml | 2 +-
examples/pojo-webservice/pom.xml| 4 +--
examples/polling-parent/pom.xml | 2 +-
examples/projectstage-demo/pom.xml | 2 +-
examples/quartz-app/pom.xml | 2 +-
examples/resources-declared-in-webapp/pom.xml | 4 +--
examples/resources-jmx-example/pom.xml | 2 +-
examples/rest-example-with-application/pom.xml | 4 +--
examples/rest-example/pom.xml | 4 +--
examples/rest-on-ejb/pom.xml| 4 +--
examples/simple-cmp2/pom.xml| 6 ++--
.../moviefun/DeployInWebAppsDirectoryTest.java | 2 +-
pom.xml | 2 +-
tck/microprofile-tck/health/pom.xml | 2 +-
tomee/tomee-deb/pom.xml | 2 +-
39 files changed, 68 insertions(+), 68 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/a32354b9/arquillian/arquillian-tomee-tests/pom.xml
--
diff --git a/arquillian/arquillian-tomee-tests/pom.xml
b/arquillian/arquillian-tomee-tests/pom.xml
index e111d75..310fbf8 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -161,7 +161,7 @@
${maven.test.skip}
-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${project.version}/openejb-javaagent-${project.version}.jar
-7.1.0
+7.1.1-SNAPSHOT
tomee-embedded
tomee-embedded
@@ -260,7 +260,7 @@
${skip.remote.webprofile}
true
-7.1.0
+7.1.1-SNAPSHOT
webprofile
tomee-remote
tomee-remote
@@ -277,7 +277,7 @@
${skip.embedded}
-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${project.version}/openejb-javaagent-${project.version}.jar
-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=768M
-7.1.0
+7.1.1-SNAPSHOT
tomee-embedded
tomee-embedded
@@ -293,7 +293,7 @@
${skip.remote.plume}
true
-7.1.0
+7.1.1-SNAPSHOT
plume
tomee-remote
tomee-remote
@@ -313,7 +313,7 @@
${skip.remote.plus}
true
-7.1.0
+7.1.1-SNAPSHOT
plus
tomee-remote
[jira] [Commented] (TOMEE-2239) mp-jwt filter eating exception and returning 200 code instead
[ https://issues.apache.org/jira/browse/TOMEE-2239?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16633828#comment-16633828 ] Roberto Cortez commented on TOMEE-2239: --- Merged to master - TomEE 8. > mp-jwt filter eating exception and returning 200 code instead > - > > Key: TOMEE-2239 > URL: https://issues.apache.org/jira/browse/TOMEE-2239 > Project: TomEE > Issue Type: Bug > Components: TomEE Core Server >Affects Versions: 7.1, 7.1.1 >Reporter: Thiago Veronezi >Assignee: Thiago Veronezi >Priority: Major > Labels: pull-request-available > > This filter has a try-catch block that eats all the exceptions from the > chain. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[2/2] tomee git commit: TOMEE-2239 add try-catch block back but add a final if statement
TOMEE-2239 add try-catch block back but add a final if statement
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f003c900
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f003c900
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f003c900
Branch: refs/heads/master
Commit: f003c900ef859ccdef3a06604ef1550d3305912b
Parents: 600901a
Author: Thiago Veronezi
Authored: Thu Sep 20 09:43:46 2018 -0400
Committer: Roberto Cortez
Committed: Mon Oct 1 11:16:47 2018 +0100
--
.../apache/tomee/microprofile/jwt/MPJWTFilter.java | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/f003c900/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
--
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
index 27b4c57..78f059e 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
@@ -68,7 +68,22 @@ public class MPJWTFilter implements Filter {
final HttpServletRequest httpServletRequest = (HttpServletRequest)
request;
// now wrap the httpServletRequest and override the principal so CXF
can propagate into the SecurityContext
-chain.doFilter(new MPJWTServletRequestWrapper(httpServletRequest,
authContextInfo.get()), response);
+try {
+chain.doFilter(new MPJWTServletRequestWrapper(httpServletRequest,
authContextInfo.get()), response);
+
+} catch (final Exception e) {
+// this is an alternative to the @Provider bellow which requires
registration on the fly
+// or users to add it into their webapp for scanning or into the
Application itself
+if (MPJWTException.class.isInstance(e)) {
+final MPJWTException jwtException =
MPJWTException.class.cast(e);
+
HttpServletResponse.class.cast(response).sendError(jwtException.getStatus(),
jwtException.getMessage());
+} else if (MPJWTException.class.isInstance(e.getCause())) {
+final MPJWTException jwtException =
MPJWTException.class.cast(e.getCause());
+
HttpServletResponse.class.cast(response).sendError(jwtException.getStatus(),
jwtException.getMessage());
+} else {
+throw e;
+}
+}
}
@Override
[1/2] tomee git commit: TOMEE-2239 removing the try-catch block
Repository: tomee
Updated Branches:
refs/heads/master a88c10cb0 -> f003c900e
TOMEE-2239 removing the try-catch block
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/600901a8
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/600901a8
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/600901a8
Branch: refs/heads/master
Commit: 600901a840ef91f7379ebe1615b336cbf7231e80
Parents: a88c10c
Author: Thiago Veronezi
Authored: Wed Sep 19 18:15:04 2018 -0400
Committer: Roberto Cortez
Committed: Mon Oct 1 11:11:48 2018 +0100
--
.../tomee/microprofile/jwt/MPJWTFilter.java | 19 +--
1 file changed, 1 insertion(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/600901a8/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
--
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
index d35fb93..27b4c57 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
@@ -68,24 +68,7 @@ public class MPJWTFilter implements Filter {
final HttpServletRequest httpServletRequest = (HttpServletRequest)
request;
// now wrap the httpServletRequest and override the principal so CXF
can propagate into the SecurityContext
-try {
-chain.doFilter(new MPJWTServletRequestWrapper(httpServletRequest,
authContextInfo.get()), response);
-
-} catch (final Exception e) {
-// this is an alternative to the @Provider bellow which requires
registration on the fly
-// or users to add it into their webapp for scanning or into the
Application itself
-if (MPJWTException.class.isInstance(e)) {
-final MPJWTException jwtException =
MPJWTException.class.cast(e);
-
HttpServletResponse.class.cast(response).sendError(jwtException.getStatus(),
jwtException.getMessage());
-}
-
-if (MPJWTException.class.isInstance(e.getCause())) {
-final MPJWTException jwtException =
MPJWTException.class.cast(e.getCause());
-
HttpServletResponse.class.cast(response).sendError(jwtException.getStatus(),
jwtException.getMessage());
-}
-
-}
-
+chain.doFilter(new MPJWTServletRequestWrapper(httpServletRequest,
authContextInfo.get()), response);
}
@Override
tomee git commit: Update MP Geronimo Config to 1.2.
Repository: tomee
Updated Branches:
refs/heads/master 55ded3eb2 -> a88c10cb0
Update MP Geronimo Config to 1.2.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a88c10cb
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a88c10cb
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a88c10cb
Branch: refs/heads/master
Commit: a88c10cb0ddbf92f8ae66af064c1ef1459e778bf
Parents: 55ded3e
Author: Roberto Cortez
Authored: Tue Sep 11 16:45:36 2018 +0100
Committer: Roberto Cortez
Committed: Mon Oct 1 10:58:34 2018 +0100
--
pom.xml | 3 ++-
tck/microprofile-tck/config/pom.xml | 4
2 files changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/a88c10cb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 606c1f8..700a50a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,7 +195,8 @@
1.3
1.2
-1.1
+
+1.2
1.0
${project.version}
1.0
http://git-wip-us.apache.org/repos/asf/tomee/blob/a88c10cb/tck/microprofile-tck/config/pom.xml
--
diff --git a/tck/microprofile-tck/config/pom.xml
b/tck/microprofile-tck/config/pom.xml
index c96d6fa..e8bdafc 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -38,10 +38,6 @@
org.eclipse.microprofile.config:microprofile-config-tck
-
-
-
org.eclipse.microprofile.config.tck.ClassConverterTest
-
