You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/12/12 22:33:30 UTC
[5/5] tomee git commit: Merge remote-tracking branch 'apache/master'
Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/66ce200e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/66ce200e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/66ce200e
Branch: refs/heads/master
Commit: 66ce200e40e13438950740b4f59bed5c337087a2
Parents: 35d5896 7e372d8
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Wed Dec 12 22:31:38 2018 +0000
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Wed Dec 12 22:31:38 2018 +0000
----------------------------------------------------------------------
.../assembler/classic/JndiEncBuilder.java | 2 +-
.../apache/openejb/core/cmp/cmp2/EjbSelect.java | 4 +-
.../singleton/SingletonEjbObjectHandler.java | 2 +-
.../openejb/core/timer/EJBCronTrigger.java | 4 +-
.../stat/descriptive/DescriptiveStatistics.java | 4 +-
.../java/org/apache/openejb/util/Index.java | 6 +-
.../apache/openejb/util/PojoSerialization.java | 16 +-
.../apache/openejb/config/InjectionTest.java | 2 +-
.../openejb/core/LegacyInterfaceTest.java | 4 +-
.../openejb/core/ivm/naming/IvmContextTest.java | 8 +-
.../core/webservices/JPACMDIntegrationTest.java | 4 +-
.../StatelessWithAroundInvokeOnlyTest.java | 2 +-
.../test/entity/cmp2/model/StorageBean.java | 4 +-
.../openejb/util/proxy/SampleLocalBean.java | 2 +-
.../org/apache/openejb/jee/BooleanAdapter.java | 2 +-
examples/mp-rest-jwt/README.md | 303 +++++++++++++++++++
examples/mp-rest-jwt/pom.xml | 225 ++++++++++++++
.../main/java/org/superbiz/moviefun/Movie.java | 70 +++++
.../java/org/superbiz/moviefun/MoviesBean.java | 61 ++++
.../moviefun/rest/ApplicationConfig.java | 28 ++
.../rest/MoviesMPJWTConfigurationProvider.java | 56 ++++
.../org/superbiz/moviefun/rest/MoviesRest.java | 77 +++++
.../java/org/superbiz/moviefun/MoviesTest.java | 133 ++++++++
.../java/org/superbiz/moviefun/TokenUtils.java | 257 ++++++++++++++++
.../resources/META-INF/application-client.xml | 1 +
.../mp-rest-jwt/src/test/resources/Token1.json | 17 ++
.../mp-rest-jwt/src/test/resources/Token2.json | 14 +
.../src/test/resources/arquillian.xml | 32 ++
.../src/test/resources/privateKey.pem | 28 ++
.../src/test/resources/publicKey.pem | 9 +
examples/pom.xml | 2 +-
examples/rest-mp-jwt/README.md | 4 -
examples/rest-mp-jwt/pom.xml | 279 -----------------
.../main/java/org/superbiz/moviefun/Movie.java | 102 -------
.../java/org/superbiz/moviefun/MoviesBean.java | 91 ------
.../moviefun/rest/ApplicationConfig.java | 28 --
.../org/superbiz/moviefun/rest/LoadRest.java | 42 ---
.../rest/MoviesMPJWTConfigurationProvider.java | 63 ----
.../org/superbiz/moviefun/rest/MoviesRest.java | 113 -------
.../java/org/superbiz/rest/GreetingService.java | 41 ---
.../src/main/resources/META-INF/persistence.xml | 31 --
examples/rest-mp-jwt/src/main/tomee/tomee.xml | 27 --
.../java/org/superbiz/moviefun/MoviesTest.java | 88 ------
.../java/org/superbiz/moviefun/TokenUtils.java | 257 ----------------
.../org/superbiz/rest/GreetingServiceTest.java | 61 ----
.../resources/META-INF/application-client.xml | 1 -
.../rest-mp-jwt/src/test/resources/Token1.json | 20 --
.../rest-mp-jwt/src/test/resources/Token2.json | 12 -
.../src/test/resources/arquillian.xml | 32 --
.../src/test/resources/privateKey.pem | 28 --
.../src/test/resources/publicKey.pem | 9 -
pom.xml | 2 +
tck/microprofile-tck/config/pom.xml | 38 +++
.../config/src/test/resources/arquillian.xml | 34 ++-
tck/microprofile-tck/fault-tolerance/pom.xml | 38 +++
.../src/test/resources/arquillian.xml | 27 +-
tck/microprofile-tck/health/pom.xml | 38 +++
.../health/src/test/resources/arquillian.xml | 27 +-
tck/microprofile-tck/jwt/pom.xml | 41 ++-
.../jwt/src/test/resources/arquillian.xml | 61 +++-
tck/microprofile-tck/metrics/pom.xml | 38 +++
.../metrics/src/test/resources/arquillian.xml | 33 +-
tck/microprofile-tck/openapi/pom.xml | 39 ++-
.../openapi/src/test/resources/arquillian.xml | 35 ++-
tck/microprofile-tck/opentracing/pom.xml | 38 +++
.../src/test/resources/arquillian.xml | 27 +-
tck/microprofile-tck/rest-client/pom.xml | 38 +++
.../src/test/resources/arquillian.xml | 33 +-
.../src/main/resources/META-INF/plume/NOTICE | 23 ++
.../src/main/resources/META-INF/plus/NOTICE | 45 +++
.../tomee-microprofile-webapp/pom.xml | 6 +-
tomee/tomee-plume-webapp/pom.xml | 134 ++++++++
.../src/main/resources/META-INF/NOTICE | 75 ++++-
tomee/tomee-plus-webapp/pom.xml | 134 ++++++++
.../src/main/resources/META-INF/NOTICE | 91 ++++++
75 files changed, 2402 insertions(+), 1401 deletions(-)
----------------------------------------------------------------------