Author: epbernard Date: 2008-01-15 18:15:54 -0500 (Tue, 15 Jan 2008) New Revision: 14278 Added: entitymanager/trunk/src/test-resources/excludehbmpar/META-INF/orm2.xml Removed: entitymanager/trunk/src/test-resources/excludehbmpar/orm2.xml Modified: entitymanager/trunk/src/test-resources/excludehbmpar/META-INF/persistence.xml Log: EJB-297 tests for EJB-297 Copied: entitymanager/trunk/src/test-resources/excludehbmpar/META-INF/orm2.xml (from rev 14142, entitymanager/trunk/src/test-resources/excludehbmpar/orm2.xml) =================================================================== --- entitymanager/trunk/src/test-resources/excludehbmpar/META-INF/orm2.xml (rev 0) +++ entitymanager/trunk/src/test-resources/excludehbmpar/META-INF/orm2.xml 2008-01-15 23:15:54 UTC (rev 14278) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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="Light" access="FIELD" metadata-complete="true"> + <attributes> + <id name="name"> + <column name="fld_id"/> + </id> + <basic name="power"></basic> + </attributes> + </entity> +</entity-mappings> \ No newline at end of file Modified: entitymanager/trunk/src/test-resources/excludehbmpar/META-INF/persistence.xml =================================================================== --- entitymanager/trunk/src/test-resources/excludehbmpar/META-INF/persistence.xml 2008-01-15 23:08:42 UTC (rev 14277) +++ entitymanager/trunk/src/test-resources/excludehbmpar/META-INF/persistence.xml 2008-01-15 23:15:54 UTC (rev 14278) @@ -5,7 +5,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0"> <persistence-unit name="excludehbmpar" transaction-type="RESOURCE_LOCAL"> - <mapping-file>orm2.xml</mapping-file> + <mapping-file>META-INF/orm2.xml</mapping-file> <properties> <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> Deleted: entitymanager/trunk/src/test-resources/excludehbmpar/orm2.xml =================================================================== --- entitymanager/trunk/src/test-resources/excludehbmpar/orm2.xml 2008-01-15 23:08:42 UTC (rev 14277) +++ entitymanager/trunk/src/test-resources/excludehbmpar/orm2.xml 2008-01-15 23:15:54 UTC (rev 14278) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - 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="Light" access="FIELD" metadata-complete="true"> - <attributes> - <id name="name"> - <column name="fld_id"/> - </id> - <basic name="power"></basic> - </attributes> - </entity> -</entity-mappings> \ No newline at end of file