Author: epbernard Date: 2006-08-17 15:22:24 -0400 (Thu, 17 Aug 2006) New Revision: 10278 Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/orm.xml trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/orm.xml Removed: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/PackageLevelTest.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/IdTest.java Log: ANN-410 remove package-info with standard javax.persistence classes Deleted: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/PackageLevelTest.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/PackageLevelTest.java 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/PackageLevelTest.java 2006-08-17 19:22:24 UTC (rev 10278) @@ -1,38 +0,0 @@ -//$Id$ -package org.hibernate.test.annotations; - -import org.hibernate.Session; - -/** - * @author Emmanuel Bernard - */ -public class PackageLevelTest extends TestCase { - - /** - * @param x - */ - public PackageLevelTest(String x) { - super( x ); - } - - /** - * @see org.hibernate.test.annotations.TestCase#getMappings() - */ - protected Class[] getMappings() { - return new Class[]{}; - } - - protected String[] getAnnotatedPackages() { - return new String[]{ - "org.hibernate.test.annotations", - "org.hibernate.test.annotations.duplicatedgenerator", - "org.hibernate.test.annotations.wrongoremptypackage", - }; - } - - public void testDuplicatedGenerator() throws Exception { - Session s = openSession(); - s.close(); - } - -} Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java 2006-08-17 19:22:24 UTC (rev 10278) @@ -16,6 +16,8 @@ try { cfg.addAnnotatedClass( Flight.class ); cfg.addAnnotatedClass( org.hibernate.test.annotations.Flight.class ); + cfg.addResource( "org/hibernate/test/annotations/orm.xml"); + cfg.addResource( "org/hibernate/test/annotations/duplicatedgenerator/orm.xml"); cfg.buildSessionFactory(); fail( "Should not be able to map the same entity name twice" ); } Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/orm.xml =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/orm.xml 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/orm.xml 2006-08-17 19:22:24 UTC (rev 10278) @@ -0,0 +1,10 @@ +<?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" + version="1.0" + > + <table-generator name="EMP_GEN" table="GENERATOR_TABLE" + pk-column-name="pkey" pk-column-value="EMP" + value-column-name="hi" allocation-size="20"/> +</entity-mappings> \ No newline at end of file Deleted: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java 2006-08-17 19:22:24 UTC (rev 10278) @@ -1,13 +0,0 @@ -/** - * Test package for metatata facilities - * It contains an example of package level metadata - */ -(a)javax.persistence.TableGenerator( - name = "EMP_GEN", - table = "GENERATOR_TABLE", - pkColumnName = "pkey", - valueColumnName = "hi", - pkColumnValue = "EMP", - allocationSize = 20 -) package org.hibernate.test.annotations.duplicatedgenerator; - Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/IdTest.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/IdTest.java 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/IdTest.java 2006-08-17 19:22:24 UTC (rev 10278) @@ -278,4 +278,11 @@ }; } + @Override + protected String[] getXmlFiles() { + return new String[] { + "org/hibernate/test/annotations/orm.xml" + }; + } + } Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/orm.xml =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/orm.xml 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/orm.xml 2006-08-17 19:22:24 UTC (rev 10278) @@ -0,0 +1,11 @@ +<?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" + version="1.0" + > + <sequence-generator name="SEQ_GEN" sequence-name="my_sequence"/> + <table-generator name="EMP_GEN" table="GENERATOR_TABLE" + pk-column-name="pkey" pk-column-value="EMP" + value-column-name="hi" allocation-size="20"/> +</entity-mappings> \ No newline at end of file Deleted: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java 2006-08-17 19:22:24 UTC (rev 10278) @@ -1,21 +0,0 @@ -/** - * Test package for metatata facilities - * It contains an example of package level metadata - */ - -@TableGenerator( - name = "EMP_GEN", - table = "GENERATOR_TABLE", - pkColumnName = "pkey", - valueColumnName = "hi", - pkColumnValue = "EMP", - allocationSize = 20 -) -@SequenceGenerator( - name = "SEQ_GEN", - sequenceName = "my_sequence" -) package org.hibernate.test.annotations; - -import javax.persistence.SequenceGenerator; -import javax.persistence.TableGenerator; -