[Hibernate-commits] Hibernate2/src/net/sf/hibernate/type ArrayType.java,1.1.1.1,1.2 BagType.java,1.1.1.1,1.2 BlobType.java,1.1.1.1,1.2 CharBooleanType.java,1.1.1.1,1.2 ClobType.java,1.1.1.1,1.2 ListType.java,1.1.1.1,1.2 MapType.java,1.1.1.1,1.2 PersistentCollectionType.java,1.1.1.1,1.2 PersistentEnumType.java,1.1.1.1,1.2 SetType.java,1.1.1.1,1.2 SortedMapType.java,1.1.1.1,1.2 SortedSetType.java,1.1.1.1,1.2 TimeType.java,1.1.1.1,1.2 TimestampType.java,1.1.1.1,1.2 TypeFactory.java,1.1.1.1,1.2

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

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

Modified Files:
	ArrayType.java BagType.java BlobType.java CharBooleanType.java 
	ClobType.java ListType.java MapType.java 
	PersistentCollectionType.java PersistentEnumType.java 
	SetType.java SortedMapType.java SortedSetType.java 
	TimeType.java TimestampType.java TypeFactory.java 
Log Message:
removed exceptions that occur if an object is saved or deleted multiple times in a session
added <parent> subelement to <composite-element> and <nested-composite-element>


