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/06 17:33:29 UTC

[07/24] tomee git commit: Merge branch 'master' into cmp-jpa

Merge branch 'master' into cmp-jpa


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/83a49c42
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/83a49c42
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/83a49c42

Branch: refs/heads/master
Commit: 83a49c4254cf68c49fbb9231305dc71be5fa790d
Parents: 2469243 d5fcddc
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Fri Nov 30 23:37:30 2018 +0000
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Fri Nov 30 23:37:30 2018 +0000

----------------------------------------------------------------------
 .../apache/openejb/config/DeploymentLoader.java |    2 +-
 docs/.DS_Store                                  |  Bin 0 -> 6148 bytes
 docs/Configuring-in-tomee.mdtext                |   41 +
 docs/activemqresourceadapter-config.mdtext      |   66 +
 docs/admin/.DS_Store                            |  Bin 0 -> 6148 bytes
 docs/admin/cluster/index.adoc                   |  227 +++
 docs/admin/configuration/application.adoc       |  100 ++
 docs/admin/configuration/containers.adoc        |  585 +++++++
 docs/admin/configuration/index.adoc             |   24 +
 docs/admin/configuration/resources.adoc         |  572 +++++++
 docs/admin/configuration/server.adoc            |   86 +
 docs/admin/file-layout.adoc                     |  144 ++
 docs/admin/index.adoc                           |    7 +
 docs/advanced/.DS_Store                         |  Bin 0 -> 6148 bytes
 docs/advanced/applicationcomposer/index.adoc    |   76 +
 docs/advanced/client/jndi.adoc                  |  116 ++
 docs/advanced/index.adoc                        |    7 +
 docs/advanced/jms/jms-configuration.adoc        |   67 +
 docs/advanced/setup/index.adoc                  |  142 ++
 docs/advanced/shading/index.adoc                |  276 ++++
 docs/advanced/tomee-embedded/index.adoc         |  223 +++
 docs/alternate-descriptors.mdtext               |  114 ++
 docs/annotations,-xml-and-defaults.mdtext       |  565 +++++++
 docs/app-clients-and-jndi.mdtext                |   69 +
 docs/application-composer/advanced.md           |   90 +
 docs/application-composer/getting-started.md    |  188 +++
 docs/application-composer/history.md            |   38 +
 docs/application-composer/index.md              |   18 +
 docs/application-deployment-solutions.mdtext    |   75 +
 ...plication-discovery-via-the-classpath.mdtext |   91 +
 docs/application-resources.mdtext               |  247 +++
 docs/arquillian-available-adapters.mdtext       |  262 +++
 docs/arquillian-getting-started.mdtext          |   20 +
 docs/basics---getting-things.mdtext             |  103 ++
 docs/basics---security.mdtext                   |   52 +
 docs/basics---transactions.mdtext               |   56 +
 docs/bmpentitycontainer-config.mdtext           |   35 +
 docs/bouncy-castle.mdtext                       |   31 +
 docs/built-in-type-converters.mdtext            |   91 +
 docs/callbacks.mdtext                           |  164 ++
 docs/changing-jms-implementations.mdtext        |  133 ++
 docs/client-server-transports.mdtext            |   19 +
 docs/clients.mdtext                             |  101 ++
 docs/cmpentitycontainer-config.mdtext           |   34 +
 docs/collapsed-ear.mdtext                       |   42 +
 docs/common-datasource-configurations.mdtext    |  111 ++
 docs/common-errors.mdtext                       |   27 +
 ...common-persistenceprovider-properties.mdtext |   44 +
 docs/comparison.mdtext                          |  219 +++
 docs/concepts.mdtext                            |   75 +
 docs/configuration.mdtext                       |  140 ++
 docs/configuring-containers-in-tests.mdtext     |   24 +
 docs/configuring-datasources-in-tests.mdtext    |   56 +
 docs/configuring-datasources.mdtext             |  167 ++
 docs/configuring-durations.mdtext               |   64 +
 docs/configuring-javamail.mdtext                |   37 +
 docs/configuring-logging-in-tests.mdtext        |  114 ++
 ...configuring-persistenceunits-in-tests.mdtext |  141 ++
 docs/constructor-injection.mdtext               |   95 ++
 docs/containers-and-resources.mdtext            |  479 ++++++
 docs/contrib/.DS_Store                          |  Bin 0 -> 6148 bytes
 docs/contrib/debug/debug-intellij.mdtext        |  129 ++
 docs/contrib/debug/idea1.png                    |  Bin 0 -> 48995 bytes
 docs/contrib/debug/idea10.png                   |  Bin 0 -> 54939 bytes
 docs/contrib/debug/idea2.png                    |  Bin 0 -> 36567 bytes
 docs/contrib/debug/idea3.png                    |  Bin 0 -> 20165 bytes
 docs/contrib/debug/idea4.png                    |  Bin 0 -> 55824 bytes
 docs/contrib/debug/idea6.png                    |  Bin 0 -> 19286 bytes
 docs/contrib/debug/idea7.png                    |  Bin 0 -> 19805 bytes
 docs/contrib/debug/idea8.png                    |  Bin 0 -> 55721 bytes
 docs/contrib/debug/idea9.png                    |  Bin 0 -> 19477 bytes
 docs/custom-injection.mdtext                    |  192 +++
 docs/datasource-config.mdtext                   |  537 ++++++
 docs/datasource-configuration-by-creator.md     |  151 ++
 docs/datasource-password-encryption.mdtext      |  124 ++
 docs/deamon/lin-service.mdtext                  |   13 +
 docs/deamon/win-service.mdtext                  |   13 +
 docs/declaring-references.mdtext                |    2 +
 docs/deploy-tool.mdtext                         |  161 ++
 docs/deploying-in-tomee.mdtext                  |   69 +
 docs/deployment-id.mdtext                       |  227 +++
 docs/deployments.mdtext                         |  131 ++
 docs/details-on-openejb-jar.mdtext              |  152 ++
 docs/developer/.DS_Store                        |  Bin 0 -> 6148 bytes
 docs/developer/classloading/index.adoc          |   59 +
 docs/developer/configuration/cxf.adoc           |   93 ++
 docs/developer/ide/index.adoc                   |   25 +
 docs/developer/index.adoc                       |    7 +
 docs/developer/json/index.adoc                  |  206 +++
 docs/developer/migration/tomee-1-to-7.adoc      |   33 +
 .../testing/applicationcomposer/index.adoc      |  335 ++++
 docs/developer/testing/arquillian/index.adoc    |  421 +++++
 docs/developer/testing/index.adoc               |    9 +
 docs/developer/testing/other/index.adoc         |  134 ++
 docs/developer/tools/gradle-plugins.adoc        |   50 +
 docs/developer/tools/index.adoc                 |    8 +
 docs/developer/tools/maven-plugins.adoc         |   12 +
 .../tools/maven/applicationcomposer.adoc        |   47 +
 docs/developer/tools/maven/embedded.adoc        |   53 +
 docs/developer/tools/maven/tomee.adoc           |  183 ++
 docs/docs.adoc                                  |   26 +
 docs/documentation.mdtext                       |  102 ++
 docs/documentation.old.mdtext                   |  102 ++
 docs/dynamic-datasource.mdtext                  |  216 +++
 docs/eclipse-plugin.mdtext                      |   38 +
 docs/ejb-failover.mdtext                        |   88 +
 docs/ejb-local-ref.mdtext                       |   49 +
 docs/ejb-over-ssl.mdtext                        |   96 ++
 docs/ejb-ref.mdtext                             |   47 +
 docs/ejb-refs.mdtext                            |  174 ++
 docs/ejb-request-logging.mdtext                 |   94 ++
 docs/ejbd-transport.mdtext                      |  132 ++
 docs/embedded-and-remotable.mdtext              |  179 ++
 docs/embedded-configuration.mdtext              |  132 ++
 docs/embedding.mdtext                           |   26 +
 docs/failover-logging.mdtext                    |   38 +
 docs/faq.mdtext                                 |   96 ++
 docs/faq_openejb-jar.html.mdtext                |    2 +
 docs/features.mdtext                            |    1 +
 docs/from-glassfish-to-tomee.mdtext             |    3 +
 ...ting-with-openejb,-jetty-and-selenium.mdtext |  236 +++
 docs/generating-ejb-3-annotations.mdtext        |   57 +
 docs/getting-started.mdtext                     |  169 ++
 docs/hello-world.mdtext                         |  246 +++
 docs/hibernate.mdtext                           |   94 ++
 docs/initialcontext-config.mdtext               |   24 +
 docs/installation-drop-in-war.mdtext            |   41 +
 docs/installation.mdtext                        |   30 +
 docs/installing-tomee.mdtext                    |   67 +
 docs/java7.mdtext                               |   36 +
 docs/javaagent-with-maven-surefire.mdtext       |   54 +
 docs/javaagent.mdtext                           |   57 +
 docs/javaee7-status.mdtext                      |  182 ++
 docs/javamailsession-config.mdtext              |   24 +
 docs/jms-resources-and-mdb-container.mdtext     |  279 ++++
 docs/jmsconnectionfactory-config.mdtext         |   85 +
 docs/jndi-names.mdtext                          |  368 +++++
 docs/jpa-concepts.mdtext                        |  217 +++
 docs/jpa-usage.mdtext                           |   50 +
 docs/local-client-injection.mdtext              |   85 +
 docs/local-server.mdtext                        |   57 +
 docs/lookup-of-other-ejbs-example.mdtext        |  147 ++
 docs/managedcontainer-config.mdtext             |   24 +
 docs/manual-installation.mdtext                 |  223 +++
 docs/maven.mdtext                               |   38 +
 docs/maven/build-mojo.mdtext                    | 1422 ++++++++++++++++
 docs/maven/configtest-mojo.mdtext               | 1324 +++++++++++++++
 docs/maven/debug-mojo.mdtext                    | 1391 ++++++++++++++++
 docs/maven/deploy-mojo.mdtext                   |  251 +++
 docs/maven/exec-mojo.mdtext                     | 1547 +++++++++++++++++
 docs/maven/favicon.ico                          |  Bin 0 -> 3638 bytes
 docs/maven/help-mojo.mdtext                     |  145 ++
 docs/maven/index.mdtext                         |  144 ++
 docs/maven/list-mojo.mdtext                     |  165 ++
 docs/maven/run-mojo.mdtext                      | 1391 ++++++++++++++++
 docs/maven/start-mojo.mdtext                    | 1391 ++++++++++++++++
 docs/maven/stop-mojo.mdtext                     | 1324 +++++++++++++++
 docs/maven/undeploy-mojo.mdtext                 |  205 +++
 docs/messagedrivencontainer-config.mdtext       |   65 +
 docs/multicast-discovery.mdtext                 |   79 +
 .../multiple-business-interface-hazzards.mdtext |  199 +++
 docs/multipoint-considerations.mdtext           |   26 +
 docs/multipoint-discovery.mdtext                |   71 +
 docs/multipoint-recommendations.mdtext          |  139 ++
 docs/multipulse-discovery.mdtext                |   90 +
 docs/new-in-openejb-3.0.mdtext                  |  175 ++
 docs/openejb-3.mdtext                           |   68 +
 docs/openejb-binaries.mdtext                    |   24 +
 docs/openejb-eclipse-plugin.mdtext              |   19 +
 docs/openejb-jsr-107-integration.mdtext         |   21 +
 docs/openejb.xml.mdtext                         |   93 ++
 docs/openjpa.mdtext                             |  111 ++
 docs/orb-config.mdtext                          |   24 +
 docs/persistence-context.mdtext                 |   54 +
 docs/persistence-unit-ref.mdtext                |   87 +
 docs/properties-listing.mdtext                  |   90 +
 docs/properties-tool.mdtext                     |  212 +++
 docs/property-overriding.mdtext                 |   62 +
 docs/provisioning.mdtext                        |   76 +
 docs/proxyfactory-config.mdtext                 |   24 +
 docs/queue-config.mdtext                        |   34 +
 docs/quickstart.mdtext                          |   67 +
 docs/refcard/.DS_Store                          |  Bin 0 -> 6148 bytes
 docs/refcard/css/cypher_main.css                |  493 ++++++
 docs/refcard/css/github.min.css                 |  129 ++
 docs/refcard/css/refcard.css                    |  491 ++++++
 docs/refcard/css/style.css                      |  102 ++
 docs/refcard/favicon.ico                        |  Bin 0 -> 3638 bytes
 docs/refcard/images/github.png                  |  Bin 0 -> 2473 bytes
 docs/refcard/images/tomee.png                   |  Bin 0 -> 1914 bytes
 docs/refcard/js/highlight.min.js                |    1 +
 docs/refcard/js/jquery.min.js                   |    5 +
 docs/refcard/js/modernizr.custom.2.6.2.js       |    4 +
 docs/refcard/js/refcard.js                      |   74 +
 docs/refcard/refcard.html                       | 1556 ++++++++++++++++++
 docs/remote-server.mdtext                       |   60 +
 docs/resource-injection.mdtext                  |  180 ++
 docs/resource-ref-for-datasource.mdtext         |   42 +
 docs/running-a-standalone-openejb-server.mdtext |   91 +
 docs/securing-a-web-service.mdtext              |  239 +++
 docs/security-annotations.mdtext                |  294 ++++
 docs/security.mdtext                            |  144 ++
 docs/securityservice-config.mdtext              |   34 +
 docs/service-locator.mdtext                     |  169 ++
 docs/services.mdtext                            |   16 +
 docs/singleton-beans.mdtext                     |  223 +++
 docs/singleton-ejb.mdtext                       |    2 +
 docs/singletoncontainer-config.mdtext           |   53 +
 docs/spring-and-openejb-3.0.mdtext              |  185 +++
 docs/spring-ejb-and-jpa.mdtext                  |  170 ++
 docs/spring.mdtext                              |  121 ++
 docs/ssh.mdtext                                 |   48 +
 docs/standalone-server.mdtext                   |   23 +
 docs/startup.mdtext                             |  293 ++++
 docs/statefulcontainer-config.mdtext            |  157 ++
 docs/statelesscontainer-config.mdtext           |  458 ++++++
 docs/system-properties-files.mdtext             |   20 +
 docs/system-properties.mdtext                   |   64 +
 docs/telnet-console.mdtext                      |  163 ++
 docs/tip-concurrency.mdtext                     |   22 +
 docs/tip-jersey-client.mdtext                   |   18 +
 docs/tip-weblogic.mdtext                        |   13 +
 docs/tomcat-object-factory.mdtext               |   12 +
 docs/tomee-and-eclipse.mdtext                   |  141 ++
 docs/tomee-and-hibernate.mdtext                 |  159 ++
 docs/tomee-and-intellij.mdtext                  |   77 +
 docs/tomee-and-netbeans.mdtext                  |   93 ++
 docs/tomee-and-security.mdtext                  |   41 +
 docs/tomee-and-webspheremq.mdtext               |  132 ++
 docs/tomee-cluster.txt                          |   72 +
 docs/tomee-directory-structure.mdtext           |   57 +
 docs/tomee-embedded-maven-plugin.mdtext         |  956 +++++++++++
 docs/tomee-jaas.mdtext                          |   69 +
 docs/tomee-logging-in-eclipse.mdtext            |   10 +
 docs/tomee-logging.mdtext                       |   29 +
 docs/tomee-maven-plugin.mdtext                  |  144 ++
 docs/tomee-mp-getting-started.mdtext            |   61 +
 docs/tomee-version-policies.mdtext              |   24 +
 docs/tomee-webaccess.mdtext                     |   18 +
 docs/tomee-webapp.mdtext                        |   58 +
 docs/topic-config.mdtext                        |   34 +
 docs/transaction-annotations.mdtext             |  217 +++
 docs/transactionmanager-config.mdtext           |  164 ++
 docs/understanding-callbacks.mdtext             |   88 +
 docs/understanding-the-directory-layout.mdtext  |   69 +
 docs/unix-daemon.mdtext                         |  105 ++
 docs/validation-tool.mdtext                     |  138 ++
 docs/version-checker.mdtext                     |    9 +
 examples/pom.xml                                |    1 +
 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 ++
 274 files changed, 39562 insertions(+), 1665 deletions(-)
----------------------------------------------------------------------