This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-7.1.x in repository https://gitbox.apache.org/repos/asf/tomee.git
commit f8218b80bc5332e3aef8a08bbf86bb46b5b4d5df Merge: 8fe1b94 e34a4d2 Author: Jonathan Gallimore <[email protected]> AuthorDate: Wed May 29 11:01:48 2019 +0100 Merge remote-tracking branch 'apache/tomee-7.1.x' into tomee-7.1.x .../config/PersistenceContextAnnFactory.java | 14 +- .../org/apache/openejb/core/TempClassLoader.java | 6 +- .../openejb/core/cmp/cmp2/Cmp1Generator.java | 10 +- .../openejb/core/cmp/cmp2/Cmp2Generator.java | 12 +- .../org/apache/openejb/core/cmp/cmp2/CmpField.java | 2 +- .../org/apache/openejb/core/cmp/cmp2/CmrField.java | 2 +- .../org/apache/openejb/core/cmp/cmp2/CmrStyle.java | 2 +- .../openejb/core/cmp/cmp2/PostCreateGenerator.java | 8 +- .../org/apache/openejb/dyni/DynamicSubclass.java | 20 +- .../org/apache/openejb/util/AnnotationFinder.java | 16 +- .../openejb/util/proxy/LocalBeanProxyFactory.java | 12 +- .../apache/openejb/DependenceValidationTest.java | 4 +- .../java/org/apache/openejb/DependencyVisitor.java | 22 +- .../openejb/config/ServiceClasspathTest.java | 16 +- .../config/rules/KeysAnnotationVisitor.java | 8 +- .../config/rules/ValidationKeysAuditorTest.java | 4 +- .../org/apache/openejb/core/cmp/jpa/JpaTest.java | 14 +- docs/activemqresourceadapter-config.adoc | 87 ++++ docs/bmpentitycontainer-config.adoc | 55 +++ docs/cmpentitycontainer-config.adoc | 53 ++ docs/comparison.adoc | 231 +++++++++ docs/datasource-config.adoc | 535 +++++++++++++++++++++ docs/initialcontext-config.adoc | 44 ++ docs/installation.adoc | 87 ++++ docs/javamailsession-config.adoc | 44 ++ docs/jmsconnectionfactory-config.adoc | 104 ++++ docs/managedcontainer-config.adoc | 44 ++ docs/messagedrivencontainer-config.adoc | 87 ++++ docs/orb-config.adoc | 42 ++ docs/proxyfactory-config.adoc | 44 ++ docs/queue-config.adoc | 50 ++ docs/securityservice-config.adoc | 52 ++ docs/singletoncontainer-config.adoc | 71 +++ docs/statefulcontainer-config.adoc | 167 +++++++ docs/statelesscontainer-config.adoc | 445 +++++++++++++++++ docs/tomee-maven-plugin.adoc | 178 +++++++ docs/topic-config.adoc | 50 ++ docs/transactionmanager-config.adoc | 183 +++++++ 38 files changed, 2739 insertions(+), 86 deletions(-)
