db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Matthew Baird" <Matthew.Ba...@motiva.com>
Subject FW: cvs commit: jakarta-ojb/src/test/org/apache/ojb repository.dtd repository_farAwayUser.xml repository_internal.xml repository_junit.xml repository_user.xml
Date Thu, 02 Jan 2003 21:41:21 GMT
This is sweet Oleg! 

death to fieldID, long live fieldRef!

-----Original Message-----
From: olegnitz@apache.org [mailto:olegnitz@apache.org]
Sent: Thursday, January 02, 2003 1:27 PM
To: jakarta-ojb-cvs@apache.org
Subject: cvs commit: jakarta-ojb/src/test/org/apache/ojb repository.dtd
repository_farAwayUser.xml repository_internal.xml repository_junit.xml
repository_user.xml


olegnitz    2003/01/02 13:27:20

  Modified:    src/java/org/apache/ojb/broker/accesslayer/sql
                        SqlDeleteByQuery.java SqlQueryStatement.java
               src/java/org/apache/ojb/broker/ant
                        RepositoryVerifierHandler.java
               src/java/org/apache/ojb/broker/metadata
                        CollectionDescriptor.java
                        ObjectReferenceDescriptor.java
                        RepositoryElements.java RepositoryTags.java
                        RepositoryXmlHandler.java
               src/java/org/apache/ojb/broker/metadata/torque
                        TorqueForeignKeyGenerator.java
               src/test/org/apache/ojb repository.dtd
                        repository_farAwayUser.xml repository_internal.xml
                        repository_junit.xml repository_user.xml
  Log:
  Field ID is not any longer a required attribute in repository.xml
  Now 'field-ref' may be used to reference foreign key field by name
  instead of referencing in by ID via 'field-id-ref' attribute
  
  Revision  Changes    Path
  1.6       +4 -3      jakarta-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlDeleteByQuery.java
  
  Index: SqlDeleteByQuery.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlDeleteByQuery.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SqlDeleteByQuery.java	24 Dec 2002 12:57:51 -0000	1.5
  +++ SqlDeleteByQuery.java	2 Jan 2003 21:27:18 -0000	1.6
  @@ -144,9 +144,10 @@
   				ObjectReferenceDescriptor ord = getRoot().cld.getObjectReferenceDescriptorByName(colName);
   				if (ord != null)
   				{
  -					if (ord.getForeignKeyFields().size() > 0)
  +					FieldDescriptor[] fk = ord.getForeignKeyFieldDescriptors(getRoot().cld);
  +					if (fk.length > 0)
   					{
  -						fld = getRoot().cld.getFieldDescriptorByIndex(((Integer) ord.getForeignKeyFields().get(0)).intValue());
  +						fld = fk[0];
   					}
   				}
   			}
  
  
  
  1.17      +4 -5      jakarta-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java
  
  Index: SqlQueryStatement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- SqlQueryStatement.java	2 Jan 2003 09:37:58 -0000	1.16
  +++ SqlQueryStatement.java	2 Jan 2003 21:27:18 -0000	1.17
  @@ -191,11 +191,10 @@
                   ObjectReferenceDescriptor ord = getRoot().cld.getObjectReferenceDescriptorByName(colName);
                   if (ord != null)
                   {
  -                    if (ord.getForeignKeyFields().size() > 0)
  +		    FieldDescriptor[] fk = ord.getForeignKeyFieldDescriptors(getRoot().cld);
  +                    if (fk.length > 0)
                       {
  -                        fld =
  -                                getRoot().cld.getFieldDescriptorByIndex(
  -                                        ((Integer) ord.getForeignKeyFields().get(0)).intValue());
  +                        fld = fk[0];
                       }
                   }
               }
  
  
  
  1.11      +9 -3      jakarta-ojb/src/java/org/apache/ojb/broker/ant/RepositoryVerifierHandler.java
  
  Index: RepositoryVerifierHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/ant/RepositoryVerifierHandler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- RepositoryVerifierHandler.java	24 Dec 2002 13:38:04 -0000	1.10
  +++ RepositoryVerifierHandler.java	2 Jan 2003 21:27:19 -0000	1.11
  @@ -112,6 +112,11 @@
   
       private Collection m_VerifyExceptions = new ArrayList(69);
       private Collection m_VerifyWarnings = new ArrayList(69);
  +    
  +    /**
  +     * Allows not to specify field id.
  +     */
  +    private int m_lastId = 0;
   
   
       /**
  @@ -290,8 +295,9 @@
   
                   case FIELD_DESCRIPTOR :
                       {
  -                        int id = Integer.parseInt(atts.getValue("id"));
  -                        m_CurrentFLD = new FieldDescriptor(null, id);
  +			String strId = atts.getValue("id");
  +                        m_lastId  = (strId == null ? m_lastId + 1 : Integer.parseInt(strId));
  +                        m_CurrentFLD = new FieldDescriptor(null, m_lastId);
   
                           String fieldName = atts.getValue(tags.getTagById(FIELD_NAME));
   
  
  
  
  1.15      +14 -4     jakarta-ojb/src/java/org/apache/ojb/broker/metadata/CollectionDescriptor.java
  
  Index: CollectionDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/metadata/CollectionDescriptor.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- CollectionDescriptor.java	24 Dec 2002 13:14:33 -0000	1.14
  +++ CollectionDescriptor.java	2 Jan 2003 21:27:19 -0000	1.15
  @@ -319,9 +319,19 @@
    		// inverse fk elements
           for (int i=0;i<getForeignKeyFields().size();i++)
           {
  -            String fkId = getForeignKeyFields().get(i).toString();
  -            result += "        " + tags.getOpeningTagNonClosingById(INVERSE_FK) + " ";
  -            result += tags.getAttribute(FIELD_ID_REF, fkId) + "/>" + eol;
  +	    Object obj = getForeignKeyFields().get(i);
  +	    if (obj instanceof Integer)
  +	    {
  +                String fkId = obj.toString();
  +	        result += "        " + tags.getOpeningTagNonClosingById(INVERSE_FK) + " ";
  +    	        result += tags.getAttribute(FIELD_ID_REF, fkId) + "/>" + eol;
  +	    }
  +	    else
  +	    {
  +                String fk = (String) obj;
  +	        result += "        " + tags.getOpeningTagNonClosingById(INVERSE_FK) + " ";
  +    	        result += tags.getAttribute(FIELD_REF, fk) + "/>" + eol;
  +	    }
           }
   
           // write optional M:N elements
  
  
  
  1.20      +42 -5     jakarta-ojb/src/java/org/apache/ojb/broker/metadata/ObjectReferenceDescriptor.java
  
  Index: ObjectReferenceDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/metadata/ObjectReferenceDescriptor.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ObjectReferenceDescriptor.java	24 Dec 2002 13:14:33 -0000	1.19
  +++ ObjectReferenceDescriptor.java	2 Jan 2003 21:27:19 -0000	1.20
  @@ -58,6 +58,7 @@
   import org.apache.ojb.broker.PersistenceBroker;
   import org.apache.ojb.broker.PersistenceBrokerException;
   import org.apache.ojb.broker.PersistenceBrokerFactory;
  +import org.apache.ojb.broker.OJBRuntimeException;
   import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
   import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
   import org.apache.commons.lang.builder.ToStringBuilder;
  @@ -145,8 +146,22 @@
                   Iterator iter = v.iterator();
                   while (iter.hasNext())
                   {
  -                    Integer index = (Integer) iter.next();
  -                    ret.add(mif.getFieldDescriptorByIndex(index.intValue()));
  +                    Object fk = iter.next();
  +	            FieldDescriptor fkfd;
  +		    if (fk instanceof Integer) 
  +		    {
  +			Integer index = (Integer) fk;
  +			fkfd = mif.getFieldDescriptorByIndex(index.intValue());
  +		    }	
  +		    else
  +		    {
  +			fkfd = mif.getFieldDescriptorByName((String) fk);
  +		    }
  +		    if (fkfd == null) 
  +		    {
  +			throw new OJBRuntimeException("Incorrect field reference \"" + fk + "\" in " + this);
  +		    }
  +		    ret.add(fkfd);
                   }
                   foreignKeyFieldDescriptors =
                           (FieldDescriptor[]) ret.toArray(new FieldDescriptor[ret.size()]);
  @@ -229,6 +244,18 @@
       }
   
       /**
  +     * add a foreign key field
  +     */
  +    public void addForeignKeyField(String newField)
  +    {
  +        if (m_ForeignKeyFields == null)
  +        {
  +            m_ForeignKeyFields = new Vector();
  +        }
  +        m_ForeignKeyFields.add(newField);
  +    }
  +
  +    /**
        * Gets the refresh.
        * @return Returns a boolean
        */
  @@ -378,9 +405,19 @@
           // write foreignkey elements
           for (int i = 0; i < getForeignKeyFields().size(); i++)
           {
  -            String fkId = getForeignKeyFields().get(i).toString();
  -            result += "        " + tags.getOpeningTagNonClosingById(FOREIGN_KEY) + " ";
  -            result += tags.getAttribute(FIELD_ID_REF, fkId) + "/>" + eol;
  +            Object obj = getForeignKeyFields().get(i);
  +	    if (obj instanceof Integer) 
  +	    {
  +        	String fkId = obj.toString();
  +                result += "        " + tags.getOpeningTagNonClosingById(FOREIGN_KEY) + " ";
  +	        result += tags.getAttribute(FIELD_ID_REF, fkId) + "/>" + eol;
  +	    }
  +	    else 
  +	    {
  +        	String fk = (String) obj;
  +                result += "        " + tags.getOpeningTagNonClosingById(FOREIGN_KEY) + " ";
  +	        result += tags.getAttribute(FIELD_REF, fk) + "/>" + eol;
  +	    }
           }
   
           // closing tag
  
  
  
  1.18      +2 -1      jakarta-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryElements.java
  
  Index: RepositoryElements.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryElements.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- RepositoryElements.java	24 Dec 2002 13:14:33 -0000	1.17
  +++ RepositoryElements.java	2 Jan 2003 21:27:19 -0000	1.18
  @@ -136,6 +136,7 @@
       public static final int CLASS_REF = 68;
       public static final int ID = 69;
       public static final int FIELD_ID_REF = 70;
  +    public static final int FIELD_REF = 84;
       public static final int ATTRIBUTE = 71;
       public static final int ATTRIBUTE_NAME = 72;
       public static final int ATTRIBUTE_VALUE = 73;
  @@ -143,5 +144,5 @@
       public static final int ACCEPT_LOCKS = 78;
   
       // maintain a last id to keep track where we are
  -    public static final int _LAST = 84;
  +    public static final int _LAST = 85;
   }
  
  
  
  1.20      +1 -0      jakarta-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryTags.java
  
  Index: RepositoryTags.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryTags.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- RepositoryTags.java	24 Dec 2002 13:14:33 -0000	1.19
  +++ RepositoryTags.java	2 Jan 2003 21:27:19 -0000	1.20
  @@ -170,6 +170,7 @@
           table.put("class-ref", new Integer(CLASS_REF));
   		table.put("id", new Integer(ID));
   		table.put("field-id-ref", new Integer(FIELD_ID_REF));
  +		table.put("field-ref", new Integer(FIELD_REF));
   		table.put("attribute", new Integer(ATTRIBUTE));
   		table.put("attribute-name", new Integer(ATTRIBUTE_NAME));
   		table.put("attribute-value", new Integer(ATTRIBUTE_VALUE));
  
  
  
  1.26      +52 -25    jakarta-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryXmlHandler.java
  
  Index: RepositoryXmlHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryXmlHandler.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- RepositoryXmlHandler.java	24 Dec 2002 13:14:33 -0000	1.25
  +++ RepositoryXmlHandler.java	2 Jan 2003 21:27:19 -0000	1.26
  @@ -90,6 +90,12 @@
       /** the default isolation level*/
       private int defIsoLevel = IL_DEFAULT;
   
  +
  +    /**
  +     * Allows not to specify field id
  +     */
  +    private int m_lastId;
  +     
       /**
        * All known xml tags are kept in this table.
        * The tags table allows lookup from literal to id
  @@ -319,8 +325,9 @@
                       {
                           if (isDebug) logger.debug("    > " + tags.getTagById(FIELD_DESCRIPTOR));
   
  -                        int id = Integer.parseInt(atts.getValue("id"));
  -                        m_CurrentFLD = new FieldDescriptor(m_CurrentCLD, id);
  +                        String strId = atts.getValue("id");
  +			m_lastId = (strId == null ? m_lastId + 1 : Integer.parseInt(strId));
  +                        m_CurrentFLD = new FieldDescriptor(m_CurrentCLD, m_lastId);
                           m_CurrentCLD.addFieldDescriptor(m_CurrentFLD);
   
                           // prepare for custom attributes
  @@ -467,19 +474,29 @@
                       {
                           if (isDebug) logger.debug("    > " + tags.getTagById(FOREIGN_KEY));
                           String fieldIdRef = atts.getValue(tags.getTagById(FIELD_ID_REF));
  -                        if (isDebug) logger.debug("      " + tags.getTagById(FIELD_ID_REF) + ": " + fieldIdRef);
   
  -                        try
  +                        if (fieldIdRef != null)
                           {
  -                            int fieldId;
  -                            fieldId = Integer.parseInt(fieldIdRef);
  -                            m_CurrentORD.addForeignKeyField(fieldId);
  -                        }
  -                        catch (NumberFormatException rex)
  -                        {
  -                            throw new MetadataException(tags.getTagById(FIELD_ID_REF)
  -                                    + " attribute must be an int. Found: "
  -                                    + fieldIdRef + ". Please check your repository file.", rex);
  +                            if (isDebug) logger.debug("      " + tags.getTagById(FIELD_ID_REF) + ": " + fieldIdRef);
  +
  +                            try
  +                            {
  +                                int fieldId;
  +                                fieldId = Integer.parseInt(fieldIdRef);
  +                                m_CurrentORD.addForeignKeyField(fieldId);
  +                            }
  +                            catch (NumberFormatException rex)
  +                            {
  +                                throw new MetadataException(tags.getTagById(FIELD_ID_REF)
  +                                        + " attribute must be an int. Found: "
  +                                        + fieldIdRef + ". Please check your repository file.", rex);
  +                            }
  +                        }
  +                        else
  +                        {
  +                            String fieldRef = atts.getValue(tags.getTagById(FIELD_REF));
  +                            if (isDebug) logger.debug("      " + tags.getTagById(FIELD_REF) + ": " + fieldRef);
  +                            m_CurrentORD.addForeignKeyField(fieldRef);
                           }
                           break;
                       }
  @@ -576,19 +593,29 @@
                       {
                           if (isDebug) logger.debug("    > " + tags.getTagById(INVERSE_FK));
                           String fieldIdRef = atts.getValue(tags.getTagById(FIELD_ID_REF));
  -                        if (isDebug) logger.debug("      " + tags.getTagById(FIELD_ID_REF) + ": " + fieldIdRef);
   
  -                        try
  +                        if (fieldIdRef != null)
  +                        {
  +                            if (isDebug) logger.debug("      " + tags.getTagById(FIELD_ID_REF) + ": " + fieldIdRef);
  +
  +                            try
  +                            {
  +                                int fieldId;
  +                                fieldId = Integer.parseInt(fieldIdRef);
  +                                m_CurrentCOD.addForeignKeyField(fieldId);
  +                            }
  +                            catch (NumberFormatException rex)
  +                            {
  +                                throw new MetadataException(tags.getTagById(FIELD_ID_REF)
  +                                        + " attribute must be an int. Found: "
  +                                        + fieldIdRef + " Please check your repository file.", rex);
  +                            }
  +                        }
  +                        else
                           {
  -                            int fieldId;
  -                            fieldId = Integer.parseInt(fieldIdRef);
  -                            m_CurrentCOD.addForeignKeyField(fieldId);
  -                        }
  -                        catch (NumberFormatException rex)
  -                        {
  -                            throw new MetadataException(tags.getTagById(FIELD_ID_REF)
  -                                    + " attribute must be an int. Found: "
  -                                    + fieldIdRef + " Please check your repository file.", rex);
  +                            String fieldRef = atts.getValue(tags.getTagById(FIELD_REF));
  +                            if (isDebug) logger.debug("      " + tags.getTagById(FIELD_REF) + ": " + fieldRef);
  +                            m_CurrentCOD.addForeignKeyField(fieldRef);
                           }
                           break;
                       }
  
  
  
  1.4       +13 -3     jakarta-ojb/src/java/org/apache/ojb/broker/metadata/torque/TorqueForeignKeyGenerator.java
  
  Index: TorqueForeignKeyGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/metadata/torque/TorqueForeignKeyGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TorqueForeignKeyGenerator.java	21 Sep 2002 15:54:15 -0000	1.3
  +++ TorqueForeignKeyGenerator.java	2 Jan 2003 21:27:19 -0000	1.4
  @@ -167,9 +167,19 @@
           buildForeignKeyHeader(foreignClassDescriptor.getFullTableName(), buffer);
   
           for (int i = 0; i < foreignKeyIndices.size(); i++) {
  -            int foreignKeyIndex = ((Integer) foreignKeyIndices.get(i)).intValue();
  -            String columnName = classDescriptor.getFieldDescriptorByIndex(foreignKeyIndex).getColumnName();
  -
  +	    String columnName;
  +	    Object obj = foreignKeyIndices.get(i);
  +	    
  +	    if (obj instanceof Integer) 
  +	    {
  +                int foreignKeyIndex = ((Integer) obj).intValue();
  +        	columnName = classDescriptor.getFieldDescriptorByIndex(foreignKeyIndex).getColumnName();
  +	    }
  +	    else
  +	    {
  +        	columnName = classDescriptor.getFieldDescriptorByName((String) obj).getColumnName();
  +	    }
  +    
               FieldDescriptor foreignColumn = foreignClassDescriptor.getPkFields()[i];
               String foreignColumnName = foreignColumn.getColumnName();
               buildReferenceForColumn(buffer, columnName, foreignColumnName);
  
  
  
  1.26      +5 -3      jakarta-ojb/src/test/org/apache/ojb/repository.dtd
  
  Index: repository.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/repository.dtd,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- repository.dtd	26 Dec 2002 19:29:12 -0000	1.25
  +++ repository.dtd	2 Jan 2003 21:27:19 -0000	1.26
  @@ -311,7 +311,7 @@
   
     -->
   <!ATTLIST field-descriptor
  -	id CDATA #REQUIRED
  +	id CDATA #IMPLIED
   	name CDATA #REQUIRED
   	table CDATA #IMPLIED
   	column CDATA #REQUIRED
  @@ -411,7 +411,8 @@
   	used as a foreign key.
     -->
   <!ATTLIST foreignkey
  -	field-id-ref CDATA #REQUIRED
  +	field-id-ref CDATA #IMPLIED
  +	field-ref CDATA #IMPLIED
   >
   
   
  @@ -518,7 +519,8 @@
   	in the class of the collection elements that is used as a foreign key.
     -->
   <!ATTLIST inverse-foreignkey
  -	field-id-ref CDATA #REQUIRED
  +	field-id-ref CDATA #IMPLIED
  +	field-ref CDATA #IMPLIED
   >
   
   <!--
  
  
  
  1.2       +8 -8      jakarta-ojb/src/test/org/apache/ojb/repository_farAwayUser.xml
  
  Index: repository_farAwayUser.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/repository_farAwayUser.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- repository_farAwayUser.xml	26 Dec 2002 19:29:12 -0000	1.1
  +++ repository_farAwayUser.xml	2 Jan 2003 21:27:19 -0000	1.2
  @@ -3,24 +3,24 @@
      	  class="org.apache.ojb.broker.FarAwayClass"
      	  table="FAR_AWAY">
   
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor
            name="description"
            column="DESCRIPTION"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor
            name="referenceId"
            column="REFERENCE_ID"
            jdbc-type="INTEGER"
  @@ -32,7 +32,7 @@
           auto-retrieve="true"
           auto-update="true"
           auto-delete="true">
  -            <foreignkey field-id-ref="4"/>
  +            <foreignkey field-ref="referenceId"/>
         </reference-descriptor>
   </class-descriptor>
   
  @@ -41,16 +41,16 @@
      	  class="org.apache.ojb.broker.FarAwayReference"
      	  table="FAR_AWAY_REFERENCE">
   
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
         />
  -</class-descriptor>
  \ No newline at end of file
  +</class-descriptor>
  
  
  
  1.5       +36 -36    jakarta-ojb/src/test/org/apache/ojb/repository_internal.xml
  
  Index: repository_internal.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/repository_internal.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- repository_internal.xml	21 Nov 2002 22:16:56 -0000	1.4
  +++ repository_internal.xml	2 Jan 2003 21:27:19 -0000	1.5
  @@ -5,24 +5,24 @@
      	  class="org.apache.ojb.broker.util.sequence.HighLowSequence"
      	  table="OJB_HL_SEQ"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="tableName"
            column="TABLENAME"
            jdbc-type="VARCHAR"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="fieldName"
            column="FIELDNAME"
            jdbc-type="VARCHAR"
            primarykey="true"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="maxKey"
            column="MAX_KEY"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="grabSize"
            column="GRAB_SIZE"
            jdbc-type="INTEGER"
  @@ -35,29 +35,29 @@
      	  class="org.apache.ojb.odmg.locking.LockEntry"
      	  table="OJB_LOCKENTRY"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="oidString"
            column="OID_"
            jdbc-type="VARCHAR"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="transactionId"
            column="TX_ID"
            jdbc-type="VARCHAR"
            primarykey="true"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="timestamp"
            column="TIMESTAMP_"
            jdbc-type="BIGINT"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="isolationLevel"
            column="ISOLATIONLEVEL"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="5"
  +      <field-descriptor 
            name="lockType"
            column="LOCKTYPE"
            jdbc-type="INTEGER"
  @@ -70,13 +70,13 @@
      	  class="org.apache.ojb.odmg.NamedRootsEntry"
      	  table="OJB_NRM"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="oid"
            column="OID_"
            jdbc-type="LONGVARBINARY"
  @@ -88,14 +88,14 @@
      	  class="org.apache.ojb.odmg.collections.DListImpl"
      	  table="OJB_DLIST"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="size"
            column="SIZE_"
            jdbc-type="INTEGER"
  @@ -104,7 +104,7 @@
            name="elements"
            element-class-ref="org.apache.ojb.odmg.collections.DListEntry"
         >
  -         <inverse-foreignkey field-id-ref="2"/>
  +         <inverse-foreignkey field-ref="dlistId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -113,24 +113,24 @@
         class="org.apache.ojb.odmg.collections.DListEntry"
         table="OJB_DLIST_ENTRIES"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="dlistId"
            column="DLIST_ID"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="position"
            column="POSITION_"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="oid"
            column="OID_"
            jdbc-type="LONGVARBINARY"
  @@ -143,14 +143,14 @@
      	  class="org.apache.ojb.odmg.collections.DBagImpl"
      	  table="OJB_DLIST"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="size"
            column="SIZE_"
            jdbc-type="INTEGER"
  @@ -159,7 +159,7 @@
            name="elements"
            element-class-ref="org.apache.ojb.odmg.collections.DListEntry"
         >
  -         <inverse-foreignkey field-id-ref="2"/>
  +         <inverse-foreignkey field-ref="dlistId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -168,14 +168,14 @@
      	  class="org.apache.ojb.odmg.collections.DSetImpl"
      	  table="OJB_DSET"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="size"
            column="SIZE_"
            jdbc-type="INTEGER"
  @@ -184,7 +184,7 @@
            name="elements"
            element-class-ref="org.apache.ojb.odmg.collections.DSetEntry"
         >
  -         <inverse-foreignkey field-id-ref="2"/>
  +         <inverse-foreignkey field-ref="dlistId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -193,24 +193,24 @@
      	  class="org.apache.ojb.odmg.collections.DSetEntry"
      	  table="OJB_DSET_ENTRIES"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="dlistId"
            column="DLIST_ID"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="position"
            column="POSITION_"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="oid"
            column="OID_"
            jdbc-type="LONGVARBINARY"
  @@ -223,14 +223,14 @@
      	  class="org.apache.ojb.odmg.collections.DMapImpl"
      	  table="OJB_DMAP"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="size"
            column="SIZE_"
            jdbc-type="INTEGER"
  @@ -240,7 +240,7 @@
            element-class-ref="org.apache.ojb.odmg.collections.DMapEntry"
            collection-class="org.apache.ojb.broker.util.collections.ManageableHashSet"
         >
  -         <inverse-foreignkey field-id-ref="2"/>
  +         <inverse-foreignkey field-ref="dmapId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -249,25 +249,25 @@
      	  class="org.apache.ojb.odmg.collections.DMapEntry"
      	  table="OJB_DMAP_ENTRIES"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="dmapId"
            column="DMAP_ID"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="keyOID"
            column="KEY_OID"
            jdbc-type="LONGVARBINARY"
            conversion="org.apache.ojb.broker.accesslayer.conversions.Object2ByteArrFieldConversion"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="valueOID"
            column="VALUE_OID"
            jdbc-type="LONGVARBINARY"
  @@ -276,4 +276,4 @@
      </class-descriptor>
   
   
  -   <!-- END OF OJB INTERNAL MAPPINGS-->
  \ No newline at end of file
  +   <!-- END OF OJB INTERNAL MAPPINGS-->
  
  
  
  1.33      +365 -365  jakarta-ojb/src/test/org/apache/ojb/repository_junit.xml
  
  Index: repository_junit.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/repository_junit.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- repository_junit.xml	24 Dec 2002 13:55:54 -0000	1.32
  +++ repository_junit.xml	2 Jan 2003 21:27:19 -0000	1.33
  @@ -9,49 +9,49 @@
         <documentation>This is important documentation on the Article class.</documentation>
         <extent-class class-ref="org.apache.ojb.broker.BookArticle" />
         <extent-class class-ref="org.apache.ojb.broker.AbstractCdArticle" />
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="articleId"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="articleName"
            column="Artikelname"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor
            name="supplierId"
            column="Lieferanten_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor
            name="productGroupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="5"
  +      <field-descriptor
            name="unit"
            column="Liefereinheit"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="6"
  +      <field-descriptor
            name="price"
            column="Einzelpreis"
            jdbc-type="FLOAT"
         />
  -      <field-descriptor id="7"
  +      <field-descriptor
            name="stock"
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="8"
  +      <field-descriptor
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="9"
  +      <field-descriptor
            name="minimumStock"
            column="MindestBestand"
            jdbc-type="INTEGER"
  @@ -71,7 +71,7 @@
               class-ref="org.apache.ojb.broker.ProductGroup"
         >
            <documentation>this is the reference to an articles productgroup</documentation>
  -         <foreignkey field-id-ref="4"/>
  +         <foreignkey field-ref="productGroupId"/>
            <attribute attribute-name="color" attribute-value="red" />
         	 <attribute attribute-name="size" attribute-value="tiny" />
         </reference-descriptor>
  @@ -98,19 +98,19 @@
      	  proxy="org.apache.ojb.broker.ProductGroupProxy"
      	  table="Kategorien"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="groupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="groupName"
            column="KategorieName"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor
            name="description"
            column="Beschreibung"
            jdbc-type="VARCHAR"
  @@ -124,7 +124,7 @@
         >
            <orderby name="articleId" sort="DESC"/>
   
  -         <inverse-foreignkey field-id-ref="4"/>
  +         <inverse-foreignkey field-ref="productGroupId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -133,18 +133,18 @@
      	  class="org.apache.ojb.broker.ProductGroupWithTypedCollection"
      	  table="Kategorien"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="groupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="groupName"
            column="KategorieName"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="description"
            column="Beschreibung"
            jdbc-type="VARCHAR"
  @@ -157,7 +157,7 @@
            auto-update="false"
            auto-delete="true"
         >
  -         <inverse-foreignkey field-id-ref="4"/>
  +         <inverse-foreignkey field-ref="productGroupId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -166,18 +166,18 @@
      	  class="org.apache.ojb.broker.ProductGroupWithArray"
      	  table="Kategorien"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="groupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="groupName"
            column="KategorieName"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="description"
            column="Beschreibung"
            jdbc-type="VARCHAR"
  @@ -189,7 +189,7 @@
            auto-update="false"
            auto-delete="true"
         >
  -         <inverse-foreignkey field-id-ref="4"/>
  +         <inverse-foreignkey field-ref="productGroupId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -198,13 +198,13 @@
   	  class="org.apache.ojb.broker.ProductGroupWithCollectionProxy"
   	  table="Kategorien"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="groupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="groupName"
            column="KategorieName"
            jdbc-type="VARCHAR"
  @@ -214,7 +214,7 @@
            element-class-ref="org.apache.ojb.broker.Article"
            proxy="true"
         >
  -         <inverse-foreignkey field-id-ref="4"/>
  +         <inverse-foreignkey field-ref="productGroupId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -224,19 +224,19 @@
      	  proxy="org.apache.ojb.broker.ProductGroupProxy"
      	  table="Kategorien"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="groupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="groupName"
            column="KategorieName"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="description"
            column="Beschreibung"
            jdbc-type="VARCHAR"
  @@ -250,7 +250,7 @@
            orderby="articleId"
            sort="DESC"
         >
  -         <inverse-foreignkey field-id-ref="4"/>
  +         <inverse-foreignkey field-ref="productGroupId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -260,48 +260,48 @@
         table="Artikel"
         row-reader="org.apache.ojb.broker.RowReaderTestImpl"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="articleId"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="articleName"
            column="Artikelname"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="supplierId"
            column="Lieferanten_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="productGroupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="5"
  +      <field-descriptor 
            name="unit"
            column="Liefereinheit"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="6"
  +      <field-descriptor 
            name="price"
            column="Einzelpreis"
            jdbc-type="FLOAT"
         />
  -      <field-descriptor id="7"
  +      <field-descriptor 
            name="stock"
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="8"
  +      <field-descriptor 
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="9"
  +      <field-descriptor 
            name="minimumStock"
            column="MindestBestand"
            jdbc-type="INTEGER"
  @@ -319,49 +319,49 @@
      	  class="org.apache.ojb.broker.ArticleWithReferenceProxy"
      	  table="Artikel"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="articleId"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="articleName"
            column="Artikelname"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="supplierId"
            column="Lieferanten_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="productGroupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="5"
  +      <field-descriptor 
            name="unit"
            column="Liefereinheit"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="6"
  +      <field-descriptor 
            name="price"
            column="Einzelpreis"
            jdbc-type="FLOAT"
         />
  -      <field-descriptor id="7"
  +      <field-descriptor 
            name="stock"
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="8"
  +      <field-descriptor 
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="9"
  +      <field-descriptor 
            name="minimumStock"
            column="MindestBestand"
            jdbc-type="INTEGER"
  @@ -378,7 +378,7 @@
            proxy="true"
            auto-update="true"
         >
  -         <foreignkey field-id-ref="4"/>
  +         <foreignkey field-ref="productGroupId"/>
         </reference-descriptor>
      </class-descriptor>
   
  @@ -387,24 +387,24 @@
         class="org.apache.ojb.broker.A"
         table="AB_TABLE"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="ojbConcreteClass"
            column="CLASS_NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="someValue"
            column="VALUE_"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="someAField"
            column="A_FIELD"
            jdbc-type="VARCHAR"
  @@ -417,24 +417,24 @@
   	  table="AB_TABLE"
      >
         <extent-class class-ref="org.apache.ojb.broker.B1" />
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="ojbConcreteClass"
            column="CLASS_NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="someValue"
            column="VALUE_"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="someBField"
            column="B_FIELD"
            jdbc-type="VARCHAR"
  @@ -446,19 +446,19 @@
   	  class="org.apache.ojb.broker.B1"
   	  table="AB_TABLE"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="ojbConcreteClass"
            column="CLASS_NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="someValue"
            column="VALUE_"
            jdbc-type="INTEGER"
  @@ -480,19 +480,19 @@
      	  table="AB_TABLE"
      >
         <extent-class class-ref="org.apache.ojb.broker.D" />
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="ojbConcreteClass"
            column="CLASS_NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="someValue"
            column="VALUE_"
            jdbc-type="INTEGER"
  @@ -504,19 +504,19 @@
      	  class="org.apache.ojb.broker.D"
      	  table="AB_TABLE"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="ojbConcreteClass"
            column="CLASS_NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="someValue"
            column="VALUE_"
            jdbc-type="INTEGER"
  @@ -529,19 +529,19 @@
      	  class="org.apache.ojb.broker.Person"
      	  table="PERSON"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="firstname"
            column="FIRSTNAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="lastname"
            column="LASTNAME"
            jdbc-type="VARCHAR"
  @@ -551,7 +551,7 @@
            element-class-ref="org.apache.ojb.broker.Role"
            auto-delete="true"
         >
  -         <inverse-foreignkey field-id-ref="1"/>
  +         <inverse-foreignkey field-ref="person_id"/>
         </collection-descriptor>
         <collection-descriptor
            name="projects"
  @@ -570,19 +570,19 @@
   	  class="org.apache.ojb.broker.Project"
   	  table="PROJECT"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="title"
            column="TITLE"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="description"
            column="DESCRIPTION"
            jdbc-type="VARCHAR"
  @@ -592,7 +592,7 @@
            element-class-ref="org.apache.ojb.broker.Role"
            auto-delete="true"
         >
  -         <inverse-foreignkey field-id-ref="2"/>
  +         <inverse-foreignkey field-ref="project_id"/>
         </collection-descriptor>
         <collection-descriptor
            name="persons"
  @@ -611,19 +611,19 @@
      	  class="org.apache.ojb.broker.Role"
      	  table="PERSON_PROJECT"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="person_id"
            column="PERSON_ID"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="project_id"
            column="PROJECT_ID"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor
            name="roleName"
            column="ROLENAME"
            jdbc-type="VARCHAR"
  @@ -632,13 +632,13 @@
            name="person"
            class-ref="org.apache.ojb.broker.Person"
         >
  -         <foreignkey field-id-ref="1"/>
  +         <foreignkey field-ref="person_id"/>
         </reference-descriptor>
         <reference-descriptor
            name="project"
            class-ref="org.apache.ojb.broker.Project"
         >
  -         <foreignkey field-id-ref="2"/>
  +         <foreignkey field-ref="project_id"/>
         </reference-descriptor>
         <collection-descriptor
            name="tasks"
  @@ -647,8 +647,8 @@
            auto-update="false"
            auto-delete="true"
         >
  -         <inverse-foreignkey field-id-ref="2"/>
  -         <inverse-foreignkey field-id-ref="3"/>
  +         <inverse-foreignkey field-ref="person_id"/>
  +         <inverse-foreignkey field-ref="project_id"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -657,23 +657,23 @@
      	  class="org.apache.ojb.broker.Task"
      	  table="TASK"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="task_id"
            column="TASK_ID"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="person_id"
            column="PERSON_ID"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor
            name="project_id"
            column="PROJECT_ID"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor
            name="taskName"
            column="TASKNAME"
            jdbc-type="VARCHAR"
  @@ -682,8 +682,8 @@
            name="role"
            class-ref="org.apache.ojb.broker.Role"
         >
  -         <foreignkey field-id-ref="2"/>
  -         <foreignkey field-id-ref="3"/>
  +         <foreignkey field-ref="person_id"/>
  +         <foreignkey field-ref="project_id"/>
         </reference-descriptor>
      </class-descriptor>
   
  @@ -692,19 +692,19 @@
      	  class="org.apache.ojb.broker.PersonUnidirectional"
      	  table="PERSON"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="firstname"
            column="FIRSTNAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="lastname"
            column="LASTNAME"
            jdbc-type="VARCHAR"
  @@ -727,19 +727,19 @@
   	  class="org.apache.ojb.broker.ProjectUnidirectional"
   	  table="PROJECT"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="title"
            column="TITLE"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="description"
            column="DESCRIPTION"
            jdbc-type="VARCHAR"
  @@ -751,49 +751,49 @@
      	  class="org.apache.ojb.broker.PerformanceArticle"
      	  table="Artikel"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="articleId"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="articleName"
            column="Artikelname"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="supplierId"
            column="Lieferanten_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="productGroupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="5"
  +      <field-descriptor 
            name="unit"
            column="Liefereinheit"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="6"
  +      <field-descriptor 
            name="price"
            column="Einzelpreis"
            jdbc-type="FLOAT"
         />
  -      <field-descriptor id="7"
  +      <field-descriptor 
            name="stock"
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="8"
  +      <field-descriptor 
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="9"
  +      <field-descriptor 
            name="minimumStock"
            column="MindestBestand"
            jdbc-type="INTEGER"
  @@ -806,19 +806,19 @@
      	  class="org.apache.ojb.broker.LockedByVersion"
      	  table="LOCKED_BY_VERSION"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="value"
            column="VALUE_"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="version"
            column="VERSION_"
            jdbc-type="INTEGER"
  @@ -831,19 +831,19 @@
      	  class="org.apache.ojb.broker.LockedByTimestamp"
      	  table="LOCKED_BY_TIMESTAMP"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="value"
            column="VALUE_"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="timestamp"
            column="TIMESTAMP_"
            jdbc-type="TIMESTAMP"
  @@ -856,19 +856,19 @@
      	  class="org.apache.ojb.broker.ObjectWithBlob"
      	  table="BLOB_TEST"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="blob"
            column="BLOB_VALUE_"
            jdbc-type="BLOB"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="clob"
            column="CLOB_VALUE_"
            jdbc-type="CLOB"
  @@ -881,7 +881,7 @@
      	  class="org.apache.ojb.broker.PBAwareEntity"
      	  table="Artikel"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
  @@ -898,49 +898,49 @@
         table="Artikel"
         isolation-level="read-uncommitted"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="articleId"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="articleName"
            column="Artikelname"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor
            name="supplierId"
            column="Lieferanten_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor
            name="productGroupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="5"
  +      <field-descriptor
            name="unit"
            column="Liefereinheit"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="6"
  +      <field-descriptor
            name="price"
            column="Einzelpreis"
            jdbc-type="FLOAT"
         />
  -      <field-descriptor id="7"
  +      <field-descriptor
            name="stock"
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="8"
  +      <field-descriptor 
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="9"
  +      <field-descriptor 
            name="minimumStock"
            column="MindestBestand"
            jdbc-type="INTEGER"
  @@ -955,7 +955,7 @@
            name="productGroup"
            class-ref="org.apache.ojb.odmg.ProductGroup"
         >
  -         <foreignkey field-id-ref="4"/>
  +         <foreignkey field-ref="productGroupId"/>
         </reference-descriptor>
      </class-descriptor>
   
  @@ -965,18 +965,18 @@
    	  table="Kategorien"
         isolation-level="serializable"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="groupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="groupName"
            column="KategorieName"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="description"
            column="Beschreibung"
            jdbc-type="VARCHAR"
  @@ -985,7 +985,7 @@
            name="allArticlesInGroup"
            element-class-ref="org.apache.ojb.odmg.Article"
         >
  -      	 <inverse-foreignkey field-id-ref="4"/>
  +      	 <inverse-foreignkey field-ref="productGroupId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -994,49 +994,49 @@
   	  class="org.apache.ojb.broker.BookArticle"
   	  table="BOOKS"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="articleId"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="articleName"
            column="Artikelname"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="supplierId"
            column="Lieferanten_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="productGroupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="5"
  +      <field-descriptor 
            name="unit"
            column="Liefereinheit"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="6"
  +      <field-descriptor 
            name="price"
            column="Einzelpreis"
            jdbc-type="FLOAT"
         />
  -      <field-descriptor id="7"
  +      <field-descriptor 
            name="stock"
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="8"
  +      <field-descriptor 
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="9"
  +      <field-descriptor 
            name="minimumStock"
            column="MindestBestand"
            jdbc-type="INTEGER"
  @@ -1061,7 +1061,7 @@
            name="productGroup"
            class-ref="org.apache.ojb.broker.ProductGroup"
         >
  -         <foreignkey field-id-ref="4"/>
  +         <foreignkey field-ref="productGroupId"/>
         </reference-descriptor>
      </class-descriptor>
   
  @@ -1070,49 +1070,49 @@
      	  class="org.apache.ojb.broker.CdArticle"
      	  table="CDS"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="articleId"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="articleName"
            column="Artikelname"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="supplierId"
            column="Lieferanten_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="productGroupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="5"
  +      <field-descriptor 
            name="unit"
            column="Liefereinheit"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="6"
  +      <field-descriptor 
            name="price"
            column="Einzelpreis"
            jdbc-type="FLOAT"
         />
  -      <field-descriptor id="7"
  +      <field-descriptor 
            name="stock"
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="8"
  +      <field-descriptor 
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="9"
  +      <field-descriptor 
            name="minimumStock"
            column="MindestBestand"
            jdbc-type="INTEGER"
  @@ -1137,7 +1137,7 @@
            name="productGroup"
            class-ref="org.apache.ojb.broker.ProductGroup"
         >
  -         <foreignkey field-id-ref="4"/>
  +         <foreignkey field-ref="productGroupId"/>
         </reference-descriptor>
      </class-descriptor>
   
  @@ -1146,18 +1146,18 @@
         class="org.apache.ojb.broker.OrderPosition"
         table="ORDER_POSITION"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="order_id"
            column="ORDER_ID"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor
            name="article_id"
            column="ARTICLE_ID"
            jdbc-type="INTEGER"
  @@ -1166,7 +1166,7 @@
            name="article"
            class-ref="org.apache.ojb.broker.Article"
         >
  -         <foreignkey field-id-ref="3"/>
  +         <foreignkey field-ref="article_id"/>
         </reference-descriptor>
      </class-descriptor>
   
  @@ -1182,18 +1182,18 @@
         class="org.apache.ojb.broker.Tree"
         table="TREE"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="data"
            column="DATA"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor
            name="parentId"
            column="PARENT_ID"
            jdbc-type="INTEGER"
  @@ -1205,7 +1205,7 @@
            auto-update="true"
            auto-delete="true"
         >
  -         <inverse-foreignkey field-id-ref="3"/>
  +         <inverse-foreignkey field-ref="parentId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -1214,23 +1214,23 @@
         class="org.apache.ojb.broker.TreeGroup"
         table="TREEGROUP"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="data"
            column="DATA"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor
            name="parentId"
            column="PARENT_ID"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor
            name="groupId"
            column="GROUP_ID"
            jdbc-type="INTEGER"
  @@ -1239,13 +1239,13 @@
            name="myParent"
            class-ref="org.apache.ojb.broker.TreeGroup"
         >
  -         <foreignkey field-id-ref="3"/>
  +         <foreignkey field-ref="parentId"/>
         </reference-descriptor>
         <reference-descriptor
            name="myGroup"
            class-ref="org.apache.ojb.broker.TreeGroup"
         >
  -         <foreignkey field-id-ref="4"/>
  +         <foreignkey field-ref="groupId"/>
         </reference-descriptor>
         <collection-descriptor
            name="children"
  @@ -1254,7 +1254,7 @@
            auto-update="true"
            auto-delete="true"
         >
  -         <inverse-foreignkey field-id-ref="3"/>
  +         <inverse-foreignkey field-ref="parentId"/>
         </collection-descriptor>
         <collection-descriptor
            name="groupMembers"
  @@ -1263,7 +1263,7 @@
            auto-update="true"
            auto-delete="true"
         >
  -         <inverse-foreignkey field-id-ref="4"/>
  +         <inverse-foreignkey field-ref="groupId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -1272,19 +1272,19 @@
         class="org.apache.ojb.broker.GraphNode"
         table="GRAPH_NODE"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="locationId"
            column="LOCATION"
            jdbc-type="INTEGER"
  @@ -1293,7 +1293,7 @@
            name="location"
            class-ref="org.apache.ojb.broker.Point"
         >
  -         <foreignkey field-id-ref="3"/>
  +         <foreignkey field-ref="locationId"/>
         </reference-descriptor>
         <collection-descriptor
            name="outgoingEdges"
  @@ -1304,7 +1304,7 @@
            auto-update="true"
            auto-delete="true"
         >
  -         <inverse-foreignkey field-id-ref="2"/>
  +         <inverse-foreignkey field-ref="sourceId"/>
         </collection-descriptor>
         <collection-descriptor
            name="incomingEdges"
  @@ -1315,7 +1315,7 @@
            auto-update="true"
            auto-delete="true"
         >
  -         <inverse-foreignkey field-id-ref="3"/>
  +         <inverse-foreignkey field-ref="sinkId"/>
         </collection-descriptor>
   
      </class-descriptor>
  @@ -1325,19 +1325,19 @@
      	  class="org.apache.ojb.broker.GraphEdge"
      	  table="GRAPH_EDGE"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="sourceId"
            column="SOURCE"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor
            name="sinkId"
            column="SINK"
            jdbc-type="INTEGER"
  @@ -1346,13 +1346,13 @@
            name="source"
            class-ref="org.apache.ojb.broker.GraphNode"
         >
  -         <foreignkey field-id-ref="2"/>
  +         <foreignkey field-ref="sourceId"/>
         </reference-descriptor>
         <reference-descriptor
            name="sink"
            class-ref="org.apache.ojb.broker.GraphNode"
         >
  -         <foreignkey field-id-ref="3"/>
  +         <foreignkey field-ref="sinkId"/>
         </reference-descriptor>
      </class-descriptor>
   
  @@ -1361,19 +1361,19 @@
      	  class="org.apache.ojb.broker.Point"
      	  table="POINT_TABLE"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="x"
            column="X"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor
            name="y"
            column="Y"
            jdbc-type="INTEGER"
  @@ -1388,29 +1388,29 @@
      	  table="FAMILY_MEMBER"
      	  proxy="dynamic"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="firstname"
            column="FIRSTNAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor
            name="lastname"
            column="LASTNAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor
            name="motherId"
            column="MOTHER_ID"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="5"
  +      <field-descriptor
            name="fatherId"
            column="FATHER_ID"
            jdbc-type="INTEGER"
  @@ -1420,13 +1420,13 @@
            name="mother"
            class-ref="org.apache.ojb.odmg.PersonImpl"
         >
  -         <foreignkey field-id-ref="4"/>
  +         <foreignkey field-ref="motherId"/>
         </reference-descriptor>
         <reference-descriptor
            name="father"
            class-ref="org.apache.ojb.odmg.PersonImpl"
         >
  -         <foreignkey field-id-ref="5"/>
  +         <foreignkey field-ref="fatherId"/>
         </reference-descriptor>
   
      </class-descriptor>
  @@ -1436,14 +1436,14 @@
      	  class="org.apache.ojb.odmg.Master"
      	  table="MDTEST_MASTER"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="masterId"
            column="MASTERID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="masterText"
            column="MASTER_TEXT"
            jdbc-type="VARCHAR"
  @@ -1452,13 +1452,13 @@
            name="collDetailFKinPK"
            element-class-ref="org.apache.ojb.odmg.DetailFKinPK"
         >
  -         <inverse-foreignkey field-id-ref="1"/>
  +         <inverse-foreignkey field-ref="masterId"/>
         </collection-descriptor>
         <collection-descriptor
            name="collDetailFKnoPK"
            element-class-ref="org.apache.ojb.odmg.DetailFKnoPK"
         >
  -         <inverse-foreignkey field-id-ref="2"/>
  +         <inverse-foreignkey field-ref="masterId"/>
         </collection-descriptor>
      </class-descriptor>
   
  @@ -1466,20 +1466,20 @@
      	  class="org.apache.ojb.odmg.DetailFKinPK"
      	  table="MDTEST_DETAIL_FKINPK"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor
            name="masterId"
            column="MASTERID"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="detailId"
            column="DETAILID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="detailText"
            column="DETAIL_TEXT"
            jdbc-type="VARCHAR"
  @@ -1488,7 +1488,7 @@
            name="master"
            class-ref="org.apache.ojb.odmg.Master"
         >
  -         <foreignkey field-id-ref="1"/>
  +         <foreignkey field-ref="masterId"/>
         </reference-descriptor>
      </class-descriptor>
   
  @@ -1496,19 +1496,19 @@
         class="org.apache.ojb.odmg.DetailFKnoPK"
         table="MDTEST_DETAIL_FKNOPK"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="detailId"
            column="DETAILID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor
            name="masterId"
            column="MASTERID"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="detailText"
            column="DETAIL_TEXT"
            jdbc-type="VARCHAR"
  @@ -1517,7 +1517,7 @@
            name="master"
            class-ref="org.apache.ojb.odmg.Master"
         >
  -         <foreignkey field-id-ref="2"/>
  +         <foreignkey field-ref="masterId"/>
         </reference-descriptor>
      </class-descriptor>
   
  @@ -1526,29 +1526,29 @@
   	class="org.apache.ojb.odmg.TestClassA"
   	table="TestClassA"
   >
  -    <field-descriptor id="1"
  +    <field-descriptor
          name="oid"
          column="id"
          jdbc-type="VARCHAR"
          primarykey="true"
          autoincrement="true"
       />
  -    <field-descriptor id="2"
  +    <field-descriptor
         name="value1"
         column="value1"
         jdbc-type="VARCHAR"
       />
  -    <field-descriptor id="3"
  +    <field-descriptor
          name="value2"
          column="value2"
          jdbc-type="VARCHAR"
       />
  -    <field-descriptor id="4"
  +    <field-descriptor
          name="value3"
          column="value3"
          jdbc-type="INTEGER"
       />
  -    <field-descriptor id="5"
  +    <field-descriptor
          name="boid"
          column="bOid"
          jdbc-type="VARCHAR"
  @@ -1557,7 +1557,7 @@
          name="b"
          class-ref="org.apache.ojb.odmg.TestClassB"
        >
  -       <foreignkey field-id-ref="5"/>
  +       <foreignkey field-ref="boid"/>
       </reference-descriptor>
   </class-descriptor>
   
  @@ -1566,19 +1566,19 @@
   	class="org.apache.ojb.odmg.TestClassB"
   	table="TestClassB"
    >
  -     <field-descriptor id="1"
  +     <field-descriptor
           name="oid"
           column="id"
           jdbc-type="VARCHAR"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="3"
  +     <field-descriptor
           name="aoid"
           column="aOid"
           jdbc-type="VARCHAR"
  @@ -1587,7 +1587,7 @@
           name="a"
           class-ref="org.apache.ojb.odmg.TestClassA"
        >
  -        <foreignkey field-id-ref="3"/>
  +        <foreignkey field-ref="aoid"/>
        </reference-descriptor>
   </class-descriptor>
   
  @@ -1596,29 +1596,29 @@
   	class="org.apache.ojb.odmg.TestClassAWithBProxy"
   	table="TestClassA"
   >
  -    <field-descriptor id="1"
  +    <field-descriptor
          name="oid"
          column="id"
          jdbc-type="VARCHAR"
          primarykey="true"
          autoincrement="true"
       />
  -    <field-descriptor id="2"
  +    <field-descriptor
         name="value1"
         column="value1"
         jdbc-type="VARCHAR"
       />
  -    <field-descriptor id="3"
  +    <field-descriptor
          name="value2"
          column="value2"
          jdbc-type="VARCHAR"
       />
  -    <field-descriptor id="4"
  +    <field-descriptor
          name="value3"
          column="value3"
          jdbc-type="INTEGER"
       />
  -    <field-descriptor id="5"
  +    <field-descriptor
          name="boid"
          column="bOid"
          jdbc-type="VARCHAR"
  @@ -1627,7 +1627,7 @@
          name="bp"
          class-ref="org.apache.ojb.odmg.TestClassBProxy"
        >
  -       <foreignkey field-id-ref="5"/>
  +       <foreignkey field-ref="boid"/>
       </reference-descriptor>
   </class-descriptor>
   
  @@ -1640,14 +1640,14 @@
   	table="TestClassB"
   	proxy="dynamic"
    >
  -     <field-descriptor id="1"
  +     <field-descriptor 
           name="oid"
           column="id"
           jdbc-type="VARCHAR"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor 
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
  @@ -1663,34 +1663,34 @@
   	class="org.apache.ojb.broker.Contract"
   	table="Contract"
    >
  -     <field-descriptor id="1"
  +     <field-descriptor 
           name="pk"
           column="pk"
           jdbc-type="VARCHAR"
           primarykey="true"
           autoincrement="false"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor
          name="contractValue1"
          column="contract_value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="3"
  +     <field-descriptor
           name="contractValue2"
           column="contract_value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="4"
  +     <field-descriptor
          name="contractValue3"
          column="contract_value3"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="5"
  +     <field-descriptor
          name="contractValue4"
          column="contract_value4"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor id="6"
  +     <field-descriptor
          name="fkToRelated"
          column="fk_to_related"
          jdbc-type="VARCHAR"
  @@ -1699,7 +1699,7 @@
            name="relatedToContract"
            class-ref="org.apache.ojb.broker.RelatedToContract"
         >
  -         <foreignkey field-id-ref="6"/>
  +         <foreignkey field-ref="fkToRelated"/>
         </reference-descriptor>
       </class-descriptor>
   
  @@ -1707,24 +1707,24 @@
   	class="org.apache.ojb.broker.RelatedToContract"
   	table="RelatedToContract"
       >
  -     <field-descriptor id="1"
  +     <field-descriptor
           name="pk"
           column="pk"
           jdbc-type="VARCHAR"
           primarykey="true"
           autoincrement="false"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor 
          name="relatedValue1"
          column="relatedValue1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="3"
  +     <field-descriptor 
           name="relatedValue2"
           column="relatedValue2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="4"
  +     <field-descriptor 
          name="relatedValue3"
          column="relatedValue3"
          jdbc-type="TIMESTAMP"
  @@ -1735,29 +1735,29 @@
   	class="org.apache.ojb.broker.Version"
   	table="Version"
       >
  -     <field-descriptor id="1"
  +     <field-descriptor
           name="pk"
           column="pk"
           jdbc-type="VARCHAR"
           primarykey="true"
           autoincrement="false"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor 
          name="versionValue1"
          column="version_value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="3"
  +     <field-descriptor 
           name="versionValue2"
           column="version_value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="4"
  +     <field-descriptor 
          name="versionValue3"
          column="version_value3"
          jdbc-type="TIMESTAMP"
        />
  -    <field-descriptor id="5"
  +    <field-descriptor
         name="fkToContract"
         column="fk_to_contract"
         jdbc-type="VARCHAR"
  @@ -1766,7 +1766,7 @@
           name="contract"
           class-ref="org.apache.ojb.broker.Contract"
        >
  -        <foreignkey field-id-ref="5"/>
  +        <foreignkey field-ref="fkToContract"/>
        </reference-descriptor>
    </class-descriptor>
   
  @@ -1774,29 +1774,29 @@
   	class="org.apache.ojb.broker.Effectiveness"
   	table="Effectiveness"
       >
  -     <field-descriptor id="1"
  +     <field-descriptor
           name="pk"
           column="pk"
           jdbc-type="VARCHAR"
           primarykey="true"
           autoincrement="false"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor
          name="effValue1"
          column="eff_value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="3"
  +     <field-descriptor
           name="effValue2"
           column="eff_value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="4"
  +     <field-descriptor
          name="effValue3"
          column="eff_value3"
          jdbc-type="TIMESTAMP"
        />
  -    <field-descriptor id="5"
  +    <field-descriptor
         name="fkToVersion"
         column="fk_to_version"
         jdbc-type="VARCHAR"
  @@ -1805,7 +1805,7 @@
           name="version"
           class-ref="org.apache.ojb.broker.Version"
        >
  -        <foreignkey field-id-ref="5"/>
  +        <foreignkey field-ref="fkToVersion"/>
        </reference-descriptor>
    </class-descriptor>
    <!-- end mappings for contract-version-effectiveness -->
  @@ -1816,29 +1816,29 @@
   	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableA"
   	table="MultiMappedTable"
    >
  -     <field-descriptor id="1"
  +     <field-descriptor
           name="ID"
           column="ID"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor 
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="3"
  +     <field-descriptor 
           name="value2"
           column="value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="4"
  +     <field-descriptor 
          name="value3"
          column="value3"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor id="5"
  +     <field-descriptor 
          name="ojbConcreteClass"
          column="ojbConcreteClass"
          jdbc-type="VARCHAR"
  @@ -1851,29 +1851,29 @@
    >
        <extent-class class-ref="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableD" />
        <extent-class class-ref="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableE" />
  -     <field-descriptor id="1"
  +     <field-descriptor 
           name="ID"
           column="ID"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor 
          name="value4"
          column="value4"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="3"
  +     <field-descriptor 
           name="value5"
           column="value5"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="4"
  +     <field-descriptor 
          name="value6"
          column="value6"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor id="5"
  +     <field-descriptor 
          name="ojbConcreteClass"
          column="ojbConcreteClass"
          jdbc-type="VARCHAR"
  @@ -1884,44 +1884,44 @@
   	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableC"
   	table="MultiMappedTable"
    >
  -     <field-descriptor id="1"
  +     <field-descriptor 
           name="ID"
           column="ID"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor 
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="3"
  +     <field-descriptor 
           name="value2"
           column="value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="4"
  +     <field-descriptor 
          name="value3"
          column="value3"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor id="5"
  +     <field-descriptor 
          name="value4"
          column="value4"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="6"
  +     <field-descriptor 
           name="value5"
           column="value5"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="7"
  +     <field-descriptor 
          name="value6"
          column="value6"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor id="8"
  +     <field-descriptor 
          name="ojbConcreteClass"
          column="ojbConcreteClass"
          jdbc-type="VARCHAR"
  @@ -1932,44 +1932,44 @@
   	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableD"
   	table="MultiMappedTable"
    >
  -     <field-descriptor id="1"
  +     <field-descriptor 
           name="ID"
           column="ID"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor 
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="3"
  +     <field-descriptor 
           name="value2"
           column="value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="4"
  +     <field-descriptor 
          name="value3"
          column="value3"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor id="5"
  +     <field-descriptor 
          name="value4"
          column="value4"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="6"
  +     <field-descriptor 
           name="value5"
           column="value5"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="7"
  +     <field-descriptor 
          name="value6"
          column="value6"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor id="8"
  +     <field-descriptor 
          name="ojbConcreteClass"
          column="ojbConcreteClass"
          jdbc-type="VARCHAR"
  @@ -1981,44 +1981,44 @@
   	table="MultiMappedTable"
    >
        <extent-class class-ref="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableF" />
  -     <field-descriptor id="1"
  +     <field-descriptor 
           name="ID"
           column="ID"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor 
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="3"
  +     <field-descriptor 
           name="value2"
           column="value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="4"
  +     <field-descriptor 
          name="value3"
          column="value3"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor id="5"
  +     <field-descriptor 
          name="value4"
          column="value4"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="6"
  +     <field-descriptor 
           name="value5"
           column="value5"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="7"
  +     <field-descriptor 
          name="value6"
          column="value6"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor id="8"
  +     <field-descriptor 
          name="ojbConcreteClass"
          column="ojbConcreteClass"
          jdbc-type="VARCHAR"
  @@ -2030,44 +2030,44 @@
   	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableF"
   	table="MultiMappedTable"
    >
  -     <field-descriptor id="1"
  +     <field-descriptor 
           name="ID"
           column="ID"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor 
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="3"
  +     <field-descriptor 
           name="value2"
           column="value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="4"
  +     <field-descriptor 
          name="value3"
          column="value3"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor id="5"
  +     <field-descriptor 
          name="value4"
          column="value4"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor id="6"
  +     <field-descriptor 
           name="value5"
           column="value5"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor id="7"
  +     <field-descriptor 
          name="value6"
          column="value6"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor id="8"
  +     <field-descriptor 
          name="ojbConcreteClass"
          column="ojbConcreteClass"
          jdbc-type="VARCHAR"
  @@ -2079,14 +2079,14 @@
   	class="org.apache.ojb.broker.Table_1Object"
   	table="TABLE_1"
    >
  -     <field-descriptor id="1"
  +     <field-descriptor 
           name="pk"
           column="pk"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor 
          name="table2ObjectFK"
          column="fk_to_related"
          jdbc-type="INTEGER"
  @@ -2095,7 +2095,7 @@
           name="table2Object"
           class-ref="org.apache.ojb.broker.Table_2Object"
        >
  -        <foreignkey field-id-ref="2"/>
  +        <foreignkey field-ref="table2ObjectFK"/>
        </reference-descriptor>
    </class-descriptor>
   
  @@ -2103,7 +2103,7 @@
       class="org.apache.ojb.broker.Table_2Object"
       table="TABLE_2"
       >
  -    <field-descriptor id="1"
  +    <field-descriptor 
       name="pk"
       column="pk"
       jdbc-type="INTEGER"
  @@ -2117,14 +2117,14 @@
   	class="org.apache.ojb.broker.BidirectionalAssociationObjectA"
   	table="BIDIR_A"
    >
  -     <field-descriptor id="1"
  +     <field-descriptor
           name="pk"
           column="pk"
           jdbc-type="VARCHAR"
           primarykey="true"
           autoincrement="false"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor
          name="fkToB"
          column="fk_to_B"
          jdbc-type="VARCHAR"
  @@ -2133,7 +2133,7 @@
           name="relatedB"
           class-ref="org.apache.ojb.broker.BidirectionalAssociationObjectB"
        >
  -        <foreignkey field-id-ref="2"/>
  +        <foreignkey field-ref="fkToB"/>
        </reference-descriptor>
    </class-descriptor>
   
  @@ -2141,14 +2141,14 @@
   	class="org.apache.ojb.broker.BidirectionalAssociationObjectB"
   	table="BIDIR_B"
    >
  -     <field-descriptor id="1"
  +     <field-descriptor
           name="pk"
           column="pk"
           jdbc-type="VARCHAR"
           primarykey="true"
           autoincrement="false"
        />
  -     <field-descriptor id="2"
  +     <field-descriptor
          name="fkToA"
          column="fk_to_A"
          jdbc-type="VARCHAR"
  @@ -2157,7 +2157,7 @@
           name="relatedA"
           class-ref="org.apache.ojb.broker.BidirectionalAssociationObjectA"
        >
  -        <foreignkey field-id-ref="2"/>
  +        <foreignkey field-ref="fkToA"/>
        </reference-descriptor>
    </class-descriptor>
   
  @@ -2173,29 +2173,29 @@
      	  class="org.apache.ojb.broker.Mammal"
      	  table="MAMMAL"
      >
  -  	<field-descriptor id="1"
  +  	<field-descriptor
    	  name="animalId"
    	  column="animalId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor id="2"
  +	<field-descriptor
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
     	/>
  -	<field-descriptor id="3"
  +	<field-descriptor
       	name="age"
         	column="age"
         	jdbc-type="INTEGER"
    	/>
  -	<field-descriptor id="4"
  +	<field-descriptor
   		name="numLegs"
   		column="numLegs"
   		jdbc-type="INTEGER"
   	/>
  -	<field-descriptor id="5"
  +	<field-descriptor
   		name="zooId"
   		column="zooId"
   		jdbc-type="INTEGER"
  @@ -2207,29 +2207,29 @@
      	  class="org.apache.ojb.broker.Reptile"
      	  table="REPTILE"
      >
  -  	<field-descriptor id="1"
  +  	<field-descriptor 
    	  name="animalId"
    	  column="animalId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor id="2"
  +	<field-descriptor 
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
     	/>
  -	<field-descriptor id="3"
  +	<field-descriptor 
       	name="age"
         	column="age"
         	jdbc-type="INTEGER"
    	/>
  -	<field-descriptor id="4"
  +	<field-descriptor 
   		name="color"
   		column="color"
   		jdbc-type="VARCHAR"
   	/>
  -	<field-descriptor id="5"
  +	<field-descriptor
   		name="zooId"
   		column="zooId"
   		jdbc-type="INTEGER"
  @@ -2241,14 +2241,14 @@
      	  class="org.apache.ojb.broker.Zoo"
      	  table="ZOO"
      >
  -  	<field-descriptor id="1"
  +  	<field-descriptor
    	  name="zooId"
    	  column="zooId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor id="2"
  +	<field-descriptor
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
  @@ -2260,7 +2260,7 @@
           auto-retrieve="true"
           auto-delete="false"
         >
  -		<inverse-foreignkey field-id-ref="5"/>
  +		<inverse-foreignkey field-ref="zooId"/>
         </collection-descriptor>
    	</class-descriptor>
   
  @@ -2269,14 +2269,14 @@
      	  class="org.apache.ojb.odmg.ODMGZoo"
      	  table="ZOO"
      >
  -  	<field-descriptor id="1"
  +  	<field-descriptor
    	  name="zooId"
    	  column="zooId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor id="2"
  +	<field-descriptor 
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
  @@ -2285,7 +2285,7 @@
        	name="animals"
           element-class-ref="org.apache.ojb.broker.InterfaceAnimal"
         >
  -		<inverse-foreignkey field-id-ref="5"/>
  +		<inverse-foreignkey field-ref="zooId"/>
         </collection-descriptor>
   
   
  @@ -2304,24 +2304,24 @@
      	  class="org.apache.ojb.broker.Fish"
      	  table="FISH"
      >
  -  	<field-descriptor id="1"
  +  	<field-descriptor 
    	  name="foodId"
    	  column="foodId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor id="2"
  +	<field-descriptor 
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
     	/>
  -	<field-descriptor id="3"
  +	<field-descriptor
       	name="calories"
         	column="calories"
         	jdbc-type="INTEGER"
    	/>
  -	<field-descriptor id="4"
  +	<field-descriptor 
   		name="typeOfWater"
   		column="typeOfWater"
   		jdbc-type="VARCHAR"
  @@ -2333,24 +2333,24 @@
      	  class="org.apache.ojb.broker.Salad"
      	  table="SALAD"
      >
  -  	<field-descriptor id="1"
  +  	<field-descriptor 
    	  name="foodId"
    	  column="foodId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor id="2"
  +	<field-descriptor 
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
     	/>
  -	<field-descriptor id="3"
  +	<field-descriptor 
       	name="calories"
         	column="calories"
         	jdbc-type="INTEGER"
    	/>
  -	<field-descriptor id="4"
  +	<field-descriptor 
   		name="color"
   		column="color"
   		jdbc-type="VARCHAR"
  @@ -2364,14 +2364,14 @@
      	  class="org.apache.ojb.broker.Gourmet"
      	  table="GOURMET"
      >
  -  	<field-descriptor id="1"
  +  	<field-descriptor 
    	  name="gourmetId"
    	  column="gourmetId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor id="2"
  +	<field-descriptor 
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
  @@ -2395,14 +2395,14 @@
      	  class="org.apache.ojb.odmg.ODMGGourmet"
      	  table="GOURMET"
      >
  -  	<field-descriptor id="1"
  +  	<field-descriptor 
    	  name="gourmetId"
    	  column="gourmetId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor id="2"
  +	<field-descriptor 
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
  @@ -2422,14 +2422,14 @@
      	  class="org.apache.ojb.broker.GuidTestEntity"
      	  table="GUIDTEST"
      >
  -	  	<field-descriptor id="1"
  +	  	<field-descriptor 
   	 	  name="guid"
   	 	  column="GUID_"
   	 	  jdbc-type="VARCHAR"
   	 	  primarykey="true"
   	 	  conversion="org.apache.ojb.broker.accesslayer.conversions.GUID2StringFieldConversion"
   	 	/>
  -		<field-descriptor id="2"
  +		<field-descriptor 
   			name="value"
   	       	column="GUIDVALUE"
   	        jdbc-type="VARCHAR"
  @@ -2439,13 +2439,13 @@
      	  class="org.apache.ojb.broker.ConversionReferrer"
      	  table="CONV_REFERER"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="pk1"
            column="PK1"
            jdbc-type="INTEGER"
            primarykey="true"
           />
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="ref1"
            column="REF1"
            jdbc-type="INTEGER"
  @@ -2455,14 +2455,14 @@
             name="referred"
             class-ref="org.apache.ojb.broker.ConversionReferred"
            >
  -          <foreignkey field-id-ref="2"/>
  +          <foreignkey field-ref="ref1"/>
            </reference-descriptor>
       </class-descriptor>
       <class-descriptor
     	  class="org.apache.ojb.broker.ConversionReferred"
      	  table="CONV_REFERED"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="pk1"
            column="PK1"
            jdbc-type="INTEGER"
  @@ -2475,24 +2475,24 @@
      	  class="org.apache.ojb.odmg.Site"
      	  table="SITE"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
           />
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
           />
  -        <field-descriptor id="3"
  +        <field-descriptor 
            name="year"
            column="SITEYEAR"
            jdbc-type="INTEGER"
           />
  -        <field-descriptor id="4"
  +        <field-descriptor 
            name="semester"
            column="SEMESTER"
            jdbc-type="INTEGER"
  @@ -2518,7 +2518,7 @@
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendAA" />
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendAB" />
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2526,7 +2526,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2538,7 +2538,7 @@
         class="org.apache.ojb.broker.sequence.SMInterfaceExtendAB"
         table="SM_TAB_AB"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2546,7 +2546,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2560,7 +2560,7 @@
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendAAA" />
   
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2568,7 +2568,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2580,7 +2580,7 @@
         class="org.apache.ojb.broker.sequence.SMInterfaceExtendAAA"
         table="SM_TAB_AAA"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2588,7 +2588,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2601,7 +2601,7 @@
         table="SM_TAB_B"
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendBB" />
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2609,7 +2609,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2621,7 +2621,7 @@
         class="org.apache.ojb.broker.sequence.SMInterfaceExtendBB"
         table="SM_TAB_BB"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2629,7 +2629,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2642,7 +2642,7 @@
         table="SM_SAME_TAB"
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMSameTableAA" />
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2650,7 +2650,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2662,7 +2662,7 @@
         class="org.apache.ojb.broker.sequence.SMSameTableAA"
         table="SM_SAME_TAB"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2670,7 +2670,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2683,7 +2683,7 @@
         table="SM_SAME_TAB"
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMSameTableBB" />
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2691,7 +2691,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2703,7 +2703,7 @@
         class="org.apache.ojb.broker.sequence.SMSameTableBB"
         table="SM_SAME_TAB"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2711,7 +2711,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2734,7 +2734,7 @@
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxAA" />
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxAB" />
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2742,7 +2742,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2754,7 +2754,7 @@
         class="org.apache.ojb.broker.sequence.SMMaxAB"
         table="SM_TAB_MAX_AB"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2762,7 +2762,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2776,7 +2776,7 @@
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxAAA" />
   
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2784,7 +2784,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2796,7 +2796,7 @@
         class="org.apache.ojb.broker.sequence.SMMaxAAA"
         table="SM_TAB_MAX_AAA"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2804,7 +2804,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2817,7 +2817,7 @@
         table="SM_TAB_MAX_B"
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxBB" />
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2825,7 +2825,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2837,7 +2837,7 @@
         class="org.apache.ojb.broker.sequence.SMMaxBB"
         table="SM_TAB_MAX_BB"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2845,7 +2845,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2858,7 +2858,7 @@
         class="org.apache.ojb.broker.sequence.SMKey"
         table="SM_KEY"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="intKey"
            column="INT_KEY"
            jdbc-type="INTEGER"
  @@ -2866,13 +2866,13 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
           />
   
  -        <field-descriptor id="3"
  +        <field-descriptor 
            name="stringKey"
            column="STRING_KEY"
            jdbc-type="VARCHAR"
  @@ -2881,7 +2881,7 @@
            sequence-name="TEST_SEQUENCE"
           />
   
  -        <field-descriptor id="4"
  +        <field-descriptor 
            name="longKey"
            column="LONG_KEY"
            jdbc-type="BIGINT"
  @@ -2889,7 +2889,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor id="5"
  +        <field-descriptor 
            name="integerKey"
            column="INTEGER_KEY"
            jdbc-type="INTEGER"
  @@ -2904,7 +2904,7 @@
         class="org.apache.ojb.broker.sequence.SMDatabaseSequence"
         table="SM_TAB_DATABASE_SEQUENCE"
       >
  -        <field-descriptor id="1"
  +        <field-descriptor 
            name="seqId"
            column="SEQ_ID"
            jdbc-type="INTEGER"
  @@ -2913,7 +2913,7 @@
            sequence-name="TEST_SEQUENCE"
           />
   
  -        <field-descriptor id="2"
  +        <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2926,4 +2926,4 @@
       <!--      END  -  Sequence manager test classes        -->
       <!-- ************************************************* -->
   
  -<!-- Mapping of classes used in junit tests and tutorials ends here -->
  \ No newline at end of file
  +<!-- Mapping of classes used in junit tests and tutorials ends here -->
  
  
  
  1.4       +18 -18    jakarta-ojb/src/test/org/apache/ojb/repository_user.xml
  
  Index: repository_user.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/repository_user.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- repository_user.xml	28 Nov 2002 07:22:53 -0000	1.3
  +++ repository_user.xml	2 Jan 2003 21:27:19 -0000	1.4
  @@ -1,9 +1,9 @@
   <!-- Please keep user defined mappings in this file only
  -     to avoid mixing user defined and system mappings. -->   
  +     to avoid mixing user defined and system mappings. -->
   <!-- Mapping of User defined classes starts here -->
   
   <!-- The mappings for the tutorial classes are placed here to make it
  -     easier to find them for OJB newbies. 
  +     easier to find them for OJB newbies.
        Please remove them if you don't need them in your environment. -->
   
   <!-- Definitions for org.apache.ojb.tutorial1.Product -->
  @@ -11,24 +11,24 @@
      	  class="org.apache.ojb.tutorial1.Product"
      	  table="PRODUCT"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="price"
            column="PRICE"
            jdbc-type="DOUBLE"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="stock"
            column="STOCK"
            jdbc-type="INTEGER"
  @@ -40,24 +40,24 @@
      	  class="org.apache.ojb.tutorial2.Product"
      	  table="PRODUCT"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="price"
            column="PRICE"
            jdbc-type="DOUBLE"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="stock"
            column="STOCK"
            jdbc-type="INTEGER"
  @@ -70,24 +70,24 @@
      	  class="org.apache.ojb.tutorial4.Product"
      	  table="PRODUCT"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="price"
            column="PRICE"
            jdbc-type="DOUBLE"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="stock"
            column="STOCK"
            jdbc-type="INTEGER"
  @@ -99,24 +99,24 @@
      	  class="org.apache.ojb.tutorial5.Product"
      	  table="PRODUCT"
      >
  -      <field-descriptor id="1"
  +      <field-descriptor 
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor id="2"
  +      <field-descriptor 
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor id="3"
  +      <field-descriptor 
            name="price"
            column="PRICE"
            jdbc-type="DOUBLE"
         />
  -      <field-descriptor id="4"
  +      <field-descriptor 
            name="stock"
            column="STOCK"
            jdbc-type="INTEGER"
  
  
  

--
To unsubscribe, e-mail:   <mailto:ojb-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ojb-dev-help@jakarta.apache.org>


Mime
View raw message