hibernate-commits

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

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

Modified Files:
	Configuration.java 
Log Message:
fixed some silly errors in new config stuff
added a warning to the javadoc
added --config option to SchemaExport

Index: Configuration.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg/Configuration.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Configuration.java	28 Jan 2003 10:22:19 -0000	1.10
--- Configuration.java	31 Jan 2003 08:49:49 -0000	1.11
***************
*** 649,654 ****
  		addProperties(sfNode);
  		
- 		Configuration ds = new Configuration();
- 		
  		NodeList mapElements = sfNode.getChildNodes();
  		for ( int j=0; j<mapElements.getLength(); j++ ) {
--- 649,652 ----
***************
*** 662,679 ****
  					log.debug(name + "<-" + rsrc);
  					try {
! 						ds.addResource( rsrc.getNodeValue(), Thread.currentThread().getContextClassLoader() );
  					}
  					catch (MappingException me) {
! 						ds.addResource( rsrc.getNodeValue(), Environment.class.getClassLoader() );
  					}
  				}
  				else if ( jar!=null ) {
  					log.debug(name + "<-" + jar);
! 					ds.addJar( jar.getNodeValue() );
  				}
  				else {
  					if (file==null) throw new HibernateException("<mapping> element in configuration specifies no attributes");
  					log.debug(name + "<-" + file);
! 					ds.addFile( file.getNodeValue() );
  				}
  			}
--- 660,677 ----
  					log.debug(name + "<-" + rsrc);
  					try {
! 						addResource( rsrc.getNodeValue(), Thread.currentThread().getContextClassLoader() );
  					}
  					catch (MappingException me) {
! 						addResource( rsrc.getNodeValue(), Environment.class.getClassLoader() );
  					}
  				}
  				else if ( jar!=null ) {
  					log.debug(name + "<-" + jar);
! 					addJar( jar.getNodeValue() );
  				}
  				else {
  					if (file==null) throw new HibernateException("<mapping> element in configuration specifies no attributes");
  					log.debug(name + "<-" + file);
! 					addFile( file.getNodeValue() );
  				}
  			}