db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: jakarta-ojb/src/test/org/apache/ojb repository_junit.xml repository_database.xml repository.xml repository.dtd OJB.properties
Date Thu, 09 Jan 2003 17:30:51 GMT
arminw      2003/01/09 09:30:50

  Modified:    src/test/org/apache/ojb repository_junit.xml
                        repository_database.xml repository.xml
                        repository.dtd OJB.properties
  Log:
  - move the whole sequence-manager
  properties stuff from the OJB.properties to
  the repository
  - move the 'useAutoCommit' and
  'ignoreAutocommitExceptions' properties from OJB.properties
  to jdbc-connection-descriptor
  
  - remove the 'maxConnectionsInPool'
  property from OJB.properties
  
  Revision  Changes    Path
  1.34      +293 -227  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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- repository_junit.xml	2 Jan 2003 21:27:19 -0000	1.33
  +++ repository_junit.xml	9 Jan 2003 17:30:48 -0000	1.34
  @@ -144,7 +144,7 @@
            column="KategorieName"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="description"
            column="Beschreibung"
            jdbc-type="VARCHAR"
  @@ -166,18 +166,18 @@
      	  class="org.apache.ojb.broker.ProductGroupWithArray"
      	  table="Kategorien"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="groupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="groupName"
            column="KategorieName"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="description"
            column="Beschreibung"
            jdbc-type="VARCHAR"
  @@ -198,13 +198,13 @@
   	  class="org.apache.ojb.broker.ProductGroupWithCollectionProxy"
   	  table="Kategorien"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="groupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="groupName"
            column="KategorieName"
            jdbc-type="VARCHAR"
  @@ -224,19 +224,19 @@
      	  proxy="org.apache.ojb.broker.ProductGroupProxy"
      	  table="Kategorien"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="groupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="groupName"
            column="KategorieName"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="description"
            column="Beschreibung"
            jdbc-type="VARCHAR"
  @@ -260,48 +260,48 @@
         table="Artikel"
         row-reader="org.apache.ojb.broker.RowReaderTestImpl"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="articleId"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="articleName"
            column="Artikelname"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="supplierId"
            column="Lieferanten_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="productGroupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="unit"
            column="Liefereinheit"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="price"
            column="Einzelpreis"
            jdbc-type="FLOAT"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="stock"
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="minimumStock"
            column="MindestBestand"
            jdbc-type="INTEGER"
  @@ -319,49 +319,49 @@
      	  class="org.apache.ojb.broker.ArticleWithReferenceProxy"
      	  table="Artikel"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="articleId"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="articleName"
            column="Artikelname"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="supplierId"
            column="Lieferanten_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="productGroupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="unit"
            column="Liefereinheit"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="price"
            column="Einzelpreis"
            jdbc-type="FLOAT"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="stock"
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="minimumStock"
            column="MindestBestand"
            jdbc-type="INTEGER"
  @@ -387,24 +387,24 @@
         class="org.apache.ojb.broker.A"
         table="AB_TABLE"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="ojbConcreteClass"
            column="CLASS_NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="someValue"
            column="VALUE_"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <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 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="ojbConcreteClass"
            column="CLASS_NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="someValue"
            column="VALUE_"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <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 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="ojbConcreteClass"
            column="CLASS_NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <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 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="ojbConcreteClass"
            column="CLASS_NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="someValue"
            column="VALUE_"
            jdbc-type="INTEGER"
  @@ -504,19 +504,19 @@
      	  class="org.apache.ojb.broker.D"
      	  table="AB_TABLE"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="ojbConcreteClass"
            column="CLASS_NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="someValue"
            column="VALUE_"
            jdbc-type="INTEGER"
  @@ -529,19 +529,19 @@
      	  class="org.apache.ojb.broker.Person"
      	  table="PERSON"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="firstname"
            column="FIRSTNAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="lastname"
            column="LASTNAME"
            jdbc-type="VARCHAR"
  @@ -570,19 +570,19 @@
   	  class="org.apache.ojb.broker.Project"
   	  table="PROJECT"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="title"
            column="TITLE"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="description"
            column="DESCRIPTION"
            jdbc-type="VARCHAR"
  @@ -699,12 +699,12 @@
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="firstname"
            column="FIRSTNAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="lastname"
            column="LASTNAME"
            jdbc-type="VARCHAR"
  @@ -727,19 +727,19 @@
   	  class="org.apache.ojb.broker.ProjectUnidirectional"
   	  table="PROJECT"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="title"
            column="TITLE"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="description"
            column="DESCRIPTION"
            jdbc-type="VARCHAR"
  @@ -751,49 +751,49 @@
      	  class="org.apache.ojb.broker.PerformanceArticle"
      	  table="Artikel"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="articleId"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="articleName"
            column="Artikelname"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="supplierId"
            column="Lieferanten_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="productGroupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="unit"
            column="Liefereinheit"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="price"
            column="Einzelpreis"
            jdbc-type="FLOAT"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="stock"
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <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 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="value"
            column="VALUE_"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <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 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="value"
            column="VALUE_"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="timestamp"
            column="TIMESTAMP_"
            jdbc-type="TIMESTAMP"
  @@ -856,19 +856,19 @@
      	  class="org.apache.ojb.broker.ObjectWithBlob"
      	  table="BLOB_TEST"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="blob"
            column="BLOB_VALUE_"
            jdbc-type="BLOB"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="clob"
            column="CLOB_VALUE_"
            jdbc-type="CLOB"
  @@ -881,7 +881,7 @@
      	  class="org.apache.ojb.broker.PBAwareEntity"
      	  table="Artikel"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="id"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
  @@ -935,12 +935,12 @@
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="minimumStock"
            column="MindestBestand"
            jdbc-type="INTEGER"
  @@ -965,18 +965,18 @@
    	  table="Kategorien"
         isolation-level="serializable"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="groupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="groupName"
            column="KategorieName"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="description"
            column="Beschreibung"
            jdbc-type="VARCHAR"
  @@ -994,49 +994,49 @@
   	  class="org.apache.ojb.broker.BookArticle"
   	  table="BOOKS"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="articleId"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="articleName"
            column="Artikelname"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="supplierId"
            column="Lieferanten_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="productGroupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="unit"
            column="Liefereinheit"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="price"
            column="Einzelpreis"
            jdbc-type="FLOAT"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="stock"
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="minimumStock"
            column="MindestBestand"
            jdbc-type="INTEGER"
  @@ -1070,49 +1070,49 @@
      	  class="org.apache.ojb.broker.CdArticle"
      	  table="CDS"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="articleId"
            column="Artikel_Nr"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="articleName"
            column="Artikelname"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="supplierId"
            column="Lieferanten_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="productGroupId"
            column="Kategorie_Nr"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="unit"
            column="Liefereinheit"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="price"
            column="Einzelpreis"
            jdbc-type="FLOAT"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="stock"
            column="Lagerbestand"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="orderedUnits"
            column="BestellteEinheiten"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="minimumStock"
            column="MindestBestand"
            jdbc-type="INTEGER"
  @@ -1272,19 +1272,19 @@
         class="org.apache.ojb.broker.GraphNode"
         table="GRAPH_NODE"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="locationId"
            column="LOCATION"
            jdbc-type="INTEGER"
  @@ -1388,7 +1388,7 @@
      	  table="FAMILY_MEMBER"
      	  proxy="dynamic"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
  @@ -1479,7 +1479,7 @@
            primarykey="true"
            autoincrement="true"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="detailText"
            column="DETAIL_TEXT"
            jdbc-type="VARCHAR"
  @@ -1496,7 +1496,7 @@
         class="org.apache.ojb.odmg.DetailFKnoPK"
         table="MDTEST_DETAIL_FKNOPK"
      >
  -      <field-descriptor 
  +      <field-descriptor
            name="detailId"
            column="DETAILID"
            jdbc-type="INTEGER"
  @@ -1508,7 +1508,7 @@
            column="MASTERID"
            jdbc-type="INTEGER"
         />
  -      <field-descriptor 
  +      <field-descriptor
            name="detailText"
            column="DETAIL_TEXT"
            jdbc-type="VARCHAR"
  @@ -1640,14 +1640,14 @@
   	table="TestClassB"
   	proxy="dynamic"
    >
  -     <field-descriptor 
  +     <field-descriptor
           name="oid"
           column="id"
           jdbc-type="VARCHAR"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
  @@ -1663,7 +1663,7 @@
   	class="org.apache.ojb.broker.Contract"
   	table="Contract"
    >
  -     <field-descriptor 
  +     <field-descriptor
           name="pk"
           column="pk"
           jdbc-type="VARCHAR"
  @@ -1714,17 +1714,17 @@
           primarykey="true"
           autoincrement="false"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="relatedValue1"
          column="relatedValue1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor 
  +     <field-descriptor
           name="relatedValue2"
           column="relatedValue2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="relatedValue3"
          column="relatedValue3"
          jdbc-type="TIMESTAMP"
  @@ -1742,17 +1742,17 @@
           primarykey="true"
           autoincrement="false"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="versionValue1"
          column="version_value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor 
  +     <field-descriptor
           name="versionValue2"
           column="version_value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="versionValue3"
          column="version_value3"
          jdbc-type="TIMESTAMP"
  @@ -1823,22 +1823,22 @@
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor 
  +     <field-descriptor
           name="value2"
           column="value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value3"
          column="value3"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor 
  +     <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 
  +     <field-descriptor
           name="ID"
           column="ID"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value4"
          column="value4"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor 
  +     <field-descriptor
           name="value5"
           column="value5"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value6"
          column="value6"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="ojbConcreteClass"
          column="ojbConcreteClass"
          jdbc-type="VARCHAR"
  @@ -1884,44 +1884,44 @@
   	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableC"
   	table="MultiMappedTable"
    >
  -     <field-descriptor 
  +     <field-descriptor
           name="ID"
           column="ID"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor 
  +     <field-descriptor
           name="value2"
           column="value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value3"
          column="value3"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value4"
          column="value4"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor 
  +     <field-descriptor
           name="value5"
           column="value5"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value6"
          column="value6"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="ojbConcreteClass"
          column="ojbConcreteClass"
          jdbc-type="VARCHAR"
  @@ -1932,44 +1932,44 @@
   	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableD"
   	table="MultiMappedTable"
    >
  -     <field-descriptor 
  +     <field-descriptor
           name="ID"
           column="ID"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor 
  +     <field-descriptor
           name="value2"
           column="value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value3"
          column="value3"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value4"
          column="value4"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor 
  +     <field-descriptor
           name="value5"
           column="value5"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value6"
          column="value6"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor 
  +     <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 
  +     <field-descriptor
           name="ID"
           column="ID"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor 
  +     <field-descriptor
           name="value2"
           column="value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value3"
          column="value3"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value4"
          column="value4"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor 
  +     <field-descriptor
           name="value5"
           column="value5"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value6"
          column="value6"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="ojbConcreteClass"
          column="ojbConcreteClass"
          jdbc-type="VARCHAR"
  @@ -2030,44 +2030,44 @@
   	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableF"
   	table="MultiMappedTable"
    >
  -     <field-descriptor 
  +     <field-descriptor
           name="ID"
           column="ID"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value1"
          column="value1"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor 
  +     <field-descriptor
           name="value2"
           column="value2"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value3"
          column="value3"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value4"
          column="value4"
          jdbc-type="VARCHAR"
        />
  -     <field-descriptor 
  +     <field-descriptor
           name="value5"
           column="value5"
           jdbc-type="INTEGER"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="value6"
          column="value6"
          jdbc-type="TIMESTAMP"
        />
  -     <field-descriptor 
  +     <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 
  +     <field-descriptor
           name="pk"
           column="pk"
           jdbc-type="INTEGER"
           primarykey="true"
           autoincrement="true"
        />
  -     <field-descriptor 
  +     <field-descriptor
          name="table2ObjectFK"
          column="fk_to_related"
          jdbc-type="INTEGER"
  @@ -2103,7 +2103,7 @@
       class="org.apache.ojb.broker.Table_2Object"
       table="TABLE_2"
       >
  -    <field-descriptor 
  +    <field-descriptor
       name="pk"
       column="pk"
       jdbc-type="INTEGER"
  @@ -2207,24 +2207,24 @@
      	  class="org.apache.ojb.broker.Reptile"
      	  table="REPTILE"
      >
  -  	<field-descriptor 
  +  	<field-descriptor
    	  name="animalId"
    	  column="animalId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor 
  +	<field-descriptor
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
     	/>
  -	<field-descriptor 
  +	<field-descriptor
       	name="age"
         	column="age"
         	jdbc-type="INTEGER"
    	/>
  -	<field-descriptor 
  +	<field-descriptor
   		name="color"
   		column="color"
   		jdbc-type="VARCHAR"
  @@ -2276,7 +2276,7 @@
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor 
  +	<field-descriptor
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
  @@ -2304,14 +2304,14 @@
      	  class="org.apache.ojb.broker.Fish"
      	  table="FISH"
      >
  -  	<field-descriptor 
  +  	<field-descriptor
    	  name="foodId"
    	  column="foodId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor 
  +	<field-descriptor
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
  @@ -2321,7 +2321,7 @@
         	column="calories"
         	jdbc-type="INTEGER"
    	/>
  -	<field-descriptor 
  +	<field-descriptor
   		name="typeOfWater"
   		column="typeOfWater"
   		jdbc-type="VARCHAR"
  @@ -2333,24 +2333,24 @@
      	  class="org.apache.ojb.broker.Salad"
      	  table="SALAD"
      >
  -  	<field-descriptor 
  +  	<field-descriptor
    	  name="foodId"
    	  column="foodId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor 
  +	<field-descriptor
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
     	/>
  -	<field-descriptor 
  +	<field-descriptor
       	name="calories"
         	column="calories"
         	jdbc-type="INTEGER"
    	/>
  -	<field-descriptor 
  +	<field-descriptor
   		name="color"
   		column="color"
   		jdbc-type="VARCHAR"
  @@ -2364,14 +2364,14 @@
      	  class="org.apache.ojb.broker.Gourmet"
      	  table="GOURMET"
      >
  -  	<field-descriptor 
  +  	<field-descriptor
    	  name="gourmetId"
    	  column="gourmetId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor 
  +	<field-descriptor
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
  @@ -2395,14 +2395,14 @@
      	  class="org.apache.ojb.odmg.ODMGGourmet"
      	  table="GOURMET"
      >
  -  	<field-descriptor 
  +  	<field-descriptor
    	  name="gourmetId"
    	  column="gourmetId"
    	  jdbc-type="INTEGER"
    	  primarykey="true"
    	  autoincrement="true"
    	/>
  -	<field-descriptor 
  +	<field-descriptor
   		name="name"
          	column="name"
           jdbc-type="VARCHAR"
  @@ -2422,14 +2422,14 @@
      	  class="org.apache.ojb.broker.GuidTestEntity"
      	  table="GUIDTEST"
      >
  -	  	<field-descriptor 
  +	  	<field-descriptor
   	 	  name="guid"
   	 	  column="GUID_"
   	 	  jdbc-type="VARCHAR"
   	 	  primarykey="true"
   	 	  conversion="org.apache.ojb.broker.accesslayer.conversions.GUID2StringFieldConversion"
   	 	/>
  -		<field-descriptor 
  +		<field-descriptor
   			name="value"
   	       	column="GUIDVALUE"
   	        jdbc-type="VARCHAR"
  @@ -2439,13 +2439,13 @@
      	  class="org.apache.ojb.broker.ConversionReferrer"
      	  table="CONV_REFERER"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="pk1"
            column="PK1"
            jdbc-type="INTEGER"
            primarykey="true"
           />
  -        <field-descriptor 
  +        <field-descriptor
            name="ref1"
            column="REF1"
            jdbc-type="INTEGER"
  @@ -2462,7 +2462,7 @@
     	  class="org.apache.ojb.broker.ConversionReferred"
      	  table="CONV_REFERED"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="pk1"
            column="PK1"
            jdbc-type="INTEGER"
  @@ -2475,33 +2475,35 @@
      	  class="org.apache.ojb.odmg.Site"
      	  table="SITE"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="ID"
            jdbc-type="INTEGER"
            primarykey="true"
            autoincrement="true"
           />
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
           />
  -        <field-descriptor 
  +        <field-descriptor
            name="year"
            column="SITEYEAR"
            jdbc-type="INTEGER"
           />
  -        <field-descriptor 
  +        <field-descriptor
            name="semester"
            column="SEMESTER"
            jdbc-type="INTEGER"
           />
      </class-descriptor>
   
  -    <!-- ************************************************* -->
  -    <!--      START  -  Sequence manager test classes      -->
  -    <!-- ************************************************* -->
  +
  +
  +<!-- ************************************************* -->
  +<!--      START  -  Sequence manager test classes      -->
  +<!-- ************************************************* -->
   
       <!-- Definitions for org.apache.ojb.broker.SMInterface -->
       <class-descriptor class="org.apache.ojb.broker.sequence.SMInterface">
  @@ -2518,7 +2520,7 @@
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendAA" />
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendAB" />
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2526,7 +2528,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2538,7 +2540,7 @@
         class="org.apache.ojb.broker.sequence.SMInterfaceExtendAB"
         table="SM_TAB_AB"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2546,7 +2548,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2560,7 +2562,7 @@
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendAAA" />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2568,7 +2570,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2580,7 +2582,7 @@
         class="org.apache.ojb.broker.sequence.SMInterfaceExtendAAA"
         table="SM_TAB_AAA"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2588,7 +2590,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2601,7 +2603,7 @@
         table="SM_TAB_B"
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendBB" />
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2609,7 +2611,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2621,7 +2623,7 @@
         class="org.apache.ojb.broker.sequence.SMInterfaceExtendBB"
         table="SM_TAB_BB"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2629,7 +2631,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2642,7 +2644,7 @@
         table="SM_SAME_TAB"
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMSameTableAA" />
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2650,7 +2652,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2662,7 +2664,7 @@
         class="org.apache.ojb.broker.sequence.SMSameTableAA"
         table="SM_SAME_TAB"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2670,7 +2672,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2683,7 +2685,7 @@
         table="SM_SAME_TAB"
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMSameTableBB" />
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2691,7 +2693,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2703,7 +2705,7 @@
         class="org.apache.ojb.broker.sequence.SMSameTableBB"
         table="SM_SAME_TAB"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2711,7 +2713,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2734,7 +2736,7 @@
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxAA" />
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxAB" />
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2742,7 +2744,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2754,7 +2756,7 @@
         class="org.apache.ojb.broker.sequence.SMMaxAB"
         table="SM_TAB_MAX_AB"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2762,7 +2764,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2776,7 +2778,7 @@
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxAAA" />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2784,7 +2786,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2796,7 +2798,7 @@
         class="org.apache.ojb.broker.sequence.SMMaxAAA"
         table="SM_TAB_MAX_AAA"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2804,7 +2806,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2817,7 +2819,7 @@
         table="SM_TAB_MAX_B"
       >
           <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxBB" />
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2825,7 +2827,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2837,7 +2839,7 @@
         class="org.apache.ojb.broker.sequence.SMMaxBB"
         table="SM_TAB_MAX_BB"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="id"
            column="SM_ID"
            jdbc-type="INTEGER"
  @@ -2845,7 +2847,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2858,7 +2860,7 @@
         class="org.apache.ojb.broker.sequence.SMKey"
         table="SM_KEY"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="intKey"
            column="INT_KEY"
            jdbc-type="INTEGER"
  @@ -2866,13 +2868,13 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="stringKey"
            column="STRING_KEY"
            jdbc-type="VARCHAR"
  @@ -2881,7 +2883,7 @@
            sequence-name="TEST_SEQUENCE"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="longKey"
            column="LONG_KEY"
            jdbc-type="BIGINT"
  @@ -2889,7 +2891,7 @@
            autoincrement="true"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="integerKey"
            column="INTEGER_KEY"
            jdbc-type="INTEGER"
  @@ -2904,7 +2906,7 @@
         class="org.apache.ojb.broker.sequence.SMDatabaseSequence"
         table="SM_TAB_DATABASE_SEQUENCE"
       >
  -        <field-descriptor 
  +        <field-descriptor
            name="seqId"
            column="SEQ_ID"
            jdbc-type="INTEGER"
  @@ -2913,7 +2915,7 @@
            sequence-name="TEST_SEQUENCE"
           />
   
  -        <field-descriptor 
  +        <field-descriptor
            name="name"
            column="NAME"
            jdbc-type="VARCHAR"
  @@ -2922,8 +2924,72 @@
   
   
   
  -    <!-- ************************************************* -->
  -    <!--      END  -  Sequence manager test classes        -->
  -    <!-- ************************************************* -->
  +<!-- ************************************************* -->
  +<!--      END  -  Sequence manager test classes        -->
  +<!-- ************************************************* -->
  +
  +
  +<!-- ************************************************* -->
  +<!--      user data for second test database           -->
  +<!-- ************************************************* -->
  +<class-descriptor
  +   	  class="org.apache.ojb.broker.FarAwayClass"
  +   	  table="FAR_AWAY">
  +
  +      <field-descriptor
  +         name="id"
  +         column="ID"
  +         jdbc-type="INTEGER"
  +         primarykey="true"
  +         autoincrement="true"
  +      />
  +      <field-descriptor
  +         name="name"
  +         column="NAME"
  +         jdbc-type="VARCHAR"
  +      />
  +      <field-descriptor
  +         name="description"
  +         column="DESCRIPTION"
  +         jdbc-type="VARCHAR"
  +      />
  +      <field-descriptor
  +         name="referenceId"
  +         column="REFERENCE_ID"
  +         jdbc-type="INTEGER"
  +      />
  +      <reference-descriptor
  +        name="reference"
  +        class-ref="org.apache.ojb.broker.FarAwayReference"
  +        proxy="true"
  +        auto-retrieve="true"
  +        auto-update="true"
  +        auto-delete="true">
  +            <foreignkey field-ref="referenceId"/>
  +      </reference-descriptor>
  +</class-descriptor>
  +
  +
  +<class-descriptor
  +   	  class="org.apache.ojb.broker.FarAwayReference"
  +   	  table="FAR_AWAY_REFERENCE">
  +
  +      <field-descriptor
  +         name="id"
  +         column="ID"
  +         jdbc-type="INTEGER"
  +         primarykey="true"
  +         autoincrement="true"
  +      />
  +      <field-descriptor
  +         name="name"
  +         column="NAME"
  +         jdbc-type="VARCHAR"
  +      />
  +</class-descriptor>
  +
  +<!-- ************************************************* -->
  +<!--      END - user data for second test database     -->
  +<!-- ************************************************* -->
   
   <!-- Mapping of classes used in junit tests and tutorials ends here -->
  
  
  
  1.4       +94 -23    jakarta-ojb/src/test/org/apache/ojb/repository_database.xml
  
  Index: repository_database.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/repository_database.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- repository_database.xml	6 Jan 2003 14:11:16 -0000	1.3
  +++ repository_database.xml	9 Jan 2003 17:30:49 -0000	1.4
  @@ -14,11 +14,11 @@
   -->
   
   
  -    <!-- this connection was used as the default one within OJB  -->
  +    <!-- this connection was used as the default one within OJB -->
       <jdbc-connection-descriptor
      		jcd-alias="@JCD_ALIAS@"
  -   		default-connection="true"
  -   		platform="@DBMS_NAME@"
  +        default-connection="true"
  +        platform="@DBMS_NAME@"
      		jdbc-level="@JDBC_LEVEL@"
      		driver="@DRIVER_NAME@"
      		protocol="@URL_PROTOCOL@"
  @@ -26,38 +26,109 @@
      		dbalias="@URL_DBALIAS@"
      		username="@USER_NAME@"
      		password="@USER_PASSWD@"
  -   		batch-mode="false"
  +        batch-mode="false"
        >
   
           <connection-pool
  -            validationQuery="@VALIDATION_QUERY@" />
  +            maxActive="21"
  +            validationQuery="" />
  +
  +        <sequence-manager className="org.apache.ojb.broker.util.sequence.SequenceManagerHighLowImpl">
  +            <attribute attribute-name="grabSize" attribute-value="20"/>
  +        </sequence-manager>
      </jdbc-connection-descriptor>
   
  -    <!-- A test db connections used for junit tests -->
  -	 <jdbc-connection-descriptor
  -   		jcd-alias="farAway"
  +   <!-- Datasource example -->
  +    <!-- jdbc-connection-descriptor
  +        jcd-alias="default"
      		platform="Hsqldb"
      		jdbc-level="2.0"
  -   		driver="org.hsqldb.jdbcDriver"
  -   		protocol="jdbc"
  -   		subprotocol="hsqldb"
  -   		dbalias="../OJB_FarAway"
  +   		jndi-datasource-name="java:DefaultDS"
      		username="sa"
      		password=""
  -   		batch-mode="false"
  -	>
  +		eager-release="false"
  +        batch-mode="false"
  +   / -->
  +
  +
  +
  +    <!--
  +        NOTE: This is a test descriptor used within
  +        the junit test suite, do not change any value.
  +        A test db connections used for junit tests.
  +        This connection match a hsql database called 'OJB_FarAway'
  +        If you do not use the test suite, you could delete
  +        this descriptor.
  +        This descriptor was used to check multiple database
  +        use.
  +    -->
  +    <jdbc-connection-descriptor
  +        jcd-alias="farAway"
  +        platform="Hsqldb"
  +        jdbc-level="2.0"
  +        driver="org.hsqldb.jdbcDriver"
  +        protocol="jdbc"
  +        subprotocol="hsqldb"
  +        dbalias="../OJB_FarAway"
  +        username="sa"
  +        password=""
  +        batch-mode="false"
  +    >
           <connection-pool
               maxActive="5"
               whenExhaustedAction="0"
  +            validationQuery="select count(*) from OJB_HL_SEQ"
           />
  +
  +        <sequence-manager className="org.apache.ojb.broker.util.sequence.SequenceManagerHighLowImpl">
  +            <attribute attribute-name="grabSize" attribute-value="5"/>
  +        </sequence-manager>
       </jdbc-connection-descriptor>
   
  -    <!-- Datasource example -->
  -    <!-- jdbc-connection-descriptor
  -   		platform="Hsqldb"
  -   		jdbc-level="2.0"
  -   		jndi-datasource-name="java:DefaultDS"
  -   		username="sa"
  -   		password=""
  -		eager-release="false"
  -   / -->
  +    <!--
  +        NOTE: This is a test descriptor used within
  +        the junit test suite, do not change any value.
  +        If you do not use the test suite, you could
  +        delete this descriptor.
  +        In the the test directory under
  +        org.apache.ojb.broker.metadata.MetadataTest#testReadConnectionDescriptor
  +        this descriptor will be evaluated.
  +    -->
  +    <jdbc-connection-descriptor
  +        jcd-alias="testConnection"
  +        default-connection="true"
  +        platform="Oracle"
  +        jdbc-level="1.0"
  +        driver="a driver"
  +        protocol="a protocol"
  +        subprotocol="a subprotocol"
  +        dbalias="myDbalias"
  +        username="a user"
  +        password="a password"
  +        eager-release="true"
  +        batch-mode="true"
  +        useAutoCommit="0"
  +        ignoreAutoCommitExceptions="true"
  +    >
  +        <connection-pool
  +            maxActive="1"
  +            maxIdle="2"
  +            maxWait="3"
  +            minEvictableIdleTimeMillis="4"
  +            numTestsPerEvictionRun="5"
  +            testOnBorrow="true"
  +            testOnReturn="true"
  +            testWhileIdle="true"
  +            timeBetweenEvictionRunsMillis="6"
  +            whenExhaustedAction="2"
  +            validationQuery="a query"
  +            logAbandoned="true"
  +            removeAbandoned="true"
  +            removeAbandonedTimeout="8"
  +        />
  +
  +        <sequence-manager className="org.apache.ojb.broker.util.sequence.SequenceManagerHighLowImpl">
  +            <attribute attribute-name="key1" attribute-value="value1"/>
  +            <attribute attribute-name="key2" attribute-value="value2"/>
  +        </sequence-manager>
  +    </jdbc-connection-descriptor>
  
  
  
  1.12      +4 -9      jakarta-ojb/src/test/org/apache/ojb/repository.xml
  
  Index: repository.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/repository.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- repository.xml	26 Dec 2002 19:29:12 -0000	1.11
  +++ repository.xml	9 Jan 2003 17:30:49 -0000	1.12
  @@ -5,28 +5,23 @@
   <!-- defining entities for include-files -->
   <!DOCTYPE descriptor-repository SYSTEM "repository.dtd" [
   <!ENTITY database SYSTEM "repository_database.xml">
  -<!ENTITY user SYSTEM "repository_user.xml">
  -<!ENTITY junit SYSTEM "repository_junit.xml">
   <!ENTITY internal SYSTEM "repository_internal.xml">
  -<!ENTITY farAway SYSTEM "repository_farAwayUser.xml">
  +<!ENTITY junit SYSTEM "repository_junit.xml">
  +<!ENTITY user SYSTEM "repository_user.xml">
   ]>
   
   
   <descriptor-repository version="0.9.9" isolation-level="read-uncommitted">
  -<!-- The Default JDBC Connection. If a class-descriptor does not specify its own JDBC Connection,
  -     the Connection specified here will be used. -->
   
       <!-- include all used database connections -->
       &database;
   
  -    <!-- include mappings for JUnit tests here -->
  +    <!-- include mappings for JUnit tests -->
  +    <!-- This could be removed (with <!ENTITY entry), if junit test suite was not used -->
       &junit;
   
       <!-- include ojb internal mappings here -->
       &internal;
  -
  -	<!-- user data of farAway test db -->
  -    &farAway;
   
       <!-- include user defined mappings here -->
       <!-- &user; -->
  
  
  
  1.29      +108 -10   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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- repository.dtd	6 Jan 2003 14:11:16 -0000	1.28
  +++ repository.dtd	9 Jan 2003 17:30:49 -0000	1.29
  @@ -17,13 +17,16 @@
   	persistent classes.
     -->
   <!ELEMENT descriptor-repository (documentation?, jdbc-connection-descriptor*, class-descriptor*)>
  -<!--
  -    The isolation attribute defines the default isolation level for
  -    class-descriptor that do not define a specific isolation level.
   
  +<!--
   	The version attribute is used to bind a repository.xml
       file to a given version of this dtd. This will help to
       avoid versions conflicts.
  +
  +    The isolation attribute defines the default isolation level for
  +    class-descriptor on ODMG api level that do not define a
  +    specific isolation level (this does NOT touch the jdbc-level
  +    of the connection).
     -->
   <!ATTLIST descriptor-repository
   	version (0.9.9) #REQUIRED
  @@ -48,7 +51,7 @@
   	A connection-pool element may be used to define connection pool
   	properties for the specified JDBC connection.
     -->
  -<!ELEMENT jdbc-connection-descriptor (documentation?, connection-pool?)>
  +<!ELEMENT jdbc-connection-descriptor (documentation?, connection-pool?, sequence-manager?)>
   <!--
       The jcdAlias attribute is a shortcut name for the defined connection
       descriptor. OJB use jcdAlias as key for the defined connections.
  @@ -74,6 +77,21 @@
       batch mode at runtime, using the
       PB.serviceConnectionManager.setBatchMode(...) method.
   
  +    The useAutoCommit attribute allow to set how OJB uses
  +    the autoCommit state of the used connections. The default mode
  +    was 1. When using mode 0 or 2 with the PB-api, you must use PB
  +    transaction demarcation.
  +    0 - OJB ignores the autoCommit setting of the connection and do not
  +        try to change it. This mode could be helpfully if the
  +        connection don't let you set the autoCommit state
  +        (e.g. using datasources from application server).
  +    1 - set autoCommit explicit 'true' when connection was created
  +        and temporary set to 'false' when necessary (default mode).
  +    2 - set autoCommit explicit 'false' when connection was created.
  +
  +    If the ignoreAutoCommitExceptions attribute is set 'true', all exceptions
  +    caused by setting autocommit state, will be ignored. Default mode 'false'.
  +
   	If a jndi-datasource-name for JNDI based lookup of Jdbc Connections is
       specified, the four attributes driver, protocol, subprotocol, dbalias
       used for Jdbc DriverManager based construction of Jdbc Connections
  @@ -93,7 +111,9 @@
                 SybaseASA | Sapdb) "Hsqldb"
   	jdbc-level (1.0 | 2.0 | 3.0) "1.0"
   	eager-release (true | false) "false"
  -	batch-mode (true | false) "false"
  +    batch-mode (true | false) "false"
  +    useAutoCommit (0 | 1 | 2) "1"
  +    ignoreAutoCommitExceptions (true | false) "false"
   
   	jndi-datasource-name CDATA #IMPLIED
   
  @@ -157,6 +177,29 @@
       Here you could specify a validation query used by pool to test a
       obtained connection (e.g. "select 1 from dual"), else a default query was
       used - if defined in the platform class for your database.
  +
  +    logAbandoned
  +    Only supported when using
  +    org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl
  +    ConnectionFactory implementation.
  +    Flag to log stack traces for application code which abandoned
  +    a Statement or Connection. Defaults to false. Logging of
  +    abandoned Statements and Connections adds overhead for
  +    every Connection open or new Statement because a
  +    stack trace has to be generated.
  +
  +    removeAbandoned/removeAbandonedTimeout
  +    Only supported when using
  +    org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl
  +    ConnectionFactory implementation.
  +    Flag to remove abandoned connections if they exceed the
  +    removeAbandonedTimeout. Set to true or false, default false.
  +    If set to true a connection is considered abandoned and
  +    eligible for removal if it has been idle longer than the
  +    removeAbandonedTimeout. Setting this to true can recover
  +    db connections from poorly written applications which
  +    fail to close a connection.
  +
   -->
   <!ATTLIST connection-pool
       maxActive                       CDATA #IMPLIED
  @@ -170,9 +213,63 @@
       timeBetweenEvictionRunsMillis   CDATA #IMPLIED
       whenExhaustedAction             (0|1|2) #IMPLIED
       validationQuery                 CDATA #IMPLIED
  +
  +    logAbandoned                    (true|false) #IMPLIED
  +    removeAbandoned                 (true|false) #IMPLIED
  +    removeAbandonedTimeout          CDATA #IMPLIED
   >
   
   
  +
  +<!--
  +	The sequence-manager element specifies the sequence
  +    manager implementation used for key generation. All
  +    sequence manager implementations shipped with OJB
  +    you will find under org.apache.ojb.broker.util.sequence
  +    If no sequence-manager is defined, OJB use the default one.
  +
  +    Use the attribute element to pass implementation specific
  +    properties.
  +-->
  +<!ELEMENT sequence-manager (documentation?, attribute*)>
  +
  +<!--
  +    The className attribute represents the full qualified class name
  +    of the desired sequence manager implementation - it is mandatory
  +    when using the sequence-manager element.
  +    All sequence manager implementations you could find under
  +    org.apache.ojb.broker.util.sequence package named as SequenceManagerXXXImpl
  +
  +    Sequence Manager implementations
  +
  +    1. className="org.apache.ojb.broker.util.sequence.SequenceManagerHighLowImpl"
  +    High/Low sequence manager implementation. This is OJB's default sequence manager.
  +
  +    2. className=org.apache.ojb.broker.util.sequence.SequenceManagerInMemoryImpl
  +    InMemory-sequence manager implementation.
  +    This is the fastest standard sequence manager implementation, but
  +    has some limitations:
  +    - do not use in client/server mode
  +    - do not use in clustered environments
  +    - do not use if other entities generate id's for the persistent objects
  +
  +    3. className=org.apache.ojb.broker.util.sequence.SequenceManagerNextValImpl
  +    Use database based sequence generation. Check your DB for support, add
  +    a extent aware 'sequence-name' attribute to your autoincrement field
  +    descriptors. If no sequence-name was found by the implementation,
  +    an extent aware sequence name is build by it's own.
  +
  +    4. className=org.apache.ojb.broker.util.sequence.SequenceManagerSeqNextValImpl
  +    A database sequence based High/Low implementation. See 3. for more informantion.
  +    Limitations:
  +    - do not use when other applications use the database sequence ditto
  +-->
  +<!ATTLIST sequence-manager
  +    className                       CDATA #REQUIRED
  +>
  +
  +
  +
   <!--
   	For interfaces or abstract classes a class-descriptor holds a sequence of
   	extent-class elements.
  @@ -201,7 +298,8 @@
   	class.
   
   	The isolation-level attribute specifies the transactional isolation to be
  -	used for this class.
  +	used for this class on ODMG api level (this does NOT touch the jdbc-level
  +    of the connection).
   
   	If the proxy attribute is set, proxies are used for all loading operations
   	of instances of this class. If set to "dynamic", dynamic proxies are used.
  @@ -283,10 +381,10 @@
   	attribute are automatically generated by OJB.
   
       The sequence-name attribute can be used to state explicitly a sequence
  -    name used by the sequence manager. Mandatory when using one of the
  -    proprietary database sequence based sequence manager implementations.
  -    If not specified, the OJB standard sequence manager implementations
  -    build a sequence name automatic.
  +    name used by the sequence manager implementations. Check the docs/javadocs
  +    of the used sequence manager implementation to get information if this
  +    is a mandatory attribute. OJB standard sequence manager implementations
  +    build a sequence name by its own, if the attribute was not set.
   
   	The locking attribute is set to true if the persistent attribute is
   	used for optimistic locking. can only be set for TIMESTAMP and INTEGER
  
  
  
  1.37      +3 -78     jakarta-ojb/src/test/org/apache/ojb/OJB.properties
  
  Index: OJB.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/OJB.properties,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- OJB.properties	26 Dec 2002 19:29:12 -0000	1.36
  +++ OJB.properties	9 Jan 2003 17:30:49 -0000	1.37
  @@ -52,7 +52,6 @@
   #
   # The PersistenceBrokerFactoryClass entry decides which concrete
   # PersistenceBrokerFactory implemention is to be used.
  -# Use this by for non-managed environments:
   PersistenceBrokerFactoryClass=org.apache.ojb.broker.ta.PersistenceBrokerFactoryDefaultImpl
   #
   # The PersistenceBrokerClass entry decides which concrete PersistenceBroker
  @@ -102,9 +101,9 @@
   #----------------------------------------------------------------------------------------
   #
   # The ConnectionFactoryClass entry determines which kind of ConnectionFactory
  -# is to be used within org.apache.ojb as DEFAULT connection factory.
  +# is to be used within org.apache.ojb as connection factory.
   # A ConnectionFactory is responsible for creating
  -# JDBC Connections. Current version ships three implementations:
  +# JDBC Connections. Current version ships four implementations:
   #
   # 1. ConnectionFactoryNotPooledImpl
   #    No pooling, no playing around.
  @@ -114,7 +113,7 @@
   #    This implementation supports connection pooling.
   # 3. ConnectionFactoryDBCPImpl
   #    Using the jakarta-DBCP api for connection management, support
  -#    connection- and prepared statement-pooling.
  +#    connection- and prepared statement-pooling, abandoned connection handling.
   # 4. ConnectionFactoryManagedImpl
   #    Connection factory for use within managed environments - e.g. JBoss.
   #    Every obtained DataSource was wrapped within OJB (and ignore
  @@ -133,86 +132,12 @@
   #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl
   #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl
   #
  -# Specifies maximum number of connections that can be borrowed from a
  -# connection pool at one time. When non-positive, there is no limit.
  -# If want a more fine grained control of each connection pool used by OJB,
  -# take a look at the repository.dtd.
  -maxConnectionsInPool=21
  -#
  -# Here you can set how OJB uses the autoCommit state of the used connections. The default
  -# mode was 1. When using mode 0 or 2 with the PB-api, you must use PB transaction demarcation
  -# 0 - OJB ignores the autoCommit setting of the connection and do not try to change it.
  -#     This mode could be helpfully if the connection don't let you set the autoCommit state.
  -#     (e.g. using datasources from application server)
  -# 1 - set autoCommit explicit 'true' when connection was created and temporary
  -#     set to 'false' when necessary.
  -# 2 - set autoCommit explicit 'false' when connection was created.
  -useAutoCommit=1
  -#
  -# if true, exceptions caused by setting autocommit state, will be ignored
  -ignoreAutoCommitExceptions=false
  -#
   #----------------------------------------------------------------------------------------
   # SqlGenerator
   #----------------------------------------------------------------------------------------
   #
   # The SqlGeneratorClass entry defines the SqlGenerator implemementation to be used
   SqlGeneratorClass=org.apache.ojb.broker.accesslayer.sql.SqlGeneratorDefaultImpl
  -#
  -#
  -#----------------------------------------------------------------------------------------
  -# SequenceManager
  -#----------------------------------------------------------------------------------------
  -#
  -# The SequenceManagerClass entry determines the SequenceManager to be used
  -# choose one of the implementations:
  -#----------------------------------
  -# 1. SequenceManagerHighLowImpl
  -#    High/Low sequence manager implementation generates continuous
  -#    id's during runtime. This is OJB's default sequence manager.
  -# 2. SequenceManagerInMemoryImpl
  -#    InMemory-sequence manager generates continuous id's during runtime
  -#    This is the fastest standard sequence manager implementation, but
  -#    has some Limitations:
  -#    - do not use in client/server mode
  -#    - do not use in clustered environments
  -#    - do not use if other entities generate id's for the persistent objects
  -# 3. SequenceManagerNextValImpl
  -#    Use database based sequence generation. Check your DB for support, add
  -#    'sequence-name' attribute to your autoincrement field descriptors
  -#
  -SequenceManagerClass=org.apache.ojb.broker.util.sequence.SequenceManagerHighLowImpl
  -#SequenceManagerClass=org.apache.ojb.broker.util.sequence.SequenceManagerInMemoryImpl
  -#SequenceManagerClass=org.apache.ojb.broker.util.sequence.SequenceManagerNextValImpl
  -#-----------------------------------
  -#
  -# The SequenceManagerGrabSize entry determines the number IDs allocated
  -# within each sequence in the H/L sequence manager implementations. Other
  -# implementaions ignore this property.
  -SequenceManagerGrabSize=20
  -#
  -# Specifies wether IDs should be unique for each id-name (so IDs would be
  -# unique over all classes that use "oid" for their id and unique over all
  -# classes that use "articleID" for their id, but not for the union of those
  -# (so there could be an oid 4 and an articleID 4). This mode interacts very
  -# badly with legacy data, as it doesn't try to find the highest used ID over
  -# all classes, but only for those that are first accessed. This parameter is
  -# useful only if you use one of the H/L sequence manager implementations.
  -#SequenceManagerGlobalIDs=true
  -SequenceManagerGlobalIDs=false
  -#
  -# Here you can induce the sequence manager to use a
  -# different as the default repository to generate sequences
  -# (if using one of the standard sequence manager implementations).
  -# The used class descriptor could be
  -# found under 'org.apache.ojb.broker.util.sequence.HighLowSequence' in
  -# repository_internal.xml.
  -# When running the OJB sequence manager in an j2ee environment with
  -# declarative or programmatic transactions it is advisable to separate
  -# the sequence generation using it's own non-transactional
  -# jdbc-connection/datasource.
  -#SequenceManagerRepository=repositorySeq.xml
  -#
   #
   #----------------------------------------------------------------------------------------
   # Object cache
  
  
  

Mime
View raw message