Message Title

I patched this one by moving the logic to scanning coordinator which is not an ideal place at all but I saw it better than having it in EnhancementContext. I think that this approach also fixed the HbmMetadataSourceProcessorImpl as a side effect.

PS. I noticed that the package-info.java for instance would not go to annotatedPackageNames in ManagedResources and this got me wondering whether it is handled correctly in case it is declared XML somehow.

org/hibernate/boot/model/process/internal/ScanningCoordinator.java

@@ -10,10 +10,12 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import javax.persistence.AttributeConverter;
 
+import org.hibernate.annotations.common.reflection.MetadataProviderInjector;
 import org.hibernate.boot.MappingException;
 import org.hibernate.boot.archive.internal.StandardArchiveDescriptorFactory;
 import org.hibernate.boot.archive.internal.UrlInputStreamAccess;
@@ -29,11 +31,14 @@
 import org.hibernate.boot.internal.ClassLoaderAccessImpl;
 import org.hibernate.boot.jaxb.Origin;
 import org.hibernate.boot.jaxb.SourceType;
+import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.spi.ClassLoaderAccess;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.boot.spi.XmlMappingBinderAccess;
 import org.hibernate.cfg.AttributeConverterDefinition;
+import org.hibernate.cfg.annotations.reflection.JPAMetadataProvider;
+import org.hibernate.cfg.annotations.reflection.XMLContext;
 import org.hibernate.service.ServiceRegistry;
 
 import org.jboss.logging.Logger;
@@ -202,8 +207,11 @@
 			nonLocatedMappingFileNames.addAll( explicitMappingFileNames );
 		}
 
+		final List<org.dom4j.Document> dom4jDocuments = new LinkedList<>();
 		for ( MappingFileDescriptor mappingFileDescriptor : scanResult.getLocatedMappingFiles() ) {
-			managedResources.addXmlBinding( xmlMappingBinderAccess.bind( mappingFileDescriptor.getStreamAccess() ) );
+			Binding<org.dom4j.Document> binding = xmlMappingBinderAccess.bind( mappingFileDescriptor.getStreamAccess() );
+			dom4jDocuments.add( binding.getRoot() );
+            managedResources.addXmlBinding( binding );
 			nonLocatedMappingFileNames.remove( mappingFileDescriptor.getName() );
 		}
 
@@ -216,7 +224,23 @@
 				);
 			}
 			final UrlInputStreamAccess inputStreamAccess = new UrlInputStreamAccess( url );
-			managedResources.addXmlBinding( xmlMappingBinderAccess.bind( inputStreamAccess ) );
+			Binding<org.dom4j.Document> binding = xmlMappingBinderAccess.bind( inputStreamAccess );
+			dom4jDocuments.add( binding.getRoot() );
+			managedResources.addXmlBinding( binding );
+		}
+		
+		if ( !dom4jDocuments.isEmpty() ) {
+	        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	        // Ewww.  This is temporary until we migrate to Jandex + StAX for annotation binding
+
+	        final JPAMetadataProvider jpaMetadataProvider = (JPAMetadataProvider) ( (MetadataProviderInjector) options.getReflectionManager() ).getMetadataProvider();
+            XMLContext xmlContext = jpaMetadataProvider.getXMLContext();
+            for ( org.dom4j.Document dom4jDocument : dom4jDocuments ) {
+                final List<String> classNames = xmlContext.addDocument( dom4jDocument );
+                for ( String className : classNames ) {
+                    managedResources.addAnnotatedClassName( className );
+                }
+            }
 		}

org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java

@@ -78,24 +78,24 @@
 		// Ewww.  This is temporary until we migrate to Jandex + StAX for annotation binding
 
 		final JPAMetadataProvider jpaMetadataProvider = (JPAMetadataProvider) ( (MetadataProviderInjector) reflectionManager ).getMetadataProvider();
-		for ( Binding xmlBinding : managedResources.getXmlMappingBindings() ) {
-//			if ( !MappingBinder.DelayedOrmXmlData.class.isInstance( xmlBinding.getRoot() ) ) {
+//		for ( Binding xmlBinding : managedResources.getXmlMappingBindings() ) {
+////			if ( !MappingBinder.DelayedOrmXmlData.class.isInstance( xmlBinding.getRoot() ) ) {
+////				continue;
+////			}
+////
+////			// convert the StAX representation in delayedOrmXmlData to DOM because that's what commons-annotations needs
+////			final MappingBinder.DelayedOrmXmlData delayedOrmXmlData = (MappingBinder.DelayedOrmXmlData) xmlBinding.getRoot();
+////			org.dom4j.Document dom4jDocument = toDom4jDocument( delayedOrmXmlData );
+//			if ( !org.dom4j.Document.class.isInstance( xmlBinding.getRoot() ) ) {
 //				continue;
 //			}
+//			org.dom4j.Document dom4jDocument = (Document) xmlBinding.getRoot();
 //
-//			// convert the StAX representation in delayedOrmXmlData to DOM because that's what commons-annotations needs
-//			final MappingBinder.DelayedOrmXmlData delayedOrmXmlData = (MappingBinder.DelayedOrmXmlData) xmlBinding.getRoot();
-//			org.dom4j.Document dom4jDocument = toDom4jDocument( delayedOrmXmlData );
-			if ( !org.dom4j.Document.class.isInstance( xmlBinding.getRoot() ) ) {
-				continue;
-			}
-			org.dom4j.Document dom4jDocument = (Document) xmlBinding.getRoot();
-
-			final List<String> classNames = jpaMetadataProvider.getXMLContext().addDocument( dom4jDocument );
-			for ( String className : classNames ) {
-				xClasses.add( toXClass( className, reflectionManager ) );
-			}
-		}
+//			final List<String> classNames = jpaMetadataProvider.getXMLContext().addDocument( dom4jDocument );
+//			for ( String className : classNames ) {
+//				xClasses.add( toXClass( className, reflectionManager ) );
+//			}
+//		}
 		jpaMetadataProvider.getXMLContext().applyDiscoveredAttributeConverters( attributeConverterManager );
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~