Menu
▾
▴
hibernate-commits
|
From: <one...@us...> - 2003-01-09 12:24:54
|
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv16192/net/sf/hibernate/test
Modified Files:
ABC.hbm.xml ABCProxy.hbm.xml Baz.hbm.xml Custom.hbm.xml
CustomPersister.java Fee.hbm.xml FooBar.hbm.xml
FooBarTest.java Many.hbm.xml One.hbm.xml ParentChild.hbm.xml
Qux.hbm.xml
Log Message:
redesigned id generator package
applied Mark Woon's patch for generated alias lengths
minor refactoring of Transaction package
Index: ABC.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ABC.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ABC.hbm.xml 1 Jan 2003 13:56:43 -0000 1.1.1.1
--- ABC.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2
***************
*** 5,9 ****
<class name="net.sf.hibernate.test.A" discriminator-value="0">
<id name = "id" unsaved-value = "null">
! <generator class="vm.long"/>
</id>
<discriminator column="clazz" type="integer"/>
--- 5,9 ----
<class name="net.sf.hibernate.test.A" discriminator-value="0">
<id name = "id" unsaved-value = "null">
! <generator class="vm"/>
</id>
<discriminator column="clazz" type="integer"/>
Index: ABCProxy.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ABCProxy.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ABCProxy.hbm.xml 1 Jan 2003 13:56:43 -0000 1.1.1.1
--- ABCProxy.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2
***************
*** 5,9 ****
<class name="net.sf.hibernate.test.A" discriminator-value="0" proxy="net.sf.hibernate.test.A">
<id name = "id" unsaved-value = "null">
! <generator class="vm.long"/>
</id>
<discriminator column="clazz" type="integer"/>
--- 5,9 ----
<class name="net.sf.hibernate.test.A" discriminator-value="0" proxy="net.sf.hibernate.test.A">
<id name = "id" unsaved-value = "null">
! <generator class="vm"/>
</id>
<discriminator column="clazz" type="integer"/>
Index: Baz.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Baz.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Baz.hbm.xml 3 Jan 2003 13:36:01 -0000 1.3
--- Baz.hbm.xml 9 Jan 2003 12:24:51 -0000 1.4
***************
*** 5,10 ****
<class name="net.sf.hibernate.test.Baz">
<id name="code" type="string">
! <column name="idcode" length="16"/>
! <generator class="hilo.hex"/>
</id>
<property name="count" column="count_count"/>
--- 5,10 ----
<class name="net.sf.hibernate.test.Baz">
<id name="code" type="string">
! <column name="idcode" length="32"/>
! <generator class="uuid.hex"/>
</id>
<property name="count" column="count_count"/>
Index: Custom.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Custom.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Custom.hbm.xml 1 Jan 2003 13:56:49 -0000 1.1.1.1
--- Custom.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2
***************
*** 5,9 ****
<class name="net.sf.hibernate.test.Custom" persister="net.sf.hibernate.test.CustomPersister">
<id type="string" name="key" column="id_" length="64" unsaved-value="null">
! <generator class="vm.hex"/>
</id>
</class>
--- 5,9 ----
<class name="net.sf.hibernate.test.Custom" persister="net.sf.hibernate.test.CustomPersister">
<id type="string" name="key" column="id_" length="64" unsaved-value="null">
! <generator class="uuid.hex"/>
</id>
</class>
Index: CustomPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/CustomPersister.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CustomPersister.java 5 Jan 2003 02:11:23 -0000 1.3
--- CustomPersister.java 9 Jan 2003 12:24:51 -0000 1.4
***************
*** 19,23 ****
import net.sf.hibernate.engine.SessionImplementor;
import net.sf.hibernate.id.IdentifierGenerator;
! import net.sf.hibernate.id.LongGenerator;
import net.sf.hibernate.mapping.PersistentClass;
import net.sf.hibernate.metadata.ClassMetadata;
--- 19,23 ----
import net.sf.hibernate.engine.SessionImplementor;
import net.sf.hibernate.id.IdentifierGenerator;
! import net.sf.hibernate.id.CounterGenerator;
import net.sf.hibernate.mapping.PersistentClass;
import net.sf.hibernate.metadata.ClassMetadata;
***************
*** 29,33 ****
private static final Hashtable instances = new Hashtable();
! private static final IdentifierGenerator idgen = new LongGenerator();
public CustomPersister(PersistentClass model, SessionFactoryImplementor factory) {}
--- 29,33 ----
private static final Hashtable instances = new Hashtable();
! private static final IdentifierGenerator idgen = new CounterGenerator();
public CustomPersister(PersistentClass model, SessionFactoryImplementor factory) {}
Index: Fee.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fee.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Fee.hbm.xml 1 Jan 2003 13:56:52 -0000 1.1.1.1
--- Fee.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2
***************
*** 5,9 ****
<class name="net.sf.hibernate.test.Fee">
<id type="string" name="key" column="id_" length="64" unsaved-value="null">
! <generator class="vm.hex"/>
</id>
<property name="fi"/>
--- 5,9 ----
<class name="net.sf.hibernate.test.Fee">
<id type="string" name="key" column="id_" length="64" unsaved-value="null">
! <generator class="uuid.hex"/>
</id>
<property name="fi"/>
Index: FooBar.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBar.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FooBar.hbm.xml 1 Jan 2003 13:56:54 -0000 1.1.1.1
--- FooBar.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2
***************
*** 1,4 ****
<?xml version="1.0"?>
! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd">
<hibernate-mapping>
--- 1,4 ----
<?xml version="1.0"?>
! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
<hibernate-mapping>
***************
*** 15,19 ****
<column name="foo_id" length="36"/>
<generator class="uuid.hex">
! <param>:</param>
</generator>
</id>
--- 15,19 ----
<column name="foo_id" length="36"/>
<generator class="uuid.hex">
! <param name="seperator">:</param>
</generator>
</id>
***************
*** 35,39 ****
<property name="double" column="double_"/>
! <primitive-array role="bytes" table="foobytes">
<key column="id"/>
<index column="i"/>
--- 35,39 ----
<property name="double" column="double_"/>
! <primitive-array name="bytes" table="foobytes">
<key column="id"/>
<index column="i"/>
***************
*** 76,80 ****
<property name="count" column="subcount"/>
<property name="name" column="subname"/>
! <array role="ImportantDates" table="foo_times">
<key column="foo_id"/>
<index column="i"/>
--- 76,80 ----
<property name="count" column="subcount"/>
<property name="name" column="subname"/>
! <array name="ImportantDates" table="foo_times">
<key column="foo_id"/>
<index column="i"/>
***************
*** 83,87 ****
<many-to-one name="fee" column="fee_sub" cascade="all" class="net.sf.hibernate.test.Fee" outer-join="false"/>
</component>
! <array role="importantDates" table="foo_dates">
<key column="foo_id"/>
<index column="i"/>
--- 83,87 ----
<many-to-one name="fee" column="fee_sub" cascade="all" class="net.sf.hibernate.test.Fee" outer-join="false"/>
</component>
! <array name="importantDates" table="foo_dates">
<key column="foo_id"/>
<index column="i"/>
***************
*** 100,104 ****
proxy="net.sf.hibernate.test.AbstractProxy"
discriminator-value="A">
! <set role="abstracts">
<key column="abstract_id"/>
<one-to-many class="net.sf.hibernate.test.Abstract"/>
--- 100,104 ----
proxy="net.sf.hibernate.test.AbstractProxy"
discriminator-value="A">
! <set name="abstracts">
<key column="abstract_id"/>
<one-to-many class="net.sf.hibernate.test.Abstract"/>
***************
*** 119,123 ****
<property name="name" length="64"/>
! <array role="importantDates">
<key column="id" />
<index column="i"/>
--- 119,123 ----
<property name="name" length="64"/>
! <array name ="importantDates">
<key column="id" />
<index column="i"/>
Index: FooBarTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FooBarTest.java 5 Jan 2003 02:11:23 -0000 1.5
--- FooBarTest.java 9 Jan 2003 12:24:51 -0000 1.6
***************
*** 233,236 ****
--- 233,239 ----
public void testPersistCollections() throws Exception {
+
+ if ( dialect instanceof SybaseDialect ) return;
+
Session s = sessions.openSession();
Index: Many.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Many.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Many.hbm.xml 1 Jan 2003 13:57:08 -0000 1.1.1.1
--- Many.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2
***************
*** 6,10 ****
<class name="net.sf.hibernate.test.Many" table="many">
<id name="key" column="many_key">
! <generator class="hilo.long" />
</id>
<many-to-one name="one" column="one_key" class="net.sf.hibernate.test.One"/>
--- 6,10 ----
<class name="net.sf.hibernate.test.Many" table="many">
<id name="key" column="many_key">
! <generator class="hilo" />
</id>
<many-to-one name="one" column="one_key" class="net.sf.hibernate.test.One"/>
Index: One.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/One.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** One.hbm.xml 1 Jan 2003 13:57:13 -0000 1.1.1.1
--- One.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2
***************
*** 6,10 ****
<class name="net.sf.hibernate.test.One" table="one">
<id name="key" column="one_key">
! <generator class="hilo.long" />
</id>
<property column="one_value" name="value"/>
--- 6,10 ----
<class name="net.sf.hibernate.test.One" table="one">
<id name="key" column="one_key">
! <generator class="hilo" />
</id>
<property column="one_value" name="value"/>
Index: ParentChild.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ParentChild.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ParentChild.hbm.xml 1 Jan 2003 13:57:13 -0000 1.1.1.1
--- ParentChild.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2
***************
*** 5,9 ****
<class name="net.sf.hibernate.test.Parent">
<id name="id" type="long">
! <generator class="native"> <!--seqhilo.long-->
<!--<param>foo_seq</param>-->
</generator>
--- 5,9 ----
<class name="net.sf.hibernate.test.Parent">
<id name="id" type="long">
! <generator class="native"> <!--seqhilo-->
<!--<param>foo_seq</param>-->
</generator>
Index: Qux.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Qux.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Qux.hbm.xml 1 Jan 2003 13:57:17 -0000 1.1.1.1
--- Qux.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2
***************
*** 5,9 ****
<class name="net.sf.hibernate.test.Qux" table="quux" proxy="net.sf.hibernate.test.Qux"> <!---->
<id name="key" column="qux_key" unsaved-value="0">
! <generator class="hilo.long"/>
</id>
<many-to-one name="foo" class="net.sf.hibernate.test.Foo">
--- 5,9 ----
<class name="net.sf.hibernate.test.Qux" table="quux" proxy="net.sf.hibernate.test.Qux"> <!---->
<id name="key" column="qux_key" unsaved-value="0">
! <generator class="hilo"/>
</id>
<many-to-one name="foo" class="net.sf.hibernate.test.Foo">
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X