Merge branch 'HHH-5709' of https://github.com/tblachowicz/hibernate-core into tblachowicz-HHH-5709

hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java

@@ -195,6 +195,7 @@ public class EntityBinder {
 		persistentClass.setAbstract( annotatedClass.isAbstract() );
 		persistentClass.setClassName( annotatedClass.getName() );
 		persistentClass.setNodeName( name );
+		persistentClass.setJpaEntityName(name);
 		//persistentClass.setDynamic(false); //no longer needed with the Entity name refactoring?
 		persistentClass.setEntityName( annotatedClass.getName() );
 		bindDiscriminatorValue();

hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java

@@ -57,6 +57,7 @@ public abstract class PersistentClass implements Serializable, Filterable, MetaA
 	private String proxyInterfaceName;
 	
 	private String nodeName;
+	private String jpaEntityName;
 
 	private String discriminatorValue;
 	private boolean lazy;
@@ -735,6 +736,14 @@ public abstract class PersistentClass implements Serializable, Filterable, MetaA
 	public void setNodeName(String nodeName) {
 		this.nodeName = nodeName;
 	}
+
+	public String getJpaEntityName() {
+		return jpaEntityName;
+	}
+	
+	public void setJpaEntityName(String jpaEntityName) {
+		this.jpaEntityName = jpaEntityName;
+	}
 	
 	public boolean hasPojoRepresentation() {
 		return getClassName()!=null;

hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/EntityTypeImpl.java

@@ -33,20 +33,20 @@ import javax.persistence.metamodel.EntityType;
 public class EntityTypeImpl<X> 
 		extends AbstractIdentifiableType<X>
 		implements EntityType<X>, Serializable {
-	private final String className;
+	private final String jpaEntityName;
 
 	public EntityTypeImpl(
 			Class<X> javaType,
 			AbstractIdentifiableType<? super X> superType, 
-			String className,
+			String jpaEntityName,
 			boolean hasIdentifierProperty,
 			boolean isVersioned) {
 		super( javaType, superType, hasIdentifierProperty, isVersioned );
-		this.className = className;
+		this.jpaEntityName = jpaEntityName;
 	}
 
 	public String getName() {
-		return className;
+		return jpaEntityName;
 	}
 
 	public BindableType getBindableType() {

hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetamodelImpl.java

@@ -94,7 +94,7 @@ public class MetamodelImpl implements Metamodel, Serializable {
 		EntityTypeImpl entityType = new EntityTypeImpl(
 				javaType,
 				superType,
-				persistentClass.getClassName(),
+				persistentClass.getJpaEntityName(),
 				persistentClass.hasIdentifierProperty(),
 				persistentClass.isVersioned()
 		);
@@ -102,7 +102,7 @@ public class MetamodelImpl implements Metamodel, Serializable {
 		context.popEntityWorkedOn(persistentClass);
 		return entityType;
 	}
-
+	
 	private static MappedSuperclassTypeImpl<?> locateOrBuildMappedsuperclassType(
 			MappedSuperclass mappedSuperclass, MetadataContext context) {
 		MappedSuperclassTypeImpl<?> mappedSuperclassType = context.locateMappedSuperclassType( mappedSuperclass );

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/House.java

@@ -37,7 +37,7 @@ import javax.persistence.OrderColumn;
 /**
  * @author Emmanuel Bernard
  */
-@Entity
+@Entity(name="org.hibernate.ejb.test.metadata.House")
 public class House {
 	private Key key;
 	private Address address;

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java

@@ -97,7 +97,7 @@ public class MetadataTest extends TestCase {
 		final SingularAttribute<? super Fridge, Long> id2 = fridgeType.getId( Long.class );
 		assertNotNull( id2 );
 
-		assertEquals( Fridge.class.getName(), fridgeType.getName() );
+		assertEquals( "Fridge", fridgeType.getName() );
 		assertEquals( Long.class, fridgeType.getIdType().getJavaType() );
 		assertTrue( fridgeType.hasSingleIdAttribute() );
 		assertFalse( fridgeType.hasVersionAttribute() );
@@ -106,6 +106,7 @@ public class MetadataTest extends TestCase {
 		assertEquals( 3, fridgeType.getDeclaredAttributes().size() );
 
 		final EntityType<House> houseType = factory.getMetamodel().entity( House.class );
+		assertEquals( "org.hibernate.ejb.test.metadata.House", houseType.getName() );
 		assertTrue( houseType.hasSingleIdAttribute() );
 		final SingularAttribute<House, House.Key> houseId = houseType.getDeclaredId( House.Key.class );
 		assertNotNull( houseId );
@@ -113,6 +114,7 @@ public class MetadataTest extends TestCase {
 		assertEquals( Attribute.PersistentAttributeType.EMBEDDED, houseId.getPersistentAttributeType() );
 		
 		final EntityType<Person> personType = factory.getMetamodel().entity( Person.class );
+		assertEquals( "Homo", personType.getName() );
 		assertFalse( personType.hasSingleIdAttribute() );
 		final Set<SingularAttribute<? super Person,?>> ids = personType.getIdClassAttributes();
 		assertNotNull( ids );

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Person.java

@@ -32,7 +32,7 @@ import javax.persistence.Entity;
  * @author Emmanuel Bernard
  */
 @IdClass(Person.PersonPK.class)
-@Entity
+@Entity(name="Homo") //Person in latin ;)
 public class Person {
 	private String firstName;
 	private String lastName;