You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2018/11/30 23:04:35 UTC
[20/20] tomee git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tomee into tomee-8.0.x-docs
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee into tomee-8.0.x-docs
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d5fcddc9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d5fcddc9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d5fcddc9
Branch: refs/heads/master
Commit: d5fcddc9c557026e6d0fe3581402e43bde2dc087
Parents: f779264 3f07dc9
Author: dblevins <da...@gmail.com>
Authored: Fri Nov 30 14:30:21 2018 -0800
Committer: dblevins <da...@gmail.com>
Committed: Fri Nov 30 14:30:21 2018 -0800
----------------------------------------------------------------------
.../openejb/assembler/classic/Assembler.java | 7 +-
.../openejb/config/AnnotationDeployer.java | 8 +-
.../apache/openejb/config/DeploymentLoader.java | 2 +-
.../apache/openejb/config/SunConversion.java | 12 +-
.../openejb/monitoring/ObjectNameBuilder.java | 2 +-
.../openejb/resource/AutoConnectionTracker.java | 2 +-
.../logging/LoggingPreparedSqlStatement.java | 26 +-
.../loader/provisining/MavenResolver.java | 2 +-
.../cdi-alternative-and-stereotypes/README.md | 24 +-
examples/cdi-basic/README.md | 6 +-
examples/cdi-events/README.md | 2 +-
examples/cdi-interceptors/README.md | 13 +-
examples/cdi-produces-disposes/README.md | 15 +-
examples/cdi-produces-disposes/README.txt | 18 -
examples/cdi-produces-field/README.md | 11 +
examples/cdi-request-scope/README.md | 2 +-
examples/mp-metrics-counted/pom.xml | 26 +-
.../org/superbiz/rest/WeatherServiceTest.java | 75 +-
examples/mp-metrics-timed/README.md | 151 +++
examples/mp-metrics-timed/pom.xml | 88 ++
.../src/main/java/WeatherService.java | 42 +
.../src/test/java/WeatherServiceTest.java | 215 ++++
.../src/test/resources/arquillian.xml | 30 +
examples/pom.xml | 2 +
examples/websocket-tls-basic-auth/README.md | 19 +
examples/websocket-tls-basic-auth/pom.xml | 123 ++
.../src/main/conf/keystore.jks | Bin 0 -> 2245 bytes
.../src/main/conf/server.xml | 166 +++
.../src/main/conf/tomcat-users.xml | 45 +
.../superbiz/websockets/WebSocketResource.java | 32 +
.../src/main/webapp/WEB-INF/beans.xml | 20 +
.../src/main/webapp/WEB-INF/web.xml | 35 +
.../websockets/WebSocketResourceTest.java | 135 ++
.../src/test/resources/arquillian.xml | 41 +
pom.xml | 2 +-
tomee/pom.xml | 2 +-
.../org/apache/tomee/installer/Installer.java | 2 +-
tomee/tomee-microprofile-webapp/pom.xml | 201 ---
.../src/main/assembly/war.xml | 92 --
.../src/main/resources/META-INF/LICENSE | 1197 ------------------
.../src/main/resources/META-INF/NOTICE | 171 ---
tomee/tomee-microprofile/mp-common/pom.xml | 52 +
...ilsafeContainerExecutionManagerProvider.java | 67 +
...feContainerExecutionManagerProviderTest.java | 75 ++
tomee/tomee-microprofile/pom.xml | 38 +
.../tomee-microprofile-webapp/pom.xml | 208 +++
.../src/main/assembly/war.xml | 92 ++
.../src/main/resources/META-INF/LICENSE | 1197 ++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 171 +++
.../webapp/installer/InstallerServlet.java | 2 +-
50 files changed, 3196 insertions(+), 1770 deletions(-)
----------------------------------------------------------------------