From 363608a604d73558f5d645b64061880db4ff619e Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Tue, 19 Apr 2011 10:00:58 -0500
Subject: [PATCH] HHH-6141 - Develop scheme for ordered processing of
 MetadataSources sources

---
 .../main/java/org/hibernate/metamodel/source/Metadata.java  | 5 +++++
 .../org/hibernate/metamodel/source/MetadataSources.java     | 6 +++++-
 .../hibernate/metamodel/source/internal/MetadataImpl.java   | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/Metadata.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/Metadata.java
index be63760d16..fba625fe0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/Metadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/Metadata.java
@@ -28,4 +28,9 @@ package org.hibernate.metamodel.source;
  * @author Steve Ebersole
  */
 public interface Metadata {
+	public static enum ProcessingOrder {
+		ANNOTATIONS_FIRST,
+		HBM_FIRST
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataSources.java
index bcb672cb5c..8a28f91c24 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataSources.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataSources.java
@@ -90,7 +90,11 @@ public class MetadataSources {
 	}
 
 	public Metadata buildMetadata() {
-		return new MetadataImpl( this );
+		return buildMetadata( Metadata.ProcessingOrder.ANNOTATIONS_FIRST );
+	}
+
+	public Metadata buildMetadata(Metadata.ProcessingOrder preferredProcessingOrder) {
+		return new MetadataImpl( this, preferredProcessingOrder );
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
index 17ab7f2886..d62a61ae9f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
@@ -65,7 +65,7 @@ public class MetadataImpl implements Metadata, MetadataImplementor, Serializable
 	private Map<String, FetchProfile> fetchProfiles = new HashMap<String, FetchProfile>();
 	private Map<String, String> imports;
 
-	public MetadataImpl(MetadataSources metadataSources) {
+	public MetadataImpl(MetadataSources metadataSources, ProcessingOrder preferredProcessingOrder) {
 		this.serviceRegistry = metadataSources.getServiceRegistry();
 		this.namingStrategy = metadataSources.getNamingStrategy();