buildbot success in on tomee-trunk-ubuntu-jvm8
The Buildbot has detected a restored build on builder tomee-trunk-ubuntu-jvm8 while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-trunk-ubuntu-jvm8/builds/1080 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_qnode7_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-trunk-ubuntu-jvm8-commit' triggered this build Build Source Stamp: [branch master] 17a4db9f6ac466dc7fb946560d8ffe13bb67b4e0 Blamelist: David Blevins Build succeeded! Sincerely, -The Buildbot
[tomee] branch master updated (17a4db9 -> f78c8da)
This is an automated email from the ASF dual-hosted git repository. dblevins pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from 17a4db9 Add staged bval repository new 0fa2e6a [maven-release-plugin] prepare release tomee-8.0.0-M3 new f78c8da [maven-release-plugin] prepare for next development iteration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: examples/groovy-spock/pom.xml| 2 +- examples/jsf-cdi-and-ejb/pom.xml | 2 +- examples/jsf-managedBean-and-ejb/pom.xml | 2 +- examples/projectstage-demo/pom.xml | 3 +-- examples/webservice-ws-security/pom.xml | 2 +- gradle/gradle-tomee-embedded/pom.xml | 2 +- gradle/pom.xml | 2 +- utils/livereload-tomee/pom.xml | 2 +- utils/log4j2-tomee/pom.xml | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-)
[tomee] branch master updated: Add staged bval repository
This is an automated email from the ASF dual-hosted git repository. dblevins pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/master by this push: new 17a4db9 Add staged bval repository 17a4db9 is described below commit 17a4db9f6ac466dc7fb946560d8ffe13bb67b4e0 Author: David Blevins AuthorDate: Fri May 17 12:43:31 2019 +0900 Add staged bval repository --- pom.xml | 11 +++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 5524f9c..88d9a44 100644 --- a/pom.xml +++ b/pom.xml @@ -847,6 +847,17 @@ + tomee-bval-patch + BVal Patch Repository + https://repository.apache.org/content/repositories/orgapachetomee-1134/ + +true + + +false + + + sonatype-snapshots Sonatype OSS Snapshots Repository https://oss.sonatype.org/content/repositories/snapshots
[tomee] branch master updated (1569b97 -> 46b08e5)
This is an automated email from the ASF dual-hosted git repository. dblevins pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from 1569b97 [maven-release-plugin] prepare for next development iteration new 57e661d Pom Formatting new 46b08e5 Adding distributionManagement The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: examples/applet/pom.xml| 4 +- examples/applicationexception/pom.xml | 4 +- examples/arquillian-jpa/pom.xml| 220 +++ examples/async-methods/pom.xml | 4 +- examples/async-postconstruct/pom.xml | 4 +- .../bean-validation-design-by-contract/pom.xml | 4 +- examples/cdi-alternative-and-stereotypes/pom.xml | 4 +- examples/cdi-application-scope/pom.xml | 4 +- examples/cdi-basic/pom.xml | 4 +- examples/cdi-ejbcontext-jaas/pom.xml | 4 +- examples/cdi-events/pom.xml| 4 +- examples/cdi-interceptors/pom.xml | 4 +- examples/cdi-produces-disposes/pom.xml | 4 +- examples/cdi-produces-field/pom.xml| 4 +- examples/cdi-qualifier/pom.xml | 4 +- examples/cdi-realm/pom.xml | 4 +- examples/cdi-request-scope/pom.xml | 4 +- examples/cdi-session-scope/pom.xml | 10 +- examples/change-jaxws-url/pom.xml | 4 +- examples/client-resource-lookup-preview/pom.xml| 4 +- examples/cloud-tomee-azure/pom.xml | 205 +++--- examples/component-interfaces/pom.xml | 4 +- examples/concurrency-utils/pom.xml | 140 - .../connector-ear/connector-sample-api/pom.xml | 10 +- examples/cucumber-jvm/pom.xml | 4 +- examples/custom-injection/pom.xml | 4 +- examples/datasource-ciphered-password/pom.xml | 4 +- examples/datasource-definition/pom.xml | 4 +- examples/datasource-versioning/pom.xml | 6 +- examples/decorators/pom.xml| 4 +- examples/deltaspike-configproperty/pom.xml | 4 +- examples/deltaspike-exception-handling/pom.xml | 4 +- examples/deltaspike-fullstack/pom.xml | 4 +- examples/deltaspike-i18n/pom.xml | 4 +- examples/dynamic-dao-implementation/pom.xml| 4 +- examples/dynamic-datasource-routing/pom.xml| 4 +- examples/dynamic-implementation/pom.xml| 4 +- examples/dynamic-proxy-to-access-mbean/pom.xml | 4 +- examples/ear-testing/business-logic/pom.xml| 4 +- examples/ear-testing/pom.xml | 4 +- examples/ejb-examples/pom.xml | 4 +- examples/ejb-remote-call-2/pom.xml | 168 +-- examples/ejb-remote-call/pom.xml | 168 +-- examples/ejb-webservice/pom.xml| 4 +- examples/groovy-jpa/pom.xml| 4 +- examples/groovy-spock/pom.xml | 6 +- examples/helloworld-weblogic/pom.xml | 4 +- examples/injection-of-connectionfactory/pom.xml| 4 +- examples/injection-of-datasource/pom.xml | 4 +- examples/injection-of-ejbs/pom.xml | 4 +- examples/injection-of-entitymanager/pom.xml| 4 +- examples/injection-of-env-entry/pom.xml| 4 +- examples/interceptors/pom.xml | 4 +- examples/java-modules/pom.xml | 162 +-- examples/javamail/pom.xml | 4 +- examples/jaxrs-filter/pom.xml | 24 +- examples/jpa-eclipselink/pom.xml | 4 +- examples/jpa-enumerated/pom.xml| 4 +- examples/jpa-hibernate/pom.xml | 4 +- examples/jsf-cdi-and-ejb/pom.xml | 6 +- examples/jsf-managedBean-and-ejb/pom.xml | 6 +- examples/jsonb-configuration/pom.xml | 126 - examples/jsonb-custom-serializer/pom.xml | 104 +++ examples/lookup-of-ejbs-with-descriptor/pom.xml| 4 +- examples/lookup-of-ejbs/pom.xml| 4 +- examples/mbean-auto-registration/pom.xml | 4 +- examples/moviefun-rest/pom.xml | 20 +- examples/moviefun/pom.xml | 4 +- examples/movies-complete-meta/pom.xml | 4 +- examples/movies-complete/pom.xml | 4 +- examples/mp-config-example/pom.xml | 182
[tomee] 02/02: Adding distributionManagement
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 46b08e5dcbcdea692baeb0245727e36be79b75d0
Author: David Blevins
AuthorDate: Fri May 17 12:29:57 2019 +0900
Adding distributionManagement
---
examples/cloud-tomee-azure/pom.xml | 15 +++
examples/jaxrs-filter/pom.xml | 20 +++-
examples/mp-faulttolerance-timeout/pom.xml | 16
3 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/examples/cloud-tomee-azure/pom.xml
b/examples/cloud-tomee-azure/pom.xml
index 992beab..da47f8a 100644
--- a/examples/cloud-tomee-azure/pom.xml
+++ b/examples/cloud-tomee-azure/pom.xml
@@ -124,4 +124,19 @@
+
+
+
+ localhost
+ file://${basedir}/target/repo/
+
+
+ localhost
+ file://${basedir}/target/snapshot-repo/
+
+
\ No newline at end of file
diff --git a/examples/jaxrs-filter/pom.xml b/examples/jaxrs-filter/pom.xml
index a8fc2de..89686c4 100644
--- a/examples/jaxrs-filter/pom.xml
+++ b/examples/jaxrs-filter/pom.xml
@@ -4,7 +4,8 @@
jaxrs-filter
war
8.0.0-SNAPSHOT
- jaxrs-filter Maven Webapp
+ OpenEJB :: Examples :: JAXRS Filter
+
http://maven.apache.org
@@ -26,5 +27,22 @@
1.8
1.8
+
+
+
+
+ localhost
+ file://${basedir}/target/repo/
+
+
+ localhost
+ file://${basedir}/target/snapshot-repo/
+
+
+
diff --git a/examples/mp-faulttolerance-timeout/pom.xml
b/examples/mp-faulttolerance-timeout/pom.xml
index 576bb2a..a097ae8 100644
--- a/examples/mp-faulttolerance-timeout/pom.xml
+++ b/examples/mp-faulttolerance-timeout/pom.xml
@@ -88,4 +88,20 @@
+
+
+
+ localhost
+ file://${basedir}/target/repo/
+
+
+ localhost
+ file://${basedir}/target/snapshot-repo/
+
+
+
buildbot failure in on tomee-trunk-ubuntu-jvm8
The Buildbot has detected a new failure on builder tomee-trunk-ubuntu-jvm8 while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-trunk-ubuntu-jvm8/builds/1078 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_qnode7_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-trunk-ubuntu-jvm8-commit' triggered this build Build Source Stamp: [branch master] 1569b97d173c081f797383120b8f56d6ceb0fff5 Blamelist: David Blevins BUILD FAILED: failed compile Sincerely, -The Buildbot
[tomee] branch master updated (71b2566 -> 1569b97)
This is an automated email from the ASF dual-hosted git repository. dblevins pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from 71b2566 Refine maven-release-plugin args to still allow system properties new c545399 Build the main modules for release new 14b02c6 Compile tests in release process new 5284ce7 [maven-release-plugin] prepare release tomee-8.0.0-M3 new 1569b97 [maven-release-plugin] prepare for next development iteration The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: arquillian/arquillian-common/pom.xml | 3 +- arquillian/arquillian-openejb-embedded/pom.xml | 4 +-- .../pom.xml| 4 +-- arquillian/arquillian-tck/pom.xml | 4 +-- arquillian/arquillian-tomee-common/pom.xml | 3 +- arquillian/arquillian-tomee-embedded/pom.xml | 3 +- .../arquillian-tomee-moviefun-example/pom.xml | 3 +- arquillian/arquillian-tomee-remote/pom.xml | 3 +- .../arquillian-tomee-codi-tests/pom.xml| 4 +-- .../arquillian-tomee-config-tests/pom.xml | 4 +-- .../arquillian-tomee-jaxrs-tests/pom.xml | 4 +-- .../arquillian-tomee-jaxws-tests/pom.xml | 4 +-- .../arquillian-tomee-jms-tests/pom.xml | 4 +-- .../arquillian-tomee-webprofile-tests/pom.xml | 4 +-- arquillian/arquillian-tomee-tests/pom.xml | 9 +++-- arquillian/arquillian-tomee-webapp-remote/pom.xml | 3 +- arquillian/pom.xml | 3 +- arquillian/ziplock/pom.xml | 3 +- assembly/openejb-lite/pom.xml | 3 +- assembly/openejb-standalone/pom.xml| 41 +++--- assembly/pom.xml | 3 +- container/mbean-annotation-api/pom.xml | 3 +- container/openejb-api/pom.xml | 3 +- container/openejb-core/pom.xml | 13 +++ container/openejb-javaagent/pom.xml| 3 +- container/openejb-jee-accessors/pom.xml| 3 +- container/openejb-jee/pom.xml | 3 +- container/openejb-jpa-integration/pom.xml | 4 +-- container/openejb-junit/pom.xml| 3 +- container/openejb-loader/pom.xml | 5 ++- container/pom.xml | 3 +- examples/access-timeout-meta/pom.xml | 3 +- examples/access-timeout/pom.xml| 3 +- examples/alternate-descriptors/pom.xml | 3 +- examples/application-composer/pom.xml | 3 +- examples/applicationcomposer-jaxws-cdi/pom.xml | 3 +- examples/applicationexception/pom.xml | 3 +- examples/arquillian-jpa/pom.xml| 3 +- examples/async-methods/pom.xml | 3 +- examples/async-postconstruct/pom.xml | 3 +- .../bean-validation-design-by-contract/pom.xml | 3 +- examples/cdi-alternative-and-stereotypes/pom.xml | 3 +- examples/cdi-application-scope/pom.xml | 3 +- examples/cdi-basic/pom.xml | 3 +- examples/cdi-ejbcontext-jaas/pom.xml | 4 +-- examples/cdi-events/pom.xml| 3 +- examples/cdi-interceptors/pom.xml | 3 +- examples/cdi-produces-disposes/pom.xml | 3 +- examples/cdi-produces-field/pom.xml| 3 +- examples/cdi-qualifier/pom.xml | 3 +- examples/cdi-realm/pom.xml | 3 +- examples/cdi-request-scope/pom.xml | 3 +- examples/cdi-session-scope/pom.xml | 3 +- examples/change-jaxws-url/pom.xml | 3 +- examples/client-resource-lookup-preview/pom.xml| 3 +- examples/cloud-tomee-azure/pom.xml | 4 +-- examples/component-interfaces/pom.xml | 3 +- examples/concurrency-utils/pom.xml | 4 +-- .../connector-ear/connector-sample-ear/pom.xml | 3 +- .../connector-sample-functional-tests/pom.xml | 3 +- examples/cucumber-jvm/pom.xml | 3 +- examples/custom-injection/pom.xml | 3 +- examples/datasource-ciphered-password/pom.xml | 3 +- examples/datasource-definition/pom.xml | 3 +- examples/datasource-versioning/pom.xml | 3 +- examples/decorators/pom.xml| 3 +- examples/deltaspike-configproperty/pom.xml | 3 +- examples/deltaspike-exception-handling/pom.xml | 3 +- examples/deltaspike-fullstack/pom.xml | 3 +- examples/deltaspike-i18n/pom.xml
[tomee] 02/04: Compile tests in release process
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 14b02c6c95892e910d75e2ee485ee52e894005d5
Author: David Blevins
AuthorDate: Fri May 17 10:02:29 2019 +0900
Compile tests in release process
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 080b2cc..242e545 100644
--- a/pom.xml
+++ b/pom.xml
@@ -414,7 +414,7 @@
false
true
- -Pmain,apache-release -Dmaven.test.skip=true
-Dadditionalparam=-Xdoclint:none -DadditionalJOption=-Xdoclint:none
${arguments}
+ -Pmain,apache-release -DskipTests -DfailIfNoTests=false
-Dadditionalparam=-Xdoclint:none -DadditionalJOption=-Xdoclint:none
${arguments}
[tomee] 01/04: Build the main modules for release
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit c54539972bb5a018960e2d2faa0efdb1c6e7e913
Author: David Blevins
AuthorDate: Fri May 17 09:16:42 2019 +0900
Build the main modules for release
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c918fe7..080b2cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -414,7 +414,7 @@
false
true
- -Papache-release -Dmaven.test.skip=true
-Dadditionalparam=-Xdoclint:none -DadditionalJOption=-Xdoclint:none
${arguments}
+ -Pmain,apache-release -Dmaven.test.skip=true
-Dadditionalparam=-Xdoclint:none -DadditionalJOption=-Xdoclint:none
${arguments}
buildbot success in on tomee-trunk-ubuntu-jvm8
The Buildbot has detected a restored build on builder tomee-trunk-ubuntu-jvm8 while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-trunk-ubuntu-jvm8/builds/1077 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_qnode7_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-trunk-ubuntu-jvm8-commit' triggered this build Build Source Stamp: [branch master] 71b256676c747800c2e26f7fe0a844131d2fdded Blamelist: David Blevins Build succeeded! Sincerely, -The Buildbot
svn commit: r1859411 - /tomee/site/trunk/content/index.html
Author: dblevins Date: Fri May 17 00:33:09 2019 New Revision: 1859411 URL: http://svn.apache.org/viewvc?rev=1859411=rev Log: Touching file to force a build Modified: tomee/site/trunk/content/index.html Modified: tomee/site/trunk/content/index.html URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/index.html?rev=1859411=1859410=1859411=diff == --- tomee/site/trunk/content/index.html (original) +++ tomee/site/trunk/content/index.html Fri May 17 00:33:09 2019 @@ -1,6 +1,9 @@ - +
[tomee] branch master updated: Refine maven-release-plugin args to still allow system properties
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 71b2566 Refine maven-release-plugin args to still allow system
properties
71b2566 is described below
commit 71b256676c747800c2e26f7fe0a844131d2fdded
Author: David Blevins
AuthorDate: Fri May 17 08:36:29 2019 +0900
Refine maven-release-plugin args to still allow system properties
---
pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6c8f50f..c918fe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,8 @@
-
+
+
${project.version}
1.8
1.8
@@ -413,7 +414,7 @@
false
true
- -Dmaven.test.skip=true -Dadditionalparam=-Xdoclint:none
-DadditionalJOption=-Xdoclint:none
+ -Papache-release -Dmaven.test.skip=true
-Dadditionalparam=-Xdoclint:none -DadditionalJOption=-Xdoclint:none
${arguments}
buildbot failure in on tomee-trunk-ubuntu-jvm8
The Buildbot has detected a new failure on builder tomee-trunk-ubuntu-jvm8 while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-trunk-ubuntu-jvm8/builds/1076 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_qnode7_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-trunk-ubuntu-jvm8-commit' triggered this build Build Source Stamp: [branch master] b1cbc0712031ba8f4d3904874d8033dca216a4ea Blamelist: David Blevins BUILD FAILED: failed test Sincerely, -The Buildbot
buildbot success in on tomee-trunk-ubuntu-jvm8
The Buildbot has detected a restored build on builder tomee-trunk-ubuntu-jvm8 while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-trunk-ubuntu-jvm8/builds/1075 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_qnode7_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-trunk-ubuntu-jvm8-commit' triggered this build Build Source Stamp: [branch master] 80238864709d264661606c6ed66ecb5794e1e1d3 Blamelist: David Blevins Build succeeded! Sincerely, -The Buildbot
[tomee] 02/02: Ingore javadoc errors on release. Don't run the 2 hour tests.
This is an automated email from the ASF dual-hosted git repository. dblevins pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit b1cbc0712031ba8f4d3904874d8033dca216a4ea Author: David Blevins AuthorDate: Fri May 17 01:11:09 2019 +0900 Ingore javadoc errors on release. Don't run the 2 hour tests. --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index c0481c8..6c8f50f 100644 --- a/pom.xml +++ b/pom.xml @@ -413,6 +413,7 @@ false true + -Dmaven.test.skip=true -Dadditionalparam=-Xdoclint:none -DadditionalJOption=-Xdoclint:none
[tomee] 01/02: We remove parameters, so don't attempt to copy parameter annotations
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit f27acee2dc8f18f59aae0229b336fb4f9a2aa960
Author: David Blevins
AuthorDate: Fri May 17 00:35:12 2019 +0900
We remove parameters, so don't attempt to copy parameter annotations
---
.../microprofile/jwt/bval/ValidationGenerator.java | 70 +-
.../jwt/bval/ValidationGeneratorTest.java | 7 +++
.../{Shapes.java => Shapes$$JwtConstraints.java} | 15 +++--
.../tomee/microprofile/jwt/bval/data/Shapes.java | 4 +-
4 files changed, 88 insertions(+), 8 deletions(-)
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
index ae32039..ee1a488 100644
---
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
+++
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
@@ -19,12 +19,15 @@ package org.apache.tomee.microprofile.jwt.bval;
import org.apache.openejb.dyni.DynamicSubclass;
import org.apache.openejb.util.proxy.ProxyGenerationException;
import org.apache.xbean.asm7.AnnotationVisitor;
+import org.apache.xbean.asm7.ClassReader;
+import org.apache.xbean.asm7.ClassVisitor;
import org.apache.xbean.asm7.ClassWriter;
import org.apache.xbean.asm7.MethodVisitor;
import org.apache.xbean.asm7.Opcodes;
import org.apache.xbean.asm7.Type;
import javax.validation.Constraint;
+import java.io.IOException;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -141,7 +144,7 @@ public class ValidationGenerator implements Opcodes {
mv.visitMaxs(1, 1);
}
-DynamicSubclass.copyMethodAnnotations(target, visitors);
+copyMethodAnnotations(target, visitors);
for (final MethodVisitor visitor : visitors.values()) {
visitor.visitEnd();
@@ -175,4 +178,69 @@ public class ValidationGenerator implements Opcodes {
private static boolean isConstraint(final Annotation annotation) {
return
annotation.annotationType().isAnnotationPresent(Constraint.class);
}
+
+public static void copyMethodAnnotations(final Class classToProxy,
final Map visitors) throws ProxyGenerationException {
+// Move all the annotations onto the newly implemented methods
+// Ensures CDI and JAX-RS and JAX-WS still work
+Class clazz = classToProxy;
+while (clazz != null && !clazz.equals(Object.class)) {
+try {
+final ClassReader classReader = new
ClassReader(DynamicSubclass.readClassFile(clazz));
+final ClassVisitor copyMethodAnnotations = new
CopyMethodAnnotations(visitors);
+classReader.accept(copyMethodAnnotations,
ClassReader.SKIP_CODE);
+} catch (final IOException e) {
+throw new ProxyGenerationException(e);
+}
+clazz = clazz.getSuperclass();
+}
+}
+
+public static class MoveAnnotationsVisitor extends MethodVisitor {
+
+private final MethodVisitor newMethod;
+
+public MoveAnnotationsVisitor(final MethodVisitor movedMethod, final
MethodVisitor newMethod) {
+super(Opcodes.ASM7, movedMethod);
+this.newMethod = newMethod;
+}
+
+@Override
+public AnnotationVisitor visitAnnotation(final String desc, final
boolean visible) {
+return newMethod.visitAnnotation(desc, visible);
+}
+
+@Override
+public AnnotationVisitor visitParameterAnnotation(final int parameter,
final String desc, final boolean visible) {
+return super.visitParameterAnnotation(parameter, desc, visible);
+}
+
+@Override
+public void visitEnd() {
+newMethod.visitEnd();
+super.visitEnd();
+}
+}
+
+private static class CopyMethodAnnotations extends ClassVisitor {
+private final Map visitors;
+
+public CopyMethodAnnotations(final Map
visitors) {
+super(Opcodes.ASM7);
+this.visitors = visitors;
+}
+
+@Override
+public MethodVisitor visitMethod(final int access, final String name,
final String desc, final String signature, final String[] exceptions) {
+final MethodVisitor newMethod = visitors.remove(name + desc);
+
+if (newMethod == null) {
+return null;
+}
+
+final MethodVisitor oldMethod = super.visitMethod(access, name,
desc, signature, exceptions);
+
+return new MoveAnnotationsVisitor(oldMethod, newMethod);
+}
+}
+
}
diff --git
a/mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/ValidationGeneratorTest.java
[tomee] branch master updated (8023886 -> b1cbc07)
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from 8023886 Remove unused import
new f27acee We remove parameters, so don't attempt to copy parameter
annotations
new b1cbc07 Ingore javadoc errors on release. Don't run the 2 hour tests.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../microprofile/jwt/bval/ValidationGenerator.java | 70 +-
.../jwt/bval/ValidationGeneratorTest.java | 7 +++
...onstraints.java => Shapes$$JwtConstraints.java} | 18 +++---
.../tomee/microprofile/jwt/bval/data/Shapes.java | 4 +-
pom.xml| 1 +
5 files changed, 87 insertions(+), 13 deletions(-)
copy
mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/data/{Colors$$JwtConstraints.java
=> Shapes$$JwtConstraints.java} (84%)
[tomee] branch master updated: Remove unused import
This is an automated email from the ASF dual-hosted git repository. dblevins pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/master by this push: new 8023886 Remove unused import 8023886 is described below commit 80238864709d264661606c6ed66ecb5794e1e1d3 Author: David Blevins AuthorDate: Fri May 17 00:16:12 2019 +0900 Remove unused import --- .../apache/tomee/microprofile/jwt/bval/ValidationGeneratorTest.java | 4 1 file changed, 4 deletions(-) diff --git a/mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/ValidationGeneratorTest.java b/mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/ValidationGeneratorTest.java index 816a64b..704bfd8 100644 --- a/mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/ValidationGeneratorTest.java +++ b/mp-jwt/src/test/java/org/apache/tomee/microprofile/jwt/bval/ValidationGeneratorTest.java @@ -3,15 +3,11 @@ package org.apache.tomee.microprofile.jwt.bval; import org.apache.openejb.util.proxy.ProxyGenerationException; import org.apache.tomee.microprofile.jwt.bval.data.Colors; import org.apache.tomee.microprofile.jwt.bval.data.Colors$$JwtConstraints; -import org.apache.tomee.microprofile.jwt.bval.data.Shapes; -import org.apache.tomee.microprofile.jwt.bval.data.Shapes$$JwtConstraints; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import java.io.IOException; import java.lang.reflect.Method; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors;
[tomee] branch master updated: Eliminate duplicate method generation in Validation
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 16ca728 Eliminate duplicate method generation in Validation
16ca728 is described below
commit 16ca7284c492fa2c7995210cf8f4ddaf43443826
Author: David Blevins
AuthorDate: Fri May 17 00:04:00 2019 +0900
Eliminate duplicate method generation in Validation
---
.../jwt/bval/GeneratedConstraintsMissingException.java | 12 ++--
.../microprofile/jwt/bval/ValidationConstraints.java| 5 ++---
.../microprofile/jwt/bval/ValidationGenerator.java | 15 +--
.../apache/tomee/microprofile/jwt/bval/Asmifier.java| 2 +-
.../microprofile/jwt/bval/ValidationGeneratorTest.java | 17 +
.../jwt/bval/data/Colors$$JwtConstraints.java | 2 ++
.../apache/tomee/microprofile/jwt/bval/data/Colors.java | 3 +++
7 files changed, 36 insertions(+), 20 deletions(-)
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/GeneratedConstraintsMissingException.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/GeneratedConstraintsMissingException.java
index 9dc50b8..a1ddf83 100644
---
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/GeneratedConstraintsMissingException.java
+++
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/GeneratedConstraintsMissingException.java
@@ -17,25 +17,25 @@
package org.apache.tomee.microprofile.jwt.bval;
import java.lang.reflect.Method;
-import java.util.List;
+import java.util.Collection;
public class GeneratedConstraintsMissingException extends
IllegalStateException {
-private final List original;
-private final List generated;
+private final Collection original;
+private final Collection generated;
-public GeneratedConstraintsMissingException(final List original,
final List generated) {
+public GeneratedConstraintsMissingException(final Collection
original, final Collection generated) {
super(String.format("Expected %s constrained methods, found %s",
original.size(), generated.size()));
this.original = original;
this.generated = generated;
}
-public List getOriginal() {
+public Collection getOriginal() {
return original;
}
-public List getGenerated() {
+public Collection getGenerated() {
return generated;
}
}
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationConstraints.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationConstraints.java
index 82c024d..e866d2b 100644
---
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationConstraints.java
+++
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationConstraints.java
@@ -27,7 +27,6 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -54,8 +53,8 @@ public class ValidationConstraints {
if (constraintsClazz == null) return null;
-final List original =
ValidationGenerator.getConstrainedMethods(componentClass);
-final List generated =
ValidationGenerator.getConstrainedMethods(constraintsClazz);
+final Set original =
ValidationGenerator.getConstrainedMethods(componentClass);
+final Set generated =
ValidationGenerator.getConstrainedMethods(constraintsClazz);
if (original.size() != generated.size()) {
throw new GeneratedConstraintsMissingException(original,
generated);
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
index 42a23d9..ae32039 100644
---
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
+++
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
@@ -28,9 +28,11 @@ import javax.validation.Constraint;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* We allow CDI and EJB beans to use BeanValidation to validate a JsonWebToken
@@ -93,7 +95,7 @@ import java.util.Map;
public class ValidationGenerator implements Opcodes {
public static byte[] generateFor(final Class target) throws
ProxyGenerationException {
-final List constrainedMethods = getConstrainedMethods(target);
+final Set constrainedMethods = getConstrainedMethods(target);
if (constrainedMethods.size() == 0) return null;
@@ -148,17
[tomee] branch master updated (6285034 -> 8514a2d)
This is an automated email from the ASF dual-hosted git repository. dblevins pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from 6285034 Javadoc errors new 36c0d5c Switch to debug as not all requests will have a JWT new 8514a2d Perform a sanity check on the generated class The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../bval/GeneratedConstraintsMissingException.java | 31 +++--- .../jwt/bval/ValidationConstraints.java| 8 ++ .../jwt/bval/ValidationInterceptor.java| 2 +- 3 files changed, 24 insertions(+), 17 deletions(-) copy itests/failover/src/main/java/org/apache/openejb/server/control/Context.java => mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/GeneratedConstraintsMissingException.java (57%)
[tomee] 01/02: Switch to debug as not all requests will have a JWT
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 36c0d5c4b1a07909f3f612998152512d501cd69c
Author: David Blevins
AuthorDate: Thu May 16 19:53:09 2019 +0900
Switch to debug as not all requests will have a JWT
---
.../org/apache/tomee/microprofile/jwt/bval/ValidationInterceptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationInterceptor.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationInterceptor.java
index 74e9c5e..a1e2e33 100644
---
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationInterceptor.java
+++
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationInterceptor.java
@@ -52,7 +52,7 @@ public class ValidationInterceptor implements
ContainerRequestFilter {
final Supplier tokenSupplier =
(Supplier) requestContext.getProperty(JWT_SUPPLIER);
if (tokenSupplier == null) {
-VALIDATION.error("No JsonWebToken found in request attribute
'" + JWT_SUPPLIER + "'");
+VALIDATION.debug("No JsonWebToken found in request attribute
'" + JWT_SUPPLIER + "'");
return;
}
[tomee] 02/02: Perform a sanity check on the generated class
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 8514a2dd8a31b193fa1a4e8e5801fd1797f295a4
Author: David Blevins
AuthorDate: Thu May 16 22:26:15 2019 +0900
Perform a sanity check on the generated class
---
.../bval/GeneratedConstraintsMissingException.java | 41 ++
.../jwt/bval/ValidationConstraints.java| 8 +
2 files changed, 49 insertions(+)
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/GeneratedConstraintsMissingException.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/GeneratedConstraintsMissingException.java
new file mode 100644
index 000..9dc50b8
--- /dev/null
+++
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/GeneratedConstraintsMissingException.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.microprofile.jwt.bval;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+public class GeneratedConstraintsMissingException extends
IllegalStateException {
+
+private final List original;
+private final List generated;
+
+public GeneratedConstraintsMissingException(final List original,
final List generated) {
+super(String.format("Expected %s constrained methods, found %s",
original.size(), generated.size()));
+
+this.original = original;
+this.generated = generated;
+}
+
+public List getOriginal() {
+return original;
+}
+
+public List getGenerated() {
+return generated;
+}
+}
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationConstraints.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationConstraints.java
index a0b4968..82c024d 100644
---
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationConstraints.java
+++
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationConstraints.java
@@ -27,6 +27,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -53,6 +54,13 @@ public class ValidationConstraints {
if (constraintsClazz == null) return null;
+final List original =
ValidationGenerator.getConstrainedMethods(componentClass);
+final List generated =
ValidationGenerator.getConstrainedMethods(constraintsClazz);
+
+if (original.size() != generated.size()) {
+throw new GeneratedConstraintsMissingException(original,
generated);
+}
+
final Object instance;
try {
instance = constraintsClazz.newInstance();
