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

HHH-9492 - Migrate to new bootstrap API (MetadataSources, etc);
HHH-7078 - Split NamingStrategy into ImplicitNamingStrategy/PhysicalNamingStrategy;
HHH-6005 - Better handling of implicit column naming with @ElementCollection of @embeddables;
HHH-9633 - Add tests that explicitly test the "main" NamingStrategy impls

Author: sebersole

build.gradle

@@ -137,6 +137,7 @@ subprojects { subProject ->
 	dependencies {
 		compile( libraries.logging )
 		compile( libraries.logging_annotations )
+		compile( libraries.logging_processor )
 
 		testCompile( libraries.junit )
 		testCompile( libraries.byteman )
@@ -154,6 +155,8 @@ subprojects { subProject ->
 		}
 		jaxb( libraries.jaxb2_basics )
 		jaxb( libraries.jaxb2_ant )
+		jaxb( libraries.jaxb2_jaxb )
+		jaxb( libraries.jaxb2_jaxb_xjc )
 
 		animalSniffer ( libraries.animal_sniffer )
 		javaApiSignature ( libraries.java16_signature )
@@ -181,15 +184,12 @@ subprojects { subProject ->
 	tasks.withType( JavaCompile.class ).all { task->
 		task.options.compilerArgs += [
 				"-nowarn",
-				"-proc:none",
 				"-encoding", "UTF-8",
 				"-source", rootProject.javaLanguageLevel,
 				"-target", rootProject.javaLanguageLevel
 		]
 	}
 
-	addLoggingProcessor( sourceSets.main )
-
 	jar {
 		manifest = osgiManifest {
 			// GRADLE-1411: Even if we override Imports and Exports

hibernate-core/hibernate-core.gradle

@@ -109,8 +109,8 @@ idea {
 task jaxb {
 	ext {
         // input schemas
-        cfgXsd = file( 'src/main/resources/org/hibernate/hibernate-configuration-4.0.xsd')
-        hbmXsd = file( 'src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd' )
+        cfgXsd = file( 'src/main/resources/org/hibernate/xsd/cfg/legacy-configuration-4.0.xsd')
+		hbmXsd = file( 'src/main/resources/org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd' )
         ormXsd = file( 'src/main/resources/org/hibernate/jpa/orm_2_0.xsd' )
 
         // input bindings
@@ -133,33 +133,30 @@ task jaxb {
         // hibernate-configuration
         ant.xjc(
                 destdir: '${jaxbTargetDir}',
-                package: 'org.hibernate.internal.jaxb.cfg',
                 binding: 'src/main/xjb/hbm-configuration-bindings.xjb',
                 schema: cfgXsd.path
         )
 
-        // hibernate-mapping
-        ant.xjc(
-                destdir: '${jaxbTargetDir}',
-                package: 'org.hibernate.internal.jaxb.mapping.hbm',
-                binding: hbmXjb.path,
-                schema: hbmXsd.path,
-                extension: 'true'
-        ) {
-            arg line:     '-Xinheritance'
-        }
-
-        // orm.xml (jpa)
-        ant.xjc(
-                destdir: '${jaxbTargetDir}',
-                package: 'org.hibernate.internal.jaxb.mapping.orm',
-                binding: 'src/main/xjb/orm-bindings.xjb',
-                schema: ormXsd.path
-        )
+		// hibernate-mapping
+		ant.xjc(
+				destdir: '${jaxbTargetDir}',
+				binding: 'src/main/xjb/hbm-mapping-bindings.xjb',
+				schema: hbmXsd.path,
+				extension: 'true'
+		) {
+			arg line:     '-Xinheritance -Xsimplify'
+		}
+
+//        // orm.xml (jpa)
+//        ant.xjc(
+//                destdir: '${jaxbTargetDir}',
+//                package: 'org.hibernate.internal.jaxb.mapping.orm',
+//                binding: 'src/main/xjb/orm-bindings.xjb',
+//                schema: ormXsd.path
+//        )
     }
 
 }
 
-runSourceGenerators.dependsOn jaxb
-runSourceGenerators.dependsOn generateGrammarSource
-
+sourceSets.main.sourceGeneratorsTask.dependsOn jaxb
+sourceSets.main.sourceGeneratorsTask.dependsOn generateGrammarSource

hibernate-core/src/main/java/org/hibernate/DuplicateMappingException.java

@@ -37,19 +37,49 @@ public static enum Type {
 		/**
 		 * A duplicate entity definition was encountered.
 		 */
-		ENTITY,
+		ENTITY( "entity" ),
+		/**
+		 * A duplicate collection role was encountered
+		 */
+		COLLECTION( "collection" ),
 		/**
 		 * A duplicate table definition was encountered.
 		 */
-		TABLE,
+		TABLE( "table" ),
 		/**
 		 * A duplicate property/attribute definition was encountered.
 		 */
-		PROPERTY,
+		PROPERTY( "property" ),
+		/**
+		 * A duplicate column definition was encountered.
+		 */
+		COLUMN( "column" ),
 		/**
 		 * A duplicate column definition was encountered.
 		 */
-		COLUMN
+		COLUMN_BINDING( "column-binding" ),
+		/**
+		 * A duplicate named entity graph was encountered
+		 */
+		NAMED_ENTITY_GRAPH( "NamedEntityGraph" ),
+		/**
+		 * A duplicate named query (ql or native) was encountered
+		 */
+		QUERY( "query" ),
+		/**
+		 * A duplicate ResultSetMapping was encountered
+		 */
+		RESULT_SET_MAPPING( "ResultSetMapping" ),
+		/**
+		 * A duplicate NamedStoredProcedureQuery was encountered
+		 */
+		PROCEDURE( "NamedStoredProcedureQuery" );
+
+		private final String text;
+
+		Type(String text) {
+			this.text = text;
+		}
 	}
 
 	private final String name;
@@ -62,7 +92,7 @@ public static enum Type {
 	 * @param name The name of the duplicated thing.
 	 */
 	public DuplicateMappingException(Type type, String name) {
-		this( type.name(), name );
+		this( type.text, name );
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/EntityMode.java

@@ -23,6 +23,8 @@
  */
 package org.hibernate;
 
+import java.util.Locale;
+
 /**
  * Defines the representation modes available for entities.
  *
@@ -40,19 +42,21 @@ public enum EntityMode {
 	 */
 	MAP( "dynamic-map" );
 
-	private final String name;
+	private final String externalName;
+
+	private EntityMode(String externalName) {
+		this.externalName = externalName;
+	}
 
-	private EntityMode(String name) {
-		this.name = name;
+	public String getExternalName() {
+		return externalName;
 	}
 
 	@Override
 	public String toString() {
-		return name;
+		return externalName;
 	}
 
-	private static final String DYNAMIC_MAP_NAME = MAP.name.toUpperCase();
-
 	/**
 	 * Legacy-style entity-mode name parsing.  <b>Case insensitive</b>
 	 *
@@ -65,11 +69,10 @@ public static EntityMode parse(String entityMode) {
 		if ( entityMode == null ) {
 			return POJO;
 		}
-		entityMode = entityMode.toUpperCase();
-		if ( DYNAMIC_MAP_NAME.equals( entityMode ) ) {
+		if ( MAP.externalName.equalsIgnoreCase( entityMode ) ) {
 			return MAP;
 		}
-		return valueOf( entityMode );
+		return valueOf( entityMode.toUpperCase( Locale.ENGLISH ) );
 	}
 
 }

hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java

@@ -23,7 +23,7 @@
  */
 package org.hibernate;
 
-import org.hibernate.internal.jaxb.Origin;
+import org.hibernate.boot.jaxb.Origin;
 import org.hibernate.internal.util.xml.XmlDocument;
 
 /**
@@ -94,7 +94,7 @@ public InvalidMappingException(String customMessage, XmlDocument xmlDocument) {
 	 * @param origin The origin of the invalid mapping document
 	 */
 	public InvalidMappingException(String customMessage, Origin origin) {
-		this( customMessage, origin.getType().toString(), origin.getName() );
+		this( customMessage, origin.getType().getLegacyTypeText(), origin.getName() );
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/LockMode.java

@@ -33,6 +33,7 @@
  * levels.
  *
  * @author Gavin King
+ *
  * @see Session#lock(Object, LockMode)
  */
 public enum LockMode {
@@ -44,44 +45,44 @@ public enum LockMode {
 	 * <br>
 	 * This is the "default" lock mode.
 	 */
-	NONE( 0 ),
+	NONE( 0, "none" ),
 	/**
 	 * A shared lock. Objects in this lock mode were read from
 	 * the database in the current transaction, rather than being
 	 * pulled from a cache.
 	 */
-	READ( 5 ),
+	READ( 5, "read" ),
 	/**
 	 * An upgrade lock. Objects loaded in this lock mode are
 	 * materialized using an SQL <tt>select ... for update</tt>.
 	 *
 	 * @deprecated instead use PESSIMISTIC_WRITE
 	 */
 	@Deprecated
-	UPGRADE( 10 ),
+	UPGRADE( 10, "upgrade" ),
 	/**
 	 * Attempt to obtain an upgrade lock, using an Oracle-style
 	 * <tt>select for update nowait</tt>. The semantics of
 	 * this lock mode, once obtained, are the same as
 	 * <tt>UPGRADE</tt>.
 	 */
-	UPGRADE_NOWAIT( 10 ),
+	UPGRADE_NOWAIT( 10, "upgrade-nowait" ),
 
 	/**
 	 * Attempt to obtain an upgrade lock, using an Oracle-style
 	 * <tt>select for update skip locked</tt>. The semantics of
 	 * this lock mode, once obtained, are the same as
 	 * <tt>UPGRADE</tt>.
 	 */
-	UPGRADE_SKIPLOCKED( 10 ),
+	UPGRADE_SKIPLOCKED( 10, "upgrade-skiplocked" ),
 
 	/**
 	 * A <tt>WRITE</tt> lock is obtained when an object is updated
 	 * or inserted.   This lock mode is for internal use only and is
 	 * not a valid mode for <tt>load()</tt> or <tt>lock()</tt> (both
 	 * of which throw exceptions if WRITE is specified).
 	 */
-	WRITE( 10 ),
+	WRITE( 10, "write" ),
 
 	/**
 	 * Similar to {@link #UPGRADE} except that, for versioned entities,
@@ -90,7 +91,7 @@ public enum LockMode {
 	 * @deprecated instead use PESSIMISTIC_FORCE_INCREMENT
 	 */
 	@Deprecated
-	FORCE( 15 ),
+	FORCE( 15, "force" ),
 
 	/**
 	 *  start of javax.persistence.LockModeType equivalent modes
@@ -100,34 +101,37 @@ public enum LockMode {
 	 * Optimistically assume that transaction will not experience contention for
 	 * entities.  The entity version will be verified near the transaction end.
 	 */
-	OPTIMISTIC( 6 ),
+	OPTIMISTIC( 6, "optimistic" ),
 
 	/**
 	 * Optimistically assume that transaction will not experience contention for
 	 * entities.  The entity version will be verified and incremented near the transaction end.
 	 */
-	OPTIMISTIC_FORCE_INCREMENT( 7 ),
+	OPTIMISTIC_FORCE_INCREMENT( 7, "optimistic_force_increment" ),
 
 	/**
 	 * Implemented as PESSIMISTIC_WRITE.
 	 * TODO:  introduce separate support for PESSIMISTIC_READ
 	 */
-	PESSIMISTIC_READ( 12 ),
+	PESSIMISTIC_READ( 12, "pessimistic_read" ),
 
 	/**
 	 * Transaction will obtain a database lock immediately.
 	 * TODO:  add PESSIMISTIC_WRITE_NOWAIT
 	 */
-	PESSIMISTIC_WRITE( 13 ),
+	PESSIMISTIC_WRITE( 13, "pessimistic_write" ),
 
 	/**
 	 * Transaction will immediately increment the entity version.
 	 */
-	PESSIMISTIC_FORCE_INCREMENT( 17 );
+	PESSIMISTIC_FORCE_INCREMENT( 17, "pessimistic_force_increment" );
+
 	private final int level;
+	private final String externalForm;
 
-	private LockMode(int level) {
+	private LockMode(int level, String externalForm) {
 		this.level = level;
+		this.externalForm = externalForm;
 	}
 
 	/**
@@ -151,4 +155,22 @@ public boolean greaterThan(LockMode mode) {
 	public boolean lessThan(LockMode mode) {
 		return level < mode.level;
 	}
+
+	public String toExternalForm() {
+		return externalForm;
+	}
+
+	public static LockMode fromExternalForm(String externalForm) {
+		if ( externalForm == null ) {
+			return NONE;
+		}
+
+		for ( LockMode lockMode : LockMode.values() ) {
+			if ( lockMode.externalForm.equalsIgnoreCase( externalForm ) ) {
+				return lockMode;
+			}
+		}
+
+		throw new IllegalArgumentException( "Unable to interpret LockMode reference from incoming external form : " + externalForm );
+	}
 }

hibernate-core/src/main/java/org/hibernate/MappingNotFoundException.java

@@ -27,7 +27,10 @@
  * Thrown when a resource for a mapping could not be found.
  * 
  * @author Max Rydahl Andersen
+ *
+ * @deprecated Use {@link org.hibernate.boot.MappingNotFoundException} instead.
  */
+@Deprecated
 public class MappingNotFoundException extends MappingException {
 	private final String path;
 	private final String type;