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 138993f Merge pull request #379 from BogdanStirbat/TOMEE-2370
new f5f1e48 creates new ear test
new fa47396 fixes custom
new cb1e66f fixes aling
new 7e194a1 fixes constant name
new f33be90 Makes readEntityMapping private
new af2e275 fixes constant name
new bf2b944 creates entitymappingurl finder interface
new d959af4 makes MEAT_INF visibla by package
new 55dfeb4 defines url
new 40b5311 define log as info
new 602d1f5 defines EntityMappingURLfinder
new 6e6fa22 fixes log
new 25a59c6 comments the test
new 48a0230 reverts to the master
new 2f4a230 returns messages to master
new b131d64 adds application xml
new bf0eac9 changes test
new 64d743f fixes the archive names
new aab400d fixes application.xml
new 90f56dc improves log
new 576275e moves servelet to the war archive
new b287dc4 "Mostly" working test
new d18948b Merge pull request #374 from otaviojava/orm_xml_ear
The 12030 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:
...tomOrmXmlTest.java => CustomOrmXmlEarTest.java} | 36 +++++--
.../arquillian/tests/cmp/sample/application.xml | 12 +++
.../apache/openejb/config/CmpJpaConversion.java | 69 ++++++-------
.../openejb/config/ConfigurationFactory.java | 2 +-
.../apache/openejb/config/DeploymentLoader.java | 82 +++++++--------
.../apache/openejb/config/DeploymentsResolver.java | 2 +-
.../openejb/config/EntityMappingURLFinder.java | 112 +++++++++++++++++++++
.../org/apache/openejb/config/NewLoaderLogic.java | 2 +-
.../org/apache/openejb/config/ReadDescriptors.java | 12 +--
.../java/org/apache/openejb/config/TldScanner.java | 14 +--
10 files changed, 237 insertions(+), 106 deletions(-)
copy
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/{CustomOrmXmlTest.java
=> CustomOrmXmlEarTest.java} (72%)
create mode 100644
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/application.xml
create mode 100644
container/openejb-core/src/main/java/org/apache/openejb/config/EntityMappingURLFinder.java
