Merge remote-tracking branch 'upstream/master' into tomee-2323
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2057761c Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2057761c Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2057761c Branch: refs/heads/master Commit: 2057761c17e27b5eb7c15c3bcfc642e243609e56 Parents: 64c4743 c64d352 Author: Weverthon Medeiros <wevert...@gmail.com> Authored: Fri Dec 21 13:51:03 2018 +0000 Committer: Weverthon Medeiros <wevert...@gmail.com> Committed: Fri Dec 21 13:51:03 2018 +0000 ---------------------------------------------------------------------- .../arquillian/tests/filter/AllFilterTest.java | 1 - .../tests/realm/CdiLazyRealmTOMEE1490Test.java | 4 +- arquillian/arquillian-tomee-tests/pom.xml | 39 ++ .../resource/AutoConnectionTrackerTest.java | 43 +- docs/app-clients-and-jndi.adoc | 4 +- docs/application-composer/getting-started.adoc | 2 +- ...application-discovery-via-the-classpath.adoc | 2 +- docs/application-resources.adoc | 4 +- docs/basics---getting-things.adoc | 2 +- docs/basics---transactions.adoc | 2 +- docs/configuration.adoc | 2 +- docs/configuring-datasources.adoc | 4 +- docs/constructor-injection.adoc | 2 +- docs/datasource-config.adoc | 2 +- docs/developer/json/index.adoc | 4 +- .../testing/applicationcomposer/index.adoc | 26 +- docs/developer/testing/arquillian/index.adoc | 2 +- docs/documentation.adoc | 2 +- docs/documentation.old.adoc | 2 +- docs/ejb-local-ref.adoc | 2 +- docs/ejb-ref.adoc | 2 +- docs/ejb-refs.adoc | 4 +- docs/embedded-and-remotable.adoc | 12 +- docs/embedding.adoc | 2 +- docs/faq.adoc | 2 +- docs/generating-ejb-3-annotations.adoc | 4 +- docs/getting-started.adoc | 2 +- docs/hello-world.adoc | 2 +- docs/installation.adoc | 2 +- docs/jndi-names.adoc | 4 +- docs/jpa-concepts.adoc | 4 +- docs/local-client-injection.adoc | 20 +- docs/local-server.adoc | 2 +- docs/lookup-of-other-ejbs-example.adoc | 8 +- docs/manual-installation.adoc | 2 +- docs/new-in-openejb-3.0.adoc | 6 +- docs/persistence-context.adoc | 2 +- docs/persistence-unit-ref.adoc | 6 +- docs/property-overriding.adoc | 2 +- docs/remote-server.adoc | 2 +- docs/resource-injection.adoc | 6 +- docs/resource-ref-for-datasource.adoc | 2 +- docs/securing-a-web-service.adoc | 2 +- docs/security-annotations.adoc | 8 +- docs/singleton-beans.adoc | 44 +- docs/spring-and-openejb-3.0.adoc | 4 +- docs/spring-ejb-and-jpa.adoc | 10 +- docs/system-properties-files.adoc | 2 +- docs/telnet-console.adoc | 2 +- docs/tomcat-object-factory.adoc | 2 +- docs/tomee-and-security.adoc | 2 +- docs/transaction-annotations.adoc | 6 +- docs/validation-tool.adoc | 2 +- examples/moviefun-rest/README.md | 404 +++++++++++++++++++ examples/mvc-cxf/README.adoc | 24 ++ examples/mvc-cxf/README.md | 23 -- examples/mvc-resteasy/README.adoc | 23 ++ examples/mvc-resteasy/pom.xml | 143 +++++++ .../java/org/superbiz/mvc/MVCApplication.java | 22 + .../java/org/superbiz/mvc/TomeeController.java | 38 ++ .../src/main/resources/META-INF/beans.xml | 23 ++ .../src/main/webapp/WEB-INF/views/hello.jsp | 28 ++ .../src/main/webapp/WEB-INF/web.xml | 28 ++ examples/mvc-resteasy/src/main/webapp/index.jsp | 28 ++ .../src/test/java/org/superbiz/mvc/MVCTest.java | 74 ++++ .../src/test/resources/arquillian.xml | 31 ++ examples/pom.xml | 1 + owasp-dc-suppression.xml | 80 ++++ pom.xml | 61 ++- .../apache/openejb/server/rest/RESTService.java | 7 +- .../apache-tomee/src/main/resources/service.bat | 2 +- tomee/tomee-plume-webapp/pom.xml | 3 +- tomee/tomee-plus-webapp/pom.xml | 3 +- 73 files changed, 1214 insertions(+), 165 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/2057761c/examples/pom.xml ----------------------------------------------------------------------