hibernate-commits — CVS commits

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/loader CollectionInitializer.java,1.1.1.1,1.2 CollectionLoader.java,1.1.1.1,1.2 EntityLoader.java,1.1.1.1,1.2 Loader.java,1.1.1.1,1.2 OneToManyLoader.java,1.1.1.1,1.2 OuterJoinLoader.java,1.1.1.1,1.2 SimpleEntityLoader.java,1.1.1.1,1.2

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

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

Modified Files:
	CollectionInitializer.java CollectionLoader.java 
	EntityLoader.java Loader.java OneToManyLoader.java 
	OuterJoinLoader.java SimpleEntityLoader.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: CollectionInitializer.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/CollectionInitializer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CollectionInitializer.java	1 Jan 2003 13:56:07 -0000	1.1.1.1
--- CollectionInitializer.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 18,21 ****
  	 * Initialize the given collection
  	 */
! 	public void initialize(Serializable id, PersistentCollection collection, SessionImplementor session) throws SQLException, HibernateException;
  }
--- 18,21 ----
  	 * Initialize the given collection
  	 */
! 	public void initialize(Serializable id, PersistentCollection collection, Object owner, SessionImplementor session) throws SQLException, HibernateException;
  }

Index: CollectionLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/CollectionLoader.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CollectionLoader.java	1 Jan 2003 13:56:07 -0000	1.1.1.1
--- CollectionLoader.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 8,15 ****
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.MappingException;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
- import net.sf.hibernate.impl.CollectionPersister;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.Type;
--- 8,15 ----
  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.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.Type;
***************
*** 21,25 ****
  	
  	private final CollectionPersister collectionPersister;
! 	private final Type[] idType;
  	private final boolean allowTwoPhaseLoad;
  
--- 21,25 ----
  	
  	private final CollectionPersister collectionPersister;
! 	private final Type idType;
  	private final boolean allowTwoPhaseLoad;
  
***************
*** 30,34 ****
  		allowTwoPhaseLoad = !persister.isSet();
  
! 		idType = new Type[] { persister.getKeyType() };
  		
  		String alias = alias( persister.getQualifiedTableName(), 0 );
--- 30,34 ----
  		allowTwoPhaseLoad = !persister.isSet();
  
! 		idType = persister.getKeyType();
  		
  		String alias = alias( persister.getQualifiedTableName(), 0 );
***************
*** 67,72 ****
  	}
  	
! 	public void initialize(Serializable id, PersistentCollection collection, SessionImplementor session) throws SQLException, HibernateException {
! 		loadCollection(session, new Object[] { id }, idType, collection, true);	
  	}
  	
--- 67,72 ----
  	}
  	
! 	public void initialize(Serializable id, PersistentCollection collection, Object owner, SessionImplementor session) throws SQLException, HibernateException {
! 		loadCollection(session, id, idType, owner, collection);	
  	}
  	

Index: EntityLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/EntityLoader.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EntityLoader.java	1 Jan 2003 13:56:07 -0000	1.1.1.1
--- EntityLoader.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 8,14 ****
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.MappingException;
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
- import net.sf.hibernate.impl.CollectionPersister;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.persister.ClassPersister;
--- 8,14 ----
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.MappingException;
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.persister.ClassPersister;

Index: Loader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/Loader.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Loader.java	1 Jan 2003 13:56:08 -0000	1.1.1.1
--- Loader.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 17,27 ****
  import net.sf.hibernate.LockMode;
  import net.sf.hibernate.WrongClassException;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.engine.Key;
  import net.sf.hibernate.engine.SessionImplementor;
  import net.sf.hibernate.util.JDBCExceptionReporter;
  import net.sf.hibernate.util.StringHelper;
- import net.sf.hibernate.impl.CollectionPersister;
- import net.sf.hibernate.impl.QueryImpl;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.Type;
--- 17,27 ----
  import net.sf.hibernate.LockMode;
  import net.sf.hibernate.WrongClassException;
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.engine.Key;
+ import net.sf.hibernate.engine.RowSelection;
  import net.sf.hibernate.engine.SessionImplementor;
  import net.sf.hibernate.util.JDBCExceptionReporter;
  import net.sf.hibernate.util.StringHelper;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.Type;
***************
*** 101,106 ****
  		final Serializable optionalID, 
  		final PersistentCollection optionalCollection,
  		boolean returnProxies,
! 		final QueryImpl.RowSelection selection,
  		final Map namedParams
  	) throws SQLException, HibernateException {
--- 101,107 ----
  		final Serializable optionalID, 
  		final PersistentCollection optionalCollection,
+ 		final Object optionalCollectionOwner,
  		boolean returnProxies,
! 		final RowSelection selection,
  		final Map namedParams
  	) throws SQLException, HibernateException {
***************
*** 108,114 ****
  		returnProxies = returnProxies && Environment.jvmSupportsProxies();
  
! 		int maxRows = (selection==null || selection.maxRows==null) ? 
  			Integer.MAX_VALUE : 
! 			selection.maxRows.intValue();
  		
  		final Loadable[] persisters = getPersisters();
--- 109,115 ----
  		returnProxies = returnProxies && Environment.jvmSupportsProxies();
  
! 		int maxRows = (selection==null || selection.getMaxRows()==null) ? 
  			Integer.MAX_VALUE : 
! 			selection.getMaxRows().intValue();
  		
  		final Loadable[] persisters = getPersisters();
***************
*** 197,201 ****
  				}
  	
! 				if (collection) optionalCollection.readFrom( rs, getCollectionPersister() );
  			}
  	
--- 198,202 ----
  				}
  	
! 				if (collection) optionalCollection.readFrom( rs, getCollectionPersister(), optionalCollectionOwner );
  			}
  	
***************
*** 385,389 ****
  	 * Advance the cursor to the first required row of the <tt>ResultSet</tt>
  	 */
