[Hibernate-commits] Hibernate2/src/net/sf/hibernate/cfg Configuration.java,1.13,1.14 Environment.java,1.2,1.3 Mappings.java,1.3,1.4

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

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

Modified Files:
	Configuration.java Environment.java Mappings.java 
Log Message:
minor changes and fixed a mistype

Index: Configuration.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg/Configuration.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Configuration.java	2 Feb 2003 00:29:06 -0000	1.13
--- Configuration.java	3 Feb 2003 12:11:36 -0000	1.14
***************
*** 715,719 ****
  				pc.setCache( createJCSCache( atts.getNamedItem("usage").getNodeValue(), region, pc ) );
  			}
! 			else if ( "jcs-ccollection-cache".equals( mapElement.getNodeName() ) ) {
  				String role = atts.getNamedItem("collection").getNodeValue();
  				Collection c = (Collection) getCollectionMapping(role);
--- 715,719 ----
  				pc.setCache( createJCSCache( atts.getNamedItem("usage").getNodeValue(), region, pc ) );
  			}
! 			else if ( "jcs-collection-cache".equals( mapElement.getNodeName() ) ) {
  				String role = atts.getNamedItem("collection").getNodeValue();
  				Collection c = (Collection) getCollectionMapping(role);

Index: Environment.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg/Environment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Environment.java	2 Feb 2003 06:47:06 -0000	1.2
--- Environment.java	3 Feb 2003 12:11:36 -0000	1.3
***************
*** 38,42 ****
  public final class Environment {
  	
! 	private static final String VERSION = "2.0 beta 2";
  	
  	/**
--- 38,42 ----
  public final class Environment {
  	
! 	private static final String VERSION = "2.0 beta 3";
  	
  	/**

Index: Mappings.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg/Mappings.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Mappings.java	2 Feb 2003 00:29:06 -0000	1.3
--- Mappings.java	3 Feb 2003 12:11:36 -0000	1.4
***************
*** 40,48 ****
  	public void addClass(PersistentClass persistentClass) throws MappingException {
  		Object old = classes.put( persistentClass.getPersistentClass(), persistentClass );
! 		if ( old!=null ) throw new MappingException( "duplicate class mapping: " + persistentClass.getPersistentClass().getName() );
  	}
  	public void addCollection(Collection collection) throws MappingException {
  		Object old = collections.put( collection.getRole(), collection );
! 		if ( old!=null ) throw new MappingException( "duplicate collection role: " + collection.getRole() );
  	}
  	public PersistentClass getClass(Class clazz) {
--- 40,48 ----
  	public void addClass(PersistentClass persistentClass) throws MappingException {
  		Object old = classes.put( persistentClass.getPersistentClass(), persistentClass );
! 		if ( old!=null ) log.warn( "duplicate class mapping: " + persistentClass.getPersistentClass().getName() );
  	}
  	public void addCollection(Collection collection) throws MappingException {
  		Object old = collections.put( collection.getRole(), collection );
! 		if ( old!=null ) log.warn( "duplicate collection role: " + collection.getRole() );
  	}
  	public PersistentClass getClass(Class clazz) {
***************
*** 99,103 ****
  	public void addQuery(String name, String query) throws MappingException {
  		Object old = queries.put(name, query);
! 		if (old!=null) throw new MappingException("duplicate query name: " + name);
  	}
  	
--- 99,103 ----
  	public void addQuery(String name, String query) throws MappingException {
  		Object old = queries.put(name, query);
! 		if (old!=null) log.warn("duplicate query name: " + name);
  	}