Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-8821 Scanning for META-INF/orm.xml does not work on Windows in jpa 

mode
This commit is contained in:
Brett Meyer 2014-01-09 13:50:33 -05:00
parent bd0892a87d
commit e3040599f1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/scan/spi/NonClassFileArchiveEntryHandler.java
View File

@ -59,12 +59,13 @@ public class NonClassFileArchiveEntryHandler implements ArchiveEntryHandler {
@SuppressWarnings("SimplifiableIfStatement") @SuppressWarnings("SimplifiableIfStatement")
private boolean acceptAsMappingFile(ArchiveEntry entry, ArchiveContext context) { private boolean acceptAsMappingFile(ArchiveEntry entry, ArchiveContext context) {
if ( entry.getName().endsWith( "hbm.xml" ) ) { if ( entry.getNameWithinArchive().endsWith( "hbm.xml" ) ) {
return scanOptions.canDetectHibernateMappingFiles(); return scanOptions.canDetectHibernateMappingFiles();
} }
// todo : should really do this case-insensitively // todo : should really do this case-insensitively
if ( entry.getName().endsWith( "META-INF/orm.xml" ) ) { // use getNameWithinArchive, not getName -- ensure paths are normalized (Windows, etc.)
if ( entry.getNameWithinArchive().endsWith( "META-INF/orm.xml" ) ) {
if ( context.getPersistenceUnitDescriptor().getMappingFileNames().contains( "META-INF/orm.xml" ) ) { if ( context.getPersistenceUnitDescriptor().getMappingFileNames().contains( "META-INF/orm.xml" ) ) {
// if the user explicitly listed META-INF/orm.xml, only except the root one // if the user explicitly listed META-INF/orm.xml, only except the root one
// //