Index: ArrayType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ArrayType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ArrayType.java	1 Jan 2003 13:58:02 -0000	1.1.1.1
--- ArrayType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 11,17 ****
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.collection.ArrayHolder;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.engine.SessionImplementor;
- import net.sf.hibernate.impl.CollectionPersister;
  
  public class ArrayType extends PersistentCollectionType {
--- 11,17 ----
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.collection.ArrayHolder;
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.engine.SessionImplementor;
  
  public class ArrayType extends PersistentCollectionType {

Index: BagType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/BagType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BagType.java	1 Jan 2003 13:58:03 -0000	1.1.1.1
--- BagType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 4,10 ****
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.collection.Bag;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.engine.SessionImplementor;
- import net.sf.hibernate.impl.CollectionPersister;
  
  public class BagType extends PersistentCollectionType {
--- 4,10 ----
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.collection.Bag;
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.engine.SessionImplementor;
  
  public class BagType extends PersistentCollectionType {

Index: BlobType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/BlobType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BlobType.java	1 Jan 2003 13:58:04 -0000	1.1.1.1
--- BlobType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 3,7 ****
  package net.sf.hibernate.type;
  
! import java.sql.*;
  
  import net.sf.hibernate.HibernateException;
--- 3,11 ----
  package net.sf.hibernate.type;
  
! import java.sql.Blob;
! import java.sql.PreparedStatement;
! import java.sql.ResultSet;
! import java.sql.SQLException;
! import java.sql.Types;
  
  import net.sf.hibernate.HibernateException;

Index: CharBooleanType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/CharBooleanType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CharBooleanType.java	1 Jan 2003 13:58:05 -0000	1.1.1.1
--- CharBooleanType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 2,6 ****
  package net.sf.hibernate.type;
  
! import java.sql.*;
  
  import net.sf.hibernate.HibernateException;
--- 2,9 ----
  package net.sf.hibernate.type;
  
! import java.sql.PreparedStatement;
! import java.sql.ResultSet;
! import java.sql.SQLException;
! import java.sql.Types;
  
  import net.sf.hibernate.HibernateException;

Index: ClobType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ClobType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ClobType.java	1 Jan 2003 13:58:06 -0000	1.1.1.1
--- ClobType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 3,7 ****
  package net.sf.hibernate.type;
  
! import java.sql.*;
  
  import net.sf.hibernate.HibernateException;
--- 3,11 ----
  package net.sf.hibernate.type;
  
! import java.sql.Clob;
! import java.sql.PreparedStatement;
! import java.sql.ResultSet;
! import java.sql.SQLException;
! import java.sql.Types;
  
  import net.sf.hibernate.HibernateException;

Index: ListType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ListType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ListType.java	1 Jan 2003 13:58:11 -0000	1.1.1.1
--- ListType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 2,9 ****
  package net.sf.hibernate.type;
  
  import net.sf.hibernate.collection.List;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.engine.SessionImplementor;
- import net.sf.hibernate.impl.CollectionPersister;
  
  public class ListType extends PersistentCollectionType {
--- 2,9 ----
  package net.sf.hibernate.type;
  
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.collection.List;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.engine.SessionImplementor;
  
  public class ListType extends PersistentCollectionType {

Index: MapType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/MapType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MapType.java	1 Jan 2003 13:58:12 -0000	1.1.1.1
--- MapType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 4,11 ****
  import java.util.Iterator;
  
  import net.sf.hibernate.collection.Map;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.engine.SessionImplementor;
- import net.sf.hibernate.impl.CollectionPersister;
  
  
--- 4,11 ----
  import java.util.Iterator;
  
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.collection.Map;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.engine.SessionImplementor;
  
  

Index: PersistentCollectionType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/PersistentCollectionType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PersistentCollectionType.java	1 Jan 2003 13:58:16 -0000	1.1.1.1
--- PersistentCollectionType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 11,18 ****
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.MappingException;
  import net.sf.hibernate.collection.PersistentCollection;
! import net.sf.hibernate.engine.*;
  import net.sf.hibernate.engine.SessionFactoryImplementor;
! import net.sf.hibernate.impl.*;
  
  public abstract class PersistentCollectionType extends AbstractType implements AssociationType {
--- 11,19 ----
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.MappingException;
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.collection.PersistentCollection;
! import net.sf.hibernate.engine.Mapping;
  import net.sf.hibernate.engine.SessionFactoryImplementor;
! import net.sf.hibernate.engine.SessionImplementor;
  
  public abstract class PersistentCollectionType extends AbstractType implements AssociationType {
***************
*** 41,46 ****
  
  	public Object nullSafeGet(ResultSet rs, String name, SessionImplementor session, Object owner) throws HibernateException, SQLException {
! 		//toplevel collection
! 		return nullSafeGet(rs, new String[] {name}, session, owner); //TODO: don't like array construction here....
  	}
  
--- 42,46 ----
  
  	public Object nullSafeGet(ResultSet rs, String name, SessionImplementor session, Object owner) throws HibernateException, SQLException {
! 		throw new AssertionFailure("bug in PersistentCollectionType");
  	}
  

Index: PersistentEnumType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/PersistentEnumType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PersistentEnumType.java	1 Jan 2003 13:58:16 -0000	1.1.1.1
--- PersistentEnumType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 10,14 ****
  import java.sql.Types;
  
! import net.sf.hibernate.*;
  import net.sf.hibernate.engine.SessionImplementor;
  import net.sf.hibernate.util.ReflectHelper;
--- 10,17 ----
  import java.sql.Types;
  
! import net.sf.hibernate.AssertionFailure;
! import net.sf.hibernate.HibernateException;
! import net.sf.hibernate.MappingException;
! import net.sf.hibernate.PersistentEnum;
  import net.sf.hibernate.engine.SessionImplementor;
  import net.sf.hibernate.util.ReflectHelper;

Index: SetType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/SetType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SetType.java	1 Jan 2003 13:58:17 -0000	1.1.1.1
--- SetType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 2,9 ****
  package net.sf.hibernate.type;
  
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.collection.Set;
  import net.sf.hibernate.engine.SessionImplementor;
- import net.sf.hibernate.impl.CollectionPersister;
  
  public class SetType extends PersistentCollectionType {
--- 2,9 ----
  package net.sf.hibernate.type;
  
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.collection.Set;
  import net.sf.hibernate.engine.SessionImplementor;
  
  public class SetType extends PersistentCollectionType {

Index: SortedMapType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/SortedMapType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SortedMapType.java	1 Jan 2003 13:58:18 -0000	1.1.1.1
--- SortedMapType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 5,12 ****
  import java.util.Comparator;
  
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.collection.SortedMap;
  import net.sf.hibernate.engine.SessionImplementor;
- import net.sf.hibernate.impl.CollectionPersister;
  
  public class SortedMapType extends MapType {
--- 5,12 ----
  import java.util.Comparator;
  
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.collection.SortedMap;
  import net.sf.hibernate.engine.SessionImplementor;
  
  public class SortedMapType extends MapType {

Index: SortedSetType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/SortedSetType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SortedSetType.java	1 Jan 2003 13:58:18 -0000	1.1.1.1
--- SortedSetType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 5,12 ****
  import java.util.Comparator;
  
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.collection.SortedSet;
  import net.sf.hibernate.engine.SessionImplementor;
- import net.sf.hibernate.impl.CollectionPersister;
  
  public class SortedSetType extends SetType {
--- 5,12 ----
  import java.util.Comparator;
  
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.collection.SortedSet;
  import net.sf.hibernate.engine.SessionImplementor;
  
  public class SortedSetType extends SetType {

Index: TimeType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/TimeType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TimeType.java	1 Jan 2003 13:58:19 -0000	1.1.1.1
--- TimeType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 2,6 ****
  package net.sf.hibernate.type;
  
! import java.sql.*;
  import java.text.SimpleDateFormat;
  import java.util.Calendar;
--- 2,10 ----
  package net.sf.hibernate.type;
  
! import java.sql.PreparedStatement;
! import java.sql.ResultSet;
! import java.sql.SQLException;
! import java.sql.Time;
! import java.sql.Types;
  import java.text.SimpleDateFormat;
  import java.util.Calendar;

Index: TimestampType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/TimestampType.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TimestampType.java	1 Jan 2003 13:58:18 -0000	1.1.1.1
--- TimestampType.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 2,6 ****
  package net.sf.hibernate.type;
  
! import java.sql.*;
  import java.text.SimpleDateFormat;
  
--- 2,10 ----
  package net.sf.hibernate.type;
  
! import java.sql.PreparedStatement;
! import java.sql.ResultSet;
! import java.sql.SQLException;
! import java.sql.Timestamp;
! import java.sql.Types;
  import java.text.SimpleDateFormat;
  

Index: TypeFactory.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/TypeFactory.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TypeFactory.java	1 Jan 2003 13:58:24 -0000	1.1.1.1
--- TypeFactory.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 16,20 ****
  import java.util.TimeZone;
  
! import net.sf.hibernate.*;
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.util.ReflectHelper;
--- 16,25 ----
  import java.util.TimeZone;
  
! import net.sf.hibernate.Hibernate;
! import net.sf.hibernate.HibernateException;
! import net.sf.hibernate.Lifecycle;
! import net.sf.hibernate.MappingException;
! import net.sf.hibernate.PersistentEnum;
! import net.sf.hibernate.UserType;
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.util.ReflectHelper;