[hibernate-commits] Hibernate SVN: r10348 - in trunk/HibernateExt: ejb/lib ejb/src/java/org/hibernate/ejb ejb/src/test ejb/src/test/org/hibernate/ejb/test/exception ejb/src/test/org/hibernate/ejb/test/xml metadata/src/java/org/hibernate/reflection/java/xml

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2006-08-24 20:14:35 -0400 (Thu, 24 Aug 2006)
New Revision: 10348

Added:
   trunk/HibernateExt/ejb/src/test/NoPackageEntity.java
Modified:
   trunk/HibernateExt/ejb/lib/hibernate-annotations.jar
   trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java
   trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/exception/Music.java
   trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/xml/orm2.xml
   trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/xml/XMLContext.java
Log:
ANN-421 handle non package classes

Modified: trunk/HibernateExt/ejb/lib/hibernate-annotations.jar
===================================================================
(Binary files differ)

Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java	2006-08-24 15:37:11 UTC (rev 10347)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java	2006-08-25 00:14:35 UTC (rev 10348)
@@ -40,6 +40,7 @@
 import org.hibernate.Interceptor;
 import org.hibernate.MappingException;
 import org.hibernate.SessionFactory;
+import org.hibernate.MappingNotFoundException;
 import org.hibernate.cfg.AnnotationConfiguration;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
@@ -829,7 +830,7 @@
 					if ( xmlFile.endsWith( META_INF_ORM_XML ) ) useMetaInf = true;
 					cfg.addResource( xmlFile );
 				}
-				catch( MappingException me ) {
+				catch( MappingNotFoundException e ) {
 					if ( ! xmlFile.endsWith( META_INF_ORM_XML ) ) {
 						throw new PersistenceException( getExceptionHeader(workingVars)
 								+ "Unable to find XML mapping file in classpath: " + xmlFile);
@@ -839,6 +840,10 @@
 						//swallow it, the META-INF/orm.xml is optional
 					}
 				}
+				catch( MappingException me ) {
+					throw new PersistenceException( getExceptionHeader(workingVars)
+								+ "Error while reading JPA XML file: " + xmlFile, me);
+				}
 				if ( log.isInfoEnabled() ) {
 					if ( Boolean.TRUE.equals( useMetaInf ) ) {
 						log.info( getExceptionHeader( workingVars ) + META_INF_ORM_XML + " found");

Added: trunk/HibernateExt/ejb/src/test/NoPackageEntity.java
===================================================================
--- trunk/HibernateExt/ejb/src/test/NoPackageEntity.java	2006-08-24 15:37:11 UTC (rev 10347)
+++ trunk/HibernateExt/ejb/src/test/NoPackageEntity.java	2006-08-25 00:14:35 UTC (rev 10348)
@@ -0,0 +1,9 @@
+//$Id: $
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class NoPackageEntity {
+	private Integer id;
+	private String name;
+}

Modified: trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/exception/Music.java
===================================================================
--- trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/exception/Music.java	2006-08-24 15:37:11 UTC (rev 10347)
+++ trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/exception/Music.java	2006-08-25 00:14:35 UTC (rev 10348)
@@ -1,6 +1,7 @@
 //$Id: $
 package org.hibernate.ejb.test.exception;
 
+import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
@@ -10,7 +11,7 @@
  * @author Emmanuel Bernard
  */
 @Entity
-public class Music {
+public class Music implements Serializable {
 	private Integer id;
 	private Integer version;
 	private String name;

Modified: trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/xml/orm2.xml
===================================================================
--- trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/xml/orm2.xml	2006-08-24 15:37:11 UTC (rev 10347)
+++ trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/xml/orm2.xml	2006-08-25 00:14:35 UTC (rev 10348)
@@ -5,8 +5,7 @@
                  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
                  version="1.0"
         >
-    <package>org.hibernate.ejb.test.xml</package>
-    <entity class="Lighter" name="ALighter" access="FIELD" metadata-complete="true">
+    <entity class="org.hibernate.ejb.test.xml.Lighter" name="ALighter" access="FIELD" metadata-complete="true">
         <attributes>
             <id name="name">
                 <column name="fld_id"/>
@@ -14,4 +13,15 @@
             <basic name="power"></basic>
         </attributes>
     </entity>
+    <!-- entity class="NoPackageEntity" name="ALighter" access="FIELD" metadata-complete="true">
+        <attributes>
+            <id name="id"/>
+            <basic name="name"/>
+        </attributes>
+    </entity -->
+    <embeddable class="NoPackageEntity" access="FIELD">
+        <attributes>
+            <basic name="name"/>
+        </attributes>
+    </embeddable>
 </entity-mappings>
\ No newline at end of file

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/xml/XMLContext.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/xml/XMLContext.java	2006-08-24 15:37:11 UTC (rev 10347)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/xml/XMLContext.java	2006-08-25 00:14:35 UTC (rev 10348)
@@ -60,7 +60,7 @@
 		//entity mapping default
 		Default entityMappingDefault = new Default();
 		Element unitElement = root.element( "package" );
-		String packageName = unitElement != null ? unitElement.getTextTrim() : "";
+		String packageName = unitElement != null ? unitElement.getTextTrim() : null;
 		entityMappingDefault.setPackageName( packageName );
 		unitElement = root.element( "schema" );
 		entityMappingDefault.setSchema( unitElement != null ? unitElement.getTextTrim() : null );
@@ -135,7 +135,7 @@
 	}
 
 	public static String buildSafeClassName(String className, String defaultPackageName) {
-		if ( className.indexOf( '.' ) < 0 && defaultPackageName != null ) {
+		if ( className.indexOf( '.' ) < 0 && StringHelper.isNotEmpty( defaultPackageName ) ) {
 			className = StringHelper.qualify( defaultPackageName, className );
 		}
 		return className;