[hibernate-commits] Hibernate SVN: r17826 - in core/trunk/entitymanager: src/test and 15 other directories.

Author: hardy.ferentschik Date: 2009-10-23 09:48:18 -0400 (Fri, 23 Oct 2009) New Revision: 17826 Added: core/trunk/entitymanager/src/test/bundles/ core/trunk/entitymanager/src/test/bundles/cfgxmlpar/ core/trunk/entitymanager/src/test/bundles/defaultpar/ core/trunk/entitymanager/src/test/bundles/excludehbmpar/ core/trunk/entitymanager/src/test/bundles/explicitpar/ core/trunk/entitymanager/src/test/bundles/explodedpar/ core/trunk/entitymanager/src/test/bundles/externaljar/ core/trunk/entitymanager/src/test/bundles/overridenpar/ core/trunk/entitymanager/src/test/bundles/space par/ core/trunk/entitymanager/src/test/bundles/war/ core/trunk/entitymanager/src/test/resources/org/ core/trunk/entitymanager/src/test/resources/org/hibernate/ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ejb3configuration/ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Employer.hbm.xml core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Node.hbm.xml core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/ParentChild.hbm.xml core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml Removed: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/hibernate.cfg.xml core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.hbm.xml core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.hbm.xml core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/ParentChild.hbm.xml core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm.xml core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm2.xml core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm3.xml core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm.xml core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm2.xml core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm3.xml core/trunk/entitymanager/src/test/resources/cfgxmlpar/ core/trunk/entitymanager/src/test/resources/defaultpar/ core/trunk/entitymanager/src/test/resources/excludehbmpar/ core/trunk/entitymanager/src/test/resources/explicitpar/ core/trunk/entitymanager/src/test/resources/explodedpar/ core/trunk/entitymanager/src/test/resources/externaljar/ core/trunk/entitymanager/src/test/resources/overridenpar/ core/trunk/entitymanager/src/test/resources/space par/ core/trunk/entitymanager/src/test/resources/war/ Modified: core/trunk/entitymanager/pom.xml core/trunk/entitymanager/src/test/resources/hibernate.properties Log: HHH-4523 restructured the test resources Modified: core/trunk/entitymanager/pom.xml =================================================================== --- core/trunk/entitymanager/pom.xml 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/pom.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -71,22 +71,15 @@ <build> <testResources> <testResource> - <filtering>false</filtering> - <directory>src/test/java</directory> - <includes> - <include>**/*.xml</include> - </includes> - </testResource> - <testResource> <filtering>true</filtering> <directory>src/test/resources</directory> - <includes> - <include>META-INF/**</include> - <include>*.properties</include> - </includes> </testResource> + <testResource> + <filtering>true</filtering> + <directory>src/test/bundles</directory> + <targetPath>../bundles</targetPath> + </testResource> </testResources> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -153,7 +146,7 @@ <property name="package.dir" value="${basedir}/target/test-packages" /> <property name="package.tmp.dir" value="${basedir}/target/tmp" /> <property name="classes.dir" value="${project.build.directory}/test-classes" /> - <property name="testresources.dir" value="${basedir}/src/test/resources" /> + <property name="testresources.dir" value="${basedir}/src/test/bundles" /> <ant antfile="${basedir}/build.xml"> <target name="package" /> </ant> Copied: core/trunk/entitymanager/src/test/bundles/cfgxmlpar (from rev 17816, core/trunk/entitymanager/src/test/resources/cfgxmlpar) Copied: core/trunk/entitymanager/src/test/bundles/defaultpar (from rev 17816, core/trunk/entitymanager/src/test/resources/defaultpar) Copied: core/trunk/entitymanager/src/test/bundles/excludehbmpar (from rev 17816, core/trunk/entitymanager/src/test/resources/excludehbmpar) Copied: core/trunk/entitymanager/src/test/bundles/explicitpar (from rev 17816, core/trunk/entitymanager/src/test/resources/explicitpar) Copied: core/trunk/entitymanager/src/test/bundles/explodedpar (from rev 17816, core/trunk/entitymanager/src/test/resources/explodedpar) Copied: core/trunk/entitymanager/src/test/bundles/externaljar (from rev 17816, core/trunk/entitymanager/src/test/resources/externaljar) Copied: core/trunk/entitymanager/src/test/bundles/overridenpar (from rev 17816, core/trunk/entitymanager/src/test/resources/overridenpar) Copied: core/trunk/entitymanager/src/test/bundles/space par (from rev 17816, core/trunk/entitymanager/src/test/resources/space par) Copied: core/trunk/entitymanager/src/test/bundles/war (from rev 17816, core/trunk/entitymanager/src/test/resources/war) Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -1,10 +0,0 @@ -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory> - <mapping class="org.hibernate.ejb.test.Cat"/> - <mapping class="org.hibernate.ejb.test.Kitten"/> - </session-factory> -</hibernate-configuration> \ No newline at end of file Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/hibernate.cfg.xml =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/hibernate.cfg.xml 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/hibernate.cfg.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -1,27 +0,0 @@ -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.connection.url">jdbc:hsqldb:.</property> - <property name="hibernate.cache.use_query_cache">true</property> - <property name="hibernate.cache.region_prefix">hibernate.test</property> - <property name="hibernate.jdbc.use_streams_for_binary">true</property> - <property name="hibernate.jdbc.batch_size">0</property> - <property name="hibernate.max_fetch_depth">3</property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.generate_statistics">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping class="org.hibernate.ejb.test.Item"/> - <mapping class="org.hibernate.ejb.test.Cat"/> - <mapping class="org.hibernate.ejb.test.Kitten"/> - <mapping class="org.hibernate.ejb.test.Distributor"/> - <class-cache class="org.hibernate.ejb.test.Item" usage="read-write"/> - <collection-cache collection="org.hibernate.ejb.test.Item.distributors" usage="read-write" region="RegionName"/> - </session-factory> -</hibernate-configuration> \ No newline at end of file Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.hbm.xml =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.hbm.xml 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.hbm.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -1,38 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<!-- - ---> - -<hibernate-mapping package="org.hibernate.ejb.test.ops"> - - <class name="Employer" polymorphism="explicit"> - <id name="id"> - <generator class="native"/> - </id> - <bag name="employees" - cascade="persist,merge" - table="EMPLOYER_EMPLOYEE"> - <key column="EMPER_ID"/> - <many-to-many class="Employee" column="EMPEE_ID"/> - </bag> - </class> - - <class name="Employee" polymorphism="explicit"> - <id name="id"> - <generator class="native"/> - </id> - <bag name="employers" - inverse="true" - cascade="persist,merge" - table="EMPLOYER_EMPLOYEE"> - <key column="EMPEE_ID"/> - <many-to-many class="Employer" column="EMPER_ID"/> - </bag> - </class> - -</hibernate-mapping> - Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.hbm.xml =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.hbm.xml 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.hbm.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -1,44 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<!-- - ---> - -<hibernate-mapping package="org.hibernate.ejb.test.ops"> - - <class name="Node" polymorphism="explicit"> - <id name="name"> - <generator class="assigned"/> - </id> - <property name="description"/> - <many-to-one name="parent"/> - <set name="children" - inverse="true" - cascade="persist,merge"> - <key column="parent"/> - <one-to-many class="Node"/> - </set> - </class> - - <class name="NumberedNode" polymorphism="explicit"> - <id name="id" unsaved-value="0"> - <generator class="native"/> - </id> - <property name="name"> - <column name="name" index="iname" not-null="true"/> - </property> - <property name="description"/> - <many-to-one name="parent" class="NumberedNode"/> - <set name="children" - inverse="true" - cascade="persist,merge"> - <key column="parent"/> - <one-to-many class="NumberedNode"/> - </set> - </class> - -</hibernate-mapping> - Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/ParentChild.hbm.xml =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/ParentChild.hbm.xml 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/ParentChild.hbm.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -1,25 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping - package="org.hibernate.ejb.test.ops"> - - <class name="Parent"> - <id name="name"/> - <list name="children" cascade="persist,merge"> - <key column="parentName" not-null="true"/> - <list-index column="sibling"/> - <one-to-many class="Child"/> - </list> - </class> - - <class name="Child"> - <id name="name"/> - <property name="age" not-null="true"/> - <many-to-one name="parent" column="parentName" - not-null="true" insert="false" update="false"/> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm.xml =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm.xml 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -1,33 +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" - > - <persistence-unit-metadata> - <persistence-unit-defaults> - <schema>MY_SCHEMA</schema> - <catalog>MY_CATALOG</catalog> - <access>PROPERTY</access> - <cascade-persist/> - </persistence-unit-defaults> - </persistence-unit-metadata> - <package>org.hibernate.ejb.test.xml</package> - <entity class="Light" metadata-complete="true" access="FIELD"> - <attributes> - <id name="name"> - <column name="fld_id"/> - </id> - <basic name="power"></basic> - </attributes> - </entity> - <entity class="Article" - metadata-complete="false"> - <attributes> - <id name="id"> - <generated-value strategy="AUTO"/> - </id> - </attributes> - </entity> -</entity-mappings> \ No newline at end of file Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm2.xml =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm2.xml 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm2.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -1,27 +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" - > - <entity class="org.hibernate.ejb.test.xml.Lighter" name="ALighter" access="FIELD" metadata-complete="true"> - <attributes> - <id name="name"> - <column name="fld_id"/> - </id> - <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 Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm3.xml =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm3.xml 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm3.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -1,63 +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 http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" - version="1.0"> - - <persistence-unit-metadata> - <persistence-unit-defaults> - <entity-listeners> - <entity-listener class="org.hibernate.ejb.test.xml.CounterListener"/> - </entity-listeners> - </persistence-unit-defaults> - </persistence-unit-metadata> - - <entity class="org.hibernate.ejb.test.xml.Employee" metadata-complete="false" access="FIELD"> - <attributes> - <id name="id"/> - <basic name="name"/> - - <embedded name="homeAddress"> - <attribute-override name="street"> - <column name="home_street"/> - </attribute-override> - <attribute-override name="city"> - <column name="home_city"/> - </attribute-override> - <attribute-override name="state"> - <column name="home_state"/> - </attribute-override> - <attribute-override name="zip"> - <column name="home_zip"/> - </attribute-override> - </embedded> - - <embedded name="mailAddress"> - <attribute-override name="street"> - <column name="mail_street"/> - </attribute-override> - <attribute-override name="city"> - <column name="mail_city"/> - </attribute-override> - <attribute-override name="state"> - <column name="mail_state"/> - </attribute-override> - <attribute-override name="zip"> - <column name="mail_zip"/> - </attribute-override> - </embedded> - - </attributes> - </entity> - - <embeddable class="org.hibernate.ejb.test.xml.Address"> - <attributes> - <basic name="street"/> - <basic name="city"/> - <basic name="state"/> - <basic name="zip"/> - </attributes> - </embeddable> - -</entity-mappings> \ No newline at end of file Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm.xml =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm.xml 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -1,33 +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" - > - <persistence-unit-metadata> - <persistence-unit-defaults> - <schema>MY_SCHEMA</schema> - <catalog>MY_CATALOG</catalog> - <access>PROPERTY</access> - <cascade-persist/> - </persistence-unit-defaults> - </persistence-unit-metadata> - <package>org.hibernate.ejb.test.xml.sequences</package> - <entity class="Light" metadata-complete="true" access="FIELD"> - <attributes> - <id name="name"> - <column name="fld_id"/> - </id> - <basic name="power"></basic> - </attributes> - </entity> - <entity class="Article" - metadata-complete="false"> - <attributes> - <id name="id"> - <generated-value strategy="SEQUENCE"/> - </id> - </attributes> - </entity> -</entity-mappings> \ No newline at end of file Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm2.xml =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm2.xml 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm2.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -1,27 +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" - > - <entity class="org.hibernate.ejb.test.xml.sequences.Lighter" name="ALighter" access="FIELD" metadata-complete="true"> - <attributes> - <id name="name"> - <column name="fld_id"/> - </id> - <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 Deleted: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm3.xml =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm3.xml 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm3.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -1,55 +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 http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" - version="1.0"> - - <entity class="org.hibernate.ejb.test.xml.sequences.Employee" metadata-complete="false" access="FIELD"> - <attributes> - <id name="id"/> - <basic name="name"/> - - <embedded name="homeAddress"> - <attribute-override name="street"> - <column name="home_street"/> - </attribute-override> - <attribute-override name="city"> - <column name="home_city"/> - </attribute-override> - <attribute-override name="state"> - <column name="home_state"/> - </attribute-override> - <attribute-override name="zip"> - <column name="home_zip"/> - </attribute-override> - </embedded> - - <embedded name="mailAddress"> - <attribute-override name="street"> - <column name="mail_street"/> - </attribute-override> - <attribute-override name="city"> - <column name="mail_city"/> - </attribute-override> - <attribute-override name="state"> - <column name="mail_state"/> - </attribute-override> - <attribute-override name="zip"> - <column name="mail_zip"/> - </attribute-override> - </embedded> - - </attributes> - </entity> - - <embeddable class="org.hibernate.ejb.test.xml.sequences.Address"> - <attributes> - <basic name="street"/> - <basic name="city"/> - <basic name="state"/> - <basic name="zip"/> - </attributes> - </embeddable> - -</entity-mappings> \ No newline at end of file Modified: core/trunk/entitymanager/src/test/resources/hibernate.properties =================================================================== --- core/trunk/entitymanager/src/test/resources/hibernate.properties 2009-10-23 13:33:58 UTC (rev 17825) +++ core/trunk/entitymanager/src/test/resources/hibernate.properties 2009-10-23 13:48:18 UTC (rev 17826) @@ -29,3 +29,5 @@ hibernate.cache.region_prefix hibernate.test hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider + +hibernate.jdbc.batch_size 0 Copied: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml (from rev 17816, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml) =================================================================== --- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml (rev 0) +++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -0,0 +1,10 @@ +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + <mapping class="org.hibernate.ejb.test.Cat"/> + <mapping class="org.hibernate.ejb.test.Kitten"/> + </session-factory> +</hibernate-configuration> \ No newline at end of file Copied: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml (from rev 17816, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/hibernate.cfg.xml) =================================================================== --- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml (rev 0) +++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -0,0 +1,27 @@ +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.connection.url">jdbc:hsqldb:.</property> + <property name="hibernate.cache.use_query_cache">true</property> + <property name="hibernate.cache.region_prefix">hibernate.test</property> + <property name="hibernate.jdbc.use_streams_for_binary">true</property> + <property name="hibernate.jdbc.batch_size">0</property> + <property name="hibernate.max_fetch_depth">3</property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.generate_statistics">true</property> + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + <mapping class="org.hibernate.ejb.test.Item"/> + <mapping class="org.hibernate.ejb.test.Cat"/> + <mapping class="org.hibernate.ejb.test.Kitten"/> + <mapping class="org.hibernate.ejb.test.Distributor"/> + <class-cache class="org.hibernate.ejb.test.Item" usage="read-write"/> + <collection-cache collection="org.hibernate.ejb.test.Item.distributors" usage="read-write" region="RegionName"/> + </session-factory> +</hibernate-configuration> \ No newline at end of file Property changes on: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Employer.hbm.xml (from rev 17816, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.hbm.xml) =================================================================== --- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Employer.hbm.xml (rev 0) +++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Employer.hbm.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -0,0 +1,38 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<!-- + +--> + +<hibernate-mapping package="org.hibernate.ejb.test.ops"> + + <class name="Employer" polymorphism="explicit"> + <id name="id"> + <generator class="native"/> + </id> + <bag name="employees" + cascade="persist,merge" + table="EMPLOYER_EMPLOYEE"> + <key column="EMPER_ID"/> + <many-to-many class="Employee" column="EMPEE_ID"/> + </bag> + </class> + + <class name="Employee" polymorphism="explicit"> + <id name="id"> + <generator class="native"/> + </id> + <bag name="employers" + inverse="true" + cascade="persist,merge" + table="EMPLOYER_EMPLOYEE"> + <key column="EMPEE_ID"/> + <many-to-many class="Employer" column="EMPER_ID"/> + </bag> + </class> + +</hibernate-mapping> + Property changes on: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Employer.hbm.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Node.hbm.xml (from rev 17816, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.hbm.xml) =================================================================== --- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Node.hbm.xml (rev 0) +++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Node.hbm.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -0,0 +1,44 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<!-- + +--> + +<hibernate-mapping package="org.hibernate.ejb.test.ops"> + + <class name="Node" polymorphism="explicit"> + <id name="name"> + <generator class="assigned"/> + </id> + <property name="description"/> + <many-to-one name="parent"/> + <set name="children" + inverse="true" + cascade="persist,merge"> + <key column="parent"/> + <one-to-many class="Node"/> + </set> + </class> + + <class name="NumberedNode" polymorphism="explicit"> + <id name="id" unsaved-value="0"> + <generator class="native"/> + </id> + <property name="name"> + <column name="name" index="iname" not-null="true"/> + </property> + <property name="description"/> + <many-to-one name="parent" class="NumberedNode"/> + <set name="children" + inverse="true" + cascade="persist,merge"> + <key column="parent"/> + <one-to-many class="NumberedNode"/> + </set> + </class> + +</hibernate-mapping> + Property changes on: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Node.hbm.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/ParentChild.hbm.xml (from rev 17816, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/ParentChild.hbm.xml) =================================================================== --- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/ParentChild.hbm.xml (rev 0) +++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/ParentChild.hbm.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -0,0 +1,25 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping + package="org.hibernate.ejb.test.ops"> + + <class name="Parent"> + <id name="name"/> + <list name="children" cascade="persist,merge"> + <key column="parentName" not-null="true"/> + <list-index column="sibling"/> + <one-to-many class="Child"/> + </list> + </class> + + <class name="Child"> + <id name="name"/> + <property name="age" not-null="true"/> + <many-to-one name="parent" column="parentName" + not-null="true" insert="false" update="false"/> + </class> + +</hibernate-mapping> \ No newline at end of file Property changes on: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/ParentChild.hbm.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml (from rev 17816, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm.xml) =================================================================== --- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml (rev 0) +++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -0,0 +1,33 @@ +<?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" + > + <persistence-unit-metadata> + <persistence-unit-defaults> + <schema>MY_SCHEMA</schema> + <catalog>MY_CATALOG</catalog> + <access>PROPERTY</access> + <cascade-persist/> + </persistence-unit-defaults> + </persistence-unit-metadata> + <package>org.hibernate.ejb.test.xml</package> + <entity class="Light" metadata-complete="true" access="FIELD"> + <attributes> + <id name="name"> + <column name="fld_id"/> + </id> + <basic name="power"></basic> + </attributes> + </entity> + <entity class="Article" + metadata-complete="false"> + <attributes> + <id name="id"> + <generated-value strategy="AUTO"/> + </id> + </attributes> + </entity> +</entity-mappings> \ No newline at end of file Copied: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml (from rev 17816, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm2.xml) =================================================================== --- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml (rev 0) +++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -0,0 +1,27 @@ +<?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" + > + <entity class="org.hibernate.ejb.test.xml.Lighter" name="ALighter" access="FIELD" metadata-complete="true"> + <attributes> + <id name="name"> + <column name="fld_id"/> + </id> + <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 Copied: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml (from rev 17816, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm3.xml) =================================================================== --- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml (rev 0) +++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -0,0 +1,63 @@ +<?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 http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" + version="1.0"> + + <persistence-unit-metadata> + <persistence-unit-defaults> + <entity-listeners> + <entity-listener class="org.hibernate.ejb.test.xml.CounterListener"/> + </entity-listeners> + </persistence-unit-defaults> + </persistence-unit-metadata> + + <entity class="org.hibernate.ejb.test.xml.Employee" metadata-complete="false" access="FIELD"> + <attributes> + <id name="id"/> + <basic name="name"/> + + <embedded name="homeAddress"> + <attribute-override name="street"> + <column name="home_street"/> + </attribute-override> + <attribute-override name="city"> + <column name="home_city"/> + </attribute-override> + <attribute-override name="state"> + <column name="home_state"/> + </attribute-override> + <attribute-override name="zip"> + <column name="home_zip"/> + </attribute-override> + </embedded> + + <embedded name="mailAddress"> + <attribute-override name="street"> + <column name="mail_street"/> + </attribute-override> + <attribute-override name="city"> + <column name="mail_city"/> + </attribute-override> + <attribute-override name="state"> + <column name="mail_state"/> + </attribute-override> + <attribute-override name="zip"> + <column name="mail_zip"/> + </attribute-override> + </embedded> + + </attributes> + </entity> + + <embeddable class="org.hibernate.ejb.test.xml.Address"> + <attributes> + <basic name="street"/> + <basic name="city"/> + <basic name="state"/> + <basic name="zip"/> + </attributes> + </embeddable> + +</entity-mappings> \ No newline at end of file Copied: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml (from rev 17816, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm.xml) =================================================================== --- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml (rev 0) +++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -0,0 +1,33 @@ +<?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" + > + <persistence-unit-metadata> + <persistence-unit-defaults> + <schema>MY_SCHEMA</schema> + <catalog>MY_CATALOG</catalog> + <access>PROPERTY</access> + <cascade-persist/> + </persistence-unit-defaults> + </persistence-unit-metadata> + <package>org.hibernate.ejb.test.xml.sequences</package> + <entity class="Light" metadata-complete="true" access="FIELD"> + <attributes> + <id name="name"> + <column name="fld_id"/> + </id> + <basic name="power"></basic> + </attributes> + </entity> + <entity class="Article" + metadata-complete="false"> + <attributes> + <id name="id"> + <generated-value strategy="SEQUENCE"/> + </id> + </attributes> + </entity> +</entity-mappings> \ No newline at end of file Copied: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml (from rev 17816, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm2.xml) =================================================================== --- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml (rev 0) +++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -0,0 +1,27 @@ +<?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" + > + <entity class="org.hibernate.ejb.test.xml.sequences.Lighter" name="ALighter" access="FIELD" metadata-complete="true"> + <attributes> + <id name="name"> + <column name="fld_id"/> + </id> + <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 Copied: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml (from rev 17816, core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm3.xml) =================================================================== --- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml (rev 0) +++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml 2009-10-23 13:48:18 UTC (rev 17826) @@ -0,0 +1,55 @@ +<?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 http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" + version="1.0"> + + <entity class="org.hibernate.ejb.test.xml.sequences.Employee" metadata-complete="false" access="FIELD"> + <attributes> + <id name="id"/> + <basic name="name"/> + + <embedded name="homeAddress"> + <attribute-override name="street"> + <column name="home_street"/> + </attribute-override> + <attribute-override name="city"> + <column name="home_city"/> + </attribute-override> + <attribute-override name="state"> + <column name="home_state"/> + </attribute-override> + <attribute-override name="zip"> + <column name="home_zip"/> + </attribute-override> + </embedded> + + <embedded name="mailAddress"> + <attribute-override name="street"> + <column name="mail_street"/> + </attribute-override> + <attribute-override name="city"> + <column name="mail_city"/> + </attribute-override> + <attribute-override name="state"> + <column name="mail_state"/> + </attribute-override> + <attribute-override name="zip"> + <column name="mail_zip"/> + </attribute-override> + </embedded> + + </attributes> + </entity> + + <embeddable class="org.hibernate.ejb.test.xml.sequences.Address"> + <attributes> + <basic name="street"/> + <basic name="city"/> + <basic name="state"/> + <basic name="zip"/> + </attributes> + </embeddable> + +</entity-mappings> \ No newline at end of file