From: <one...@us...> - 2002-11-05 13:40:57
|
Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/map In directory usw-pr-cvs1:/tmp/cvs-serv22899/cirrus/hibernate/map Modified Files: Collection.java Subclass.java Log Message: updates to hibernate-mapping-1.1.dtd and documentation Index: Collection.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Collection.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Collection.java 31 Oct 2002 14:00:27 -0000 1.45 --- Collection.java 5 Nov 2002 13:40:53 -0000 1.46 *************** *** 140,144 **** String name = subnode.getNodeName(); ! if ( "key".equals(name) ) { identifier = new Value(subnode, null, DEFAULT_KEY_COLUMN_NAME, isOneToMany, table, root); if (!toplevel) identifier.setType( owner.getIdentifier().getType() ); --- 140,144 ---- String name = subnode.getNodeName(); ! if ( "key".equals(name) || "generated-key".equals(name) ) { identifier = new Value(subnode, null, DEFAULT_KEY_COLUMN_NAME, isOneToMany, table, root); if (!toplevel) identifier.setType( owner.getIdentifier().getType() ); Index: Subclass.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Subclass.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Subclass.java 31 Oct 2002 14:00:28 -0000 1.18 --- Subclass.java 5 Nov 2002 13:40:53 -0000 1.19 *************** *** 125,129 **** NodeList subnodes = node.getChildNodes(); for ( int i=0; i<subnodes.getLength(); i++ ) { ! if ( "superclass-key".equals( subnodes.item(i).getNodeName() ) ) { key = new Value( subnodes.item(i), Root.ROOT_ROLE_NAME, false, this.table, root ); } --- 125,129 ---- NodeList subnodes = node.getChildNodes(); for ( int i=0; i<subnodes.getLength(); i++ ) { ! if ( "key".equals( subnodes.item(i).getNodeName() ) ) { key = new Value( subnodes.item(i), Root.ROOT_ROLE_NAME, false, this.table, root ); } |