(tomee) annotated tag tomee-project-8.0.16 updated (859b441af2 -> cb7c24b836)
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a change to annotated tag tomee-project-8.0.16 in repository https://gitbox.apache.org/repos/asf/tomee.git *** WARNING: tag tomee-project-8.0.16 was modified! *** from 859b441af2 (commit) to cb7c24b836 (tag) tagging 859b441af2fb89d1e7c13ec383d1ac6edbbe7075 (commit) replaces tomee-project-8.0.15 by Jonathan S. Fisher on Sun Oct 29 11:51:54 2023 -0500 - Log - [maven-release-plugin] copy for tag tomee-project-8.0.16 -BEGIN PGP SIGNATURE- iJUEABMJAB0WIQS11zr9EsR/oJTH1IT5dcJ7sXr2sQUCZT6NqgAKCRD5dcJ7sXr2 sZenAYDQUmcf/zHaAHo4egxWxr84+2EnhdgfdTCrXgA6WohER1gL4UYqh+n/HE+/ +0iSd5IBfAlpmY4IjconlJD17OeZj7gmXBFfn1wqtkBOczEAGCz2EZUdN4e2HyNP B9YesyEzew== =aUH4 -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(tomee) branch tomee-8.x updated (3362da0210 -> c239b0bf2d)
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a change to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git from 3362da0210 Revert "[maven-release-plugin] prepare release tomee-project-8.0.16" new 859b441af2 [maven-release-plugin] prepare release tomee-project-8.0.16 new c239b0bf2d [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: arquillian/arquillian-common/pom.xml | 2 +- arquillian/arquillian-openejb-embedded/pom.xml | 2 +- arquillian/arquillian-openejb-transaction-provider/pom.xml | 2 +- arquillian/arquillian-tck/pom.xml| 2 +- arquillian/arquillian-tomee-common/pom.xml | 2 +- arquillian/arquillian-tomee-embedded/pom.xml | 2 +- arquillian/arquillian-tomee-moviefun-example/pom.xml | 2 +- arquillian/arquillian-tomee-remote/pom.xml | 8 .../arquillian-tomee-codi-tests/pom.xml | 2 +- .../arquillian-tomee-config-tests/pom.xml| 2 +- .../arquillian-tomee-jaxrs-tests/pom.xml | 2 +- .../arquillian-tomee-jaxws-tests/pom.xml | 2 +- .../arquillian-tomee-jms-tests/pom.xml | 2 +- .../arquillian-tomee-webprofile-tests/pom.xml| 2 +- arquillian/arquillian-tomee-tests/pom.xml| 2 +- arquillian/arquillian-tomee-webapp-remote/pom.xml| 2 +- arquillian/pom.xml | 4 ++-- arquillian/ziplock/pom.xml | 2 +- assembly/openejb-lite/pom.xml| 2 +- assembly/openejb-standalone/pom.xml | 2 +- assembly/pom.xml | 2 +- boms/jaxb-runtime/pom.xml| 2 +- boms/pom.xml | 2 +- boms/tomee-microprofile-api/pom.xml | 2 +- boms/tomee-microprofile/pom.xml | 10 +- boms/tomee-plume-api/pom.xml | 2 +- boms/tomee-plume/pom.xml | 10 +- boms/tomee-plus-api/pom.xml | 2 +- boms/tomee-plus/pom.xml | 10 +- boms/tomee-webprofile-api/pom.xml| 2 +- boms/tomee-webprofile/pom.xml| 10 +- container/mbean-annotation-api/pom.xml | 2 +- container/openejb-api/pom.xml| 2 +- container/openejb-core/pom.xml | 2 +- container/openejb-javaagent/pom.xml | 2 +- container/openejb-jee-accessors/pom.xml | 2 +- container/openejb-jee/pom.xml| 2 +- container/openejb-jpa-integration/pom.xml| 2 +- container/openejb-junit/pom.xml | 2 +- container/openejb-junit5-backward/pom.xml| 2 +- container/openejb-junit5/pom.xml | 2 +- container/openejb-loader/pom.xml | 2 +- container/pom.xml| 2 +- deps/cxf-shade/pom.xml | 2 +- deps/pom.xml | 2 +- deps/servicemix-bcel-shade/pom.xml | 2 +- deps/taglibs-shade/pom.xml | 2 +- examples/access-timeout-meta/pom.xml | 4 ++-- examples/access-timeout/pom.xml | 6 +++--- examples/alternate-descriptors/pom.xml | 4 ++-- examples/application-composer/pom.xml| 4 ++-- examples/applicationcomposer-jaxws-cdi/pom.xml | 8 examples/applicationexception/pom.xml| 4 ++-- examples/arquillian-jpa/pom.xml | 6 +++--- examples/async-methods/pom.xml | 4 ++-- examples/async-postconstruct/pom.xml | 4 ++-- examples/async-servlet/pom.xml | 8 examples/bean-validation-design-by-contract/pom.xml | 4 ++-- examples/bval-evaluation-redeployment/WebApp1/pom.xml| 2 +- examples/bval-evaluation-redeployment/WebApp2/pom.xml| 2 +- example
svn commit: r64917 - in /dev/tomee/staging-1223: ./ tomee-8.0.16/
Author: jfisher Date: Sun Oct 29 17:40:41 2023 New Revision: 64917 Log: [release-tools] staged binary dir for tomee-8.0.16 Added: dev/tomee/staging-1223/ dev/tomee/staging-1223/tomee-8.0.16/
svn commit: r64916 - /dev/tomee/staging-1222/
Author: jfisher Date: Sun Oct 29 17:02:22 2023 New Revision: 64916 Log: remove staging-1222 and try again Removed: dev/tomee/staging-1222/
svn commit: r64915 - /dev/tomee/testdir3/
Author: jfisher Date: Sun Oct 29 17:01:23 2023 New Revision: 64915 Log: Delete test dir Removed: dev/tomee/testdir3/
svn commit: r64914 - /dev/tomee/testdir3/
Author: jfisher Date: Sun Oct 29 17:01:13 2023 New Revision: 64914 Log: Create test dir Added: dev/tomee/testdir3/
svn commit: r64913 - /dev/tomee/testdir3/
Author: jfisher Date: Sun Oct 29 16:24:26 2023 New Revision: 64913 Log: Delete test dir Removed: dev/tomee/testdir3/
svn commit: r64912 - /dev/tomee/testdir3/
Author: jfisher Date: Sun Oct 29 16:24:17 2023 New Revision: 64912 Log: Create test dir Added: dev/tomee/testdir3/
(tomee) 01/01: Merge pull request #1078 from apache/tomee-8.x-regenerate_boms_after_dep_upgrade
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a commit to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git commit 48ac3c7e143dbeb16bb4ee99f5abea6b8221dc62 Merge: da67c96c5e 88c5a03ad5 Author: Jonathan S. Fisher AuthorDate: Sun Oct 29 11:08:01 2023 -0500 Merge pull request #1078 from apache/tomee-8.x-regenerate_boms_after_dep_upgrade Regenerated BOMs after dependency upgrades boms/tomee-plume/pom.xml | 12 ++-- boms/tomee-plus/pom.xml | 12 ++-- 2 files changed, 12 insertions(+), 12 deletions(-)
(tomee) branch tomee-8.x updated (da67c96c5e -> 48ac3c7e14)
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a change to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git from da67c96c5e [maven-release-plugin] prepare for next development iteration add 88c5a03ad5 Minor: Regenerated BOMs for da67c96c5ebaa2ecd5ebe0fbfbd9af908d078123 new 48ac3c7e14 Merge pull request #1078 from apache/tomee-8.x-regenerate_boms_after_dep_upgrade The 1 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: boms/tomee-plume/pom.xml | 12 ++-- boms/tomee-plus/pom.xml | 12 ++-- 2 files changed, 12 insertions(+), 12 deletions(-)
(tomee) annotated tag tomee-project-8.0.16 deleted (was f60eb17700)
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a change to annotated tag tomee-project-8.0.16 in repository https://gitbox.apache.org/repos/asf/tomee.git *** WARNING: tag tomee-project-8.0.16 was deleted! *** tag was f60eb17700 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
(tomee) annotated tag tomee-project-8.0.16 updated (a73aca679c -> f60eb17700)
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a change to annotated tag tomee-project-8.0.16 in repository https://gitbox.apache.org/repos/asf/tomee.git *** WARNING: tag tomee-project-8.0.16 was modified! *** from a73aca679c (commit) to f60eb17700 (tag) tagging a73aca679c6f61716b09275ac35fef2f51fe015b (commit) replaces tomee-project-8.0.15 by Jonathan S. Fisher on Sat Oct 28 13:49:57 2023 -0500 - Log - tomee-project-8.0.16 -BEGIN PGP SIGNATURE- iJUEABMJAB0WIQS11zr9EsR/oJTH1IT5dcJ7sXr2sQUCZT1X2AAKCRD5dcJ7sXr2 sfSoAYDJKD/TzRMqukx3UZRFzmuImnzuPfLJ5iECPjEOXtZLyqsZhGuyr1BpVC72 /Qda7WQBgN0oimvL/hSH6cpLqpRHASMKivmLPRIB4mSK1qy53LwqIyvBlGgQDZEV cjxeXbDxfQ== =IcaW -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(tomee) branch tomee-8.x updated (be3901cc3c -> da67c96c5e)
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a change to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git from be3901cc3c Merge pull request #1075 from apache/tomee-8.x-regenerate_boms_after_dep_upgrade new a73aca679c [maven-release-plugin] prepare release tomee-project-8.0.16 new da67c96c5e [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: arquillian/arquillian-common/pom.xml | 2 +- arquillian/arquillian-openejb-embedded/pom.xml | 2 +- .../pom.xml| 2 +- arquillian/arquillian-tck/pom.xml | 2 +- arquillian/arquillian-tomee-common/pom.xml | 2 +- arquillian/arquillian-tomee-embedded/pom.xml | 2 +- .../arquillian-tomee-moviefun-example/pom.xml | 2 +- arquillian/arquillian-tomee-remote/pom.xml | 8 .../arquillian-tomee-codi-tests/pom.xml| 2 +- .../arquillian-tomee-config-tests/pom.xml | 2 +- .../arquillian-tomee-jaxrs-tests/pom.xml | 2 +- .../arquillian-tomee-jaxws-tests/pom.xml | 2 +- .../arquillian-tomee-jms-tests/pom.xml | 2 +- .../arquillian-tomee-webprofile-tests/pom.xml | 2 +- arquillian/arquillian-tomee-tests/pom.xml | 2 +- arquillian/arquillian-tomee-webapp-remote/pom.xml | 2 +- arquillian/pom.xml | 4 ++-- arquillian/ziplock/pom.xml | 2 +- assembly/openejb-lite/pom.xml | 2 +- assembly/openejb-standalone/pom.xml| 2 +- assembly/pom.xml | 2 +- boms/jaxb-runtime/pom.xml | 2 +- boms/pom.xml | 2 +- boms/tomee-microprofile-api/pom.xml| 2 +- boms/tomee-microprofile/pom.xml| 10 +- boms/tomee-plume-api/pom.xml | 2 +- boms/tomee-plume/pom.xml | 22 +++--- boms/tomee-plus-api/pom.xml| 2 +- boms/tomee-plus/pom.xml| 22 +++--- boms/tomee-webprofile-api/pom.xml | 2 +- boms/tomee-webprofile/pom.xml | 10 +- container/mbean-annotation-api/pom.xml | 2 +- container/openejb-api/pom.xml | 2 +- container/openejb-core/pom.xml | 2 +- container/openejb-javaagent/pom.xml| 2 +- container/openejb-jee-accessors/pom.xml| 2 +- container/openejb-jee/pom.xml | 2 +- container/openejb-jpa-integration/pom.xml | 2 +- container/openejb-junit/pom.xml| 2 +- container/openejb-junit5-backward/pom.xml | 2 +- container/openejb-junit5/pom.xml | 2 +- container/openejb-loader/pom.xml | 2 +- container/pom.xml | 2 +- deps/cxf-shade/pom.xml | 2 +- deps/pom.xml | 2 +- deps/servicemix-bcel-shade/pom.xml | 2 +- deps/taglibs-shade/pom.xml | 2 +- examples/access-timeout-meta/pom.xml | 4 ++-- examples/access-timeout/pom.xml| 6 +++--- examples/alternate-descriptors/pom.xml | 4 ++-- examples/application-composer/pom.xml | 4 ++-- examples/applicationcomposer-jaxws-cdi/pom.xml | 8 examples/applicationexception/pom.xml | 4 ++-- examples/arquillian-jpa/pom.xml| 6 +++--- examples/async-methods/pom.xml | 4 ++-- examples/async-postconstruct/pom.xml | 4 ++-- examples/async-servlet/pom.xml | 8 .../bean-validation-design-by-contract/pom.xml | 4 ++-- .../bval-evaluation-redeployment/WebApp1/pom.xml | 2 +- .../bval-evaluation-redeployment/WebApp2/pom.xml | 2 +- examples/bval-evaluation-redeployment/pom.xml | 8 .../bval-evaluation-redeployment/runner/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-dynamic-inject/pom.xml| 4 ++-- examples/cdi-ejbcontext-jaas/pom.xml | 6 +++--- examples/cdi-events/pom.xml| 4 ++-- examples/cdi-interceptors/pom.xml | 4 ++-- examples/cdi-produ
svn commit: r64883 - /dev/tomee/staging-1222/tomee-8.0.16/
Author: jfisher Date: Fri Oct 27 22:05:21 2023 New Revision: 64883 Log: [release-tools] staged binaries for tomee-8.0.16 Added: dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz (with props) dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz.asc dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz.sha256 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz.sha512 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.zip (with props) dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.zip.asc dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.zip.sha256 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.zip.sha512 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plume.tar.gz (with props) dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plume.tar.gz.asc dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plume.tar.gz.sha256 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plume.tar.gz.sha512 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plume.zip (with props) dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plume.zip.asc dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plume.zip.sha256 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plume.zip.sha512 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plus.tar.gz (with props) dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plus.tar.gz.asc dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plus.tar.gz.sha256 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plus.tar.gz.sha512 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plus.zip (with props) dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plus.zip.asc dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plus.zip.sha256 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-plus.zip.sha512 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-webprofile.tar.gz (with props) dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-webprofile.tar.gz.asc dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-webprofile.tar.gz.sha256 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-webprofile.tar.gz.sha512 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-webprofile.zip (with props) dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-webprofile.zip.asc dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-webprofile.zip.sha256 dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-webprofile.zip.sha512 dev/tomee/staging-1222/tomee-8.0.16/tomee-project-8.0.16-source-release.zip (with props) dev/tomee/staging-1222/tomee-8.0.16/tomee-project-8.0.16-source-release.zip.asc dev/tomee/staging-1222/tomee-8.0.16/tomee-project-8.0.16-source-release.zip.sha256 dev/tomee/staging-1222/tomee-8.0.16/tomee-project-8.0.16-source-release.zip.sha512 Added: dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz == Binary file - no diff available. Propchange: dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz -- svn:mime-type = application/octet-stream Added: dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz.asc == --- dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz.asc (added) +++ dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz.asc Fri Oct 27 22:05:21 2023 @@ -0,0 +1,8 @@ +-BEGIN PGP SIGNATURE- + +iJUEABMKAB0WIQS11zr9EsR/oJTH1IT5dcJ7sXr2sQUCZTwtwgAKCRD5dcJ7sXr2 +sYrBAX9rsvyhax+5aYlkGJE/PD7UtQ3JLNdAbjff0WWucMDOKGRr9dJOPIyvnfks +AFpt6CMBgOVnkwTVGRFZy7UUZWIcL218tTjwywiRN4KE4N4KyVQj5/w8C4tqIMhY +X8v1+UJnjg== +=U/p+ +-END PGP SIGNATURE- Added: dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz.sha256 == --- dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz.sha256 (added) +++ dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz.sha256 Fri Oct 27 22:05:21 2023 @@ -0,0 +1 @@ +91ddbcc51739d4c873f3ea868a3dd02446c45003752fef28c61ce72c398c6970 apache-tomee-8.0.16-microprofile.tar.gz \ No newline at end of file Added: dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16-microprofile.tar.gz.sha512 == --- dev/tomee/staging-1222/tomee-8.0.16/apache-tomee-8.0.16
svn commit: r64882 - in /dev/tomee/staging-1222: ./ tomee-8.0.16/
Author: jfisher Date: Fri Oct 27 22:04:24 2023 New Revision: 64882 Log: [release-tools] staged binary dir for tomee-8.0.16 Added: dev/tomee/staging-1222/ dev/tomee/staging-1222/tomee-8.0.16/
svn commit: r64880 - /dev/tomee/testdir3/
Author: jfisher Date: Fri Oct 27 22:04:06 2023 New Revision: 64880 Log: Create test dir Added: dev/tomee/testdir3/
svn commit: r64881 - /dev/tomee/testdir3/
Author: jfisher Date: Fri Oct 27 22:04:06 2023 New Revision: 64881 Log: Delete test dir Removed: dev/tomee/testdir3/
(tomee) 01/01: Merge pull request #1075 from apache/tomee-8.x-regenerate_boms_after_dep_upgrade
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a commit to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git commit be3901cc3c96b56989a5d501313fe4225f7872c3 Merge: c63eacac49 2f739aa10f Author: Jonathan S. Fisher AuthorDate: Fri Oct 27 15:56:56 2023 -0500 Merge pull request #1075 from apache/tomee-8.x-regenerate_boms_after_dep_upgrade Regenerated BOMs after dependency upgrades boms/tomee-plume/pom.xml | 12 ++-- boms/tomee-plus/pom.xml | 12 ++-- 2 files changed, 12 insertions(+), 12 deletions(-)
(tomee) branch tomee-8.x updated (c63eacac49 -> be3901cc3c)
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a change to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git from c63eacac49 TOMEE-4266 update ActiveMQ to 5.16.7 add 2f739aa10f Minor: Regenerated BOMs for c63eacac4956c29454a0efc3e75e933dd4316b26 new be3901cc3c Merge pull request #1075 from apache/tomee-8.x-regenerate_boms_after_dep_upgrade The 1 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: boms/tomee-plume/pom.xml | 12 ++-- boms/tomee-plus/pom.xml | 12 ++-- 2 files changed, 12 insertions(+), 12 deletions(-)
[tomee] branch tomee-8.x updated: Close #TOMEE-4263: Update Apache Santuario to 2.3.4 from 2.3.2 (xmlsec) to mitigate CVE-2023-44483
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a commit to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/tomee-8.x by this push: new aa3dde4420 Close #TOMEE-4263: Update Apache Santuario to 2.3.4 from 2.3.2 (xmlsec) to mitigate CVE-2023-44483 new cb9e3c3c55 Merge pull request #1072 from exabrial/TOMEE-4263/upgrade-xmlsec-santuario aa3dde4420 is described below commit aa3dde442023d7c290cf311f15285e410b35f152 Author: Jonathan S. Fisher AuthorDate: Thu Oct 26 07:42:07 2023 -0500 Close #TOMEE-4263: Update Apache Santuario to 2.3.4 from 2.3.2 (xmlsec) to mitigate CVE-2023-44483 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 36f1aa6b54..ae44d6a964 100644 --- a/pom.xml +++ b/pom.xml @@ -213,7 +213,7 @@ 6.4.0 -2.3.2 +2.3.4 2.4.1 2.10.6 1.0-alpha-1
[tomee] branch tomee-8.x updated (22325f92c4 -> 7f3d1d1d82)
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a change to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git from 22325f92c4 Merge pull request #1070 from exabrial/TOMEE-4262/upgrade-eclipselink-2_7_13 add 32d6bfd7d3 Minor: Regenerated BOMs for 22325f92c43db34760011cd801a823930a12c1ee new 7f3d1d1d82 Merge pull request #1071 from apache/tomee-8.x-regenerate_boms_after_dep_upgrade The 1 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: boms/tomee-plume/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[tomee] 01/01: Merge pull request #1071 from apache/tomee-8.x-regenerate_boms_after_dep_upgrade
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a commit to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git commit 7f3d1d1d824fca3c9a34128ceb823e5bde3ea6e8 Merge: 22325f92c4 32d6bfd7d3 Author: Jonathan S. Fisher AuthorDate: Wed Oct 25 16:35:31 2023 -0500 Merge pull request #1071 from apache/tomee-8.x-regenerate_boms_after_dep_upgrade Regenerated BOMs after dependency upgrades boms/tomee-plume/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[tomee] branch tomee-8.x updated: Close #TOMEE-4262: Upgrade EclipseLink to 2.7.13 from 2.7.12
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a commit to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/tomee-8.x by this push: new d1dc9c7c24 Close #TOMEE-4262: Upgrade EclipseLink to 2.7.13 from 2.7.12 new 22325f92c4 Merge pull request #1070 from exabrial/TOMEE-4262/upgrade-eclipselink-2_7_13 d1dc9c7c24 is described below commit d1dc9c7c24755e1ca862092b1db17158f40ac145 Author: Jonathan S. Fisher AuthorDate: Wed Oct 25 13:50:16 2023 -0500 Close #TOMEE-4262: Upgrade EclipseLink to 2.7.13 from 2.7.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2f64bf0d73..36f1aa6b54 100644 --- a/pom.xml +++ b/pom.xml @@ -204,7 +204,7 @@ 3.2.2 2.0.27 -2.7.12 +2.7.13 2.3.19
[tomee] branch tomee-8.x updated: Make new tests public
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new a1e9d1e000 Make new tests public
a1e9d1e000 is described below
commit a1e9d1e000d8ba483a047135c6cef21fc7c826f8
Author: Jonathan S. Fisher
AuthorDate: Sat Jun 10 23:02:52 2023 -0500
Make new tests public
(cherry picked from commit d05723871fe91e9d828fc93be6c68b488fc121bb)
---
.../java/org/apache/tomee/security/http/SavedAuthenticationTest.java| 2 +-
.../src/test/java/org/apache/tomee/security/http/SavedRequestTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
index d0d2cbfb93..967d7afa20 100644
---
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
+++
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import org.junit.Test;
-class SavedAuthenticationTest {
+public class SavedAuthenticationTest {
@Test
public void testSerializable() {
diff --git
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
index 51770cf07e..fe49dd5aae 100644
---
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
+++
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import org.junit.Test;
-class SavedRequestTest {
+public class SavedRequestTest {
@Test
public void testSerializable() {
final SavedRequest savedRequest = new SavedRequest();
[tomee] branch tomee-9.x updated: Make new tests public
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-9.x by this push:
new a33c6b8381 Make new tests public
a33c6b8381 is described below
commit a33c6b8381b9e6ef45e5c841600c4bb16b623443
Author: Jonathan S. Fisher
AuthorDate: Sat Jun 10 23:02:52 2023 -0500
Make new tests public
(cherry picked from commit d05723871fe91e9d828fc93be6c68b488fc121bb)
---
.../java/org/apache/tomee/security/http/SavedAuthenticationTest.java| 2 +-
.../src/test/java/org/apache/tomee/security/http/SavedRequestTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
index d0d2cbfb93..967d7afa20 100644
---
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
+++
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import org.junit.Test;
-class SavedAuthenticationTest {
+public class SavedAuthenticationTest {
@Test
public void testSerializable() {
diff --git
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
index 51770cf07e..fe49dd5aae 100644
---
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
+++
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import org.junit.Test;
-class SavedRequestTest {
+public class SavedRequestTest {
@Test
public void testSerializable() {
final SavedRequest savedRequest = new SavedRequest();
[tomee] branch main updated: Make new tests public
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new d05723871f Make new tests public
d05723871f is described below
commit d05723871fe91e9d828fc93be6c68b488fc121bb
Author: Jonathan S. Fisher
AuthorDate: Sat Jun 10 23:02:52 2023 -0500
Make new tests public
---
.../java/org/apache/tomee/security/http/SavedAuthenticationTest.java| 2 +-
.../src/test/java/org/apache/tomee/security/http/SavedRequestTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
index d0d2cbfb93..967d7afa20 100644
---
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
+++
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import org.junit.Test;
-class SavedAuthenticationTest {
+public class SavedAuthenticationTest {
@Test
public void testSerializable() {
diff --git
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
index 51770cf07e..fe49dd5aae 100644
---
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
+++
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import org.junit.Test;
-class SavedRequestTest {
+public class SavedRequestTest {
@Test
public void testSerializable() {
final SavedRequest savedRequest = new SavedRequest();
[tomee] branch tomee-8.x updated: Close Tomee-4031 - attempt to use parameter names from reflection, which should fall back to arg0 syntax if information was not compiled in
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new 2f97531fdf Close Tomee-4031 - attempt to use parameter names from
reflection, which should fall back to arg0 syntax if information was not
compiled in
new 36f62daff1 Merge pull request #1058 from
exabrial/tomee-8/TOMEE-4031_improve-jmx-parameter-names
2f97531fdf is described below
commit 2f97531fdf950503bee08e9431ee10eb9d57d93e
Author: Jonathan S. Fisher
AuthorDate: Fri Jun 9 09:23:04 2023 -0500
Close Tomee-4031 - attempt to use parameter names from reflection, which
should fall back to arg0 syntax if information was not compiled in
(cherry picked from commit ea068b4e633e81ef730493521fe610ac7e801004)
---
.../java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java| 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
index e52ce320dd..eb696d5d8e 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
@@ -33,6 +33,7 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.HashMap;
@@ -243,12 +244,12 @@ public class DynamicMBeanWrapper implements DynamicMBean,
MBeanRegistration {
private static MBeanParameterInfo[] methodSignature(final
MBeanOperationInfo jvmInfo, final Method method) {
final Class[] classes = method.getParameterTypes();
final Annotation[][] annots = method.getParameterAnnotations();
-return parameters(jvmInfo, classes, annots);
+return parameters(jvmInfo, classes, annots, method.getParameters());
}
static MBeanParameterInfo[] parameters(final MBeanOperationInfo jvmInfo,
final Class[] classes,
- final Annotation[][] annots) {
+ final Annotation[][] annots,
Parameter[] parameters) {
final MBeanParameterInfo[] params =
new MBeanParameterInfo[classes.length];
assert classes.length == annots.length;
@@ -256,7 +257,7 @@ public class DynamicMBeanWrapper implements DynamicMBean,
MBeanRegistration {
String desc = "";
for (int i = 0; i < classes.length; i++) {
final Descriptor d = jvmInfo.getSignature()[i].getDescriptor();
-final String pn = "arg" + i;
+final String pn = parameters[i].getName();
for (final Annotation a : annots[i]) {
final Class type = a.annotationType();
if (type.equals(Description.class) ||
type.equals(OPENEJB_API_TO_JAVAX.get(Description.class))) {
[tomee] branch tomee-9.x updated: Close Tomee-4031 - attempt to use parameter names from reflection, which should fall back to arg0 syntax if information was not compiled in
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-9.x by this push:
new 881db31a78 Close Tomee-4031 - attempt to use parameter names from
reflection, which should fall back to arg0 syntax if information was not
compiled in
new 00a43122fc Merge pull request #1057 from
exabrial/tomee-9/TOMEE-4031_improve-jmx-parameter-names
881db31a78 is described below
commit 881db31a78f25e6f4bc90fcd1a1a113f68b43e83
Author: Jonathan S. Fisher
AuthorDate: Fri Jun 9 09:23:04 2023 -0500
Close Tomee-4031 - attempt to use parameter names from reflection, which
should fall back to arg0 syntax if information was not compiled in
(cherry picked from commit ea068b4e633e81ef730493521fe610ac7e801004)
(cherry picked from commit 2f97531fdf950503bee08e9431ee10eb9d57d93e)
---
.../java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java| 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
index e52ce320dd..eb696d5d8e 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
@@ -33,6 +33,7 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.HashMap;
@@ -243,12 +244,12 @@ public class DynamicMBeanWrapper implements DynamicMBean,
MBeanRegistration {
private static MBeanParameterInfo[] methodSignature(final
MBeanOperationInfo jvmInfo, final Method method) {
final Class[] classes = method.getParameterTypes();
final Annotation[][] annots = method.getParameterAnnotations();
-return parameters(jvmInfo, classes, annots);
+return parameters(jvmInfo, classes, annots, method.getParameters());
}
static MBeanParameterInfo[] parameters(final MBeanOperationInfo jvmInfo,
final Class[] classes,
- final Annotation[][] annots) {
+ final Annotation[][] annots,
Parameter[] parameters) {
final MBeanParameterInfo[] params =
new MBeanParameterInfo[classes.length];
assert classes.length == annots.length;
@@ -256,7 +257,7 @@ public class DynamicMBeanWrapper implements DynamicMBean,
MBeanRegistration {
String desc = "";
for (int i = 0; i < classes.length; i++) {
final Descriptor d = jvmInfo.getSignature()[i].getDescriptor();
-final String pn = "arg" + i;
+final String pn = parameters[i].getName();
for (final Annotation a : annots[i]) {
final Class type = a.annotationType();
if (type.equals(Description.class) ||
type.equals(OPENEJB_API_TO_JAVAX.get(Description.class))) {
[tomee] branch main updated: Close Tomee-4031 - attempt to use parameter names from reflection, which should fall back to arg0 syntax if information was not compiled in
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new ea068b4e63 Close Tomee-4031 - attempt to use parameter names from
reflection, which should fall back to arg0 syntax if information was not
compiled in
new 77bdfa481c Merge pull request #1056 from
exabrial/TOMEE-4031_improve-jmx-parameter-names
ea068b4e63 is described below
commit ea068b4e633e81ef730493521fe610ac7e801004
Author: Jonathan S. Fisher
AuthorDate: Fri Jun 9 09:23:04 2023 -0500
Close Tomee-4031 - attempt to use parameter names from reflection, which
should fall back to arg0 syntax if information was not compiled in
---
.../java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java| 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
index e52ce320dd..eb696d5d8e 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
@@ -33,6 +33,7 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.HashMap;
@@ -243,12 +244,12 @@ public class DynamicMBeanWrapper implements DynamicMBean,
MBeanRegistration {
private static MBeanParameterInfo[] methodSignature(final
MBeanOperationInfo jvmInfo, final Method method) {
final Class[] classes = method.getParameterTypes();
final Annotation[][] annots = method.getParameterAnnotations();
-return parameters(jvmInfo, classes, annots);
+return parameters(jvmInfo, classes, annots, method.getParameters());
}
static MBeanParameterInfo[] parameters(final MBeanOperationInfo jvmInfo,
final Class[] classes,
- final Annotation[][] annots) {
+ final Annotation[][] annots,
Parameter[] parameters) {
final MBeanParameterInfo[] params =
new MBeanParameterInfo[classes.length];
assert classes.length == annots.length;
@@ -256,7 +257,7 @@ public class DynamicMBeanWrapper implements DynamicMBean,
MBeanRegistration {
String desc = "";
for (int i = 0; i < classes.length; i++) {
final Descriptor d = jvmInfo.getSignature()[i].getDescriptor();
-final String pn = "arg" + i;
+final String pn = parameters[i].getName();
for (final Annotation a : annots[i]) {
final Class type = a.annotationType();
if (type.equals(Description.class) ||
type.equals(OPENEJB_API_TO_JAVAX.get(Description.class))) {
[tomee] branch tomee-9.x updated (40e6f2fb7c -> da87d72a22)
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a change to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git from 40e6f2fb7c TOMEE-4221 - JUnit 5.9.3 new eaa7f0e6ff Fix TOMEE-4222 - LoginToContinue causes IllegalArgumentException: setAttribute: Non-serializable attribute new b587763a55 Add SavedAuthenticationTest and SavedRequestTest to ensure referenced objects implement Serializable new aab75d07a5 RAT police nailed me. Add license headers to SavedAuthenticationTest and SavedRequestTest, apologies everyone for commit log spam new da87d72a22 Merge pull request #1055 from exabrial/tomee-9/TOMEE-4222_jsr-375-IllegalArgumentException-Non-serializable-attribute The 14675 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: .../apache/tomee/security/http/SavedAuthentication.java | 5 - .../java/org/apache/tomee/security/http/SavedRequest.java | 5 - .../tomee/security/http/SavedAuthenticationTest.java | 15 +++ .../org/apache/tomee/security/http/SavedRequestTest.java | 15 ++- 4 files changed, 29 insertions(+), 11 deletions(-) copy container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmProxy.java => tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java (63%) copy container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmProxy.java => tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java (68%)
[tomee] branch tomee-8.x updated (1543acf359 -> d2d9b6c7a0)
This is an automated email from the ASF dual-hosted git repository. jfisher pushed a change to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git from 1543acf359 TOMEE-4221 - JUnit 5.9.3 new 2e3bd6a232 Fix TOMEE-4222 - LoginToContinue causes IllegalArgumentException: setAttribute: Non-serializable attribute new 788d394fda Add SavedAuthenticationTest and SavedRequestTest to ensure referenced objects implement Serializable new e911f8d615 RAT police nailed me. Add license headers to SavedAuthenticationTest and SavedRequestTest, apologies everyone for commit log spam new d2d9b6c7a0 Merge pull request #1054 from exabrial/tomee-8/TOMEE-4222_jsr-375-IllegalArgumentException-Non-serializable-attribute The 14306 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: .../apache/tomee/security/http/SavedAuthentication.java | 5 - .../java/org/apache/tomee/security/http/SavedRequest.java | 5 - .../tomee/security/http/SavedAuthenticationTest.java | 15 +++ .../org/apache/tomee/security/http/SavedRequestTest.java | 15 ++- 4 files changed, 29 insertions(+), 11 deletions(-) copy container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmProxy.java => tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java (63%) copy container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmProxy.java => tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java (68%)
[tomee] branch main updated: RAT police nailed me. Add license headers to SavedAuthenticationTest and SavedRequestTest, apologies everyone for commit log spam
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new cf233251f8 RAT police nailed me. Add license headers to
SavedAuthenticationTest and SavedRequestTest, apologies everyone for commit log
spam
cf233251f8 is described below
commit cf233251f8463c261e8b113819ec15f0bbc95fba
Author: Jonathan S. Fisher
AuthorDate: Fri Jun 9 08:35:06 2023 -0500
RAT police nailed me. Add license headers to SavedAuthenticationTest and
SavedRequestTest, apologies everyone for commit log spam
---
.../tomee/security/http/SavedAuthenticationTest.java | 18 +-
.../apache/tomee/security/http/SavedRequestTest.java | 18 +-
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
index fe667d0b61..d0d2cbfb93 100644
---
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
+++
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.security.http;
import static org.junit.Assert.assertTrue;
@@ -7,7 +23,7 @@ import java.util.HashSet;
import org.junit.Test;
-public class SavedAuthenticationTest {
+class SavedAuthenticationTest {
@Test
public void testSerializable() {
diff --git
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
index 5583cd35f4..51770cf07e 100644
---
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
+++
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.security.http;
import static org.junit.Assert.assertTrue;
@@ -6,7 +22,7 @@ import java.io.Serializable;
import org.junit.Test;
-public class SavedRequestTest {
+class SavedRequestTest {
@Test
public void testSerializable() {
final SavedRequest savedRequest = new SavedRequest();
[tomee] branch main updated: Fix TOMEE-4222 - LoginToContinue causes IllegalArgumentException: setAttribute: Non-serializable attribute
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 4d9f032368 Fix TOMEE-4222 - LoginToContinue causes
IllegalArgumentException: setAttribute: Non-serializable attribute
new 7e9453719b Merge pull request #1053 from
exabrial/TOMEE-4222_jsr-375-IllegalArgumentException-Non-serializable-attribute
4d9f032368 is described below
commit 4d9f032368d4cac936ed40c1ad7771ca4021b8b6
Author: Jonathan S. Fisher
AuthorDate: Thu Jun 8 10:21:01 2023 -0500
Fix TOMEE-4222 - LoginToContinue causes IllegalArgumentException:
setAttribute: Non-serializable attribute
---
.../java/org/apache/tomee/security/http/SavedAuthentication.java | 5 -
.../src/main/java/org/apache/tomee/security/http/SavedRequest.java | 5 -
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git
a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/SavedAuthentication.java
b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/SavedAuthentication.java
index 5c303535c0..6788422fd3 100644
---
a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/SavedAuthentication.java
+++
b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/SavedAuthentication.java
@@ -22,7 +22,10 @@ import java.util.Set;
import static java.util.Collections.unmodifiableSet;
-public final class SavedAuthentication {
+import java.io.Serializable;
+
+public final class SavedAuthentication implements Serializable {
+private static final long serialVersionUID = 1L;
private final Principal principal;
private final Set groups;
diff --git
a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/SavedRequest.java
b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/SavedRequest.java
index 24fef8c240..3c900fa07f 100644
---
a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/SavedRequest.java
+++
b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/SavedRequest.java
@@ -19,6 +19,8 @@ package org.apache.tomee.security.http;
import org.apache.tomcat.util.buf.ByteChunk;
import jakarta.servlet.http.Cookie;
+
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -30,7 +32,8 @@ import java.util.Map;
/**
* Mostly copied from org.apache.catalina.authenticator.SavedRequest.
*/
-public final class SavedRequest {
+public final class SavedRequest implements Serializable {
+private static final long serialVersionUID = 1L;
SavedRequest() {
}
[tomee] branch main updated: Add SavedAuthenticationTest and SavedRequestTest to ensure referenced objects implement Serializable
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 4f033942ce Add SavedAuthenticationTest and SavedRequestTest to ensure
referenced objects implement Serializable
4f033942ce is described below
commit 4f033942ce2c3417f31437c57b0f0ba29005618a
Author: Jonathan S. Fisher
AuthorDate: Fri Jun 9 08:26:33 2023 -0500
Add SavedAuthenticationTest and SavedRequestTest to ensure referenced
objects implement Serializable
(cherry picked from commit 788d394fda9c56c81454db8edc1ba29eadecfe3c)
(cherry picked from commit b587763a553df28ee7f98e9497c978491e838f79)
---
.../tomee/security/http/SavedAuthenticationTest.java | 18 ++
.../apache/tomee/security/http/SavedRequestTest.java | 16
2 files changed, 34 insertions(+)
diff --git
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
new file mode 100644
index 00..fe667d0b61
--- /dev/null
+++
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedAuthenticationTest.java
@@ -0,0 +1,18 @@
+package org.apache.tomee.security.http;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.HashSet;
+
+import org.junit.Test;
+
+public class SavedAuthenticationTest {
+
+ @Test
+ public void testSerializable() {
+final SavedAuthentication savedAuthentication = new
SavedAuthentication(null, new HashSet<>());
+assertTrue("SavedAuthentication must implement Serializable, since it will
be set as a session attribute",
+savedAuthentication instanceof Serializable);
+ }
+}
diff --git
a/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
new file mode 100644
index 00..5583cd35f4
--- /dev/null
+++
b/tomee/tomee-security/src/test/java/org/apache/tomee/security/http/SavedRequestTest.java
@@ -0,0 +1,16 @@
+package org.apache.tomee.security.http;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+
+import org.junit.Test;
+
+public class SavedRequestTest {
+ @Test
+ public void testSerializable() {
+final SavedRequest savedRequest = new SavedRequest();
+assertTrue("SavedRequest must implement Serializable, since it will be
set as a session attribute",
+savedRequest instanceof Serializable);
+ }
+}
[tomee] branch master updated: Fix tomee-2653: JMSContext auto-destruction results in exception
This is an automated email from the ASF dual-hosted git repository.
jfisher 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 10efad0 Fix tomee-2653: JMSContext auto-destruction results in
exception
10efad0 is described below
commit 10efad057ff82cdfb7a6b73d543b98df2c3293f2
Author: Jonathan S. Fisher
AuthorDate: Fri Aug 30 08:37:37 2019 -0500
Fix tomee-2653: JMSContext auto-destruction results in exception
---
.../java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java | 3 ---
1 file changed, 3 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java
index 872b1c9..573624d 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java
@@ -143,9 +143,6 @@ public class JMSContextImpl implements JMSContext {
public void close() {
try {
synchronized (this) {
-if (session != null) {
-session.close();
-}
if (connection != null) {
connection.close();
}
[tomee] branch tomee-7.1.x updated: Fix tomee-2653: JMSContext auto-destruction results in exception
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch tomee-7.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-7.1.x by this push:
new 79ddc0a Fix tomee-2653: JMSContext auto-destruction results in
exception
79ddc0a is described below
commit 79ddc0a9e9884fe3bbac36a16330edb0d4a223e2
Author: Jonathan S. Fisher
AuthorDate: Fri Aug 30 08:37:37 2019 -0500
Fix tomee-2653: JMSContext auto-destruction results in exception
---
.../java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java | 3 ---
1 file changed, 3 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java
index 872b1c9..573624d 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java
@@ -143,9 +143,6 @@ public class JMSContextImpl implements JMSContext {
public void close() {
try {
synchronized (this) {
-if (session != null) {
-session.close();
-}
if (connection != null) {
connection.close();
}
[tomee] branch tomee-7.0.x updated: Fix tomee-2653: JMSContext auto-destruction results in exception
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch tomee-7.0.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-7.0.x by this push:
new b9dbdee Fix tomee-2653: JMSContext auto-destruction results in
exception
b9dbdee is described below
commit b9dbdee85eaa4550cb2c578cffb17057e387e138
Author: Jonathan S. Fisher
AuthorDate: Fri Aug 30 08:37:37 2019 -0500
Fix tomee-2653: JMSContext auto-destruction results in exception
---
.../java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java | 3 ---
1 file changed, 3 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java
index 872b1c9..573624d 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMSContextImpl.java
@@ -143,9 +143,6 @@ public class JMSContextImpl implements JMSContext {
public void close() {
try {
synchronized (this) {
-if (session != null) {
-session.close();
-}
if (connection != null) {
connection.close();
}
[tomee] branch tomee-7.1.x updated: Fix several JMS/JMS2.0 bugs
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch tomee-7.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-7.1.x by this push:
new d4097e3 Fix several JMS/JMS2.0 bugs
d4097e3 is described below
commit d4097e360673cef742d2c42ab664df754993e561
Author: Jonathan S. Fisher
AuthorDate: Mon Aug 26 20:09:10 2019 -0500
Fix several JMS/JMS2.0 bugs
* Fix TOMEE-2229: JMSContext Injected by TomEE does not participate in JTA
* Fix TOMEE-2650: TomEE Creating non-JTA Sessions
* Fix TOMEE-2651: TomEE doesn't return JMS Connection to pool after a
Transaction Timeout
* Fix TOMEE-2652: TransactionSupport parameter not honored on JMS
Connection Factory resources
---
.../openejb/resource/AutoConnectionTracker.java| 26 ++--
.../openejb/resource/activemq/jms2/JMS2.java | 13 ++
.../resource/activemq/jms2/JMSContextImpl.java | 7 +-
.../resource/activemq/jms2/JMSProducerImpl.java| 1 +
.../activemq/jms2/TomEEConnectionFactory.java | 42 +--
.../activemq/jms2/TomEEManagedConnection.java | 10 +-
.../jms2/TomEEManagedConnectionFactory.java| 45 ++-
.../activemq/jms2/TomEEManagedConnectionProxy.java | 132 -
.../activemq/jms2/TomEERAConnectionFactory.java| 108 -
.../activemq/jms2/cdi/JMS2CDIExtension.java| 18 ++-
10 files changed, 360 insertions(+), 42 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
index 49f891e..3064aec 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
@@ -22,6 +22,7 @@ import
org.apache.geronimo.connector.outbound.ConnectionReturnAction;
import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
import org.apache.geronimo.connector.outbound.ManagedConnectionInfo;
import
org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
+import org.apache.geronimo.transaction.manager.TransactionImpl;
import org.apache.openejb.dyni.DynamicSubclass;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.LogCategory;
@@ -32,7 +33,6 @@ import javax.resource.ResourceException;
import javax.resource.spi.DissociatableManagedConnection;
import javax.transaction.Synchronization;
import javax.transaction.SystemException;
-import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
import java.lang.ref.PhantomReference;
@@ -58,6 +58,7 @@ public class AutoConnectionTracker implements
ConnectionTracker {
private final TransactionManager txMgr;
private final Logger logger =
Logger.getInstance(LogCategory.OPENEJB_CONNECTOR,
"org.apache.openejb.resource");
private final ConcurrentMap
references = new ConcurrentHashMap();
+@SuppressWarnings("rawtypes")
private final ReferenceQueue referenceQueue = new ReferenceQueue();
private final ConcurrentMap, Class> proxies = new
ConcurrentHashMap<>();
private final ConcurrentMap, Class[]> interfaces = new
ConcurrentHashMap<>();
@@ -80,6 +81,7 @@ public class AutoConnectionTracker implements
ConnectionTracker {
* @param connectionInfo the connection to be obtained
* @param keythe unique id of the connection manager
*/
+@Override
public void setEnvironment(final ConnectionInfo connectionInfo, final
String key) {
ProxyPhantomReference reference = (ProxyPhantomReference)
referenceQueue.poll();
while (reference != null) {
@@ -103,12 +105,14 @@ public class AutoConnectionTracker implements
ConnectionTracker {
* @param connectionInfo the connection that was obtained
* @param reassociateshould always be false
*/
+@SuppressWarnings("unchecked")
+@Override
public void handleObtained(final ConnectionTrackingInterceptor
interceptor, final ConnectionInfo connectionInfo, final boolean reassociate)
throws ResourceException {
if (txMgr != null && registry != null) {
-Transaction currentTx = null;
+TransactionImpl currentTx = null;
try {
-currentTx = txMgr.getTransaction();
-} catch (SystemException e) {
+currentTx = (TransactionImpl) txMgr.getTransaction();
+} catch (SystemException | ClassCastException e) {
//ignore
}
@@ -166,16 +170,18 @@ public class AutoConnectionTracker implements
ConnectionTracker {
* @param connectionInfo the connection
[tomee] branch tomee-7.0.x updated: Bump version number to 7.0.7-SNAPSHOT on this file
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch tomee-7.0.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-7.0.x by this push:
new 6bdfc48 Bump version number to 7.0.7-SNAPSHOT on this file
6bdfc48 is described below
commit 6bdfc48b75d3849a85213462b0dcc883ca661f3e
Author: Jonathan S. Fisher
AuthorDate: Thu Aug 29 11:33:52 2019 -0500
Bump version number to 7.0.7-SNAPSHOT on this file
---
.../test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
b/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
index 05e58e9..190cc39 100644
---
a/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
+++
b/examples/connector-ear/connector-sample-functional-tests/src/test/java/org/superbiz/moviefun/DeployInWebAppsDirectoryTest.java
@@ -105,7 +105,7 @@ public class DeployInWebAppsDirectoryTest {
configuration.setGroupId("org.apache.tomee");
configuration.setArtifactId("apache-tomee");
configuration.setClassifier("plus");
-configuration.setVersion("7.0.6-SNAPSHOT");
+configuration.setVersion("7.0.7-SNAPSHOT");
//configuration.setDebug(true);
configuration.setHttpPort(-1);
[tomee] branch master updated: Fix several JMS/JMS2.0 bugs
This is an automated email from the ASF dual-hosted git repository.
jfisher 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 f56b2b2 Fix several JMS/JMS2.0 bugs
f56b2b2 is described below
commit f56b2b25a65b13472c6e6a02757cc2dc978c9953
Author: Jonathan S. Fisher
AuthorDate: Mon Aug 26 20:09:10 2019 -0500
Fix several JMS/JMS2.0 bugs
* Fix TOMEE-2229: JMSContext Injected by TomEE does not participate in JTA
* Fix TOMEE-2650: TomEE Creating non-JTA Sessions
* Fix TOMEE-2651: TomEE doesn't return JMS Connection to pool after a
Transaction Timeout
* Fix TOMEE-2652: TransactionSupport parameter not honored on JMS
Connection Factory resources
---
.../openejb/resource/AutoConnectionTracker.java| 26 ++--
.../openejb/resource/activemq/jms2/JMS2.java | 13 ++
.../resource/activemq/jms2/JMSContextImpl.java | 7 +-
.../resource/activemq/jms2/JMSProducerImpl.java| 1 +
.../activemq/jms2/TomEEConnectionFactory.java | 42 +--
.../activemq/jms2/TomEEManagedConnection.java | 10 +-
.../jms2/TomEEManagedConnectionFactory.java| 45 ++-
.../activemq/jms2/TomEEManagedConnectionProxy.java | 132 -
.../activemq/jms2/TomEERAConnectionFactory.java| 108 -
.../activemq/jms2/cdi/JMS2CDIExtension.java| 18 ++-
10 files changed, 360 insertions(+), 42 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
index 49135c8..b5080ab 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
@@ -22,6 +22,7 @@ import
org.apache.geronimo.connector.outbound.ConnectionReturnAction;
import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
import org.apache.geronimo.connector.outbound.ManagedConnectionInfo;
import
org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
+import org.apache.geronimo.transaction.manager.TransactionImpl;
import org.apache.openejb.dyni.DynamicSubclass;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.LogCategory;
@@ -32,7 +33,6 @@ import javax.resource.ResourceException;
import javax.resource.spi.DissociatableManagedConnection;
import javax.transaction.Synchronization;
import javax.transaction.SystemException;
-import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
import java.lang.ref.PhantomReference;
@@ -58,6 +58,7 @@ public class AutoConnectionTracker implements
ConnectionTracker {
private final TransactionManager txMgr;
private final Logger logger =
Logger.getInstance(LogCategory.OPENEJB_CONNECTOR,
"org.apache.openejb.resource");
private final ConcurrentMap
references = new ConcurrentHashMap<>();
+@SuppressWarnings("rawtypes")
private final ReferenceQueue referenceQueue = new ReferenceQueue();
private final ConcurrentMap, Class> proxies = new
ConcurrentHashMap<>();
private final ConcurrentMap, Class[]> interfaces = new
ConcurrentHashMap<>();
@@ -80,6 +81,7 @@ public class AutoConnectionTracker implements
ConnectionTracker {
* @param connectionInfo the connection to be obtained
* @param keythe unique id of the connection manager
*/
+@Override
public void setEnvironment(final ConnectionInfo connectionInfo, final
String key) {
ProxyPhantomReference reference = (ProxyPhantomReference)
referenceQueue.poll();
while (reference != null) {
@@ -103,12 +105,14 @@ public class AutoConnectionTracker implements
ConnectionTracker {
* @param connectionInfo the connection that was obtained
* @param reassociateshould always be false
*/
+@SuppressWarnings("unchecked")
+@Override
public void handleObtained(final ConnectionTrackingInterceptor
interceptor, final ConnectionInfo connectionInfo, final boolean reassociate)
throws ResourceException {
if (txMgr != null && registry != null) {
-Transaction currentTx = null;
+TransactionImpl currentTx = null;
try {
-currentTx = txMgr.getTransaction();
-} catch (SystemException e) {
+currentTx = (TransactionImpl) txMgr.getTransaction();
+} catch (SystemException | ClassCastException e) {
//ignore
}
@@ -162,16 +166,18 @@ public class AutoConnectionTracker implements
ConnectionTracker {
* @param connectionInfo the conn
[tomee] branch tomee-7.0.x updated: Fix several JMS/JMS2.0 bugs
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch tomee-7.0.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-7.0.x by this push:
new 3780eb6 Fix several JMS/JMS2.0 bugs
3780eb6 is described below
commit 3780eb6008ea3369ab745d0c1d7af718664323be
Author: Jonathan S. Fisher
AuthorDate: Mon Aug 26 20:09:10 2019 -0500
Fix several JMS/JMS2.0 bugs
* Fix TOMEE-2229: JMSContext Injected by TomEE does not participate in JTA
* Fix TOMEE-2650: TomEE Creating non-JTA Sessions
* Fix TOMEE-2651: TomEE doesn't return JMS Connection to pool after a
Transaction Timeout
* Fix TOMEE-2652: TransactionSupport parameter not honored on JMS
Connection Factory resources
---
.../openejb/resource/AutoConnectionTracker.java| 26 ++--
.../openejb/resource/activemq/jms2/JMS2.java | 13 ++
.../resource/activemq/jms2/JMSContextImpl.java | 7 +-
.../resource/activemq/jms2/JMSProducerImpl.java| 1 +
.../activemq/jms2/TomEEConnectionFactory.java | 42 +--
.../activemq/jms2/TomEEManagedConnection.java | 10 +-
.../jms2/TomEEManagedConnectionFactory.java| 45 ++-
.../activemq/jms2/TomEEManagedConnectionProxy.java | 132 -
.../activemq/jms2/TomEERAConnectionFactory.java| 108 -
.../activemq/jms2/cdi/JMS2CDIExtension.java| 18 ++-
10 files changed, 360 insertions(+), 42 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
index 49f891e..3064aec 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
@@ -22,6 +22,7 @@ import
org.apache.geronimo.connector.outbound.ConnectionReturnAction;
import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
import org.apache.geronimo.connector.outbound.ManagedConnectionInfo;
import
org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
+import org.apache.geronimo.transaction.manager.TransactionImpl;
import org.apache.openejb.dyni.DynamicSubclass;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.LogCategory;
@@ -32,7 +33,6 @@ import javax.resource.ResourceException;
import javax.resource.spi.DissociatableManagedConnection;
import javax.transaction.Synchronization;
import javax.transaction.SystemException;
-import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
import java.lang.ref.PhantomReference;
@@ -58,6 +58,7 @@ public class AutoConnectionTracker implements
ConnectionTracker {
private final TransactionManager txMgr;
private final Logger logger =
Logger.getInstance(LogCategory.OPENEJB_CONNECTOR,
"org.apache.openejb.resource");
private final ConcurrentMap
references = new ConcurrentHashMap();
+@SuppressWarnings("rawtypes")
private final ReferenceQueue referenceQueue = new ReferenceQueue();
private final ConcurrentMap, Class> proxies = new
ConcurrentHashMap<>();
private final ConcurrentMap, Class[]> interfaces = new
ConcurrentHashMap<>();
@@ -80,6 +81,7 @@ public class AutoConnectionTracker implements
ConnectionTracker {
* @param connectionInfo the connection to be obtained
* @param keythe unique id of the connection manager
*/
+@Override
public void setEnvironment(final ConnectionInfo connectionInfo, final
String key) {
ProxyPhantomReference reference = (ProxyPhantomReference)
referenceQueue.poll();
while (reference != null) {
@@ -103,12 +105,14 @@ public class AutoConnectionTracker implements
ConnectionTracker {
* @param connectionInfo the connection that was obtained
* @param reassociateshould always be false
*/
+@SuppressWarnings("unchecked")
+@Override
public void handleObtained(final ConnectionTrackingInterceptor
interceptor, final ConnectionInfo connectionInfo, final boolean reassociate)
throws ResourceException {
if (txMgr != null && registry != null) {
-Transaction currentTx = null;
+TransactionImpl currentTx = null;
try {
-currentTx = txMgr.getTransaction();
-} catch (SystemException e) {
+currentTx = (TransactionImpl) txMgr.getTransaction();
+} catch (SystemException | ClassCastException e) {
//ignore
}
@@ -166,16 +170,18 @@ public class AutoConnectionTracker implements
ConnectionTracker {
* @param connectionInfo the connection
[tomee] branch tomee-7.0.x updated: reset version number so we're testing 7.0.7-SNAPSHOT, not the 7.0.6-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
jfisher pushed a commit to branch tomee-7.0.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-7.0.x by this push:
new 30324f0 reset version number so we're testing 7.0.7-SNAPSHOT, not the
7.0.6-SNAPSHOT
30324f0 is described below
commit 30324f096d7327b4e057d690525db9895c293cee
Author: Jonathan S. Fisher
AuthorDate: Tue Aug 27 09:47:58 2019 -0500
reset version number so we're testing 7.0.7-SNAPSHOT, not the 7.0.6-SNAPSHOT
---
examples/applet/pom.xml | 6 +++---
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 | 4 ++--
examples/multi-jpa-provider-testing/pom.xml | 2 +-
examples/resources-declared-in-webapp/pom.xml | 2 +-
examples/rest-example-with-application/pom.xml| 2 +-
examples/rest-on-ejb/pom.xml | 2 +-
examples/simple-cmp2/pom.xml | 4 ++--
tomee/tomee-deb/pom.xml | 2 +-
11 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/examples/applet/pom.xml b/examples/applet/pom.xml
index 9233dd4..8bcb2e4 100644
--- a/examples/applet/pom.xml
+++ b/examples/applet/pom.xml
@@ -22,7 +22,7 @@
org.superbiz.applet
applet
war
- 7.0.6-SNAPSHOT
+ 7.0.7-SNAPSHOT
OpenEJB :: Web Examples :: Signed Applet EJB Client
http://tomee.apache.org
@@ -44,7 +44,7 @@
org.apache.tomee
openejb-client
- 7.0.6-SNAPSHOT
+ 7.0.7-SNAPSHOT
test
@@ -112,7 +112,7 @@
org.apache.tomee
openejb-client
- 7.0.6-SNAPSHOT
+ 7.0.7-SNAPSHOT
${project.build.directory}/${project.build.finalName}
openejb-client.jar
diff --git a/examples/bval-evaluation-redeployment/WebApp1/pom.xml
b/examples/bval-evaluation-redeployment/WebApp1/pom.xml
index 9ae824f..4953157 100644
--- a/examples/bval-evaluation-redeployment/WebApp1/pom.xml
+++ b/examples/bval-evaluation-redeployment/WebApp1/pom.xml
@@ -24,7 +24,7 @@
org.superbiz
bval-evaluation-redeployment
-7.0.6-SNAPSHOT
+7.0.7-SNAPSHOT
WebApp1
diff --git a/examples/bval-evaluation-redeployment/WebApp2/pom.xml
b/examples/bval-evaluation-redeployment/WebApp2/pom.xml
index 7c1064b..812a10e 100644
--- a/examples/bval-evaluation-redeployment/WebApp2/pom.xml
+++ b/examples/bval-evaluation-redeployment/WebApp2/pom.xml
@@ -24,7 +24,7 @@
org.superbiz
bval-evaluation-redeployment
-7.0.6-SNAPSHOT
+7.0.7-SNAPSHOT
WebApp2
diff --git a/examples/bval-evaluation-redeployment/pom.xml
b/examples/bval-evaluation-redeployment/pom.xml
index 1c162d3..557ca2c 100644
--- a/examples/bval-evaluation-redeployment/pom.xml
+++ b/examples/bval-evaluation-redeployment/pom.xml
@@ -23,7 +23,7 @@
org.superbiz
bval-evaluation-redeployment
- 7.0.6-SNAPSHOT
+ 7.0.7-SNAPSHOT
pom
@@ -109,7 +109,7 @@
org.apache.tomee
arquillian-tomee-remote
-7.0.6-SNAPSHOT
+7.0.7-SNAPSHOT
test
diff --git a/examples/bval-evaluation-redeployment/runner/pom.xml
b/examples/bval-evaluation-redeployment/runner/pom.xml
index 3345eb4..f4d39a3 100644
--- a/examples/bval-evaluation-redeployment/runner/pom.xml
+++ b/examples/bval-evaluation-redeployment/runner/pom.xml
@@ -24,7 +24,7 @@
org.superbiz
bval-evaluation-redeployment
-7.0.6-SNAPSHOT
+7.0.7-SNAPSHOT
runner
@@ -51,7 +51,7 @@
org.apache.tomee
apache-tomee
- 7.0.6-SNAPSHOT
+ 7.0.7-SNAPSHOT
zip
webprofile
test
diff --git a/examples/multi-jpa-provider-testing/pom.xml
b/examples/multi-jpa-provider-testing/pom.xml
index 96d5b90..a776ed4 100644
--- a/examples/multi-jpa-provider-testing/pom.xml
+++ b/examples/multi-jpa-provider-testing/pom.xml
@@ -71,7 +71,7 @@
${maven.test.skip}
-
"-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/7.0.6-SNAPSHOT/openejb-javaagent-7.0.6-SNAPSHOT.jar"
+
"-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/7.0.7-SNAPSHOT/openejb-javaagent-7.0.7-SNAPSHOT.jar"
org.apache.openjpa.persistence.PersistenceProviderImpl
diff --git a/examples/resources-declared-in-webapp/pom.xml
b/examples/resources-declared-in-webapp/pom.xml
index a04b46e..b2146bd 100644
--- a/examples/resources-declared-in-webapp/pom.xml
+++ b/examples/resources-declared-in-webapp/po
tomee git commit: Upgrade CXF to 3.1.8 per user request: https://bit.ly/2SGYGm6
Repository: tomee Updated Branches: refs/heads/tomee-7.1.x f8a66c240 -> 0dbd32599 Upgrade CXF to 3.1.8 per user request: https://bit.ly/2SGYGm6 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0dbd3259 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0dbd3259 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0dbd3259 Branch: refs/heads/tomee-7.1.x Commit: 0dbd32599fa0b5b264f158b7d26d6507f0622f6e Parents: f8a66c2 Author: Jonathan S. Fisher Authored: Sat Nov 3 14:35:54 2018 -0500 Committer: Jonathan S. Fisher Committed: Sat Nov 3 14:35:54 2018 -0500 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/0dbd3259/pom.xml -- diff --git a/pom.xml b/pom.xml index 4c7bece..5be97b6 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ 8.5.34 -3.1.15 +3.1.18 1.2.6 2.0.0 1.1.13.Final
tomee git commit: Upgrade CXF to 3.1.8 per user request: https://bit.ly/2SGYGm6
Repository: tomee Updated Branches: refs/heads/tomee-7.0.x 4f56a3009 -> 9cc49c3a2 Upgrade CXF to 3.1.8 per user request: https://bit.ly/2SGYGm6 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9cc49c3a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9cc49c3a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9cc49c3a Branch: refs/heads/tomee-7.0.x Commit: 9cc49c3a28fd62a4897a219a12cac5b150f1ffb3 Parents: 4f56a30 Author: Jonathan S. Fisher Authored: Sat Nov 3 14:33:34 2018 -0500 Committer: Jonathan S. Fisher Committed: Sat Nov 3 14:33:34 2018 -0500 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/9cc49c3a/pom.xml -- diff --git a/pom.xml b/pom.xml index 676ce76..09ecffa 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ 8.5.34 -3.1.16 +3.1.18 1.2.6 2.0.0 1.1.13.Final
[1/2] tomee git commit: Update CXF to latest release
Repository: tomee Updated Branches: refs/heads/master 285458dd1 -> 3e3f59df0 Update CXF to latest release Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a5513230 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a5513230 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a5513230 Branch: refs/heads/master Commit: a5513230e8f77a4985916f901c3eda2c5c45c6d2 Parents: f815b50 Author: Dennis Kieselhorst Authored: Tue Oct 30 15:30:06 2018 +0100 Committer: GitHub Committed: Tue Oct 30 15:30:06 2018 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/a5513230/pom.xml -- diff --git a/pom.xml b/pom.xml index 42b6643..7327038 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ 9.0.12 -3.2.6 +3.2.7 2.10.3 7.5.3.v20111011
[3/3] tomee git commit: Update ManagedExecutorServiceImpl.java
Update ManagedExecutorServiceImpl.java
Needs to return an Integer, not a long
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/285458dd
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/285458dd
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/285458dd
Branch: refs/heads/master
Commit: 285458dd1160b30942026e0a876a88dedac04cb8
Parents: 70bf6fc
Author: Jonathan S. Fisher
Authored: Tue Sep 25 13:34:03 2018 -0500
Committer: Jonathan S. Fisher
Committed: Sat Nov 3 14:24:12 2018 -0500
--
.../apache/openejb/threads/impl/ManagedExecutorServiceImpl.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/285458dd/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
--
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index bea9d1d..68b27e8 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -101,7 +101,7 @@ public class ManagedExecutorServiceImpl extends
AbstractExecutorService implemen
}
}
-public Long getQueueSize() {
+public Integer getQueueSize() {
if (delegate instanceof ThreadPoolExecutor) {
return ((ThreadPoolExecutor) delegate).getQueue().size();
} else {
[2/3] tomee git commit: Update ManagedExecutorServiceImpl.java
Update ManagedExecutorServiceImpl.java
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/70bf6fcf
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/70bf6fcf
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/70bf6fcf
Branch: refs/heads/master
Commit: 70bf6fcfbd4191bde67fd028385df12943ff370d
Parents: 5b6dfb7
Author: Jonathan S. Fisher
Authored: Tue Sep 25 13:29:37 2018 -0500
Committer: Jonathan S. Fisher
Committed: Sat Nov 3 14:24:12 2018 -0500
--
.../apache/openejb/threads/impl/ManagedExecutorServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/70bf6fcf/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
--
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index 59831b4..bea9d1d 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -101,9 +101,9 @@ public class ManagedExecutorServiceImpl extends
AbstractExecutorService implemen
}
}
-public Long getTaskCount() {
+public Long getQueueSize() {
if (delegate instanceof ThreadPoolExecutor) {
-return ((ThreadPoolExecutor) delegate).getTaskCount();
+return ((ThreadPoolExecutor) delegate).getQueue().size();
} else {
return null;
}
[1/3] tomee git commit: Allow for JMX on ManagedExecutorServices
Repository: tomee
Updated Branches:
refs/heads/master f815b5036 -> 285458dd1
Allow for JMX on ManagedExecutorServices
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5b6dfb79
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5b6dfb79
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5b6dfb79
Branch: refs/heads/master
Commit: 5b6dfb79fd6466abc2ca38151d6eecf91e4cbc8b
Parents: f815b50
Author: Jonathan S. Fisher
Authored: Sun Sep 23 22:44:17 2018 -0500
Committer: Jonathan S. Fisher
Committed: Sat Nov 3 14:24:11 2018 -0500
--
.../impl/ManagedExecutorServiceImpl.java| 59 +++-
1 file changed, 58 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/5b6dfb79/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
--
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index e710aa8..59831b4 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -29,6 +29,7 @@ import java.util.concurrent.AbstractExecutorService;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
public class ManagedExecutorServiceImpl extends AbstractExecutorService
implements ManagedExecutorService, DestroyableResource {
@@ -59,8 +60,64 @@ public class ManagedExecutorServiceImpl extends
AbstractExecutorService implemen
public boolean isTerminated() {
return delegate.isTerminated();
}
+
+public Integer getCorePoolSize() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getCorePoolSize();
+} else {
+return null;
+}
+}
+
+public Integer getMaximumPoolSize() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getMaximumPoolSize();
+} else {
+return null;
+}
+}
-@Override
+public Integer getPoolSize() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getPoolSize();
+} else {
+return null;
+}
+}
+
+public Integer getActiveCount() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getActiveCount();
+} else {
+return null;
+}
+}
+
+public Integer getLargestPoolSize() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getLargestPoolSize();
+} else {
+return null;
+}
+}
+
+public Long getTaskCount() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getTaskCount();
+} else {
+return null;
+}
+}
+
+public Long getCompletedTaskCount() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getCompletedTaskCount();
+} else {
+return null;
+}
+}
+
+@Override
public boolean awaitTermination(final long timeout, final TimeUnit unit)
throws InterruptedException {
return delegate.awaitTermination(timeout, unit);
}
[1/3] tomee git commit: Update ManagedExecutorServiceImpl.java
Repository: tomee
Updated Branches:
refs/heads/tomee-7.1.x 43774cc82 -> f8a66c240
Update ManagedExecutorServiceImpl.java
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6c8c20f4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6c8c20f4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6c8c20f4
Branch: refs/heads/tomee-7.1.x
Commit: 6c8c20f43502c5eda858b77b7ced607db2e583ef
Parents: 33b4c81
Author: Jonathan S. Fisher
Authored: Tue Sep 25 13:29:37 2018 -0500
Committer: Jonathan S. Fisher
Committed: Sat Nov 3 14:22:30 2018 -0500
--
.../apache/openejb/threads/impl/ManagedExecutorServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/6c8c20f4/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
--
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index 59831b4..bea9d1d 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -101,9 +101,9 @@ public class ManagedExecutorServiceImpl extends
AbstractExecutorService implemen
}
}
-public Long getTaskCount() {
+public Long getQueueSize() {
if (delegate instanceof ThreadPoolExecutor) {
-return ((ThreadPoolExecutor) delegate).getTaskCount();
+return ((ThreadPoolExecutor) delegate).getQueue().size();
} else {
return null;
}
[2/3] tomee git commit: Allow for JMX on ManagedExecutorServices
Allow for JMX on ManagedExecutorServices
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/33b4c815
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/33b4c815
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/33b4c815
Branch: refs/heads/tomee-7.1.x
Commit: 33b4c8152eb679e1840699ed0928773883a2f9f6
Parents: 43774cc
Author: Jonathan S. Fisher
Authored: Sun Sep 23 22:44:17 2018 -0500
Committer: Jonathan S. Fisher
Committed: Sat Nov 3 14:22:30 2018 -0500
--
.../impl/ManagedExecutorServiceImpl.java| 59 +++-
1 file changed, 58 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/33b4c815/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
--
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index e710aa8..59831b4 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -29,6 +29,7 @@ import java.util.concurrent.AbstractExecutorService;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
public class ManagedExecutorServiceImpl extends AbstractExecutorService
implements ManagedExecutorService, DestroyableResource {
@@ -59,8 +60,64 @@ public class ManagedExecutorServiceImpl extends
AbstractExecutorService implemen
public boolean isTerminated() {
return delegate.isTerminated();
}
+
+public Integer getCorePoolSize() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getCorePoolSize();
+} else {
+return null;
+}
+}
+
+public Integer getMaximumPoolSize() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getMaximumPoolSize();
+} else {
+return null;
+}
+}
-@Override
+public Integer getPoolSize() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getPoolSize();
+} else {
+return null;
+}
+}
+
+public Integer getActiveCount() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getActiveCount();
+} else {
+return null;
+}
+}
+
+public Integer getLargestPoolSize() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getLargestPoolSize();
+} else {
+return null;
+}
+}
+
+public Long getTaskCount() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getTaskCount();
+} else {
+return null;
+}
+}
+
+public Long getCompletedTaskCount() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getCompletedTaskCount();
+} else {
+return null;
+}
+}
+
+@Override
public boolean awaitTermination(final long timeout, final TimeUnit unit)
throws InterruptedException {
return delegate.awaitTermination(timeout, unit);
}
[3/3] tomee git commit: Update ManagedExecutorServiceImpl.java
Update ManagedExecutorServiceImpl.java
Needs to return an Integer, not a long
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f8a66c24
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f8a66c24
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f8a66c24
Branch: refs/heads/tomee-7.1.x
Commit: f8a66c240b73a4d6b3c224303621982667d1a93f
Parents: 6c8c20f
Author: Jonathan S. Fisher
Authored: Tue Sep 25 13:34:03 2018 -0500
Committer: Jonathan S. Fisher
Committed: Sat Nov 3 14:22:31 2018 -0500
--
.../apache/openejb/threads/impl/ManagedExecutorServiceImpl.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/f8a66c24/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
--
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index bea9d1d..68b27e8 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -101,7 +101,7 @@ public class ManagedExecutorServiceImpl extends
AbstractExecutorService implemen
}
}
-public Long getQueueSize() {
+public Integer getQueueSize() {
if (delegate instanceof ThreadPoolExecutor) {
return ((ThreadPoolExecutor) delegate).getQueue().size();
} else {
[3/4] tomee git commit: Update ManagedExecutorServiceImpl.java
Update ManagedExecutorServiceImpl.java
Needs to return an Integer, not a long
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8e907820
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8e907820
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8e907820
Branch: refs/heads/tomee-7.0.x
Commit: 8e907820e35c4f6ac666e0a80bfe0be6385c7e1a
Parents: 0c36aa3
Author: Jonathan S. Fisher
Authored: Tue Sep 25 13:34:03 2018 -0500
Committer: GitHub
Committed: Tue Sep 25 13:34:03 2018 -0500
--
.../apache/openejb/threads/impl/ManagedExecutorServiceImpl.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/8e907820/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
--
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index bea9d1d..68b27e8 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -101,7 +101,7 @@ public class ManagedExecutorServiceImpl extends
AbstractExecutorService implemen
}
}
-public Long getQueueSize() {
+public Integer getQueueSize() {
if (delegate instanceof ThreadPoolExecutor) {
return ((ThreadPoolExecutor) delegate).getQueue().size();
} else {
[2/4] tomee git commit: Update ManagedExecutorServiceImpl.java
Update ManagedExecutorServiceImpl.java
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0c36aa3c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0c36aa3c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0c36aa3c
Branch: refs/heads/tomee-7.0.x
Commit: 0c36aa3cbf5ca0635bea47f85a9f67dd57c4399f
Parents: 1590538
Author: Jonathan S. Fisher
Authored: Tue Sep 25 13:29:37 2018 -0500
Committer: GitHub
Committed: Tue Sep 25 13:29:37 2018 -0500
--
.../apache/openejb/threads/impl/ManagedExecutorServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/0c36aa3c/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
--
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index 59831b4..bea9d1d 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -101,9 +101,9 @@ public class ManagedExecutorServiceImpl extends
AbstractExecutorService implemen
}
}
-public Long getTaskCount() {
+public Long getQueueSize() {
if (delegate instanceof ThreadPoolExecutor) {
-return ((ThreadPoolExecutor) delegate).getTaskCount();
+return ((ThreadPoolExecutor) delegate).getQueue().size();
} else {
return null;
}
[4/4] tomee git commit: Merge branch 'exabrial/TOMEE-2243_jmx-on-managed-executors' of github.com:exabrial/tomee into tomee-7.0.x
Merge branch 'exabrial/TOMEE-2243_jmx-on-managed-executors' of github.com:exabrial/tomee into tomee-7.0.x Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4f56a300 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4f56a300 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4f56a300 Branch: refs/heads/tomee-7.0.x Commit: 4f56a300937362c70f643e617eeae8e313b18c10 Parents: 4309ec7 8e90782 Author: Jonathan S. Fisher Authored: Sat Nov 3 14:19:24 2018 -0500 Committer: Jonathan S. Fisher Committed: Sat Nov 3 14:19:24 2018 -0500 -- .../impl/ManagedExecutorServiceImpl.java| 59 +++- 1 file changed, 58 insertions(+), 1 deletion(-) --
[1/4] tomee git commit: Allow for JMX on ManagedExecutorServices
Repository: tomee
Updated Branches:
refs/heads/tomee-7.0.x 4309ec73f -> 4f56a3009
Allow for JMX on ManagedExecutorServices
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1590538b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1590538b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1590538b
Branch: refs/heads/tomee-7.0.x
Commit: 1590538beb144aacc576728bb6c34512e05a47a8
Parents: 4c98121
Author: Jonathan S. Fisher
Authored: Sun Sep 23 22:44:17 2018 -0500
Committer: Jonathan S. Fisher
Committed: Sun Sep 23 22:44:17 2018 -0500
--
.../impl/ManagedExecutorServiceImpl.java| 59 +++-
1 file changed, 58 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/1590538b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
--
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index e710aa8..59831b4 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -29,6 +29,7 @@ import java.util.concurrent.AbstractExecutorService;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
public class ManagedExecutorServiceImpl extends AbstractExecutorService
implements ManagedExecutorService, DestroyableResource {
@@ -59,8 +60,64 @@ public class ManagedExecutorServiceImpl extends
AbstractExecutorService implemen
public boolean isTerminated() {
return delegate.isTerminated();
}
+
+public Integer getCorePoolSize() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getCorePoolSize();
+} else {
+return null;
+}
+}
+
+public Integer getMaximumPoolSize() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getMaximumPoolSize();
+} else {
+return null;
+}
+}
-@Override
+public Integer getPoolSize() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getPoolSize();
+} else {
+return null;
+}
+}
+
+public Integer getActiveCount() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getActiveCount();
+} else {
+return null;
+}
+}
+
+public Integer getLargestPoolSize() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getLargestPoolSize();
+} else {
+return null;
+}
+}
+
+public Long getTaskCount() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getTaskCount();
+} else {
+return null;
+}
+}
+
+public Long getCompletedTaskCount() {
+if (delegate instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) delegate).getCompletedTaskCount();
+} else {
+return null;
+}
+}
+
+@Override
public boolean awaitTermination(final long timeout, final TimeUnit unit)
throws InterruptedException {
return delegate.awaitTermination(timeout, unit);
}
tomee git commit: Merge branch 'issues/TOMEE-2249_eclipselink-npe' into tomee-7.0.x
Repository: tomee
Updated Branches:
refs/heads/tomee-7.1.x 205eb44c9 -> ba15cc22c
Merge branch 'issues/TOMEE-2249_eclipselink-npe' into tomee-7.0.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ba15cc22
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ba15cc22
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ba15cc22
Branch: refs/heads/tomee-7.1.x
Commit: ba15cc22c8358e3c4def8bff658b00ca306e280e
Parents: 205eb44
Author: Jonathan S. Fisher
Authored: Tue Oct 16 20:00:12 2018 -0500
Committer: Jonathan S. Fisher
Committed: Tue Oct 16 20:09:00 2018 -0500
--
.../MBeanOpenEJBRuntimeServices.java| 26
.../MBeanOpenEJBRuntimeServicesMBean.java | 22 ++
.../eclipselink/OpenEJBRuntimeServices.java | 42
.../eclipselink/OpenEJBServerPlatform.java | 13 +-
4 files changed, 101 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/ba15cc22/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
--
diff --git
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
new file mode 100644
index 000..5e3d967
--- /dev/null
+++
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
@@ -0,0 +1,26 @@
+/*
+ * 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.openejb.jpa.integration.eclipselink;
+
+import org.eclipse.persistence.internal.sessions.AbstractSession;
+import org.eclipse.persistence.sessions.Session;
+
+public class MBeanOpenEJBRuntimeServices extends OpenEJBRuntimeServices
implements MBeanOpenEJBRuntimeServicesMBean {
+public MBeanOpenEJBRuntimeServices(Session session) {
+super((AbstractSession) session);
+}
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/ba15cc22/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
--
diff --git
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
new file mode 100644
index 000..4e229fa
--- /dev/null
+++
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
@@ -0,0 +1,22 @@
+/*
+ * 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.openejb.jpa.integration.eclipselink;
+
+import org.eclipse.persistence.services.mbean.MBeanRuntimeServicesMBean;
+
+public interface MBeanOpenEJBRuntimeServicesMBean extends
MBeanRuntimeServicesMBean {
+}
tomee git commit: Merge branch 'issues/TOMEE-2249_eclipselink-npe' into tomee-7.0.x
Repository: tomee
Updated Branches:
refs/heads/master 027a0975f -> aae3eb867
Merge branch 'issues/TOMEE-2249_eclipselink-npe' into tomee-7.0.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/aae3eb86
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/aae3eb86
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/aae3eb86
Branch: refs/heads/master
Commit: aae3eb867b559259e68b294cb176cf97c587cb59
Parents: 027a097
Author: Jonathan S. Fisher
Authored: Tue Oct 16 20:00:12 2018 -0500
Committer: Jonathan S. Fisher
Committed: Tue Oct 16 20:09:18 2018 -0500
--
.../MBeanOpenEJBRuntimeServices.java| 26
.../MBeanOpenEJBRuntimeServicesMBean.java | 22 ++
.../eclipselink/OpenEJBRuntimeServices.java | 42
.../eclipselink/OpenEJBServerPlatform.java | 13 +-
4 files changed, 101 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/aae3eb86/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
--
diff --git
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
new file mode 100644
index 000..5e3d967
--- /dev/null
+++
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
@@ -0,0 +1,26 @@
+/*
+ * 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.openejb.jpa.integration.eclipselink;
+
+import org.eclipse.persistence.internal.sessions.AbstractSession;
+import org.eclipse.persistence.sessions.Session;
+
+public class MBeanOpenEJBRuntimeServices extends OpenEJBRuntimeServices
implements MBeanOpenEJBRuntimeServicesMBean {
+public MBeanOpenEJBRuntimeServices(Session session) {
+super((AbstractSession) session);
+}
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/aae3eb86/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
--
diff --git
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
new file mode 100644
index 000..4e229fa
--- /dev/null
+++
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
@@ -0,0 +1,22 @@
+/*
+ * 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.openejb.jpa.integration.eclipselink;
+
+import org.eclipse.persistence.services.mbean.MBeanRuntimeServicesMBean;
+
+public interface MBeanOpenEJBRuntimeServicesMBean extends
MBeanRuntimeServicesMBean {
+}
[3/5] tomee git commit: move this method above other code
move this method above other code
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f4d3e015
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f4d3e015
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f4d3e015
Branch: refs/heads/tomee-7.0.x
Commit: f4d3e01563bf9e37f32b9231d6a4b4a8bb0c3aa2
Parents: 460ba29
Author: Jonathan S. Fisher
Authored: Mon Oct 8 13:25:03 2018 -0500
Committer: Jonathan S. Fisher
Committed: Mon Oct 8 13:25:03 2018 -0500
--
.../eclipselink/OpenEJBServerPlatform.java | 16
1 file changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4d3e015/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
--
diff --git
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
index cd73c26..bca85fc 100644
---
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
+++
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
@@ -46,9 +46,16 @@ public class OpenEJBServerPlatform extends
JMXServerPlatformBase implements JMXE
}
@Override
-public Class getExternalTransactionControllerClass() {
+public Class getExternalTransactionControllerClass() {
return OpenEJBJTATransactionController.class;
}
+
+@Override
+public void prepareServerSpecificServicesMBean() {
+if (isRuntimeServicesEnabledDefault() && getDatabaseSession() != null
&& shouldRegisterRuntimeBean) {
+this.setRuntimeServicesMBean(new
MBeanOpenEJBRuntimeServices(getDatabaseSession()));
+}
+}
public static class OpenEJBJTATransactionController extends
JTATransactionController {
@Override
@@ -65,11 +72,4 @@ public class OpenEJBServerPlatform extends
JMXServerPlatformBase implements JMXE
transaction.registerInterposedSynchronization(synchronization);
}
}
-
-@Override
-public void prepareServerSpecificServicesMBean() {
-if (isRuntimeServicesEnabledDefault() && getDatabaseSession() !=
null && shouldRegisterRuntimeBean) {
- this.setRuntimeServicesMBean(new
MBeanOpenEJBRuntimeServices(getDatabaseSession()));
-}
-}
}
[5/5] tomee git commit: Merge branch 'issues/TOMEE-2249_eclipselink-npe' into tomee-7.0.x
Merge branch 'issues/TOMEE-2249_eclipselink-npe' into tomee-7.0.x Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6709b3d9 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6709b3d9 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6709b3d9 Branch: refs/heads/tomee-7.0.x Commit: 6709b3d9a381a0fad05355bf77a7f04c1a5bba57 Parents: 1b73ff8 0640376 Author: Jonathan S. Fisher Authored: Tue Oct 16 20:00:12 2018 -0500 Committer: Jonathan S. Fisher Committed: Tue Oct 16 20:00:12 2018 -0500 -- .../MBeanOpenEJBRuntimeServices.java| 26 .../MBeanOpenEJBRuntimeServicesMBean.java | 22 ++ .../eclipselink/OpenEJBRuntimeServices.java | 42 .../eclipselink/OpenEJBServerPlatform.java | 13 +- 4 files changed, 101 insertions(+), 2 deletions(-) --
[4/5] tomee git commit: newlines
newlines
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0640376e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0640376e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0640376e
Branch: refs/heads/tomee-7.0.x
Commit: 0640376e4dd8a21a2d96f1b5f43b2ee7ecd1ecf5
Parents: f4d3e01
Author: Jonathan S. Fisher
Authored: Mon Oct 8 13:25:46 2018 -0500
Committer: Jonathan S. Fisher
Committed: Mon Oct 8 13:25:46 2018 -0500
--
.../jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java | 2 +-
.../integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java | 2 +-
.../jpa/integration/eclipselink/OpenEJBRuntimeServices.java| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/0640376e/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
--
diff --git
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
index c3aae0d..5e3d967 100644
---
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
+++
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
@@ -23,4 +23,4 @@ public class MBeanOpenEJBRuntimeServices extends
OpenEJBRuntimeServices implemen
public MBeanOpenEJBRuntimeServices(Session session) {
super((AbstractSession) session);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/0640376e/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
--
diff --git
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
index c7b5942..4e229fa 100644
---
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
+++
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
@@ -19,4 +19,4 @@ package org.apache.openejb.jpa.integration.eclipselink;
import org.eclipse.persistence.services.mbean.MBeanRuntimeServicesMBean;
public interface MBeanOpenEJBRuntimeServicesMBean extends
MBeanRuntimeServicesMBean {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/0640376e/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java
--
diff --git
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java
index db962b0..82b82a2 100644
---
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java
+++
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java
@@ -39,4 +39,4 @@ public class OpenEJBRuntimeServices extends RuntimeServices {
public OpenEJBRuntimeServices(Locale locale) {
}
-}
\ No newline at end of file
+}
[1/5] tomee git commit: Add required interface implementations etc
Repository: tomee
Updated Branches:
refs/heads/tomee-7.0.x 1b73ff86c -> 6709b3d9a
Add required interface implementations etc
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/515306f7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/515306f7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/515306f7
Branch: refs/heads/tomee-7.0.x
Commit: 515306f7ba0fa1c13720c4426f67854a339d2e30
Parents: df1983f
Author: Jonathan S. Fisher
Authored: Sat Sep 29 13:10:49 2018 -0500
Committer: Jonathan S. Fisher
Committed: Mon Oct 8 13:12:57 2018 -0500
--
.../MBeanOpenEJBRuntimeServices.java| 26
.../MBeanOpenEJBRuntimeServicesMBean.java | 22 ++
.../eclipselink/OpenEJBRuntimeServices.java | 42
.../eclipselink/OpenEJBServerPlatform.java | 11 -
4 files changed, 100 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/515306f7/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
--
diff --git
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
new file mode 100644
index 000..c3aae0d
--- /dev/null
+++
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
@@ -0,0 +1,26 @@
+/*
+ * 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.openejb.jpa.integration.eclipselink;
+
+import org.eclipse.persistence.internal.sessions.AbstractSession;
+import org.eclipse.persistence.sessions.Session;
+
+public class MBeanOpenEJBRuntimeServices extends OpenEJBRuntimeServices
implements MBeanOpenEJBRuntimeServicesMBean {
+public MBeanOpenEJBRuntimeServices(Session session) {
+super((AbstractSession) session);
+}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/515306f7/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
--
diff --git
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
new file mode 100644
index 000..c7b5942
--- /dev/null
+++
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
@@ -0,0 +1,22 @@
+/*
+ * 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.openejb.jpa.integration.eclipselink;
+
+import org.eclipse.persistence.services.mbean.MBeanRuntimeServicesMBean;
+
+public interface MBeanOpenEJBRuntimeServicesMBean extends
MBeanRuntimeServicesMBean {
+}
\ No newline at end of file
[2/5] tomee git commit: Fix rmannibucau concern on PR and explicity check for JMX runtime flag
Fix rmannibucau concern on PR and explicity check for JMX runtime flag
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/460ba29b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/460ba29b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/460ba29b
Branch: refs/heads/tomee-7.0.x
Commit: 460ba29b6dc0790e70b28920c47b04591d80a026
Parents: 515306f
Author: Jonathan S. Fisher
Authored: Mon Oct 8 13:21:17 2018 -0500
Committer: Jonathan S. Fisher
Committed: Mon Oct 8 13:21:17 2018 -0500
--
.../openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/460ba29b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
--
diff --git
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
index f68a962..cd73c26 100644
---
a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
+++
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
@@ -68,7 +68,7 @@ public class OpenEJBServerPlatform extends
JMXServerPlatformBase implements JMXE
@Override
public void prepareServerSpecificServicesMBean() {
-if (getDatabaseSession() != null && shouldRegisterRuntimeBean) {
+if (isRuntimeServicesEnabledDefault() && getDatabaseSession() !=
null && shouldRegisterRuntimeBean) {
this.setRuntimeServicesMBean(new
MBeanOpenEJBRuntimeServices(getDatabaseSession()));
}
}
[tomee] Git Push Summary
Repository: tomee Updated Branches: refs/heads/issues/TOMEE-2249_eclipselink-npe [deleted] 0640376e4
[tomee] Git Push Summary
Repository: tomee Updated Branches: refs/heads/apache/master [deleted] 027a0975f
[1/2] tomee git commit: Allow custom JSON Providers to replace Johnzon
Repository: tomee
Updated Branches:
refs/heads/tomee-7.1.x 71d42a48d -> 205eb44c9
Allow custom JSON Providers to replace Johnzon
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4302acab
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4302acab
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4302acab
Branch: refs/heads/tomee-7.1.x
Commit: 4302acab62bb64c2d77cce3a66b92ae7e9cff7c5
Parents: 71d42a4
Author: Jonathan S. Fisher
Authored: Sat Sep 15 16:16:51 2018 -0500
Committer: Jonathan S. Fisher
Committed: Tue Oct 16 19:18:52 2018 -0500
--
.../org/apache/openejb/server/cxf/rs/CxfRSService.java | 13 ++---
.../openejb/server/cxf/rs/CxfRsHttpListener.java | 6 --
2 files changed, 14 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/4302acab/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
--
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
index 347f42b..3f492ce 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
@@ -223,9 +223,16 @@ public class CxfRSService extends RESTService {
bus.setProperty("skip.default.json.provider.registration",
"true"); // client jaxrs, we want johnzon not jettison
final Collection defaults = new ArrayList<>();
-for (final String provider : asList(
-
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonbProvider",
-
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonpProvider")) {
+List jsonProviders;
+String userConfiguredJsonProviders =
SystemInstance.get().getProperty("openejb.jaxrs.jsonProviders");
+if (userConfiguredJsonProviders == null) {
+jsonProviders = asList(
+
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJohnzonProvider",
+
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonpProvider");
+} else {
+jsonProviders = asList(userConfiguredJsonProviders.split(","));
+}
+for (final String provider : jsonProviders) {
if (!isActive(provider)) {
continue;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/4302acab/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
--
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index e10172f..9366de7 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -498,8 +498,10 @@ public class CxfRsHttpListener implements RsHttpListener {
}
private void addMandatoryProviders(final Collection instances,
final ServiceConfiguration serviceConfiguration) {
-if
(!shouldSkipProvider(WadlDocumentMessageBodyWriter.class.getName())) {
-instances.add(new WadlDocumentMessageBodyWriter());
+if (SystemInstance.get().getProperty("openejb.jaxrs.jsonProviders") ==
null) {
+if
(!shouldSkipProvider(WadlDocumentMessageBodyWriter.class.getName())) {
+instances.add(new WadlDocumentMessageBodyWriter());
+}
}
if (!shouldSkipProvider(EJBExceptionMapper.class.getName())) {
instances.add(new EJBExceptionMapper());
tomee git commit: add doc reference in system.properties
Repository: tomee Updated Branches: refs/heads/master 38959d7fd -> 027a0975f add doc reference in system.properties Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/027a0975 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/027a0975 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/027a0975 Branch: refs/heads/master Commit: 027a0975feba872ced4d0c5692b2b801ec6ac016 Parents: 38959d7 Author: Jonathan S. Fisher Authored: Mon Sep 17 14:31:34 2018 -0500 Committer: Jonathan S. Fisher Committed: Tue Oct 16 19:14:05 2018 -0500 -- --
[2/2] tomee git commit: add doc reference in system.properties
add doc reference in system.properties
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/38959d7f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/38959d7f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/38959d7f
Branch: refs/heads/master
Commit: 38959d7fd036ff26f385579defb1e2cac403a5a0
Parents: 7f18f4b
Author: Jonathan S. Fisher
Authored: Mon Sep 17 14:31:34 2018 -0500
Committer: Jonathan S. Fisher
Committed: Tue Oct 16 19:08:25 2018 -0500
--
.../src/main/java/org/apache/tomee/installer/Installer.java| 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/38959d7f/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
--
diff --git
a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 40422f1..5ad3b09 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -780,6 +780,8 @@ public class Installer implements InstallerInterface {
systemPropertiesWriter.write("# openejb.jaxrs.application =
\n");
systemPropertiesWriter.write("#
openejb.cxf-rs.wadl-generator.ignoreRequests = false\n");
systemPropertiesWriter.write("#
openejb.cxf-rs.wadl-generator.ignoreMessageWriters = true\n");
+systemPropertiesWriter.write("# Replace the Jonhzon JSON
Providers with the following classes [comma seperated, no spaces]\n");
+systemPropertiesWriter.write("# openejb.jaxrs.jsonProviders
=\n");
systemPropertiesWriter.write("#\n");
systemPropertiesWriter.write("# These properties are only for
cxf service (SOAP webservices) and TomEE+\n");
[1/2] tomee git commit: Allow custom JSON Providers to replace Johnzon
Repository: tomee
Updated Branches:
refs/heads/master a48208ac3 -> 38959d7fd
Allow custom JSON Providers to replace Johnzon
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7f18f4bc
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7f18f4bc
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7f18f4bc
Branch: refs/heads/master
Commit: 7f18f4bcfe64119b9001d5ac6bffeb7324987a37
Parents: a48208a
Author: Jonathan S. Fisher
Authored: Sat Sep 15 16:16:51 2018 -0500
Committer: Jonathan S. Fisher
Committed: Tue Oct 16 19:08:21 2018 -0500
--
.../org/apache/openejb/server/cxf/rs/CxfRSService.java | 13 ++---
.../openejb/server/cxf/rs/CxfRsHttpListener.java | 6 --
2 files changed, 14 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/7f18f4bc/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
--
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
index 347f42b..3f492ce 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
@@ -223,9 +223,16 @@ public class CxfRSService extends RESTService {
bus.setProperty("skip.default.json.provider.registration",
"true"); // client jaxrs, we want johnzon not jettison
final Collection defaults = new ArrayList<>();
-for (final String provider : asList(
-
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonbProvider",
-
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonpProvider")) {
+List jsonProviders;
+String userConfiguredJsonProviders =
SystemInstance.get().getProperty("openejb.jaxrs.jsonProviders");
+if (userConfiguredJsonProviders == null) {
+jsonProviders = asList(
+
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJohnzonProvider",
+
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonpProvider");
+} else {
+jsonProviders = asList(userConfiguredJsonProviders.split(","));
+}
+for (final String provider : jsonProviders) {
if (!isActive(provider)) {
continue;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/7f18f4bc/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
--
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index e155b9d..1fa8b1a 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -498,8 +498,10 @@ public class CxfRsHttpListener implements RsHttpListener {
}
private void addMandatoryProviders(final Collection instances,
final ServiceConfiguration serviceConfiguration) {
-if
(!shouldSkipProvider(WadlDocumentMessageBodyWriter.class.getName())) {
-instances.add(new WadlDocumentMessageBodyWriter());
+if (SystemInstance.get().getProperty("openejb.jaxrs.jsonProviders") ==
null) {
+if
(!shouldSkipProvider(WadlDocumentMessageBodyWriter.class.getName())) {
+instances.add(new WadlDocumentMessageBodyWriter());
+}
}
if (!shouldSkipProvider(EJBExceptionMapper.class.getName())) {
instances.add(new EJBExceptionMapper());
