[Hibernate-commits] Hibernate2/src/net/sf/hibernate/impl SessionFactoryImpl.java,1.6,1.7

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

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

Modified Files:
	SessionFactoryImpl.java 
Log Message:
redesigned configuration API

Index: SessionFactoryImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/SessionFactoryImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SessionFactoryImpl.java	20 Jan 2003 12:48:11 -0000	1.6
--- SessionFactoryImpl.java	26 Jan 2003 01:33:35 -0000	1.7
***************
*** 33,37 ****
  import net.sf.hibernate.AssertionFailure;
  import net.sf.hibernate.Databinder;
- import net.sf.hibernate.Environment;
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.Interceptor;
--- 33,36 ----
***************
*** 42,45 ****
--- 41,45 ----
  import net.sf.hibernate.SessionFactory;
  import net.sf.hibernate.cache.Timestamper;
+ import net.sf.hibernate.cfg.*;
  import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.connection.ConnectionProvider;
***************
*** 114,118 ****
  	private static final Log log = LogFactory.getLog(SessionFactoryImpl.class);
  	
! 	public SessionFactoryImpl(DatastoreImpl datastore, Properties properties, Interceptor interceptor) throws HibernateException {
  		
  		log.trace("Instantiating session factory");
--- 114,118 ----
  	private static final Log log = LogFactory.getLog(SessionFactoryImpl.class);
  	
! 	public SessionFactoryImpl(Configuration datastore, Properties properties, Interceptor interceptor) throws HibernateException {
  		
  		log.trace("Instantiating session factory");
***************
*** 189,193 ****
  		classPersisters = new HashMap();
  		classPersistersByName = new HashMap();
! 		iter = datastore.getClassMaps();
  		while ( iter.hasNext() ) {
  			PersistentClass model = (PersistentClass) iter.next();
--- 189,193 ----
  		classPersisters = new HashMap();
  		classPersistersByName = new HashMap();
! 		iter = datastore.getClassMappings();
  		while ( iter.hasNext() ) {
  			PersistentClass model = (PersistentClass) iter.next();
***************
*** 208,212 ****
  		
  		collectionPersisters = new HashMap();
! 		iter = datastore.getCollectionMaps();
  		while ( iter.hasNext() ) {
  			Collection map = (Collection) iter.next();
--- 208,212 ----
  		
  		collectionPersisters = new HashMap();
! 		iter = datastore.getCollectionMappings();
  		while ( iter.hasNext() ) {
  			Collection map = (Collection) iter.next();