This is still a work in progress as I'd like to incorporate some Arquillian tests today, and ensure that this works with things like relationships between entities.
The change here is fairly straightforward though; we pick up a persistence unit called "cmp", if one has been defined, and read all the <mapping-file> elements on it. If an entity has been defined in one of those mappings files, we add the entity class to a set, and the CMP/JPA processing will simply ignore it. The persistence provider should then use the mapping that has been defined in the mapping file and not generate its own
You can merge this pull request into a Git repository by running: