[Hibernate-commits] Hibernate2/src/net/sf/hibernate FlushMode.java,1.3,1.4 LockMode.java,1.3,1.4 UserType.java,1.4,1.5 hibernate-mapping-2.0.dtd,1.13,1.14

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv20713/hibernate

Modified Files:
	FlushMode.java LockMode.java UserType.java 
	hibernate-mapping-2.0.dtd 
Log Message:
standardised on dom4j
fixed bugs in collection caching (sometimes an exception occurred)
allowed null discriminators
set autocommit to true in SchemaUpdate
collections now deserialize correctly

Index: FlushMode.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/FlushMode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FlushMode.java	5 Jan 2003 02:11:19 -0000	1.3
--- FlushMode.java	9 Feb 2003 06:28:14 -0000	1.4
***************
*** 49,53 ****
  	}
  	
! 	Object readResolve() {
  		return instances.get( new Integer(level) );
  	}
--- 49,53 ----
  	}
  	
! 	private Object readResolve() {
  		return instances.get( new Integer(level) );
  	}

Index: LockMode.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/LockMode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LockMode.java	5 Jan 2003 02:11:19 -0000	1.3
--- LockMode.java	9 Feb 2003 06:28:14 -0000	1.4
***************
*** 77,81 ****
  	}
  	
! 	Object readResolve() {
  		return instances.get( new Integer(level) );
  	}
--- 77,81 ----
  	}
  	
! 	private Object readResolve() {
  		return instances.get( new Integer(level) );
  	}

Index: UserType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/UserType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** UserType.java	19 Jan 2003 11:47:07 -0000	1.4
--- UserType.java	9 Feb 2003 06:28:14 -0000	1.5
***************
*** 18,21 ****
--- 18,25 ----
   * default constructor.<br>
   * <br>
+  * The actual class mapped by a <tt>UserType</tt> may be just
+  * about anything. However, if it is to be cacheable by JCS, it 
+  * must be serializable.<br>
+  * <br>
   * Alternatively, custom types could implement <tt>Type</tt>
   * directly or extend one of the abstract classes in

Index: hibernate-mapping-2.0.dtd
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hibernate-mapping-2.0.dtd,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** hibernate-mapping-2.0.dtd	28 Jan 2003 10:22:18 -0000	1.13
--- hibernate-mapping-2.0.dtd	9 Feb 2003 06:28:14 -0000	1.14
***************
*** 71,74 ****
--- 71,75 ----
    <!ATTLIST discriminator column CDATA #IMPLIED>   <!-- default: "class"|none -->
    <!ATTLIST discriminator type CDATA "string">
+   <!ATTLIST discriminator not-null (true|false) "true">
    <!ATTLIST discriminator length CDATA #IMPLIED>