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
|