HHH-9490 - Migrate from dom4j to jaxb for XML processing

This commit is contained in:
Steve Ebersole 2015-03-19 19:22:35 -05:00
parent bd8acaebca
commit 93cf72bfa1
1 changed files with 16 additions and 1 deletions

View File

@ -81,7 +81,17 @@ public class LocalXmlResourceResolver implements javax.xml.stream.XMLResolver {
log.debug( log.debug(
"Recognized legacy hibernate-mapping identifier; attempting to resolve on classpath under org/hibernate/" "Recognized legacy hibernate-mapping identifier; attempting to resolve on classpath under org/hibernate/"
); );
return openUrlStream( LEGACY_HBM_DTD_MAPPING.getMappedLocalUrl() ); return openUrlStream( HBM_DTD_MAPPING.getMappedLocalUrl() );
}
else if ( LEGACY2_HBM_DTD_MAPPING.matches( publicID, systemID ) ) {
log.recognizedObsoleteHibernateNamespace(
LEGACY2_HBM_DTD_MAPPING.getIdentifierBase(),
HBM_DTD_MAPPING.getIdentifierBase()
);
log.debug(
"Recognized legacy hibernate-mapping identifier; attempting to resolve on classpath under org/hibernate/"
);
return openUrlStream( HBM_DTD_MAPPING.getMappedLocalUrl() );
} }
else if ( CFG_DTD_MAPPING.matches( publicID, systemID ) ) { else if ( CFG_DTD_MAPPING.matches( publicID, systemID ) ) {
log.debug( log.debug(
@ -170,6 +180,11 @@ public class LocalXmlResourceResolver implements javax.xml.stream.XMLResolver {
"org/hibernate/hibernate-mapping-3.0.dtd" "org/hibernate/hibernate-mapping-3.0.dtd"
); );
public static final DtdMapping LEGACY2_HBM_DTD_MAPPING = new DtdMapping(
"http://hibernate.sourceforge.net/hibernate-mapping",
"org/hibernate/hibernate-mapping-3.0.dtd"
);
public static final DtdMapping CFG_DTD_MAPPING = new DtdMapping( public static final DtdMapping CFG_DTD_MAPPING = new DtdMapping(
"http://www.hibernate.org/dtd/hibernate-configuration", "http://www.hibernate.org/dtd/hibernate-configuration",
"org/hibernate/hibernate-configuration-3.0.dtd" "org/hibernate/hibernate-configuration-3.0.dtd"