! 	protected final void advance(ResultSet rs, QueryImpl.RowSelection selection, SessionImplementor session) throws SQLException {
  		if (selection==null) {
  			// we need the whole ResultSet from the beginning
--- 386,390 ----
  	 * Advance the cursor to the first required row of the <tt>ResultSet</tt>
  	 */
! 	protected final void advance(ResultSet rs, RowSelection selection, SessionImplementor session) throws SQLException {
  		if (selection==null) {
  			// we need the whole ResultSet from the beginning
***************
*** 391,395 ****
  		}
  		else {
! 			Integer first = selection.firstRow;
  			if (first!=null && first.intValue()!=0 ) {
  				if ( session.getFactory().useScrollableResultSets() ) {
--- 392,396 ----
  		}
  		else {
! 			Integer first = selection.getFirstRow();
  			if (first!=null && first.intValue()!=0 ) {
  				if ( session.getFactory().useScrollableResultSets() ) {
***************
*** 408,415 ****
  	 * Obtain a <tt>PreparedStatement</tt> and bind JDBC-style <tt>?</tt> parameters
  	 */
! 	protected final PreparedStatement prepareQueryStatement(String sql, Object[] values, Type[] types, QueryImpl.RowSelection selection, boolean scroll, SessionImplementor session) throws SQLException, HibernateException {
  		
  		boolean scrollable = selection!=null &&
! 			( ( selection.firstRow!=null && selection.firstRow.intValue()!=0 ) || scroll ) && 
  			session.getFactory().useScrollableResultSets();
  		
--- 409,416 ----
  	 * Obtain a <tt>PreparedStatement</tt> and bind JDBC-style <tt>?</tt> parameters
  	 */
! 	protected final PreparedStatement prepareQueryStatement(String sql, Object[] values, Type[] types, RowSelection selection, boolean scroll, SessionImplementor session) throws SQLException, HibernateException {
  		
  		boolean scrollable = selection!=null &&
! 			( ( selection.getFirstRow()!=null && selection.getFirstRow().intValue()!=0 ) || scroll ) && 
  			session.getFactory().useScrollableResultSets();
  		
***************
*** 418,422 ****
  		try {
  
! 			if (selection!=null && selection.timeout!=null) st.setQueryTimeout( selection.timeout.intValue() );
  
  			int col=1;
--- 419,423 ----
  		try {
  
! 			if (selection!=null && selection.getTimeout()!=null) st.setQueryTimeout( selection.getTimeout().intValue() );
  
  			int col=1;
***************
*** 443,449 ****
  	 * Limit the number of rows returned by the SQL query if necessary
  	 */
! 	protected final void setMaxRows(PreparedStatement st,QueryImpl.RowSelection selection) throws SQLException {
! 		if ( selection!=null && selection.maxRows!=null ) st.setMaxRows( 
! 			selection.maxRows.intValue() + ( (selection.firstRow==null) ? 0 : selection.firstRow.intValue() ) 
  		);
  	}
--- 444,450 ----
  	 * Limit the number of rows returned by the SQL query if necessary
  	 */
! 	protected final void setMaxRows(PreparedStatement st,RowSelection selection) throws SQLException {
! 		if ( selection!=null && selection.getMaxRows()!=null ) st.setMaxRows( 
! 			selection.getMaxRows().intValue() + ( (selection.getFirstRow()==null) ? 0 : selection.getFirstRow().intValue() ) 
  		);
  	}
***************
*** 453,457 ****
  	 * returning an SQL <tt>ResultSet</tt>
  	 */
! 	private final ResultSet getResultSet(PreparedStatement st, Map namedParams, QueryImpl.RowSelection selection, SessionImplementor session) throws SQLException, HibernateException {
  		try {
  			bindNamedParameters(st, namedParams, session);
--- 454,458 ----
  	 * returning an SQL <tt>ResultSet</tt>
  	 */
! 	private final ResultSet getResultSet(PreparedStatement st, Map namedParams, RowSelection selection, SessionImplementor session) throws SQLException, HibernateException {
  		try {
  			bindNamedParameters(st, namedParams, session);
***************
*** 488,492 ****
  		boolean returnProxies
  	) throws SQLException, HibernateException {
! 		return doFind(session, values, types, optionalObject, optionalID, null, returnProxies, null, null);
  	}
  	
--- 489,493 ----
  		boolean returnProxies
  	) throws SQLException, HibernateException {
! 		return doFind(session, values, types, optionalObject, optionalID, null, null, returnProxies, null, null);
  	}
  	
***************
*** 496,505 ****
  	protected final List loadCollection(
  		final SessionImplementor session,
! 		final Object[] values, 
! 		final Type[] types,
! 		final PersistentCollection collection,
! 		boolean returnProxies
  	) throws SQLException, HibernateException {
! 		return doFind(session, values, types, null, null, collection, returnProxies, null, null);
  	}
  
--- 497,506 ----
  	protected final List loadCollection(
  		final SessionImplementor session,
! 		final Serializable id, 
! 		final Type type,
! 		final Object owner,
! 		final PersistentCollection collection
  	) throws SQLException, HibernateException {
! 		return doFind(session, new Object[] {id}, new Type[] {type}, null, null, collection, owner, true, null, null);
  	}
  
***************
*** 513,520 ****
  		final Type[] types,
  		boolean returnProxies,
! 		final QueryImpl.RowSelection selection,
  		final Map namedParams
  	) throws SQLException, HibernateException {
! 		return doFind(session, values, types, null, null, null, returnProxies, selection, namedParams);
  	}
  
--- 514,521 ----
  		final Type[] types,
  		boolean returnProxies,
! 		final RowSelection selection,
  		final Map namedParams
  	) throws SQLException, HibernateException {
! 		return doFind(session, values, types, null, null, null, null, returnProxies, selection, namedParams);
  	}
  

Index: OneToManyLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/OneToManyLoader.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OneToManyLoader.java	1 Jan 2003 13:56:08 -0000	1.1.1.1
--- OneToManyLoader.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 8,15 ****
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.MappingException;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
- import net.sf.hibernate.impl.CollectionPersister;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.EntityType;
--- 8,15 ----
  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.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.EntityType;
***************
*** 22,26 ****
  	
  	private final CollectionPersister collectionPersister;
! 	private final Type[] idType;
  	private final boolean allowTwoPhaseLoad;
  
--- 22,26 ----
  	
  	private final CollectionPersister collectionPersister;
! 	private final Type idType;
  	private final boolean allowTwoPhaseLoad;
  
***************
*** 33,37 ****
  		collectionPersister = collPersister;
  		
! 		idType = new Type[] { collPersister.getKeyType() };
  		
  		Loadable persister = (Loadable) session.getPersister(
--- 33,37 ----
  		collectionPersister = collPersister;
  		
! 		idType = collPersister.getKeyType();
  		
  		Loadable persister = (Loadable) session.getPersister(
***************
*** 78,83 ****
  	}
  
! 	public void initialize(Serializable id, PersistentCollection collection, SessionImplementor session) throws SQLException, HibernateException {
! 		loadCollection(session, new Object[] { id }, idType, collection, true);	
  	}
  
--- 78,83 ----
  	}
  
! 	public void initialize(Serializable id, PersistentCollection collection, Object owner, SessionImplementor session) throws SQLException, HibernateException {
! 		loadCollection(session, id, idType, owner, collection);	
  	}
  

Index: OuterJoinLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/OuterJoinLoader.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OuterJoinLoader.java	1 Jan 2003 13:56:11 -0000	1.1.1.1
--- OuterJoinLoader.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 10,18 ****
  import net.sf.hibernate.util.ArrayHelper;
  import net.sf.hibernate.util.StringHelper;
- import net.sf.hibernate.impl.CollectionPersister;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.*;
  
  import net.sf.hibernate.MappingException;
  import net.sf.hibernate.dialect.Dialect;
  
--- 10,18 ----
  import net.sf.hibernate.util.ArrayHelper;
  import net.sf.hibernate.util.StringHelper;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.*;
  
  import net.sf.hibernate.MappingException;
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.dialect.Dialect;
  

Index: SimpleEntityLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/SimpleEntityLoader.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SimpleEntityLoader.java	1 Jan 2003 13:56:11 -0000	1.1.1.1
--- SimpleEntityLoader.java	3 Jan 2003 13:36:01 -0000	1.2
***************
*** 8,13 ****
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.LockMode;
  import net.sf.hibernate.engine.SessionImplementor;
- import net.sf.hibernate.impl.CollectionPersister;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.Type;
--- 8,13 ----
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.LockMode;
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.engine.SessionImplementor;
  import net.sf.hibernate.persister.*;
  import net.sf.hibernate.type.Type;

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/engine RowSelection.java,NONE,1.1 TypedValue.java,NONE,1.1 Cascades.java,1.1.1.1,1.2 Key.java,1.1.1.1,1.2 SessionFactoryImplementor.java,1.1.1.1,1.2 SessionImplementor.java,1.1.1.1,1.2

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

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

Modified Files:
	Cascades.java Key.java SessionFactoryImplementor.java 
	SessionImplementor.java 
Added Files:
	RowSelection.java TypedValue.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>


--- NEW FILE: RowSelection.java ---
//$Id: RowSelection.java,v 1.1 2003/01/03 13:36:00 oneovthafew Exp $
package net.sf.hibernate.engine;

public final class RowSelection {
	private Integer firstRow;
	private Integer maxRows;
	private Integer timeout;

	public void setFirstRow(Integer firstRow) {
		this.firstRow = firstRow;
	}

	public Integer getFirstRow() {
		return firstRow;
	}

	public void setMaxRows(Integer maxRows) {
		this.maxRows = maxRows;
	}

	public Integer getMaxRows() {
		return maxRows;
	}

	public void setTimeout(Integer timeout) {
		this.timeout = timeout;
	}

	public Integer getTimeout() {
		return timeout;
	}
}
--- NEW FILE: TypedValue.java ---
//$Id: TypedValue.java,v 1.1 2003/01/03 13:36:00 oneovthafew Exp $
package net.sf.hibernate.engine;

import java.lang.Object;
import net.sf.hibernate.type.Type;

public final class TypedValue {
	private Type type;
	private Object value;

	public TypedValue(Type t, Object o) {
		setType(t); value=o;
	}

	public void setValue(Object value) {
		this.value = value;
	}

	public Object getValue() {
		return value;
	}

	public void setType(Type type) {
		this.type = type;
	}

	public Type getType() {
		return type;
	}

}
Index: Cascades.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/engine/Cascades.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Cascades.java	1 Jan 2003 13:54:21 -0000	1.1.1.1
--- Cascades.java	3 Jan 2003 13:36:00 -0000	1.2
***************
*** 11,16 ****
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.Session;
  import net.sf.hibernate.collection.PersistentCollection;
- import net.sf.hibernate.impl.CollectionPersister;
  import net.sf.hibernate.persister.ClassPersister;
  import net.sf.hibernate.proxy.HibernateProxy;
--- 11,16 ----
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.Session;
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.persister.ClassPersister;
  import net.sf.hibernate.proxy.HibernateProxy;

Index: Key.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/engine/Key.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Key.java	1 Jan 2003 13:54:21 -0000	1.1.1.1
--- Key.java	3 Jan 2003 13:36:00 -0000	1.2
***************
*** 5,9 ****
  
  import net.sf.hibernate.AssertionFailure;
! import net.sf.hibernate.impl.CollectionPersister;
  import net.sf.hibernate.persister.ClassPersister;
  
--- 5,9 ----
  
  import net.sf.hibernate.AssertionFailure;
! import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.persister.ClassPersister;
  

Index: SessionFactoryImplementor.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/engine/SessionFactoryImplementor.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SessionFactoryImplementor.java	1 Jan 2003 13:54:22 -0000	1.1.1.1
--- SessionFactoryImplementor.java	3 Jan 2003 13:36:00 -0000	1.2
***************
*** 9,14 ****
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.MappingException;
- import net.sf.hibernate.impl.CollectionPersister;
  import net.sf.hibernate.persister.ClassPersister;
  import net.sf.hibernate.dialect.Dialect;
  import net.sf.hibernate.type.Type;
--- 9,14 ----
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.MappingException;
  import net.sf.hibernate.persister.ClassPersister;
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.dialect.Dialect;
  import net.sf.hibernate.type.Type;

Index: SessionImplementor.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/engine/SessionImplementor.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SessionImplementor.java	1 Jan 2003 13:54:23 -0000	1.1.1.1
--- SessionImplementor.java	3 Jan 2003 13:36:00 -0000	1.2
***************
*** 15,22 ****
  import net.sf.hibernate.ScrollableResults;
  import net.sf.hibernate.Session;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.collection.ArrayHolder;
! import net.sf.hibernate.impl.CollectionPersister;
! import net.sf.hibernate.impl.QueryImpl;
  
  /** 
--- 15,22 ----
  import net.sf.hibernate.ScrollableResults;
  import net.sf.hibernate.Session;
+ import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.collection.ArrayHolder;
! 
  
  /** 
***************
*** 109,130 ****
  	 * Execute a <tt>find()</tt> query
  	 */
! 	public List find(String query, Object[] values, Type[] types, QueryImpl.RowSelection selection, Map namedParams) throws SQLException, HibernateException;	
  	/**
  	 * Execute an <tt>iterate()</tt> query
  	 */
! 	public Iterator iterate(String query, Object[] values, Type[] types, QueryImpl.RowSelection selection, Map namedParams) throws SQLException, HibernateException;
  	/**
  	 * Execute a <tt>scroll()</tt> query
  	 */
! 	public ScrollableResults scroll(String query, Object[] values, Type[] types, QueryImpl.RowSelection selection, Map namedParams) throws SQLException, HibernateException;
  	
  	/**
  	 * Execute a filter
  	 */
! 	public List filter(Object collection, String filter, Object[] values, Type[] types, QueryImpl.RowSelection selection, Map namedParams) throws SQLException, HibernateException;
  	/**
  	 * Iterate a filter
  	 */
! 	public Iterator iterateFilter(Object collection, String filter, Object[] values, Type[] types, QueryImpl.RowSelection selection, Map namedParams) throws SQLException, HibernateException;
  	/**
  	 * Get the <tt>ClassPersister</tt> for an object
--- 109,130 ----
  	 * Execute a <tt>find()</tt> query
  	 */
! 	public List find(String query, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws SQLException, HibernateException;	
  	/**
  	 * Execute an <tt>iterate()</tt> query
  	 */
! 	public Iterator iterate(String query, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws SQLException, HibernateException;
  	/**
  	 * Execute a <tt>scroll()</tt> query
  	 */
! 	public ScrollableResults scroll(String query, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws SQLException, HibernateException;
  	
  	/**
  	 * Execute a filter
  	 */
! 	public List filter(Object collection, String filter, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws SQLException, HibernateException;
  	/**
  	 * Iterate a filter
  	 */
! 	public Iterator iterateFilter(Object collection, String filter, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws SQLException, HibernateException;
  	/**
  	 * Get the <tt>ClassPersister</tt> for an object

[Hibernate-commits] Hibernate2/src/net/sf/hibernate hibernate-mapping-2.0.dtd,1.3,1.4

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

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

Modified Files:
	hibernate-mapping-2.0.dtd 
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: hibernate-mapping-2.0.dtd
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hibernate-mapping-2.0.dtd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hibernate-mapping-2.0.dtd	2 Jan 2003 11:01:49 -0000	1.3
--- hibernate-mapping-2.0.dtd	3 Jan 2003 13:36:00 -0000	1.4
***************
*** 282,285 ****
--- 282,286 ----
  
  <!ELEMENT composite-element ( 
+   parent?,
    (property|many-to-one|nested-composite-element)* 
  )>
***************
*** 287,290 ****
--- 288,292 ----
  
  <!ELEMENT nested-composite-element ( 
+   parent?,
    (property|many-to-one|nested-composite-element)* 
  )>

[Hibernate-commits] Hibernate2 changelog.txt,1.1.1.1,1.2

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

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

Modified Files:
	changelog.txt 
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: changelog.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/changelog.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** changelog.txt	1 Jan 2003 13:42:55 -0000	1.1.1.1
--- changelog.txt	3 Jan 2003 13:35:59 -0000	1.2
***************
*** 1,8 ****
  Hibernate Changelog
  ===================
  Changes in version 1.2.1b (1.1.2003)
! --------------------------------------
  * fixed an NPE that occurred while loading Hibernate classes in IBM JVM
  * arbitrary JNDI InitialContext properties may now be passed as hibernate.jndi.*
  
  Changes in version 1.2.1 (31.12.2002)
--- 1,20 ----
  Hibernate Changelog
  ===================
+ Changed in version 2.0 beta 1
+ -----------------------------
+ * renamed packages to net.sf.hibernate.*
+ * removed support for toplevel collections / subcollections
+ * created hibernate-mapping-2.0.dtd
+ - renamed 'readonly' attribute to 'inverse'
+ - renamed 'role' attribute to 'name'
+ - changed default value for 'unsaved-value' to "null"
+ * 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>
+ 
  Changes in version 1.2.1b (1.1.2003)
! ------------------------------------
  * fixed an NPE that occurred while loading Hibernate classes in IBM JVM
  * arbitrary JNDI InitialContext properties may now be passed as hibernate.jndi.*
+ * fixed a problem where index column was not being nullified when an entity was removed from a one-to-many
  
  Changes in version 1.2.1 (31.12.2002)

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/mapping Array.java,1.1.1.1,1.2 Association.java,1.1.1.1,1.2 Collection.java,1.2,1.3 Component.java,1.1.1.1,1.2 IntegerValue.java,1.1.1.1,1.2 ManyToOne.java,1.1.1.1,1.2 Map.java,1.2,1.3 OneToOne.java,1.1.1.1,1.2 PersistentClass.java,1.1.1.1,1.2 Root.java,1.1.1.1,1.2 RootClass.java,1.1.1.1,1.2 Value.java,1.1.1.1,1.2

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

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

Modified Files:
	Array.java Association.java Collection.java Component.java 
	IntegerValue.java ManyToOne.java Map.java OneToOne.java 
	PersistentClass.java Root.java RootClass.java Value.java 
Log Message:
changed default unsaved-value
changed 'role' attribute to 'name'
added a new check/exception in delete()

Index: Array.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Array.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Array.java	1 Jan 2003 13:56:13 -0000	1.1.1.1
--- Array.java	2 Jan 2003 11:01:49 -0000	1.2
***************
*** 32,37 ****
  				String name = subnode.getNodeName();
  				
! 				if ( "element".equals(name) || "subcollection".equals(name) ) {
! 					Type type = Value.getTypeFromXML(subnode, Root.ROOT_ROLE_NAME, root);
  					elementClass = isPrimitiveArray() ? ( (PrimitiveType) type ).primitiveClass() : type.returnedClass();
  				}
--- 32,37 ----
  				String name = subnode.getNodeName();
  				
! 				if ( "element".equals(name) ) {
! 					Type type = Value.getTypeFromXML(subnode);
  					elementClass = isPrimitiveArray() ? ( (PrimitiveType) type ).primitiveClass() : type.returnedClass();
  				}

Index: Association.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Association.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Association.java	1 Jan 2003 13:56:13 -0000	1.1.1.1
--- Association.java	2 Jan 2003 11:01:49 -0000	1.2
***************
*** 25,30 ****
  	
  	// A one-to-one association
! 	protected Association(Node node, String path, boolean isNullable, Table table, Root root) throws MappingException {
! 		super(node, path, isNullable, table, root);
  		joinedFetch = initJoinedFetch(node);
  	}
--- 25,30 ----
  	
  	// A one-to-one association
! 	protected Association(Node node, boolean isNullable, Table table, Root root) throws MappingException {
! 		super(node, isNullable, table, root);
  		joinedFetch = initJoinedFetch(node);
  	}
***************
*** 32,40 ****
  	// A many-to-one association
  	protected Association(Node node, String path, String defaultColumnName, boolean isNullable, Table table, Root root) throws MappingException {
! 		super(node, path, defaultColumnName, isNullable, table, root);
  		joinedFetch = initJoinedFetch(node);
  	}
  	
! 	protected abstract Type typeFromXML(Node node, String path, Root root) throws MappingException;
  	
  	public abstract void setTypeByReflection(Class propertyClass, String propertyName) throws MappingException;
--- 32,40 ----
  	// A many-to-one association
  	protected Association(Node node, String path, String defaultColumnName, boolean isNullable, Table table, Root root) throws MappingException {
! 		super(node, defaultColumnName, isNullable, table, root);
  		joinedFetch = initJoinedFetch(node);
  	}
  	
! 	protected abstract Type typeFromXML(Node node) throws MappingException;
  	
  	public abstract void setTypeByReflection(Class propertyClass, String propertyName) throws MappingException;

Index: Collection.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Collection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Collection.java	1 Jan 2003 15:12:52 -0000	1.2
--- Collection.java	2 Jan 2003 11:01:49 -0000	1.3
***************
*** 68,72 ****
  		NamedNodeMap atts = node.getAttributes();
  		//ROLENAME
! 		String barerole = atts.getNamedItem("role").getNodeValue();
  		role = prefix + Root.ROLE_SEPERATOR + barerole;
  		
--- 68,74 ----
  		NamedNodeMap atts = node.getAttributes();
  		//ROLENAME
! 		Node roleAtt = atts.getNamedItem("name");
! 		if (roleAtt==null) roleAtt = atts.getNamedItem("role");
! 		String barerole = roleAtt.getNodeValue();
  		role = prefix + Root.ROLE_SEPERATOR + barerole;
  		
***************
*** 136,140 ****
  			
  			if ( "key".equals(name) || "generated-key".equals(name) ) {
! 				key = new Value(subnode, null, DEFAULT_KEY_COLUMN_NAME, isOneToMany, table, root);
  				key.setType( owner.getIdentifier().getType() );
  				if ( key.getType().returnedClass().isArray() ) throw new MappingException(
--- 138,142 ----
  			
  			if ( "key".equals(name) || "generated-key".equals(name) ) {
! 				key = new Value(subnode, DEFAULT_KEY_COLUMN_NAME, isOneToMany, table, root);
  				key.setType( owner.getIdentifier().getType() );
  				if ( key.getType().returnedClass().isArray() ) throw new MappingException(
***************
*** 143,150 ****
  			}
  			else if ( "element".equals(name) ) {
! 				element = new Value(subnode, Root.ROOT_ROLE_NAME, DEFAULT_ELEMENT_COLUMN_NAME, true, table, root);
! 			}
! 			else if ( "subcollection".equals(name) ) {
! 				element = new Value(subnode, Root.ROOT_ROLE_NAME, DEFAULT_ELEMENT_COLUMN_NAME, true, table, root);
  			}
  			else if ( "many-to-many".equals(name) ) { 
--- 145,149 ----
  			}
  			else if ( "element".equals(name) ) {
! 				element = new Value(subnode, DEFAULT_ELEMENT_COLUMN_NAME, true, table, root);
  			}
  			else if ( "many-to-many".equals(name) ) { 

Index: Component.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Component.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Component.java	1 Jan 2003 13:56:15 -0000	1.1.1.1
--- Component.java	2 Jan 2003 11:01:49 -0000	1.2
***************
*** 94,98 ****
  				Collection collection = collectType.create( list.item(i), path, owner, root );
  				root.addCollection(collection);
! 				value = new Value(subnode, path, isNullable, table, root);
  			}
  			else if ( "many-to-one".equals(name) || "key-many-to-one".equals(name) ) {
--- 94,99 ----
  				Collection collection = collectType.create( list.item(i), path, owner, root );
  				root.addCollection(collection);
! 				value = new Value(subnode, isNullable, table, root);
! 				value.setType( collection.getType() );
  			}
  			else if ( "many-to-one".equals(name) || "key-many-to-one".equals(name) ) {
***************
*** 103,110 ****
  			}
  			else if ( "property".equals(name) || "key-property".equals(name) ) {
! 				value = new Value(subnode, Root.ROOT_ROLE_NAME, propertyName, isNullable, table, root);
  			}
  			else if ( "collection".equals(name) ) {
! 				value = new Value(subnode, Root.ROOT_ROLE_NAME, propertyName, isNullable, table, root);
  			}
  			else if ( "component".equals(name) || "nested-composite-element".equals(name) ) {
--- 104,111 ----
  			}
  			else if ( "property".equals(name) || "key-property".equals(name) ) {
! 				value = new Value(subnode, propertyName, isNullable, table, root);
  			}
  			else if ( "collection".equals(name) ) {
! 				value = new Value(subnode, propertyName, isNullable, table, root);
  			}
  			else if ( "component".equals(name) || "nested-composite-element".equals(name) ) {

Index: IntegerValue.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/IntegerValue.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** IntegerValue.java	1 Jan 2003 13:56:16 -0000	1.1.1.1
--- IntegerValue.java	2 Jan 2003 11:01:49 -0000	1.2
***************
*** 14,18 ****
  	
  	public IntegerValue(Node node, String defaultColumnName, boolean isNullable, Table table, Root root) throws MappingException {
! 		super(node, null, defaultColumnName, isNullable, table, root);
  		Column col = ( (Column) getColumnIterator().next() );
  		col.setType( getType() );
--- 14,18 ----
  	
  	public IntegerValue(Node node, String defaultColumnName, boolean isNullable, Table table, Root root) throws MappingException {
! 		super(node, defaultColumnName, isNullable, table, root);
  		Column col = ( (Column) getColumnIterator().next() );
  		col.setType( getType() );

Index: ManyToOne.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/ManyToOne.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ManyToOne.java	1 Jan 2003 13:56:16 -0000	1.1.1.1
--- ManyToOne.java	2 Jan 2003 11:01:49 -0000	1.2
***************
*** 19,23 ****
  	}
  
! 	protected Type typeFromXML(Node node, String path, Root root) throws MappingException {
  	
  		NamedNodeMap atts = node.getAttributes();
--- 19,23 ----
  	}
  
! 	protected Type typeFromXML(Node node) throws MappingException {
  	
  		NamedNodeMap atts = node.getAttributes();

Index: Map.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Map.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Map.java	1 Jan 2003 15:12:52 -0000	1.2
--- Map.java	2 Jan 2003 11:01:49 -0000	1.3
***************
*** 50,54 ****
  			
  			if ( "index".equals(name) ) {
! 				setIndex( new Value(subnode, null, DEFAULT_INDEX_COLUMN_NAME, isOneToMany(), getTable(), root) );
  				if ( getIndex().getType()==null ) throw new MappingException("map index element must specify a type");
  			}
--- 50,54 ----
  			
  			if ( "index".equals(name) ) {
! 				setIndex( new Value(subnode, DEFAULT_INDEX_COLUMN_NAME, isOneToMany(), getTable(), root) );
  				if ( getIndex().getType()==null ) throw new MappingException("map index element must specify a type");
  			}

Index: OneToOne.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/OneToOne.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OneToOne.java	1 Jan 2003 13:56:18 -0000	1.1.1.1
--- OneToOne.java	2 Jan 2003 11:01:49 -0000	1.2
***************
*** 24,32 ****
  	// A one-to-one association
  	public OneToOne(Node node, Value identifier, String path, boolean isNullable, Table table, Root root) throws MappingException {
! 		super(node, path, isNullable, table, root);
  		this.identifier = identifier;
  	}
  
! 	protected Type typeFromXML(Node node, String path, Root root) throws MappingException {
  	
  		NamedNodeMap atts = node.getAttributes();
--- 24,32 ----
  	// A one-to-one association
  	public OneToOne(Node node, Value identifier, String path, boolean isNullable, Table table, Root root) throws MappingException {
! 		super(node, isNullable, table, root);
  		this.identifier = identifier;
  	}
  
! 	protected Type typeFromXML(Node node) throws MappingException {
  	
  		NamedNodeMap atts = node.getAttributes();

Index: PersistentClass.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/PersistentClass.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PersistentClass.java	1 Jan 2003 13:56:19 -0000	1.1.1.1
--- PersistentClass.java	2 Jan 2003 11:01:49 -0000	1.2
***************
*** 71,75 ****
  				Collection collection = collectType.create(subnode, path, this, root);
  				root.addCollection(collection);
! 				value = new Value(subnode, path, true, table, root);
  			}
  			else if ( "many-to-one".equals(name) ) {
--- 71,76 ----
  				Collection collection = collectType.create(subnode, path, this, root);
  				root.addCollection(collection);
! 				value = new Value(subnode, true, table, root);
! 				value.setType( collection.getType() );
  			}
  			else if ( "many-to-one".equals(name) ) {
***************
*** 80,87 ****
  			}
  			else if ( "property".equals(name) ) {
! 				value = new Value(subnode, Root.ROOT_ROLE_NAME, propertyName, true, table, root);
! 			}
! 			else if ( "collection".equals(name) ) {
! 				value = new Value(subnode, Root.ROOT_ROLE_NAME, propertyName, true, table, root);
  			}
  			else if ( "component".equals(name) ) {
--- 81,85 ----
  			}
  			else if ( "property".equals(name) ) {
! 				value = new Value(subnode, propertyName, true, table, root);
  			}
  			else if ( "component".equals(name) ) {

Index: Root.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Root.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Root.java	1 Jan 2003 13:56:21 -0000	1.1.1.1
--- Root.java	2 Jan 2003 11:01:49 -0000	1.2
***************
*** 141,149 ****
  	}
  	
! 	public Type getCollectionType(String role) throws MappingException {
  		Collection coll = (Collection) collections.get(role);
  		if (coll==null) throw new MappingException("undeclared collection role: " + role );
  		return coll.getType();
! 	}
  	
  	public void addPersistentClass(PersistentClass persistentClass) throws MappingException {
--- 141,149 ----
  	}
  	
! 	/*public Type getCollectionType(String role) throws MappingException {
  		Collection coll = (Collection) collections.get(role);
  		if (coll==null) throw new MappingException("undeclared collection role: " + role );
  		return coll.getType();
! 	}*/
  	
  	public void addPersistentClass(PersistentClass persistentClass) throws MappingException {

Index: RootClass.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/RootClass.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** RootClass.java	1 Jan 2003 13:56:23 -0000	1.1.1.1
--- RootClass.java	2 Jan 2003 11:01:49 -0000	1.2
***************
*** 139,148 ****
  			if ( "id".equals(name) ) {
  				if (propertyName==null) {
! 					identifier = new Value(subnode, null, DEFAULT_IDENTIFIER_COLUMN_NAME, false, table, root);
  					if (identifier.getType()==null) throw new MappingException( "must specify an identifier type: " + getPersistentClass().getName() );
  					identifierProperty = null;
  				}
  				else {
! 					identifier = new Value(subnode, null, propertyName, false, table, root);
  					identifier.setTypeByReflection( getPersistentClass(), propertyName );
  					identifierProperty = new Property(subnode, identifier, root);
--- 139,148 ----
  			if ( "id".equals(name) ) {
  				if (propertyName==null) {
! 					identifier = new Value(subnode, DEFAULT_IDENTIFIER_COLUMN_NAME, false, table, root);
  					if (identifier.getType()==null) throw new MappingException( "must specify an identifier type: " + getPersistentClass().getName() );
  					identifierProperty = null;
  				}
  				else {
! 					identifier = new Value(subnode, propertyName, false, table, root);
  					identifier.setTypeByReflection( getPersistentClass(), propertyName );
  					identifierProperty = new Property(subnode, identifier, root);
***************
*** 166,170 ****
  			else if ( "version".equals(name) || "timestamp".equals(name) ) {
  				//VERSION
! 				Value val = new Value(subnode, null, propertyName, false, table, root);
  				if ( val.getType()==null ) val.setType( "version".equals(name) ? Hibernate.INTEGER : Hibernate.TIMESTAMP );
  				version = new Property(subnode, val, root);
--- 166,170 ----
  			else if ( "version".equals(name) || "timestamp".equals(name) ) {
  				//VERSION
! 				Value val = new Value(subnode, propertyName, false, table, root);
  				if ( val.getType()==null ) val.setType( "version".equals(name) ? Hibernate.INTEGER : Hibernate.TIMESTAMP );
  				version = new Property(subnode, val, root);
***************
*** 173,177 ****
  			else if ( "discriminator".equals(name) ) {
  				//DISCRIMINATOR
! 				discriminator = new Value(subnode, null, DEFAULT_DISCRIMINATOR_COLUMN_NAME, false, table, root);
  				if ( discriminator.getType()==null ) {
  					discriminator.setType(Hibernate.STRING);
--- 173,177 ----
  			else if ( "discriminator".equals(name) ) {
  				//DISCRIMINATOR
! 				discriminator = new Value(subnode, DEFAULT_DISCRIMINATOR_COLUMN_NAME, false, table, root);
  				if ( discriminator.getType()==null ) {
  					discriminator.setType(Hibernate.STRING);

Index: Value.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Value.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Value.java	1 Jan 2003 13:56:27 -0000	1.1.1.1
--- Value.java	2 Jan 2003 11:01:49 -0000	1.2
***************
*** 62,66 ****
  
  	//Does _not_ automatically make a column if none is specifed by XML
! 	public Value(Node node, String path, boolean isNullable, Table table, Root root) throws MappingException {
  		
  		this.table = table;
--- 62,66 ----
  
  	//Does _not_ automatically make a column if none is specifed by XML
! 	public Value(Node node, boolean isNullable, Table table, Root root) throws MappingException {
  		
  		this.table = table;
***************
*** 68,72 ****
  		NamedNodeMap atts = node.getAttributes();
  		//TYPE
! 		type = typeFromXML(node, path, root);
  		//COLUMN(S)
  		Node columnName = atts.getNamedItem("column");
--- 68,72 ----
  		NamedNodeMap atts = node.getAttributes();
  		//TYPE
! 		type = typeFromXML(node);
  		//COLUMN(S)
  		Node columnName = atts.getNamedItem("column");
***************
*** 115,120 ****
  
  	//automatically makes a column with the default name if none is specifed by XML
! 	public Value(Node node, String path, String defaultColumnName, boolean isNullable, Table table, Root root) throws MappingException {
! 		this(node, path, isNullable, table, root);
  		if ( getColumnSpan()==0 ) {
  			Column col = new Column(node, isNullable, type, 0);
--- 115,120 ----
  
  	//automatically makes a column with the default name if none is specifed by XML
! 	public Value(Node node, String defaultColumnName, boolean isNullable, Table table, Root root) throws MappingException {
! 		this(node, isNullable, table, root);
  		if ( getColumnSpan()==0 ) {
  			Column col = new Column(node, isNullable, type, 0);
***************
*** 141,152 ****
  	}
  
! 	protected Type typeFromXML(Node node, String path, Root root) throws MappingException {
! 		return getTypeFromXML(node, path, root);
  	}
  
! 	static Type getTypeFromXML(Node node, String path, Root root) throws MappingException {
  		Type type;
  		NamedNodeMap atts = node.getAttributes();
! 		Node roleNode = atts.getNamedItem("role");
  		if (roleNode!=null) {
  			//System.out.println( path + Root.ROLE_SEPERATOR + roleNode.getNodeValue() );
--- 141,152 ----
  	}
  
! 	protected Type typeFromXML(Node node) throws MappingException {
! 		return getTypeFromXML(node);
  	}
  
! 	static Type getTypeFromXML(Node node) throws MappingException {
  		Type type;
  		NamedNodeMap atts = node.getAttributes();
! 		/*Node roleNode = atts.getNamedItem("role");
  		if (roleNode!=null) {
  			//System.out.println( path + Root.ROLE_SEPERATOR + roleNode.getNodeValue() );
***************
*** 155,159 ****
  			);
  		}
! 		else {
  			Node typeNode = atts.getNamedItem("type");
  			if (typeNode==null) {
--- 155,159 ----
  			);
  		}
! 		else {*/
  			Node typeNode = atts.getNamedItem("type");
  			if (typeNode==null) {
***************
*** 164,168 ****
  				if (type==null) throw new MappingException( "Could not interpret type: " + typeNode.getNodeValue() );
  			}
! 		}
  		return type;
  	}
--- 164,168 ----
  				if (type==null) throw new MappingException( "Could not interpret type: " + typeNode.getNodeValue() );
  			}
! 		//}
  		return type;
  	}

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test Baz.hbm.xml,1.1.1.1,1.2 FooBarTest.java,1.1.1.1,1.2

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

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

Modified Files:
	Baz.hbm.xml FooBarTest.java 
Log Message:
changed default unsaved-value
changed 'role' attribute to 'name'
added a new check/exception in delete()

Index: Baz.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Baz.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Baz.hbm.xml	1 Jan 2003 13:56:46 -0000	1.1.1.1
--- Baz.hbm.xml	2 Jan 2003 11:01:49 -0000	1.2
***************
*** 11,15 ****
  		<property name="name" column="name_b"/>
  
! 		<list role="stringList" table="string_list">
  			<key>
  				<column name="id" length="16"/>
--- 11,15 ----
  		<property name="name" column="name_b"/>
  
! 		<list name="stringList" table="string_list">
  			<key>
  				<column name="id" length="16"/>
***************
*** 18,22 ****
  			<element column="element" type="string"/>
  		</list>
! 		<primitive-array role="intArray" table="int_array">
  			<key>
  				<column name="id" length="16"/>
--- 18,22 ----
  			<element column="element" type="string"/>
  		</list>
! 		<primitive-array name="intArray" table="int_array">
  			<key>
  				<column name="id" length="16"/>
***************
*** 25,29 ****
  			<element column="j" type="int"/>
  		</primitive-array>
! 		<set role="fooSet" lazy="true" order-by="string_">
  			<key>
  				<column name="baz_id" length="16"/>
--- 25,29 ----
  			<element column="j" type="int"/>
  		</primitive-array>
! 		<set name="fooSet" lazy="true" order-by="string_">
  			<key>
  				<column name="baz_id" length="16"/>
***************
*** 31,35 ****
  			<one-to-many class="net.sf.hibernate.test.Foo"/>
  		</set>
! 		<array role="components" table="bazcomponents">
  			<key>
  				<column name="baz_id" length="16"/>
--- 31,35 ----
  			<one-to-many class="net.sf.hibernate.test.Foo"/>
  		</set>
! 		<array name="components" table="bazcomponents">
  			<key>
  				<column name="baz_id" length="16"/>
***************
*** 47,51 ****
  			</composite-element>
  		</array>
! 		<array role="timeArray">
  			<key>
  				<column name="baz_id" length="16"/>
--- 47,51 ----
  			</composite-element>
  		</array>
! 		<array name="timeArray">
  			<key>
  				<column name="baz_id" length="16"/>
***************
*** 54,58 ****
  			<element column="the_time" type="time"/>
  		</array>
! 		<bag role="bag" order-by="name">
  			<key>
  				<column name="baz_id" length="16"/>
--- 54,58 ----
  			<element column="the_time" type="time"/>
  		</array>
! 		<bag name="bag" order-by="name">
  			<key>
  				<column name="baz_id" length="16"/>
***************
*** 60,64 ****
  			<element column="name" type="string"/>
  		</bag>
! 		<map role="fooToGlarch">
  			<key>
  				<column name="baz_id" length="16"/>
--- 60,64 ----
  			<element column="name" type="string"/>
  		</bag>
! 		<map name="fooToGlarch">
  			<key>
  				<column name="baz_id" length="16"/>
***************
*** 67,71 ****
  			<many-to-many column="glarch_id" class="net.sf.hibernate.test.Glarch"/>
  		</map>
! 		<map role="fooComponentToFoo">
  			<key>
  				<column name="baz_id" length="16"/>
--- 67,71 ----
  			<many-to-many column="glarch_id" class="net.sf.hibernate.test.Glarch"/>
  		</map>
! 		<map name="fooComponentToFoo">
  			<key>
  				<column name="baz_id" length="16"/>
***************
*** 77,81 ****
  			<many-to-many column="foo_id" class="net.sf.hibernate.test.Foo"/>
  		</map>
! 		<map role="glarchToFoo">
  			<key>
  				<column name="gtf_baz_id" length="16"/>
--- 77,81 ----
  			<many-to-many column="foo_id" class="net.sf.hibernate.test.Foo"/>
  		</map>
! 		<map name="glarchToFoo">
  			<key>
  				<column name="gtf_baz_id" length="16"/>
***************
*** 85,89 ****
  		</map>
  		
! 	<set role="stringSet" lazy="true" sort="natural">
  		<!--<jcs-cache usage="read-write"/>-->
  		<key column="id_" />
--- 85,89 ----
  		</map>
  		
! 	<set name="stringSet" lazy="true" sort="natural">
  		<!--<jcs-cache usage="read-write"/>-->
  		<key column="id_" />
***************
*** 91,95 ****
  	</set>
  
! 	<map role="stringDateMap" lazy="true" sort="net.sf.hibernate.test.ReverseComparator">
  		<key column="id_" />
  		<index column="map_key" type="string" length="32"/>
--- 91,95 ----
  	</set>
  
! 	<map name="stringDateMap" lazy="true" sort="net.sf.hibernate.test.ReverseComparator">
  		<key column="id_" />
  		<index column="map_key" type="string" length="32"/>
***************
*** 97,101 ****
  	</map>
  
! 	<array role="fooArray" element-class="net.sf.hibernate.test.FooProxy">
  		<!--<jcs-cache usage="read-write"/>-->
  		<key column="id_" />
--- 97,101 ----
  	</map>
  
! 	<array name="fooArray" element-class="net.sf.hibernate.test.FooProxy">
  		<!--<jcs-cache usage="read-write"/>-->
  		<key column="id_" />
***************
*** 106,110 ****
  	</array>
  
! 	<array role="stringArray">
  		<key column="id_" />
  		<index column="i"/>
--- 106,110 ----
  	</array>
  
! 	<array name="stringArray">
  		<key column="id_" />
  		<index column="i"/>
***************
*** 112,116 ****
  	</array>
  	
! 	<list role="customs">
  		<key column="id_"/>
  		<index column="indx"/>
--- 112,116 ----
  	</array>
  	
! 	<list name="customs">
  		<key column="id_"/>
  		<index column="indx"/>
***************
*** 121,125 ****
  	</list>
  
! 	<list role="topComponents" table="topcomponents">
  		<!--<jcs-cache usage="read-write"/>-->
  		<key column="id_"/>
--- 121,125 ----
  	</list>
  
! 	<list name="topComponents" table="topcomponents">
  		<!--<jcs-cache usage="read-write"/>-->
  		<key column="id_"/>
***************
*** 131,145 ****
  	</list>
  	
! 	<set role="topFoos">
  		<key column="idtopbar" />
  		<one-to-many class = "net.sf.hibernate.test.Bar"/>
  	</set>
  
! 	<set role="cascadingBars" cascade="all">
  		<key column="idtopbar" />
  		<one-to-many class = "net.sf.hibernate.test.Bar"/>
  	</set>
  
! 	<map role="topGlarchez">
  		<key column="idtopglarch" />
  		<index column="mapkey" type="character"/>
--- 131,145 ----
  	</list>
  	
! 	<set name="topFoos">
  		<key column="idtopbar" />
  		<one-to-many class = "net.sf.hibernate.test.Bar"/>
  	</set>
  
! 	<set name="cascadingBars" cascade="all">
  		<key column="idtopbar" />
  		<one-to-many class = "net.sf.hibernate.test.Bar"/>
  	</set>
  
! 	<map name="topGlarchez">
  		<key column="idtopglarch" />
  		<index column="mapkey" type="character"/>

Index: FooBarTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FooBarTest.java	1 Jan 2003 13:57:03 -0000	1.1.1.1
--- FooBarTest.java	2 Jan 2003 11:01:49 -0000	1.2
***************
*** 101,105 ****
  		assertTrue( stuff.getProperty().equals( TimeZone.getDefault() ) );
  		assertTrue( stuff.getMoreStuff().getName().equals("More Stuff") );
! 		s.delete( stuff.getMoreStuff() );
  		s.delete("from foo in class Foo");
  		t.commit();
--- 101,105 ----
  		assertTrue( stuff.getProperty().equals( TimeZone.getDefault() ) );
  		assertTrue( stuff.getMoreStuff().getName().equals("More Stuff") );
! 		s.delete("from ms in class MoreStuff");
  		s.delete("from foo in class Foo");
  		t.commit();
***************
*** 523,527 ****
      	baz.getOnes().remove(o);
      	s.delete("from o in class net.sf.hibernate.test.One");
!     	s.delete(h);
      	s.flush();
      	s.connection().commit();
--- 523,527 ----
      	baz.getOnes().remove(o);
      	s.delete("from o in class net.sf.hibernate.test.One");
!     	s.delete(baz);
      	s.flush();
      	s.connection().commit();

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/tool/hbm2java ClassMapping.java,1.1.1.1,1.2

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

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

Modified Files:
	ClassMapping.java 
Log Message:
changed default unsaved-value
changed 'role' attribute to 'name'
added a new check/exception in delete()

Index: ClassMapping.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java/ClassMapping.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ClassMapping.java	1 Jan 2003 13:57:41 -0000	1.1.1.1
--- ClassMapping.java	2 Jan 2003 11:01:50 -0000	1.2
***************
*** 418,421 ****
--- 418,422 ----
           
           String name = collection.getAttributeValue("role");
+          if (name==null) name = collection.getAttributeValue("name");
           
           // add an import and field for this collection
***************
*** 451,454 ****
--- 452,456 ----
           Element array = (Element) arrays.next();
           String role = array.getAttributeValue("role");
+          if (role==null) role = array.getAttributeValue("name");
           String elementClass = array.getAttributeValue("element-class");
           if (elementClass==null) {

[Hibernate-commits] Hibernate2/src/net/sf/hibernate hibernate-mapping-2.0.dtd,1.2,1.3

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

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

Modified Files:
	hibernate-mapping-2.0.dtd 
Log Message:
changed default unsaved-value
changed 'role' attribute to 'name'
added a new check/exception in delete()

Index: hibernate-mapping-2.0.dtd
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hibernate-mapping-2.0.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hibernate-mapping-2.0.dtd	1 Jan 2003 15:12:51 -0000	1.2
--- hibernate-mapping-2.0.dtd	2 Jan 2003 11:01:49 -0000	1.3
***************
*** 52,56 ****
    <!ATTLIST id type CDATA #IMPLIED>
    <!ATTLIST id length CDATA #IMPLIED>
!   <!ATTLIST id unsaved-value CDATA "any">          <!-- any|none|null|"value" -->
  
  <!-- A composite key may be modelled by a java class with a property for each 
--- 52,56 ----
    <!ATTLIST id type CDATA #IMPLIED>
    <!ATTLIST id length CDATA #IMPLIED>
!   <!ATTLIST id unsaved-value CDATA "null">          <!-- any|none|null|"value" -->
  
  <!-- A composite key may be modelled by a java class with a property for each 
***************
*** 163,167 ****
  <!ELEMENT component (
    parent?,
!   (property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*
  )>
    <!ATTLIST component class CDATA #IMPLIED>
--- 163,167 ----
  <!ELEMENT component (
    parent?,
!   (property|many-to-one|one-to-one|component|map|set|list|bag|array|primitive-array)*
  )>
    <!ATTLIST component class CDATA #IMPLIED>
***************
*** 174,185 ****
    <!ATTLIST parent name CDATA #REQUIRED>
  
! <!-- Collection roles declared directly beneath the root element have their own key
! and may be referenced by many collection or subcollection tags. Collection declarations
! nested inside a class declaration indicate a foreign key relationship from the 
! collection table to the enclosing class. For toplevel collections, the name of
! the role may be an arbitrary string. For nested collections, it must be the name
! of the property containing the collection. 
! 
! Note that the cascade attribute is ignored for toplevel collections. -->
  
  <!ELEMENT map (
--- 174,179 ----
    <!ATTLIST parent name CDATA #REQUIRED>
  
! <!-- Collection declarations nested inside a class declaration indicate a foreign key 
! relationship from the collection table to the enclosing class. -->
  
  <!ELEMENT map (
***************
*** 189,194 ****
  	(element|one-to-many|many-to-many|composite-element)
  )>
!   <!ATTLIST map role CDATA #REQUIRED>
!   <!ATTLIST map table CDATA #IMPLIED>                              <!-- default: rolename -->
    <!ATTLIST map schema CDATA #IMPLIED>                             <!-- default: none -->
    <!ATTLIST map lazy (true|false) "false">
--- 183,188 ----
  	(element|one-to-many|many-to-many|composite-element)
  )>
!   <!ATTLIST map name CDATA #REQUIRED>
!   <!ATTLIST map table CDATA #IMPLIED>                              <!-- default: name -->
    <!ATTLIST map schema CDATA #IMPLIED>                             <!-- default: none -->
    <!ATTLIST map lazy (true|false) "false">
***************
*** 203,208 ****
  	(element|one-to-many|many-to-many|composite-element)
  )>
!   <!ATTLIST set role CDATA #REQUIRED>
!   <!ATTLIST set table CDATA #IMPLIED>                              <!-- default: rolename -->
    <!ATTLIST set schema CDATA #IMPLIED>                             <!-- default: none -->
    <!ATTLIST set lazy (true|false) "false">
--- 197,202 ----
  	(element|one-to-many|many-to-many|composite-element)
  )>
!   <!ATTLIST set name CDATA #REQUIRED>
!   <!ATTLIST set table CDATA #IMPLIED>                              <!-- default: name -->
    <!ATTLIST set schema CDATA #IMPLIED>                             <!-- default: none -->
    <!ATTLIST set lazy (true|false) "false">
***************
*** 217,222 ****
  	(element|one-to-many|many-to-many|composite-element)
  )>
!   <!ATTLIST bag role CDATA #REQUIRED>
!   <!ATTLIST bag table CDATA #IMPLIED>                              <!-- default: rolename -->
    <!ATTLIST bag schema CDATA #IMPLIED>                             <!-- default: none -->
    <!ATTLIST bag lazy (true|false) "false">
--- 211,216 ----
  	(element|one-to-many|many-to-many|composite-element)
  )>
!   <!ATTLIST bag name CDATA #REQUIRED>
!   <!ATTLIST bag table CDATA #IMPLIED>                              <!-- default: name -->
    <!ATTLIST bag schema CDATA #IMPLIED>                             <!-- default: none -->
    <!ATTLIST bag lazy (true|false) "false">
***************
*** 231,236 ****
  	(element|one-to-many|many-to-many|composite-element)
  )>
!   <!ATTLIST list role CDATA #REQUIRED>
!   <!ATTLIST list table CDATA #IMPLIED>                             <!-- default: rolename -->
    <!ATTLIST list schema CDATA #IMPLIED>                            <!-- default: none -->
    <!ATTLIST list lazy (true|false) "false">
--- 225,230 ----
  	(element|one-to-many|many-to-many|composite-element)
  )>
!   <!ATTLIST list name CDATA #REQUIRED>
!   <!ATTLIST list table CDATA #IMPLIED>                             <!-- default: name -->
    <!ATTLIST list schema CDATA #IMPLIED>                            <!-- default: none -->
    <!ATTLIST list lazy (true|false) "false">
***************
*** 244,249 ****
  	(element|one-to-many|many-to-many|composite-element)
  )>
!   <!ATTLIST array role CDATA #REQUIRED>
!   <!ATTLIST array table CDATA #IMPLIED>                            <!-- default: rolename -->
    <!ATTLIST array schema CDATA #IMPLIED>                           <!-- default: none -->
    <!ATTLIST array element-class CDATA #IMPLIED>
--- 238,243 ----
  	(element|one-to-many|many-to-many|composite-element)
  )>
!   <!ATTLIST array name CDATA #REQUIRED>
!   <!ATTLIST array table CDATA #IMPLIED>                            <!-- default: name -->
    <!ATTLIST array schema CDATA #IMPLIED>                           <!-- default: none -->
    <!ATTLIST array element-class CDATA #IMPLIED>
***************
*** 251,256 ****
  
  <!ELEMENT primitive-array (jcs-cache?, key, index, element)>
!   <!ATTLIST primitive-array role CDATA #REQUIRED>
!   <!ATTLIST primitive-array table CDATA #IMPLIED>                  <!-- default: rolename -->
    <!ATTLIST primitive-array schema CDATA #IMPLIED>                 <!-- default: none -->
  
--- 245,250 ----
  
  <!ELEMENT primitive-array (jcs-cache?, key, index, element)>
!   <!ATTLIST primitive-array name CDATA #REQUIRED>
!   <!ATTLIST primitive-array table CDATA #IMPLIED>                  <!-- default: name -->
    <!ATTLIST primitive-array schema CDATA #IMPLIED>                 <!-- default: none -->
  

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/impl SessionImpl.java,1.2,1.3

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

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

Modified Files:
	SessionImpl.java 
Log Message:
changed default unsaved-value
changed 'role' attribute to 'name'
added a new check/exception in delete()

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/SessionImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SessionImpl.java	1 Jan 2003 15:12:52 -0000	1.2
--- SessionImpl.java	2 Jan 2003 11:01:49 -0000	1.3
***************
*** 502,508 ****
  
  		if ( isEntryFor(object) ) throw new PersistentObjectException(
! 			"attempted to save an instance of " +
! 			persister.getClassName() +
! 			" that was already associated with the Session"
  		);
  
--- 502,506 ----
  
  		if ( isEntryFor(object) ) throw new PersistentObjectException(
! 			"attempted to save an instance of that was already associated with the Session: " + infoString(persister, id)
  		);
  
***************
*** 526,530 ****
              key = new Key(id, persister);
  
!             if ( getEntity(key) != null ) throw new HibernateException("The generated ID is already in use" + infoString(persister, id));
  
              persister.setIdentifier(object, id);
--- 524,528 ----
              key = new Key(id, persister);
  
!             if ( getEntity(key) != null ) throw new HibernateException("The generated ID is already in use: " + infoString(persister, id));
  
              persister.setIdentifier(object, id);
***************
*** 701,704 ****
--- 699,708 ----
  			persister = getPersister(object);
  			Serializable id = persister.getIdentifier(object);
+ 			
+ 			Object old = getEntity( new Key(id, persister) );
+ 			
+ 			if (old!=null) {
+ 				throw new HibernateException( "Another object with the same id was already associated with the session: " + infoString(persister, id) );
+ 			} 
  
  			removeCollectionsFor(persister, id, object);
***************
*** 719,723 ****
  			persister = entry.persister;
  		}
! 		if ( !persister.isMutable() ) throw new HibernateException( "attempted to delete an object of immutable class: " + infoString(persister));
  
  
--- 723,727 ----
  			persister = entry.persister;
  		}
! 		if ( !persister.isMutable() ) throw new HibernateException( "attempted to delete an object of immutable class: " + infoString(persister) );
  
  
***************
*** 964,968 ****
  		else if ( old!=null ) {
  			throw new HibernateException(
! 				"Another object was associated with this id (the object with the given id was already loaded) " +
  				 infoString(persister, id)
  			);
--- 968,972 ----
  		else if ( old!=null ) {
  			throw new HibernateException(
! 				"Another object was associated with this id (the object with the given id was already loaded): " +
  				 infoString(persister, id)
  			);
***************
*** 1351,1359 ****
  	private void doLoadByObject(Object object, Serializable id, boolean checkDeleted) throws SQLException, HibernateException {
  
- 		if ( getEntry(object)!=null ) throw new PersistentObjectException("attempted to load into an instance that was already associated with the Session");
  		Class clazz = object.getClass();
  		Object result = doLoad(clazz, id, object, LockMode.NONE, checkDeleted);
  		throwObjectNotFound(result, id, clazz);
! 		if (result!=object) throw new HibernateException("The object with that id was already loaded by the Session: " + id);
  
  	}
--- 1355,1369 ----
  	private void doLoadByObject(Object object, Serializable id, boolean checkDeleted) throws SQLException, HibernateException {
  
  		Class clazz = object.getClass();
+ 		if ( getEntry(object)!=null ) throw new PersistentObjectException(
+ 			"attempted to load into an instance that was already associated with the Session: " +
+ 			infoString(clazz, id)
+ 		);
  		Object result = doLoad(clazz, id, object, LockMode.NONE, checkDeleted);
  		throwObjectNotFound(result, id, clazz);
! 		if (result!=object) throw new HibernateException(
! 			"The object with that id was already loaded by the Session: " +
! 			infoString(clazz, id) 
! 		);
  
  	}

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/mapping Collection.java,1.1.1.1,1.2 Map.java,1.1.1.1,1.2

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

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

Modified Files:
	Collection.java Map.java 
Log Message:
renamed readonly to inverse

Index: Collection.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Collection.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Collection.java	1 Jan 2003 13:56:14 -0000	1.1.1.1
--- Collection.java	1 Jan 2003 15:12:52 -0000	1.2
***************
*** 30,34 ****
  	private boolean lazy;
  	private boolean isOneToMany;
! 	private boolean readonly;
  	private OneToMany oneToMany;
  	private CacheConcurrencyStrategy cache;
--- 30,34 ----
  	private boolean lazy;
  	private boolean isOneToMany;
! 	private boolean inverse;
  	private OneToMany oneToMany;
  	private CacheConcurrencyStrategy cache;
***************
*** 71,76 ****
  		role = prefix + Root.ROLE_SEPERATOR + barerole;
  		
! 		Node readonlyNode = atts.getNamedItem("readonly");
! 		if ( readonlyNode!=null) readonly = StringHelper.booleanValue( readonlyNode.getNodeValue() );
  		
  		Node orderNode = atts.getNamedItem("order-by");
--- 71,77 ----
  		role = prefix + Root.ROLE_SEPERATOR + barerole;
  		
! 		Node inverseNode = atts.getNamedItem("inverse");
! 		if ( inverseNode==null) inverseNode = atts.getNamedItem("readonly");
! 		if ( inverseNode!=null) inverse = StringHelper.booleanValue( inverseNode.getNodeValue() );
  		
  		Node orderNode = atts.getNamedItem("order-by");
***************
*** 158,162 ****
  		}
  
! 		if (!readonly) {
  			if (!isOneToMany) element.createForeignKeys(root, table);
  			// no foreign key for a one-to-many
--- 159,163 ----
  		}
  
! 		if (!inverse) {
  			if (!isOneToMany) element.createForeignKeys(root, table);
  			// no foreign key for a one-to-many
***************
*** 215,220 ****
  	}
  
! 	public boolean isReadOnly() {
! 		return readonly;
  	}
  
--- 216,221 ----
  	}
  
! 	public boolean isInverse() {
! 		return inverse;
  	}
  

Index: Map.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Map.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Map.java	1 Jan 2003 13:56:17 -0000	1.1.1.1
--- Map.java	1 Jan 2003 15:12:52 -0000	1.2
***************
*** 61,65 ****
  			}
  		}
! 		if ( !isReadOnly() ) getIndex().createForeignKeys( root, getTable() );
  		
  		if ( !isOneToMany() ) createPrimaryKey();
--- 61,65 ----
  			}
  		}
! 		if ( !isInverse() ) getIndex().createForeignKeys( root, getTable() );
  		
  		if ( !isOneToMany() ) createPrimaryKey();

[Hibernate-commits] Hibernate2/src/net/sf/hibernate hibernate-mapping-2.0.dtd,1.1.1.1,1.2

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

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

Modified Files:
	hibernate-mapping-2.0.dtd 
Log Message:
renamed readonly to inverse

Index: hibernate-mapping-2.0.dtd
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hibernate-mapping-2.0.dtd,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** hibernate-mapping-2.0.dtd	1 Jan 2003 13:53:44 -0000	1.1.1.1
--- hibernate-mapping-2.0.dtd	1 Jan 2003 15:12:51 -0000	1.2
***************
*** 193,196 ****
--- 193,197 ----
    <!ATTLIST map schema CDATA #IMPLIED>                             <!-- default: none -->
    <!ATTLIST map lazy (true|false) "false">
+   <!ATTLIST map inverse (true|false) "false">
    <!ATTLIST map sort CDATA #IMPLIED>                               <!-- unsorted|natural|"comparator class", default: unsorted -->
    <!ATTLIST map cascade (none|all|save-update|delete) #IMPLIED>    <!-- default: none -->
***************
*** 207,211 ****
    <!ATTLIST set lazy (true|false) "false">
    <!ATTLIST set sort CDATA "unsorted">                             <!-- unsorted|natural|"comparator class" -->
!   <!ATTLIST set readonly (true|false) "false">
    <!ATTLIST set cascade (none|all|save-update|delete) #IMPLIED>    <!-- default: none -->
    <!ATTLIST set order-by CDATA #IMPLIED>                           <!-- default: none -->
--- 208,212 ----
    <!ATTLIST set lazy (true|false) "false">
    <!ATTLIST set sort CDATA "unsorted">                             <!-- unsorted|natural|"comparator class" -->
!   <!ATTLIST set inverse (true|false) "false">
    <!ATTLIST set cascade (none|all|save-update|delete) #IMPLIED>    <!-- default: none -->
    <!ATTLIST set order-by CDATA #IMPLIED>                           <!-- default: none -->
***************
*** 220,224 ****
    <!ATTLIST bag schema CDATA #IMPLIED>                             <!-- default: none -->
    <!ATTLIST bag lazy (true|false) "false">
!   <!ATTLIST bag readonly (true|false) "false">
    <!ATTLIST bag cascade (none|all|save-update|delete) #IMPLIED>    <!-- default: none -->
    <!ATTLIST bag order-by CDATA #IMPLIED>                           <!-- default: none -->
--- 221,225 ----
    <!ATTLIST bag schema CDATA #IMPLIED>                             <!-- default: none -->
    <!ATTLIST bag lazy (true|false) "false">
!   <!ATTLIST bag inverse (true|false) "false">
    <!ATTLIST bag cascade (none|all|save-update|delete) #IMPLIED>    <!-- default: none -->
    <!ATTLIST bag order-by CDATA #IMPLIED>                           <!-- default: none -->
***************
*** 234,237 ****
--- 235,239 ----
    <!ATTLIST list schema CDATA #IMPLIED>                            <!-- default: none -->
    <!ATTLIST list lazy (true|false) "false">
+   <!ATTLIST list inverse (true|false) "false">
    <!ATTLIST list cascade (none|all|save-update|delete) #IMPLIED>   <!-- default: none -->
  

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/impl CollectionPersister.java,1.1.1.1,1.2 SessionImpl.java,1.1.1.1,1.2

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

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

Modified Files:
	CollectionPersister.java SessionImpl.java 
Log Message:
renamed readonly to inverse

Index: CollectionPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/CollectionPersister.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CollectionPersister.java	1 Jan 2003 13:54:46 -0000	1.1.1.1
--- CollectionPersister.java	1 Jan 2003 15:12:52 -0000	1.2
***************
*** 62,66 ****
  	private transient final boolean hasIndex;
  	private transient final boolean isLazy;
! 	private transient final boolean isReadonly;
  	private transient final Class elementClass;
  	private transient final CacheConcurrencyStrategy cache;
--- 62,66 ----
  	private transient final boolean hasIndex;
  	private transient final boolean isLazy;
! 	private transient final boolean isInverse;
  	private transient final Class elementClass;
  	private transient final CacheConcurrencyStrategy cache;
***************
*** 170,174 ****
  		isLazy = collection.isLazy();
  		
! 		isReadonly = collection.isReadOnly();
  		
  		if ( collection.isArray() ) {
--- 170,174 ----
  		isLazy = collection.isLazy();
  		
! 		isInverse = collection.isInverse();
  		
  		if ( collection.isArray() ) {
***************
*** 466,471 ****
  	public boolean isLazy() { return isLazy; }
  	
! 	public boolean isReadOnly() {
! 		return isReadonly;
  	}
  
--- 466,471 ----
  	public boolean isLazy() { return isLazy; }
  	
! 	public boolean isInverse() {
! 		return isInverse;
  	}
  
***************
*** 476,480 ****
  	public final void remove(Serializable id, SessionImplementor session) throws SQLException, HibernateException {
  		
! 		if ( !isReadonly ) {
  			
  			if ( log.isDebugEnabled() ) log.debug("Deleting collection: " + role + "#" + id);
--- 476,480 ----
  	public final void remove(Serializable id, SessionImplementor session) throws SQLException, HibernateException {
  		
! 		if ( !isInverse ) {
  			
  			if ( log.isDebugEnabled() ) log.debug("Deleting collection: " + role + "#" + id);
***************
*** 500,504 ****
  		throws SQLException, HibernateException {
  		
! 		if (!isReadonly) {
  			
  			if ( log.isDebugEnabled() ) log.debug("Inserting collection: " + role + "#" + id);
--- 500,504 ----
  		throws SQLException, HibernateException {
  		
! 		if (!isInverse) {
  			
  			if ( log.isDebugEnabled() ) log.debug("Inserting collection: " + role + "#" + id);
***************
*** 533,537 ****
  		throws SQLException, HibernateException {
  		
! 		if (!isReadonly) {
  			
  			if ( log.isDebugEnabled() ) log.debug("Deleting rows of collection: " + role + "#" + id);
--- 533,537 ----
  		throws SQLException, HibernateException {
  		
! 		if (!isInverse) {
  			
  			if ( log.isDebugEnabled() ) log.debug("Deleting rows of collection: " + role + "#" + id);
***************
*** 627,631 ****
  	public final void updateRows(PersistentCollection collection, Serializable id, SessionImplementor session) throws SQLException, HibernateException {
  		
! 		if (!isReadonly) {
  			
  			if ( log.isDebugEnabled() ) log.debug("Updating rows of collection: " + role + "#" + id);
--- 627,631 ----
  	public final void updateRows(PersistentCollection collection, Serializable id, SessionImplementor session) throws SQLException, HibernateException {
  		
! 		if (!isInverse) {
  			
  			if ( log.isDebugEnabled() ) log.debug("Updating rows of collection: " + role + "#" + id);
***************
*** 644,648 ****
  		throws SQLException, HibernateException {
  
! 		if (!isReadonly) {
  			
  			if ( log.isDebugEnabled() ) log.debug("Inserting rows of collection: " + role + "#" + id);
--- 644,648 ----
  		throws SQLException, HibernateException {
  
! 		if (!isInverse) {
  			
  			if ( log.isDebugEnabled() ) log.debug("Inserting rows of collection: " + role + "#" + id);

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/SessionImpl.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SessionImpl.java	1 Jan 2003 13:56:04 -0000	1.1.1.1
--- SessionImpl.java	1 Jan 2003 15:12:52 -0000	1.2
***************
*** 2169,2173 ****
  	public boolean isCollectionReadOnly(PersistentCollection collection) {
  		CollectionEntry ce = getCollectionEntry(collection);
! 		return ce!=null && ce.loadedPersister.isReadOnly();
  	}
  
--- 2169,2173 ----
  	public boolean isCollectionReadOnly(PersistentCollection collection) {
  		CollectionEntry ce = getCollectionEntry(collection);
! 		return ce!=null && ce.loadedPersister.isInverse();
  	}
  

[Hibernate-commits] Hibernate/cirrus/hibernate/impl CollectionPersister.java,1.86,1.87

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv10736/hibernate/impl

Modified Files:
	CollectionPersister.java 
Log Message:
fixed a problem where index columns of one-to-many were not getting cleaned up

Index: CollectionPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl/CollectionPersister.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** CollectionPersister.java	26 Nov 2002 08:37:25 -0000	1.86
--- CollectionPersister.java	1 Jan 2003 15:04:09 -0000	1.87
***************
*** 370,381 ****
  	private String sqlDeleteString() {
  		if (isOneToMany) {
! 			return new StringBuffer("update ")
  				.append(qualifiedTableName)
  				.append( " set " )
  				.append( StringHelper.join( " = null, ", keyColumnNames ) )
! 				.append( " = null where " )
  				.append( StringHelper.join( " = ? and ", keyColumnNames ) )
! 				.append( " = ?" )
! 				.toString();
  		}
  		else {
--- 370,387 ----
  	private String sqlDeleteString() {
  		if (isOneToMany) {
! 			StringBuffer buf = new StringBuffer("update ")
  				.append(qualifiedTableName)
  				.append( " set " )
  				.append( StringHelper.join( " = null, ", keyColumnNames ) )
! 				.append( " = null" );
! 			if ( hasIndex ) {
! 				buf.append(", ")
! 					.append( StringHelper.join( " = null, ", indexColumnNames ) )
! 					.append( " = null" );
! 			}
! 			buf.append( " where " )
  				.append( StringHelper.join( " = ? and ", keyColumnNames ) )
! 				.append( " = ?" );
! 			return buf.toString();
  		}
  		else {

[Hibernate-commits] CVSROOT cvswrappers,1.1,1.2

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

Update of /cvsroot/hibernate/CVSROOT
In directory sc8-pr-cvs1:/tmp/cvs-serv17534

Modified Files:
	cvswrappers 
Log Message:
correct binary defaults

Index: cvswrappers
===================================================================
RCS file: /cvsroot/hibernate/CVSROOT/cvswrappers,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cvswrappers	27 Nov 2001 17:11:03 -0000	1.1
--- cvswrappers	1 Jan 2003 13:22:15 -0000	1.2
***************
*** 22,23 ****
--- 22,33 ----
  # For example:
  #*.gif -k 'b'
+ *.gif -k 'b'
+ *.jpg -k 'b'
+ *.pdf -k 'b'
+ *.jar -k 'b'
+ *.eps -k 'b'
+ *.png -k 'b'
+ *.zargo -k 'b'
+ *.sxd -k 'b'
+ 
+ 

[Hibernate-commits] Hibernate build.xml,1.34,1.35

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

Update of /cvsroot/hibernate/Hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv3165

Modified Files:
	build.xml 
Log Message:
fixed a build bug

Index: build.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** build.xml	31 Dec 2002 08:22:28 -0000	1.34
--- build.xml	1 Jan 2003 09:36:05 -0000	1.35
***************
*** 202,206 ****
  	<target name="extras" description="Copies miscellaneous files to root dir">
  		<copy todir="${dist.dir}/bin">
! 			<fileset dir="${src.dir}/bin">
  				<include name="*.bat"/>
  			</fileset>
--- 202,206 ----
  	<target name="extras" description="Copies miscellaneous files to root dir">
  		<copy todir="${dist.dir}/bin">
! 			<fileset dir="bin">
  				<include name="*.bat"/>
  			</fileset>

[Hibernate-commits] Hibernate/cirrus/hibernate/helpers NamingHelper.java,1.7,1.8

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/helpers
In directory sc8-pr-cvs1:/tmp/cvs-serv10832/cirrus/hibernate/helpers

Modified Files:
	NamingHelper.java 
Log Message:
arbitrary JNDI InitialContext properties may now be passed as hibernate.jndi.*

Index: NamingHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/helpers/NamingHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NamingHelper.java	16 Sep 2002 04:50:50 -0000	1.7
--- NamingHelper.java	1 Jan 2003 03:03:17 -0000	1.8
***************
*** 2,6 ****
--- 2,8 ----
  package cirrus.hibernate.helpers;
  
+ import java.util.HashSet;
  import java.util.Hashtable;
+ import java.util.Iterator;
  import java.util.Properties;
  
***************
*** 21,40 ****
  	public static InitialContext getInitialContext(Properties props) throws NamingException {
  
! 	    String jndiClass = props.getProperty(Environment.JNDI_CLASS);
! 	    String jndiURL = props.getProperty(Environment.JNDI_URL);
! 
! 	    // we want to be able to just use the defaults,
! 	    // if JNDI environment properties are not supplied
! 	    Hashtable hash = new Hashtable();
! 	    if (jndiClass != null) hash.put(Context.INITIAL_CONTEXT_FACTORY, jndiClass);
! 	    if (jndiURL != null) hash.put(Context.PROVIDER_URL, jndiURL);
! 
  	    try {
! 			return ( jndiURL==null && jndiClass==null ) ?
  			    new InitialContext() :
  			    new InitialContext(hash);
  	    }
  	    catch (NamingException e) {
! 	    	log.error("Could not obtain initial context: " + jndiURL, e);
  	    	throw e;
  	    }
--- 23,35 ----
  	public static InitialContext getInitialContext(Properties props) throws NamingException {
  
! 		Hashtable hash = getJndiProperties(props);
! 		log.info("JNDI InitialContext properties:" + hash);
  	    try {
! 			return ( hash.size()==0 ) ?
  			    new InitialContext() :
  			    new InitialContext(hash);
  	    }
  	    catch (NamingException e) {
! 	    	log.error("Could not obtain initial context", e);
  	    	throw e;
  	    }
***************
*** 80,83 ****
--- 75,111 ----
  		}
  		log.debug("Bound name: " + name);
+ 	}
+ 
+ 	/**
+ 	 * Transform JNDI properties passed in the form <tt>hibernate.jndi.*</tt> to the
+ 	 * format accepted by <tt>InitialContext</tt> by triming the leading "<tt>hibernate.jndi</tt>".
+ 	 */
+ 	public static Properties getJndiProperties(Properties properties) {
+ 		
+ 		HashSet specialProps = new HashSet();
+ 		specialProps.add(Environment.JNDI_CLASS);
+ 		specialProps.add(Environment.JNDI_URL);
+ 		
+ 		Iterator iter = properties.keySet().iterator();
+ 		Properties result = new Properties();
+ 		while ( iter.hasNext() ) {
+ 			String prop = (String) iter.next();
+ 			if ( prop.indexOf(Environment.JNDI_PREFIX) > -1 && !specialProps.contains(prop) ) {
+ 				result.setProperty(
+ 					prop.substring( Environment.JNDI_PREFIX.length()+1 ),
+ 					properties.getProperty(prop)
+ 				);
+ 			}
+ 		}
+ 
+ 	    String jndiClass = properties.getProperty(Environment.JNDI_CLASS);
+ 	    String jndiURL = properties.getProperty(Environment.JNDI_URL);
+ 	    // we want to be able to just use the defaults,
+ 	    // if JNDI environment properties are not supplied
+ 	    // so don't put null in anywhere
+ 	    if (jndiClass != null) result.put(Context.INITIAL_CONTEXT_FACTORY, jndiClass);
+ 	    if (jndiURL != null) result.put(Context.PROVIDER_URL, jndiURL);
+ 	    
+ 		return result;
  	}
  

[Hibernate-commits] Hibernate/cirrus/hibernate/eg NetworkDemo.java,1.31,1.32

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/eg
In directory sc8-pr-cvs1:/tmp/cvs-serv10832/cirrus/hibernate/eg

Modified Files:
	NetworkDemo.java 
Log Message:
arbitrary JNDI InitialContext properties may now be passed as hibernate.jndi.*

Index: NetworkDemo.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/eg/NetworkDemo.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** NetworkDemo.java	18 Aug 2002 09:43:19 -0000	1.31
--- NetworkDemo.java	1 Jan 2003 03:03:16 -0000	1.32
***************
*** 284,288 ****
  				Session sess = sessions.openSession();
  				Databinder db = sessions.openDatabinder();
! 				
  				try {
  				
--- 284,288 ----
  				Session sess = sessions.openSession();
  				Databinder db = sessions.openDatabinder();
! 				db.setInitializeLazy(true);
  				try {
  				

[Hibernate-commits] Hibernate changelog.txt,1.293,1.294

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

Update of /cvsroot/hibernate/Hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv10832

Modified Files:
	changelog.txt 
Log Message:
arbitrary JNDI InitialContext properties may now be passed as hibernate.jndi.*

Index: changelog.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/changelog.txt,v
retrieving revision 1.293
retrieving revision 1.294
diff -C2 -d -r1.293 -r1.294
*** changelog.txt	31 Dec 2002 08:22:28 -0000	1.293
--- changelog.txt	1 Jan 2003 03:03:15 -0000	1.294
***************
*** 3,7 ****
  Changes in version 1.2.1b (1.1.2003)
  --------------------------------------
! * fixed an NPE that occurred while loading classes in IBM JVM
  
  Changes in version 1.2.1 (31.12.2002)
--- 3,8 ----
  Changes in version 1.2.1b (1.1.2003)
  --------------------------------------
! * fixed an NPE that occurred while loading Hibernate classes in IBM JVM
! * arbitrary JNDI InitialContext properties may now be passed as hibernate.jndi.*
  
  Changes in version 1.2.1 (31.12.2002)

[Hibernate-commits] Hibernate/cirrus/hibernate Environment.java,1.81,1.82

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv10832/cirrus/hibernate

Modified Files:
	Environment.java 
Log Message:
arbitrary JNDI InitialContext properties may now be passed as hibernate.jndi.*

Index: Environment.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/Environment.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** Environment.java	31 Dec 2002 08:22:29 -0000	1.81
--- Environment.java	1 Jan 2003 03:03:15 -0000	1.82
***************
*** 92,95 ****
--- 92,99 ----
  	public static final String JNDI_URL ="hibernate.jndi.url";
  	/**
+ 	 * prefix for arbitrary JNDI <tt>InitialContext</tt> properties
+ 	 */
+ 	public static final String JNDI_PREFIX = "hibernate.jndi";
+ 	/**
  	 * JNDI name to bind to <tt>SessionFactory</tt>
  	 */

[Hibernate-commits] Hibernate/cirrus/hibernate/connection ConnectionProviderFactory.java,1.10,1.11

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/connection
In directory sc8-pr-cvs1:/tmp/cvs-serv10832/cirrus/hibernate/connection

Modified Files:
	ConnectionProviderFactory.java 
Log Message:
arbitrary JNDI InitialContext properties may now be passed as hibernate.jndi.*

Index: ConnectionProviderFactory.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/connection/ConnectionProviderFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ConnectionProviderFactory.java	10 Sep 2002 15:30:32 -0000	1.10
--- ConnectionProviderFactory.java	1 Jan 2003 03:03:16 -0000	1.11
***************
*** 80,85 ****
  
  	/**
! 	 * Transform JDBC connection properties passed in the for <tt>hibernate.connection.*</tt> to the
! 	 * format accepted by <tt>DriverManager</tt> ie. trim off the leading "<tt>hibernate.connection</tt>".
  	 */
  	public static Properties getJdbcConnectionProperties(Properties properties) {
--- 80,85 ----
  
  	/**
! 	 * Transform JDBC connection properties passed in the form <tt>hibernate.connection.*</tt> to the
! 	 * format accepted by <tt>DriverManager</tt> by triming the leading "<tt>hibernate.connection</tt>".
  	 */
  	public static Properties getJdbcConnectionProperties(Properties properties) {

[Hibernate-commits] Hibernate/cirrus/hibernate/type NullableType.java,1.30,1.31

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/type
In directory sc8-pr-cvs1:/tmp/cvs-serv30547/cirrus/hibernate/type

Modified Files:
	NullableType.java 
Log Message:
fixed an NPE that occurred on IBM JVM
nest InvocationTargetExceptions

Index: NullableType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/type/NullableType.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** NullableType.java	25 Dec 2002 06:47:11 -0000	1.30
--- NullableType.java	31 Dec 2002 08:22:29 -0000	1.31
***************
*** 13,16 ****
--- 13,17 ----
  import cirrus.hibernate.engine.SessionFactoryImplementor;
  import cirrus.hibernate.engine.SessionImplementor;
+ import cirrus.hibernate.helpers.StringHelper;
  
  /**
***************
*** 19,23 ****
  public abstract class NullableType extends AbstractType {
  	
! 	private static final Log log = LogFactory.getLog( Type.class.getPackage().getName() );
  
  	public abstract Object get(ResultSet rs, String name) throws HibernateException, SQLException;
--- 20,24 ----
  public abstract class NullableType extends AbstractType {
  	
! 	private static final Log log = LogFactory.getLog( StringHelper.qualifier( Type.class.getName() ) );
  
  	public abstract Object get(ResultSet rs, String name) throws HibernateException, SQLException;

[Hibernate-commits] Hibernate/cirrus/hibernate Environment.java,1.80,1.81 PropertyAccessException.java,1.2,1.3

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv30547/cirrus/hibernate

Modified Files:
	Environment.java PropertyAccessException.java 
Log Message:
fixed an NPE that occurred on IBM JVM
nest InvocationTargetExceptions

Index: Environment.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/Environment.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** Environment.java	27 Dec 2002 11:54:48 -0000	1.80
--- Environment.java	31 Dec 2002 08:22:29 -0000	1.81
***************
*** 39,43 ****
  public final class Environment {
  
! 	private static final String VERSION = "1.2.1";
  
  	/**
--- 39,43 ----
  public final class Environment {
  
! 	private static final String VERSION = "1.2.1b";
  
  	/**

Index: PropertyAccessException.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/PropertyAccessException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PropertyAccessException.java	27 Oct 2002 03:11:33 -0000	1.2
--- PropertyAccessException.java	31 Dec 2002 08:22:29 -0000	1.3
***************
*** 14,18 ****
  
  	public PropertyAccessException(Exception root, String s, boolean wasSetter, Class persistentClass, String propertyName) {
! 		super(s);
  		this.persistentClass = persistentClass;
  		this.wasSetter = wasSetter;
--- 14,18 ----
  
  	public PropertyAccessException(Exception root, String s, boolean wasSetter, Class persistentClass, String propertyName) {
! 		super(s, root);
  		this.persistentClass = persistentClass;
  		this.wasSetter = wasSetter;

[Hibernate-commits] Hibernate build.xml,1.33,1.34 changelog.txt,1.292,1.293 readme.txt,1.56,1.57

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

Update of /cvsroot/hibernate/Hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv30547

Modified Files:
	build.xml changelog.txt readme.txt 
Log Message:
fixed an NPE that occurred on IBM JVM
nest InvocationTargetExceptions

Index: build.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** build.xml	30 Dec 2002 12:48:51 -0000	1.33
--- build.xml	31 Dec 2002 08:22:28 -0000	1.34
***************
*** 156,160 ****
      </target>
  
! 	<target name="docbook" description="Compile docbook documentation to html and copy to dist dir">
  		<java classname="com.icl.saxon.StyleSheet" fork="true" dir="${doc.dir}/reference/src/">
  			<arg value="-o"/>
--- 156,160 ----
      </target>
  
! 	<target name="docbook" description="Compile docbook documentation to html">
  		<java classname="com.icl.saxon.StyleSheet" fork="true" dir="${doc.dir}/reference/src/">
  			<arg value="-o"/>
***************
*** 181,184 ****
--- 181,197 ----
  				<patternset refid="doc.files"/>
  				<exclude name="api/**/*"/>
+ 				<exclude name="reference/**/*"/>
+ 
+ 			</fileset>
+ 		</copy>
+ 	</target>
+ 	
+ 	<target name="copydoc">
+ 		<mkdir dir="${dist.doc.dir}"/>
+ 		<copy todir="${dist.doc.dir}">
+ 			<fileset dir="${doc.dir}">
+ 				<patternset refid="doc.files"/>
+ 				<exclude name="*"/>
+ 				<exclude name="api/**/*"/>
  				<exclude name="reference/src/**/*"/>
  				<exclude name="reference/images/*.pdf"/>
***************
*** 211,215 ****
  	</target>
  	
! 	<target name="dist" depends="jar,javadoc,copysource,copylib,extras" description="Build everything">
  		<zip zipfile = "${dist.dir}.zip">
  			<zipfileset prefix="${name}-${version}" dir="${dist.dir}"/>
--- 224,228 ----
  	</target>
  	
! 	<target name="dist" depends="jar,javadoc,copysource,copylib,copydoc,extras" description="Build everything">
  		<zip zipfile = "${dist.dir}.zip">
  			<zipfileset prefix="${name}-${version}" dir="${dist.dir}"/>

Index: changelog.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/changelog.txt,v
retrieving revision 1.292
retrieving revision 1.293
diff -C2 -d -r1.292 -r1.293
*** changelog.txt	30 Dec 2002 12:48:51 -0000	1.292
--- changelog.txt	31 Dec 2002 08:22:28 -0000	1.293
***************
*** 1,5 ****
  Hibernate Changelog
  ===================
! Changes in version 1.2.1 (xx.12.2002)
  -------------------------------------
  * Changed the MySQL mapping of Hibernate "timestamp" to MySQL "DATETIME" (Matthias Schwinn)
--- 1,9 ----
  Hibernate Changelog
  ===================
! Changes in version 1.2.1b (1.1.2003)
! --------------------------------------
! * fixed an NPE that occurred while loading classes in IBM JVM
! 
! Changes in version 1.2.1 (31.12.2002)
  -------------------------------------
  * Changed the MySQL mapping of Hibernate "timestamp" to MySQL "DATETIME" (Matthias Schwinn)

Index: readme.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/readme.txt,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** readme.txt	25 Dec 2002 07:51:50 -0000	1.56
--- readme.txt	31 Dec 2002 08:22:28 -0000	1.57
***************
*** 1,5 ****
  Hibernate - Relational Persistence for Idiomatic Java
  =====================================================
! version 1.2.1 xx December 2002
  
  Instructions
--- 1,5 ----
  Hibernate - Relational Persistence for Idiomatic Java
  =====================================================
! version 1.2.1b 1 January 2003
  
  Instructions

[Hibernate-commits] Hibernate/cirrus/hibernate/test FooBarTest.java,1.237,1.238 MultiTableTest.java,1.21,1.22

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv14135/cirrus/hibernate/test

Modified Files:
	FooBarTest.java MultiTableTest.java 
Log Message:
got tests working in IBM JVM

Index: FooBarTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/FooBarTest.java,v
retrieving revision 1.237
retrieving revision 1.238
diff -C2 -d -r1.237 -r1.238
*** FooBarTest.java	28 Dec 2002 02:25:48 -0000	1.237
--- FooBarTest.java	30 Dec 2002 13:11:42 -0000	1.238
***************
*** 2410,2413 ****
--- 2410,2414 ----
      		"cached object identity"
      	);
+     	s.connection().createStatement().executeUpdate("delete from immut");
      	s.connection().commit();
      	s.close();

Index: MultiTableTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/MultiTableTest.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MultiTableTest.java	27 Dec 2002 11:54:47 -0000	1.21
--- MultiTableTest.java	30 Dec 2002 13:11:42 -0000	1.22
***************
*** 155,158 ****
--- 155,159 ----
  		Session s = sessions.openSession();
  		Transaction t = s.beginTransaction();
+ 		assertTrue( s.find("from s in class Simple").size()==0 );
  		Multi multi = new Multi();
  		multi.setExtraProp("extra");
***************
*** 234,237 ****
--- 235,239 ----
  		assertTrue( po.getList().size()==1 );
  		s.delete(po);
+ 		assertTrue( s.find("from s in class Simple").size()==0 );
  		t.commit();
  		s.close();
***************
*** 250,254 ****
  		s.close();
  		s = sessions.openSession();
! 		s.load(LessSimple.class, id);
  		s.connection().commit();
  		s.close();
--- 252,257 ----
  		s.close();
  		s = sessions.openSession();
! 		s.delete( s.load(LessSimple.class, id) );
! 		s.flush();
  		s.connection().commit();
  		s.close();

[Hibernate-commits] Hibernate/cirrus/hibernate/map RootClass.java,1.55,1.56 Subclass.java,1.24,1.25

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/map
In directory sc8-pr-cvs1:/tmp/cvs-serv30673/cirrus/hibernate/map

Modified Files:
	RootClass.java Subclass.java 
Log Message:
fixed JDK1.2 compile brob

Index: RootClass.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/RootClass.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** RootClass.java	25 Dec 2002 04:16:36 -0000	1.55
--- RootClass.java	30 Dec 2002 12:48:52 -0000	1.56
***************
*** 71,75 ****
  	}
  	public Iterator getTableClosureIterator() {
! 		return Collections.singletonList( getTable() ).iterator();
  	}
  
--- 71,75 ----
  	}
  	public Iterator getTableClosureIterator() {
! 		return Collections.singleton( getTable() ).iterator();
  	}
  

Index: Subclass.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Subclass.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Subclass.java	26 Dec 2002 03:35:07 -0000	1.24
--- Subclass.java	30 Dec 2002 12:48:52 -0000	1.25
***************
*** 71,75 ****
  		return new JoinedIterator( new Iterator[] { 			 
  			getSuperclass().getTableClosureIterator(),
! 			Collections.singletonList( getTable() ).iterator()
  		} );
  	}
--- 71,75 ----
  		return new JoinedIterator( new Iterator[] { 			 
  			getSuperclass().getTableClosureIterator(),
! 			Collections.singleton( getTable() ).iterator()
  		} );
  	}