[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openejb-cvs
Subject:    [tomee] branch master updated (3be5d3a -> 8f40dad)
From:       jgallimore () apache ! org
Date:       2019-06-27 10:47:39
Message-ID: 156163245906.7711.10432529262043129731 () gitbox ! apache ! org
[Download RAW message or body]

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.


    from 3be5d3a  Merge pull request #494 from cesarhernandezgt/TOMEE-2549
     new ac7ad0c  TOMEE-2547 do not add openejb-cmp-generated.xml if it is already \
included in the <mapping-file> elements of the persistence unit.  new a68f21d  \
                TOMEE-2548 Adding (currently failing) test for Hibernate
     new 70da116  Explicitly check where a openejb-cmp-generated-orm.xml descriptor \
                may have been included incorrectly.
     new 7a04d4e  Merge branch 'master' of https://github.com/jgallimore/tomee
     new 8f40dad  Merge remote-tracking branch 'upstream/master'

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../tests/cmp/sample/CustomOrmXmlEarTest.java      |  2 +-
 ...Test.java => CustomOrmXmlHibernateEarTest.java} | 22 ++++++--
 .../src/test/resources/arquillian.xml              | 22 ++++++++
 .../arquillian/tests/cmp/sample/custom-orm.xml     |  6 +--
 .../{persistence.xml => persistence-hibernate.xml} | 10 ++--
 .../arquillian/tests/cmp/sample/persistence.xml    |  4 +-
 arquillian/arquillian-tomee-tests/pom.xml          | 58 ++++++++++++++++++++++
 .../apache/openejb/config/CmpJpaConversion.java    | 28 ++++++++---
 .../openejb/core/cmp/cmp2/Cmp2Generator.java       |  2 +-
 9 files changed, 133 insertions(+), 21 deletions(-)
 copy arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/{CustomOrmXmlEarTest.java \
=> CustomOrmXmlHibernateEarTest.java} (82%)  copy \
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/{persistence.xml \
=> persistence-hibernate.xml} (79%)


[prev in list] [next in list] [prev in thread] [next in thread]