January 2010 - hibernate-commits - Jboss List Archives

Hibernate SVN: r18383 - in search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms: slave and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2010-01-04 05:03:22 -0500 (Mon, 04 Jan 2010) New Revision: 18383 Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/TShirt.java search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java Log: JBPAPP-3321 keywords 'size' on oracle cause two H-search test case fails Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java =================================================================== --- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java 2010-01-03 19:59:01 UTC (rev 18382) +++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java 2010-01-04 10:03:22 UTC (rev 18383) @@ -33,7 +33,7 @@ import org.hibernate.search.test.SearchTestCase; /** - * Tests that the Master node in a JMS cluster can propertly process messages placed onto the queue. + * Tests that the Master node in a JMS cluster can properly process messages placed onto the queue. * * @author Emmanuel Bernard * @author Hardy Ferentschik @@ -135,18 +135,18 @@ } /** - * Create a test object without trigggering indexing. Use SQL directly. + * Create a test object without triggering indexing. Use SQL directly. * * @return a <code>TShirt</code> test object. * - * @throws SQLException in case the inset fails. + * @throws SQLException in case the insert fails. */ private TShirt createObjectWithSQL() throws SQLException { Session s = openSession(); s.getTransaction().begin(); Statement statement = s.connection().createStatement(); statement.executeUpdate( - "insert into TShirt_Master(id, logo, size) values( '1', 'JBoss balls', 'large')" + "insert into TShirt_Master(id, logo, size_) values( '1', 'JBoss balls', 'large')" ); statement.close(); TShirt ts = ( TShirt ) s.get( TShirt.class, 1 ); Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/TShirt.java =================================================================== --- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/TShirt.java 2010-01-03 19:59:01 UTC (rev 18382) +++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/TShirt.java 2010-01-04 10:03:22 UTC (rev 18383) @@ -1,6 +1,7 @@ //$Id$ package org.hibernate.search.test.jms.master; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; @@ -22,6 +23,7 @@ private int id; @Field(index= Index.TOKENIZED) private String logo; + @Column(name="size_") private String size; public int getId() { Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java =================================================================== --- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java 2010-01-03 19:59:01 UTC (rev 18382) +++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java 2010-01-04 10:03:22 UTC (rev 18383) @@ -1,6 +1,7 @@ //$Id$ package org.hibernate.search.test.jms.slave; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.GeneratedValue; @@ -22,6 +23,7 @@ private int id; @Field(index= Index.TOKENIZED) private String logo; + @Column(name="size_") private String size; public int getId() {

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r18382 - in annotations/branches/v3_4_0_GA_CP/src/test: java/org/hibernate/test/annotations/bytecode and 24 other directories.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2010-01-03 14:59:01 -0500 (Sun, 03 Jan 2010) New Revision: 18382 Added: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/bytecode/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/configuration/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/inheritance/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/inheritance/joined/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/interitance/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/loader/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/orm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/query/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/query/orm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/reflection/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml Removed: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/orm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/orm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/orm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/orm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml Log: JBPAPP-3150 change the build tool of Hibernate Annotations(eap 5 cp branch) Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,26 +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.test.annotations"> - - <class name="Boat" table="BoatInXml"> - - <id name="id"> - <generator class="native"/> - </id> - - <property name="size" column="boat_size"/> - - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,23 +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.test.annotations"> - - <joined-subclass name="Ferry" table="FerryJoined" extends="org.hibernate.test.annotations.Boat"> - <key column="id"/> - <property name="sea"/> - - </joined-subclass> - -</hibernate-mapping> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,12 +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.test.annotations.bytecode"> - <class name="Hammer"> - <id name="id" type="java.lang.Long"> - <generator class="increment"/> - </id> - </class> -</hibernate-mapping> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/orm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/orm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/orm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,7 +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-mappings> Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,10 +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" - 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: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,11 +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 resource="org/hibernate/test/annotations/Boat.hbm.xml"/> - <mapping package="org.hibernate.test.annotations"/> - <mapping class="org.hibernate.test.annotations.Plane"/> - </session-factory> -</hibernate-configuration> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,36 +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.test.annotations.inheritance.joined"> - - <class name="Parent"> - <id name="id"> - <generator class="native"/> - </id> - <set name="financialAssets" fetch="join" cascade="refresh" inverse="true"> - <key column="PARENT_ID"/> - <one-to-many class="FinancialAsset"/> - </set> - <set name="propertyAssets" fetch="join" cascade="refresh" inverse="true"> - <key column="PARENT_ID"/> - <one-to-many class="PropertyAsset"/> - </set> - </class> - <class name="Asset"> - <id name="id"> - <generator class="native"/> - </id> - <many-to-one name="parent" column="PARENT_ID" property-ref="parent"/> - <joined-subclass name="FinancialAsset"> - <key column="ID"/> - <property name="price"/> - </joined-subclass> - <joined-subclass name="PropertyAsset"> - <key column="ID"/> - <property name="price"/> - </joined-subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,21 +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.test.annotations.loader"> - - <sql-query name="loadByTeam"> - <load-collection alias="p" role="Team.players"/> - select {p.*} from Player p where p.team_id = ? - </sql-query> - -</hibernate-mapping> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/orm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/orm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/orm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,11 +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" - 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: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/orm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/orm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/orm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,24 +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" - version="1.0" - > - <named-query name="plane.getAll"> - <query>select p from Plane p</query> - </named-query> - <named-native-query name="night.getAll.bySQL" result-set-mapping="sqlmapping"> - <query>select id, night_duration, night_date as dte, area_id from Night where night_duration > ?</query> - </named-native-query> - <named-native-query name="getAreaByNative" result-class="org.hibernate.test.annotations.query.Area"> - <query>select * from tbl_area</query> - </named-native-query> - <sql-result-set-mapping name="sqlmapping"> - <entity-result entity-class="org.hibernate.test.annotations.query.Night"> - <field-result name="id" column="id"/> - <field-result name="duration" column="night_duration"/> - <field-result name="date" column="dte"/> - <field-result name="area" column="area_id"/> - </entity-result> - </sql-result-set-mapping> -</entity-mappings> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,76 +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> - <xml-mapping-metadata-complete/> - <persistence-unit-defaults> - <schema>myschema</schema> - <catalog>mycatalog</catalog> - <cascade-persist/> - </persistence-unit-defaults> - </persistence-unit-metadata> - <package>org.hibernate.test.annotations.reflection</package> - <mapped-superclass class="Organization"> - <attributes> - <basic name="organizationId"/> - </attributes> - </mapped-superclass> - <entity class="Administration"> - <attributes> - <id name="id"/> - </attributes> - </entity> - <entity class="Match"> - </entity> - <entity class="SocialSecurityMoralAccount"/> - <entity class="BusTrip" access="FIELD"> - <attributes> - <embedded-id name="id"> - <attribute-override name="busDriver"> - <column name="fld_busdriver"/> - </attribute-override> - </embedded-id> - <basic name="status" optional="false"> - <enumerated>STRING</enumerated> - </basic> - <basic name="serial" optional="true"> - <column name="serialbytes"/> - <lob/> - </basic> - <basic name="terminusTime" fetch="LAZY"> - <temporal>TIMESTAMP</temporal> - </basic> - <one-to-many name="players"> - <map-key name="name"/> - <join-column name="driver"/> - <join-column name="number"/> - </one-to-many> - <many-to-many name="roads" target-entity="Administration"> - <order-by>maxSpeed</order-by> - <join-table name="bus_road"> - <join-column name="driver"/> - <join-column name="number"/> - <inverse-join-column name="road_id"/> - <unique-constraint> - <column-name>driver</column-name> - <column-name>number</column-name> - </unique-constraint> - </join-table> - </many-to-many> - </attributes> - </entity> - <embeddable class="BusTripPk" access="FIELD"> - <attributes> - <basic name="busDriver"> - <column name="busdriver"/> - </basic> - <basic name="busNumber"> - <column name="busnumber"/> - </basic> - </attributes> - </embeddable> -</entity-mappings> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/orm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/orm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/orm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,117 +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>myschema</schema> - <catalog>mycatalog</catalog> - <cascade-persist/> - <entity-listeners> - <entity-listener class="org.hibernate.test.annotations.reflection.OtherLogListener"> - <post-update method-name="log"/> - </entity-listener> - </entity-listeners> - </persistence-unit-defaults> - </persistence-unit-metadata> - <package>org.hibernate.test.annotations.reflection</package> - <entity class="Administration"> - <table name="tbl_admin"> - <unique-constraint> - <column-name>firstname</column-name> - <column-name>lastname</column-name> - </unique-constraint> - </table> - <secondary-table name="admin2"> - <primary-key-join-column name="admin_id" referenced-column-name="id"/> - <unique-constraint> - <column-name>address</column-name> - </unique-constraint> - </secondary-table> - <sequence-generator name="seqhilo" sequence-name="seqhilo"/> - <table-generator name="table" table="tablehilo"/> - <entity-listeners> - <entity-listener class="LogListener"> - <pre-persist method-name="log"/> - <post-load method-name="noLog"/> - </entity-listener> - </entity-listeners> - <pre-persist method-name="calculate"/> - <attributes> - <id name="id"> - <column name="fld_id"/> - <generated-value generator="generator" strategy="SEQUENCE"/> - <temporal>DATE</temporal> - <sequence-generator name="generator" sequence-name="seq"/> - </id> - <version name="version"/> - <one-to-one name="defaultBusTrip" fetch="LAZY" mapped-by="test"> - <primary-key-join-column name="pk"/> - <cascade> - <cascade-all/> - <cascade-persist/> - <cascade-merge/> - <cascade-remove/> - <cascade-refresh/> - </cascade> - </one-to-one> - <transient name="transientField"/> - </attributes> - </entity> - <entity class="Match"> - <inheritance strategy="JOINED"/> - <named-query name="allmatches"> - <query>select m from Match m</query> - <hint name="org.hibernate.timeout" value="200"/> - </named-query> - <named-query name="matchbyid"> - <query>select m from Match m where m.id = :id</query> - <hint name="org.hibernate.timeout" value="200"/> - </named-query> - <named-native-query name="allmatches" result-set-mapping="matchrs"> - <query>select m from Match m</query> - <hint name="org.hibernate.timeout" value="200"/> - </named-native-query> - <named-native-query name="matchbyid" result-set-mapping="matchrs"> - <query>select m from Match m where m.id = :id</query> - <hint name="org.hibernate.timeout" value="200"/> - </named-native-query> - <sql-result-set-mapping name="matchrs"> - <entity-result entity-class="org.hibernate.test.annotations.reflection.Match"> - <field-result name="competitor1Point" column="competitor1Point"/> - </entity-result> - <column-result name="competitor1Point"/> - </sql-result-set-mapping> - <exclude-default-listeners/> - <exclude-superclass-listeners/> - <entity-listeners> - <entity-listener class="LogListener"> - <pre-persist method-name="log"/> - <post-load method-name="noLog"/> - </entity-listener> - </entity-listeners> - <attributes> - <embedded name="playerASSN"/> - </attributes> - </entity> - <entity class="TennisMatch"> - <primary-key-join-column name="id"/> - <attribute-override name="net"> - <column name="fld_net"/> - </attribute-override> - <attribute-override name="ground"> - <column name="fld_ground" unique="true" scale="2"/> - </attribute-override> - <association-override name="referer"> - <join-column name="referer_id" referenced-column-name="id"/> - </association-override> - </entity> - <entity class="SocialSecurityPhysicalAccount"> - <id-class class="org.hibernate.test.annotations.reflection.SocialSecurityNumber"/> - <discriminator-value>Physical</discriminator-value> - <discriminator-column length="34"/> - </entity> -</entity-mappings> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,56 +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" - version="1.0" - > -  - <persistence-unit-metadata> - <persistence-unit-defaults> - <cascade-persist/> - </persistence-unit-defaults> - </persistence-unit-metadata> - <package>org.hibernate.test.annotations.xml.ejb3</package> - <table-generator name="generator" table="table_id"/> - <named-query name="manufacturer.findAll"> - <query>select m from Manufacturer m</query> - </named-query> - <entity class="Model" access="PROPERTY" name="ModelZ" metadata-complete="true"> - <table name="ModelZ"> - </table> - <inheritance strategy="JOINED"/> - <attributes> - <id name="id"> - <column name="fld_id"/> - <generated-value strategy="TABLE" generator="generator"/> - </id> - <basic name="unknownProperty"/> - <many-to-one name="manufacturer" fetch="LAZY"> - <join-column name="manufacturer_pk"/> - </many-to-one> - </attributes> - </entity> - <entity class="CarModel" metadata-complete="true"> - <primary-key-join-column name="model_id"/> - <inheritance strategy="JOINED"/> - <named-query name="allModelsPerManufacturer"> - <query>from ModelZ m where m.manufacturer = :manufacturer</query> - <hint name="org.hibernate.timeout" value="200"/> - </named-query> - <exclude-default-listeners/> - <exclude-superclass-listeners/> - <attributes> - <basic name="year" optional="false"> - <temporal>DATE</temporal> - </basic> - </attributes> - </entity> - <entity class="Manufacturer"> - <attributes> - <id name="id"> - <generated-value strategy="AUTO"/> - </id> - <one-to-many name="models" mapped-by="manufacturer"/> - </attributes> - </entity> -</entity-mappings> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -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.test.annotations.xml.ejb3</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 Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -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.test.annotations.xml.ejb3</package> - <entity class="Lighter" 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 Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,12 +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> - <class name="org.hibernate.test.annotations.xml.hbm.AImpl" table="A" - proxy="org.hibernate.test.annotations.xml.hbm.A"> - <id name="AId" column="aID" type="java.lang.Integer"> - <generator class="identity"/> - </id> - </class> -</hibernate-mapping> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,13 +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> - <joined-subclass name="org.hibernate.test.annotations.xml.hbm.BImpl" table="B" - proxy="org.hibernate.test.annotations.xml.hbm.B" - extends="org.hibernate.test.annotations.xml.hbm.AImpl"> - <key column="aID"/> - <property name="BId" column="bID" type="java.lang.Integer" - not-null="true"/> - </joined-subclass> -</hibernate-mapping> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,15 +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.test.annotations.xml.hbm"> - - <class name="CloudType"> - <id name="id"> - <generator class="native"/> - </id> - <property name="name"/> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml 2010-01-03 17:23:13 UTC (rev 18381) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -1,16 +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.test.annotations.xml.hbm"> - - <class name="Government"> - <id name="id"> - <generator class="native"/> - </id> - <property name="name"/> - <many-to-one name="primeMinister" column="primeMinister_id"/> - </class> - -</hibernate-mapping> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,26 @@ +<?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.test.annotations"> + + <class name="Boat" table="BoatInXml"> + + <id name="id"> + <generator class="native"/> + </id> + + <property name="size" column="boat_size"/> + + </class> + +</hibernate-mapping> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,23 @@ +<?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.test.annotations"> + + <joined-subclass name="Ferry" table="FerryJoined" extends="org.hibernate.test.annotations.Boat"> + <key column="id"/> + <property name="sea"/> + + </joined-subclass> + +</hibernate-mapping> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,12 @@ +<?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.test.annotations.bytecode"> + <class name="Hammer"> + <id name="id" type="java.lang.Long"> + <generator class="increment"/> + </id> + </class> +</hibernate-mapping> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/orm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,7 @@ +<?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-mappings> Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -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 Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,11 @@ +<!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 resource="org/hibernate/test/annotations/Boat.hbm.xml"/> + <mapping package="org.hibernate.test.annotations"/> + <mapping class="org.hibernate.test.annotations.Plane"/> + </session-factory> +</hibernate-configuration> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,36 @@ +<?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.test.annotations.inheritance.joined"> + + <class name="Parent"> + <id name="id"> + <generator class="native"/> + </id> + <set name="financialAssets" fetch="join" cascade="refresh" inverse="true"> + <key column="PARENT_ID"/> + <one-to-many class="FinancialAsset"/> + </set> + <set name="propertyAssets" fetch="join" cascade="refresh" inverse="true"> + <key column="PARENT_ID"/> + <one-to-many class="PropertyAsset"/> + </set> + </class> + <class name="Asset"> + <id name="id"> + <generator class="native"/> + </id> + <many-to-one name="parent" column="PARENT_ID" property-ref="parent"/> + <joined-subclass name="FinancialAsset"> + <key column="ID"/> + <property name="price"/> + </joined-subclass> + <joined-subclass name="PropertyAsset"> + <key column="ID"/> + <property name="price"/> + </joined-subclass> + </class> + +</hibernate-mapping> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,21 @@ +<?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.test.annotations.loader"> + + <sql-query name="loadByTeam"> + <load-collection alias="p" role="Team.players"/> + select {p.*} from Player p where p.team_id = ? + </sql-query> + +</hibernate-mapping> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/orm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/orm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/orm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/orm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -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 Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/query/orm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/orm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/query/orm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/query/orm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,24 @@ +<?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" + > + <named-query name="plane.getAll"> + <query>select p from Plane p</query> + </named-query> + <named-native-query name="night.getAll.bySQL" result-set-mapping="sqlmapping"> + <query>select id, night_duration, night_date as dte, area_id from Night where night_duration > ?</query> + </named-native-query> + <named-native-query name="getAreaByNative" result-class="org.hibernate.test.annotations.query.Area"> + <query>select * from tbl_area</query> + </named-native-query> + <sql-result-set-mapping name="sqlmapping"> + <entity-result entity-class="org.hibernate.test.annotations.query.Night"> + <field-result name="id" column="id"/> + <field-result name="duration" column="night_duration"/> + <field-result name="date" column="dte"/> + <field-result name="area" column="area_id"/> + </entity-result> + </sql-result-set-mapping> +</entity-mappings> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,76 @@ +<?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> + <xml-mapping-metadata-complete/> + <persistence-unit-defaults> + <schema>myschema</schema> + <catalog>mycatalog</catalog> + <cascade-persist/> + </persistence-unit-defaults> + </persistence-unit-metadata> + <package>org.hibernate.test.annotations.reflection</package> + <mapped-superclass class="Organization"> + <attributes> + <basic name="organizationId"/> + </attributes> + </mapped-superclass> + <entity class="Administration"> + <attributes> + <id name="id"/> + </attributes> + </entity> + <entity class="Match"> + </entity> + <entity class="SocialSecurityMoralAccount"/> + <entity class="BusTrip" access="FIELD"> + <attributes> + <embedded-id name="id"> + <attribute-override name="busDriver"> + <column name="fld_busdriver"/> + </attribute-override> + </embedded-id> + <basic name="status" optional="false"> + <enumerated>STRING</enumerated> + </basic> + <basic name="serial" optional="true"> + <column name="serialbytes"/> + <lob/> + </basic> + <basic name="terminusTime" fetch="LAZY"> + <temporal>TIMESTAMP</temporal> + </basic> + <one-to-many name="players"> + <map-key name="name"/> + <join-column name="driver"/> + <join-column name="number"/> + </one-to-many> + <many-to-many name="roads" target-entity="Administration"> + <order-by>maxSpeed</order-by> + <join-table name="bus_road"> + <join-column name="driver"/> + <join-column name="number"/> + <inverse-join-column name="road_id"/> + <unique-constraint> + <column-name>driver</column-name> + <column-name>number</column-name> + </unique-constraint> + </join-table> + </many-to-many> + </attributes> + </entity> + <embeddable class="BusTripPk" access="FIELD"> + <attributes> + <basic name="busDriver"> + <column name="busdriver"/> + </basic> + <basic name="busNumber"> + <column name="busnumber"/> + </basic> + </attributes> + </embeddable> +</entity-mappings> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/orm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,117 @@ +<?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>myschema</schema> + <catalog>mycatalog</catalog> + <cascade-persist/> + <entity-listeners> + <entity-listener class="org.hibernate.test.annotations.reflection.OtherLogListener"> + <post-update method-name="log"/> + </entity-listener> + </entity-listeners> + </persistence-unit-defaults> + </persistence-unit-metadata> + <package>org.hibernate.test.annotations.reflection</package> + <entity class="Administration"> + <table name="tbl_admin"> + <unique-constraint> + <column-name>firstname</column-name> + <column-name>lastname</column-name> + </unique-constraint> + </table> + <secondary-table name="admin2"> + <primary-key-join-column name="admin_id" referenced-column-name="id"/> + <unique-constraint> + <column-name>address</column-name> + </unique-constraint> + </secondary-table> + <sequence-generator name="seqhilo" sequence-name="seqhilo"/> + <table-generator name="table" table="tablehilo"/> + <entity-listeners> + <entity-listener class="LogListener"> + <pre-persist method-name="log"/> + <post-load method-name="noLog"/> + </entity-listener> + </entity-listeners> + <pre-persist method-name="calculate"/> + <attributes> + <id name="id"> + <column name="fld_id"/> + <generated-value generator="generator" strategy="SEQUENCE"/> + <temporal>DATE</temporal> + <sequence-generator name="generator" sequence-name="seq"/> + </id> + <version name="version"/> + <one-to-one name="defaultBusTrip" fetch="LAZY" mapped-by="test"> + <primary-key-join-column name="pk"/> + <cascade> + <cascade-all/> + <cascade-persist/> + <cascade-merge/> + <cascade-remove/> + <cascade-refresh/> + </cascade> + </one-to-one> + <transient name="transientField"/> + </attributes> + </entity> + <entity class="Match"> + <inheritance strategy="JOINED"/> + <named-query name="allmatches"> + <query>select m from Match m</query> + <hint name="org.hibernate.timeout" value="200"/> + </named-query> + <named-query name="matchbyid"> + <query>select m from Match m where m.id = :id</query> + <hint name="org.hibernate.timeout" value="200"/> + </named-query> + <named-native-query name="allmatches" result-set-mapping="matchrs"> + <query>select m from Match m</query> + <hint name="org.hibernate.timeout" value="200"/> + </named-native-query> + <named-native-query name="matchbyid" result-set-mapping="matchrs"> + <query>select m from Match m where m.id = :id</query> + <hint name="org.hibernate.timeout" value="200"/> + </named-native-query> + <sql-result-set-mapping name="matchrs"> + <entity-result entity-class="org.hibernate.test.annotations.reflection.Match"> + <field-result name="competitor1Point" column="competitor1Point"/> + </entity-result> + <column-result name="competitor1Point"/> + </sql-result-set-mapping> + <exclude-default-listeners/> + <exclude-superclass-listeners/> + <entity-listeners> + <entity-listener class="LogListener"> + <pre-persist method-name="log"/> + <post-load method-name="noLog"/> + </entity-listener> + </entity-listeners> + <attributes> + <embedded name="playerASSN"/> + </attributes> + </entity> + <entity class="TennisMatch"> + <primary-key-join-column name="id"/> + <attribute-override name="net"> + <column name="fld_net"/> + </attribute-override> + <attribute-override name="ground"> + <column name="fld_ground" unique="true" scale="2"/> + </attribute-override> + <association-override name="referer"> + <join-column name="referer_id" referenced-column-name="id"/> + </association-override> + </entity> + <entity class="SocialSecurityPhysicalAccount"> + <id-class class="org.hibernate.test.annotations.reflection.SocialSecurityNumber"/> + <discriminator-value>Physical</discriminator-value> + <discriminator-column length="34"/> + </entity> +</entity-mappings> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,56 @@ +<?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" + > +  + <persistence-unit-metadata> + <persistence-unit-defaults> + <cascade-persist/> + </persistence-unit-defaults> + </persistence-unit-metadata> + <package>org.hibernate.test.annotations.xml.ejb3</package> + <table-generator name="generator" table="table_id"/> + <named-query name="manufacturer.findAll"> + <query>select m from Manufacturer m</query> + </named-query> + <entity class="Model" access="PROPERTY" name="ModelZ" metadata-complete="true"> + <table name="ModelZ"> + </table> + <inheritance strategy="JOINED"/> + <attributes> + <id name="id"> + <column name="fld_id"/> + <generated-value strategy="TABLE" generator="generator"/> + </id> + <basic name="unknownProperty"/> + <many-to-one name="manufacturer" fetch="LAZY"> + <join-column name="manufacturer_pk"/> + </many-to-one> + </attributes> + </entity> + <entity class="CarModel" metadata-complete="true"> + <primary-key-join-column name="model_id"/> + <inheritance strategy="JOINED"/> + <named-query name="allModelsPerManufacturer"> + <query>from ModelZ m where m.manufacturer = :manufacturer</query> + <hint name="org.hibernate.timeout" value="200"/> + </named-query> + <exclude-default-listeners/> + <exclude-superclass-listeners/> + <attributes> + <basic name="year" optional="false"> + <temporal>DATE</temporal> + </basic> + </attributes> + </entity> + <entity class="Manufacturer"> + <attributes> + <id name="id"> + <generated-value strategy="AUTO"/> + </id> + <one-to-many name="models" mapped-by="manufacturer"/> + </attributes> + </entity> +</entity-mappings> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -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.test.annotations.xml.ejb3</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 Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -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.test.annotations.xml.ejb3</package> + <entity class="Lighter" 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 Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,12 @@ +<?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> + <class name="org.hibernate.test.annotations.xml.hbm.AImpl" table="A" + proxy="org.hibernate.test.annotations.xml.hbm.A"> + <id name="AId" column="aID" type="java.lang.Integer"> + <generator class="identity"/> + </id> + </class> +</hibernate-mapping> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,13 @@ +<?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> + <joined-subclass name="org.hibernate.test.annotations.xml.hbm.BImpl" table="B" + proxy="org.hibernate.test.annotations.xml.hbm.B" + extends="org.hibernate.test.annotations.xml.hbm.AImpl"> + <key column="aID"/> + <property name="BId" column="bID" type="java.lang.Integer" + not-null="true"/> + </joined-subclass> +</hibernate-mapping> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,15 @@ +<?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.test.annotations.xml.hbm"> + + <class name="CloudType"> + <id name="id"> + <generator class="native"/> + </id> + <property name="name"/> + </class> + +</hibernate-mapping> \ No newline at end of file Copied: annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml (from rev 18378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml 2010-01-03 19:59:01 UTC (rev 18382) @@ -0,0 +1,16 @@ +<?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.test.annotations.xml.hbm"> + + <class name="Government"> + <id name="id"> + <generator class="native"/> + </id> + <property name="name"/> + <many-to-one name="primeMinister" column="primeMinister_id"/> + </class> + +</hibernate-mapping> \ No newline at end of file

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r18381 - entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2010-01-03 12:23:13 -0500 (Sun, 03 Jan 2010) New Revision: 18381 Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java Log: JBPAPP-3320 org.hibernate.ejb.test.inheritance.InheritanceTest fails on Oracle due to the 'size' keyword Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java 2010-01-03 14:45:09 UTC (rev 18380) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java 2010-01-03 17:23:13 UTC (rev 18381) @@ -9,9 +9,9 @@ */ @Entity public class Strawberry extends Fruit { + + private Long size; @Column(name="size_") - private Long size; - public Long getSize() { return size; }

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r18380 - annotations/branches/v3_4_0_GA_CP.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2010-01-03 09:45:09 -0500 (Sun, 03 Jan 2010) New Revision: 18380 Modified: annotations/branches/v3_4_0_GA_CP/pom.xml Log: update javadoc link Modified: annotations/branches/v3_4_0_GA_CP/pom.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/pom.xml 2010-01-03 14:38:44 UTC (rev 18379) +++ annotations/branches/v3_4_0_GA_CP/pom.xml 2010-01-03 14:45:09 UTC (rev 18380) @@ -361,6 +361,7 @@ <links> <link>http://java.sun.com/j2se/1.5.0/docs/api/</link> <link>http://java.sun.com/javaee/5/docs/api/</link> + <link>http://docs.jboss.org/hibernate/stable/core/api</link> </links> <stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile> </configuration>

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r18379 - annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2010-01-03 09:38:44 -0500 (Sun, 03 Jan 2010) New Revision: 18379 Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDef.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizer.java Log: minor change, update javadoc spell Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDef.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDef.java 2010-01-01 17:43:25 UTC (rev 18378) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDef.java 2010-01-03 14:38:44 UTC (rev 18379) @@ -29,7 +29,7 @@ /** * Hibernate type of the id column - * @return + * @return type of the id column */ String idType(); Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizer.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizer.java 2010-01-01 17:43:25 UTC (rev 18378) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizer.java 2010-01-03 14:38:44 UTC (rev 18379) @@ -16,6 +16,6 @@ public @interface Tuplizer { /** tuplizer implementation */ Class impl(); - /** either pojo, dynamic-map or dom4j� */ + /** either pojo, dynamic-map or dom4j */ String entityMode() default "pojo"; }

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r18378 - in sandbox/trunk/lobtest-ee5: lobtest-web/src/main/webapp and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2010-01-01 12:43:25 -0500 (Fri, 01 Jan 2010) New Revision: 18378 Modified: sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingService.java sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp Log: retrive to r18376 due to the last wrong commit Modified: sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingService.java =================================================================== --- sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingService.java 2010-01-01 17:32:13 UTC (rev 18377) +++ sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingService.java 2010-01-01 17:43:25 UTC (rev 18378) @@ -12,13 +12,13 @@ public Thing findThingHibernate(Long id); -// public List<Thing> findAllThingsJPA(); -// -// public Thing findThingJPA(Long id); -// -// public Thing findThingJPAjndi(Long id) throws Exception; -// -// public Thing findThingHibernateMBean(Long id) throws Exception; -// -// public Thing findThingJPAThruHibernate(Long id); + public List<Thing> findAllThingsJPA(); + + public Thing findThingJPA(Long id); + + public Thing findThingJPAjndi(Long id) throws Exception; + + public Thing findThingHibernateMBean(Long id) throws Exception; + + public Thing findThingJPAThruHibernate(Long id); } Modified: sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java =================================================================== --- sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java 2010-01-01 17:32:13 UTC (rev 18377) +++ sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java 2010-01-01 17:43:25 UTC (rev 18378) @@ -2,7 +2,6 @@ import java.util.List; -import javax.ejb.Stateful; import javax.ejb.Stateless; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; @@ -15,21 +14,53 @@ import com.redhat.gss.lobtest.hibernate.HibernateUtil; import com.redhat.gss.lobtest.jpa.Thing; -@Stateful +@Stateless public class ThingServiceBean implements ThingService { + @PersistenceContext(unitName="lobtest-jpa") + private EntityManager em; - @SuppressWarnings("unchecked") public List<Thing> findAllThingsHibernate() { Session s = HibernateUtil.getSession(); return s.createQuery("from Thing").list(); } + + @SuppressWarnings("unchecked") + public List<Thing> findAllThingsJPA() + { + return em.createQuery("from Thing").getResultList(); + } + + // Use Cae A-1 + public Thing findThingJPA(Long id) + { + Thing t = em.getReference(Thing.class, id); + System.out.println("Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); + return t; + } + //Use Case A-2 + public Thing findThingJPAjndi(Long id) throws Exception + { + InitialContext ctx = new InitialContext(); + EntityManager em = (EntityManager) ctx.lookup("persistence/EntityManager"); + Thing t = em.getReference(Thing.class, id); + System.out.println("Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); + return t; + } + + //Use Case A-3 + public Thing findThingJPAThruHibernate(Long id) + { + Session s = (Session)em.getDelegate(); + Thing t = (Thing) s.load(Thing.class, id); + System.out.println("Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); + return t; + } - // Use Case B-1 public Thing findThingHibernate(Long id) { @@ -41,26 +72,24 @@ } // Use Case B-2 -// public Thing findThingHibernateMBean(Long id) throws Exception -// { -// Thing t = null; -// Session s = null; -// InitialContext ctx = new InitialContext(); -// SessionFactory sf = (SessionFactory) ctx.lookup("java:/hibernate/LobTestSessionFactory"); -// s = sf.getCurrentSession(); -// -// t = (Thing) s.load(Thing.class, id); -// System.out.println("Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); -// return t; -// } + public Thing findThingHibernateMBean(Long id) throws Exception + { + Thing t = null; + Session s = null; + InitialContext ctx = new InitialContext(); + SessionFactory sf = (SessionFactory) ctx.lookup("java:/hibernate/LobTestSessionFactory"); + s = sf.getCurrentSession(); + t = (Thing) s.load(Thing.class, id); + System.out.println("Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); + return t; + } + public Thing setUp() { Thing t1 = new Thing(System.currentTimeMillis(), "One"); - Session s= HibernateUtil.getSession(); - s.persist( t1 ); - //em.persist(t1); + em.persist(t1); return t1; } Modified: sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp =================================================================== --- sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp 2010-01-01 17:32:13 UTC (rev 18377) +++ sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp 2010-01-01 17:43:25 UTC (rev 18378) @@ -14,15 +14,35 @@ System.out.println("basic.jsp from query: Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); } - %> + t = ts.findThingJPA(t.getId()); + System.out.println("A-1 - basic.jsp from ts.findThingJPA(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); + out.println("A-1 - basic.jsp from ts.findThingJPA(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); + %> </br> - + <% + t = ts.findThingJPAjndi(t.getId()); + System.out.println("A-2 - basic.jsp from ts.findJPAjndi(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); + out.println("A-2 - basic.jsp from ts.findJPAjndi(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); + %> + </br> + <% + t = ts.findThingJPAThruHibernate(t.getId()); + System.out.println("A-3 - basic.jsp from ts.findThingJPAThruHibernate(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); + out.println("A-3 - basic.jsp from ts.findThingJPAThruHibernate(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); + %> + </br> <% t = ts.findThingHibernate(t.getId()); System.out.println("B-1 - basic.jsp from ts.findThingHibernate(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); out.println("B-1 - basic.jsp from ts.findThingHibernate(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); %> </br> - + <% + t = ts.findThingHibernateMBean(t.getId()); + System.out.println("B-2 - basic.jsp from ts.findThingHibernateMBean(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); + out.println("B-2 - basic.jsp from ts.findThingHibernateMBean(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); + + +%> </br> Tests run successfully.

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r18377 - in sandbox/trunk/lobtest-ee5: lobtest-web/src/main/webapp and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2010-01-01 12:32:13 -0500 (Fri, 01 Jan 2010) New Revision: 18377 Modified: sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingService.java sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp Log: ignore the metadata files generated by eclipse, move profiles from sub-module to the top pom.xml Modified: sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingService.java =================================================================== --- sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingService.java 2010-01-01 17:27:49 UTC (rev 18376) +++ sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingService.java 2010-01-01 17:32:13 UTC (rev 18377) @@ -12,13 +12,13 @@ public Thing findThingHibernate(Long id); - public List<Thing> findAllThingsJPA(); - - public Thing findThingJPA(Long id); - - public Thing findThingJPAjndi(Long id) throws Exception; - - public Thing findThingHibernateMBean(Long id) throws Exception; - - public Thing findThingJPAThruHibernate(Long id); +// public List<Thing> findAllThingsJPA(); +// +// public Thing findThingJPA(Long id); +// +// public Thing findThingJPAjndi(Long id) throws Exception; +// +// public Thing findThingHibernateMBean(Long id) throws Exception; +// +// public Thing findThingJPAThruHibernate(Long id); } Modified: sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java =================================================================== --- sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java 2010-01-01 17:27:49 UTC (rev 18376) +++ sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java 2010-01-01 17:32:13 UTC (rev 18377) @@ -2,6 +2,7 @@ import java.util.List; +import javax.ejb.Stateful; import javax.ejb.Stateless; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; @@ -14,53 +15,21 @@ import com.redhat.gss.lobtest.hibernate.HibernateUtil; import com.redhat.gss.lobtest.jpa.Thing; -@Stateless +@Stateful public class ThingServiceBean implements ThingService { - @PersistenceContext(unitName="lobtest-jpa") - private EntityManager em; + @SuppressWarnings("unchecked") public List<Thing> findAllThingsHibernate() { Session s = HibernateUtil.getSession(); return s.createQuery("from Thing").list(); } - - @SuppressWarnings("unchecked") - public List<Thing> findAllThingsJPA() - { - return em.createQuery("from Thing").getResultList(); - } - - // Use Cae A-1 - public Thing findThingJPA(Long id) - { - Thing t = em.getReference(Thing.class, id); - System.out.println("Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); - return t; - } - //Use Case A-2 - public Thing findThingJPAjndi(Long id) throws Exception - { - InitialContext ctx = new InitialContext(); - EntityManager em = (EntityManager) ctx.lookup("persistence/EntityManager"); - Thing t = em.getReference(Thing.class, id); - System.out.println("Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); - return t; - } - - //Use Case A-3 - public Thing findThingJPAThruHibernate(Long id) - { - Session s = (Session)em.getDelegate(); - Thing t = (Thing) s.load(Thing.class, id); - System.out.println("Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); - return t; - } + // Use Case B-1 public Thing findThingHibernate(Long id) { @@ -72,24 +41,26 @@ } // Use Case B-2 - public Thing findThingHibernateMBean(Long id) throws Exception - { - Thing t = null; - Session s = null; - InitialContext ctx = new InitialContext(); - SessionFactory sf = (SessionFactory) ctx.lookup("java:/hibernate/LobTestSessionFactory"); - s = sf.getCurrentSession(); +// public Thing findThingHibernateMBean(Long id) throws Exception +// { +// Thing t = null; +// Session s = null; +// InitialContext ctx = new InitialContext(); +// SessionFactory sf = (SessionFactory) ctx.lookup("java:/hibernate/LobTestSessionFactory"); +// s = sf.getCurrentSession(); +// +// t = (Thing) s.load(Thing.class, id); +// System.out.println("Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); +// return t; +// } - t = (Thing) s.load(Thing.class, id); - System.out.println("Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); - return t; - } - public Thing setUp() { Thing t1 = new Thing(System.currentTimeMillis(), "One"); - em.persist(t1); + Session s= HibernateUtil.getSession(); + s.persist( t1 ); + //em.persist(t1); return t1; } Modified: sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp =================================================================== --- sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp 2010-01-01 17:27:49 UTC (rev 18376) +++ sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp 2010-01-01 17:32:13 UTC (rev 18377) @@ -14,35 +14,15 @@ System.out.println("basic.jsp from query: Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); } - t = ts.findThingJPA(t.getId()); - System.out.println("A-1 - basic.jsp from ts.findThingJPA(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); - out.println("A-1 - basic.jsp from ts.findThingJPA(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); - %> + %> </br> - <% - t = ts.findThingJPAjndi(t.getId()); - System.out.println("A-2 - basic.jsp from ts.findJPAjndi(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); - out.println("A-2 - basic.jsp from ts.findJPAjndi(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); - %> - </br> - <% - t = ts.findThingJPAThruHibernate(t.getId()); - System.out.println("A-3 - basic.jsp from ts.findThingJPAThruHibernate(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); - out.println("A-3 - basic.jsp from ts.findThingJPAThruHibernate(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); - %> - </br> + <% t = ts.findThingHibernate(t.getId()); System.out.println("B-1 - basic.jsp from ts.findThingHibernate(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); out.println("B-1 - basic.jsp from ts.findThingHibernate(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); %> </br> - <% - t = ts.findThingHibernateMBean(t.getId()); - System.out.println("B-2 - basic.jsp from ts.findThingHibernateMBean(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); - out.println("B-2 - basic.jsp from ts.findThingHibernateMBean(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass()); - - -%> + </br> Tests run successfully.

14 years, 11 months

1
0
0 / 0

Hibernate SVN: r18376 - in sandbox/trunk/lobtest-ee5: lobtest-ear and 3 other directories.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2010-01-01 12:27:49 -0500 (Fri, 01 Jan 2010) New Revision: 18376 Modified: sandbox/trunk/lobtest-ee5/lobtest-ear/ sandbox/trunk/lobtest-ee5/lobtest-ear/pom.xml sandbox/trunk/lobtest-ee5/lobtest-ejb/ sandbox/trunk/lobtest-ee5/lobtest-ejb/pom.xml sandbox/trunk/lobtest-ee5/lobtest-sar/ sandbox/trunk/lobtest-ee5/lobtest-sar/pom.xml sandbox/trunk/lobtest-ee5/lobtest-web/ sandbox/trunk/lobtest-ee5/pom.xml Log: ignore the metadata files generated by eclipse, move profiles from sub-module to the top pom.xml Property changes on: sandbox/trunk/lobtest-ee5/lobtest-ear ___________________________________________________________________ Name: svn:ignore - target + target .settings .project Modified: sandbox/trunk/lobtest-ee5/lobtest-ear/pom.xml =================================================================== --- sandbox/trunk/lobtest-ee5/lobtest-ear/pom.xml 2009-12-31 18:56:17 UTC (rev 18375) +++ sandbox/trunk/lobtest-ee5/lobtest-ear/pom.xml 2010-01-01 17:27:49 UTC (rev 18376) @@ -72,70 +72,5 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>eap-4.3-cp06</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>hibernate.</groupId> - <artifactId>hibernate3</artifactId> - <version>3.2.4.SP1_CP08-brew</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>hibernate-entitymanager</groupId> - <artifactId>ejb3-persistence</artifactId> - <version>3.3.2.GA-brew</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.3.1.GA_CP01-brew</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>hibernate-entitymanager</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.3.2.GA-brew</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>eap-5</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.hibernate.</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - <version>1.0.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> + </project> Property changes on: sandbox/trunk/lobtest-ee5/lobtest-ejb ___________________________________________________________________ Name: svn:ignore - target + target .settings .classpath .project Modified: sandbox/trunk/lobtest-ee5/lobtest-ejb/pom.xml =================================================================== --- sandbox/trunk/lobtest-ee5/lobtest-ejb/pom.xml 2009-12-31 18:56:17 UTC (rev 18375) +++ sandbox/trunk/lobtest-ee5/lobtest-ejb/pom.xml 2010-01-01 17:27:49 UTC (rev 18376) @@ -47,71 +47,4 @@ <scope>provided</scope> </dependency> </dependencies> - - <profiles> - <profile> - <id>eap-4.3-cp06</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>hibernate.</groupId> - <artifactId>hibernate3</artifactId> - <version>3.2.4.SP1_CP08-brew</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>hibernate-entitymanager</groupId> - <artifactId>ejb3-persistence</artifactId> - <version>3.3.2.GA-brew</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.3.1.GA_CP01-brew</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>hibernate-entitymanager</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.3.2.GA-brew</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>eap-5</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.hibernate.</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - <version>1.0.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> </project> Property changes on: sandbox/trunk/lobtest-ee5/lobtest-sar ___________________________________________________________________ Name: svn:ignore - target + target .settings .classpath .project Modified: sandbox/trunk/lobtest-ee5/lobtest-sar/pom.xml =================================================================== --- sandbox/trunk/lobtest-ee5/lobtest-sar/pom.xml 2009-12-31 18:56:17 UTC (rev 18375) +++ sandbox/trunk/lobtest-ee5/lobtest-sar/pom.xml 2010-01-01 17:27:49 UTC (rev 18376) @@ -46,70 +46,5 @@ <scope>provided</scope> </dependency> </dependencies> - <profiles> - <profile> - <id>eap-4.3-cp06</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>hibernate.</groupId> - <artifactId>hibernate3</artifactId> - <version>3.2.4.SP1_CP08-brew</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>hibernate-entitymanager</groupId> - <artifactId>ejb3-persistence</artifactId> - <version>3.3.2.GA-brew</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.3.1.GA_CP01-brew</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>hibernate-entitymanager</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.3.2.GA-brew</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>eap-5</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.hibernate.</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - <version>1.0.2.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> + </project> Property changes on: sandbox/trunk/lobtest-ee5/lobtest-web ___________________________________________________________________ Name: svn:ignore - target + target .settings .classpath .project Modified: sandbox/trunk/lobtest-ee5/pom.xml =================================================================== --- sandbox/trunk/lobtest-ee5/pom.xml 2009-12-31 18:56:17 UTC (rev 18375) +++ sandbox/trunk/lobtest-ee5/pom.xml 2010-01-01 17:27:49 UTC (rev 18376) @@ -24,4 +24,70 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>eap-4.3-cp06</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + <version>3.2.4.SP1_CP08-brew</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>hibernate-entitymanager</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>3.3.2.GA-brew</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>hibernate-annotations</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.3.1.GA_CP01-brew</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>hibernate-entitymanager</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.3.2.GA-brew</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>eap-5</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>1.0.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> </project> \ No newline at end of file

14 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits January 2010