Merge remote-tracking branch 'upstream/master' into executor-example
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/69c9f671 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/69c9f671 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/69c9f671 Branch: refs/heads/master Commit: 69c9f6712833442449db37e7671710c9c5cdf68c Parents: ab1de6c ce2998f Author: brunobat <[email protected]> Authored: Tue Dec 18 19:27:31 2018 +0000 Committer: brunobat <[email protected]> Committed: Tue Dec 18 19:27:31 2018 +0000 ---------------------------------------------------------------------- .../resource/AutoConnectionTrackerTest.java | 46 ++- 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/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 | 10 +- docs/generating-ejb-3-annotations.adoc | 4 +- docs/hello-world.adoc | 2 +- docs/jndi-names.adoc | 4 +- docs/jpa-concepts.adoc | 4 +- docs/local-client-injection.adoc | 20 +- docs/lookup-of-other-ejbs-example.adoc | 8 +- docs/new-in-openejb-3.0.adoc | 6 +- docs/persistence-context.adoc | 2 +- docs/persistence-unit-ref.adoc | 6 +- docs/quickstart.adoc | 2 +- docs/resource-injection.adoc | 6 +- docs/resource-ref-for-datasource.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/tomcat-object-factory.adoc | 2 +- docs/tomee-and-security.adoc | 2 +- docs/transaction-annotations.adoc | 6 +- examples/mp-rest-client/README.md | 138 +++++++++ examples/mp-rest-client/pom.xml | 121 ++++++++ .../org/superbiz/rest/ApplicationConfig.java | 26 ++ .../src/main/java/org/superbiz/rest/Book.java | 50 ++++ .../main/java/org/superbiz/rest/BookBean.java | 60 ++++ .../java/org/superbiz/rest/BookResource.java | 71 +++++ .../org/superbiz/rest/BookResourceClient.java | 57 ++++ .../org/superbiz/rest/BookResourceTest.java | 77 +++++ .../src/test/resources/META-INF/beans.xml | 1 + .../META-INF/microprofile-config.properties | 1 + .../src/test/resources/arquillian.xml | 38 +++ examples/pom.xml | 4 +- .../maven/plugin/AbstractAddressMojo.java | 21 ++ .../maven/plugin/AbstractCommandMojo.java | 9 + .../maven/plugin/AbstractDeployMojo.java | 6 + .../maven/plugin/AbstractSynchronizable.java | 63 +++++ .../openejb/maven/plugin/AbstractTomEEMojo.java | 281 +++++++++++++++++++ .../openejb/maven/plugin/BuildTomEEMojo.java | 20 ++ .../maven/plugin/ConfigTestTomEEMojo.java | 2 + .../openejb/maven/plugin/DebugTomEEMojo.java | 1 + .../apache/openejb/maven/plugin/DeployMojo.java | 11 + .../apache/openejb/maven/plugin/ExecMojo.java | 11 + .../openejb/maven/plugin/ListEjbMojo.java | 13 + .../openejb/maven/plugin/RunTomEEMojo.java | 2 + .../openejb/maven/plugin/StartTomEEMojo.java | 1 + .../openejb/maven/plugin/StopTomEEMojo.java | 1 + .../org/apache/openejb/maven/plugin/Synch.java | 24 ++ .../openejb/maven/plugin/Synchronization.java | 43 +++ .../openejb/maven/plugin/TomEEException.java | 14 + .../openejb/maven/plugin/UnDeployMojo.java | 1 + .../maven/plugin/UpdatableTomEEMojo.java | 41 +++ .../apache/openejb/maven/plugin/cli/Args.java | 9 + .../maven/plugin/customizer/monkey/Monkey.java | 12 +- .../monkey/classloader/ClassLoaderFactory.java | 15 + .../monkey/file/PatchFolderFinder.java | 10 + .../customizer/monkey/index/FileIndexer.java | 30 ++ .../plugin/customizer/monkey/index/Item.java | 38 ++- .../customizer/monkey/jar/JarPatcher.java | 11 + .../openejb/maven/plugin/runner/ExecRunner.java | 9 + pom.xml | 39 ++- .../test/java/org/apache/tomee/TomEECliIT.java | 57 +++- 79 files changed, 1575 insertions(+), 130 deletions(-) ----------------------------------------------------------------------
