db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb/src/test/org/apache/ojb Test_Repository.xml Test_ConnectionDescriptor.xml repository_database.xml repository.dtd
Date Wed, 26 Feb 2003 00:00:18 GMT
arminw      2003/02/25 16:00:16

  Modified:    src/test/org/apache/ojb Test_ConnectionDescriptor.xml
                        repository_database.xml repository.dtd
  Added:       src/test/org/apache/ojb Test_Repository.xml
  Log:
  add support for custom attributes to
  descriptor-repository and
  jdbc-connection-descriptor level
  
  Revision  Changes    Path
  1.3       +13 -1     db-ojb/src/test/org/apache/ojb/Test_ConnectionDescriptor.xml
  
  Index: Test_ConnectionDescriptor.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/Test_ConnectionDescriptor.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Test_ConnectionDescriptor.xml	19 Feb 2003 21:13:26 -0000	1.2
  +++ Test_ConnectionDescriptor.xml	26 Feb 2003 00:00:15 -0000	1.3
  @@ -11,8 +11,9 @@
   
       <!--
           NOTE: This is a test descriptor used within
  -        the junit test suite, do not change any value.
  +        the junit test suite, DO NOT change any value.
       -->
  +
       <jdbc-connection-descriptor
           jcd-alias="runtime"
           platform="Hsqldb"
  @@ -34,6 +35,17 @@
           <sequence-manager className="org.apache.ojb.broker.util.sequence.SequenceManagerHighLowImpl">
               <attribute attribute-name="grabSize" attribute-value="5"/>
           </sequence-manager>
  +
  +        <!-- add some custom attributes -->
  +        <attribute
  +            attribute-name="attribute-connection-1"
  +            attribute-value="attribute-connection-test-value-1">
  +        </attribute>
  +
  +        <attribute
  +            attribute-name="attribute-connection-2"
  +            attribute-value="attribute-connection-test-value-2">
  +        </attribute>
       </jdbc-connection-descriptor>
   
   </descriptor-repository>
  
  
  
  1.9       +2 -0      db-ojb/src/test/org/apache/ojb/repository_database.xml
  
  Index: repository_database.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository_database.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- repository_database.xml	14 Jan 2003 11:23:37 -0000	1.8
  +++ repository_database.xml	26 Feb 2003 00:00:15 -0000	1.9
  @@ -27,6 +27,8 @@
      		username="@USER_NAME@"
      		password="@USER_PASSWD@"
      		batch-mode="false"
  +        useAutoCommit="1"
  +        ignoreAutoCommitExceptions="false"
        >
   
           <connection-pool
  
  
  
  1.34      +16 -5     db-ojb/src/test/org/apache/ojb/repository.dtd
  
  Index: repository.dtd
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository.dtd,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- repository.dtd	19 Feb 2003 21:13:26 -0000	1.33
  +++ repository.dtd	26 Feb 2003 00:00:15 -0000	1.34
  @@ -10,13 +10,15 @@
   	It consists of one jdbc-connection-descriptor and at least one
   	class-descriptor element.
   
  -	The jdbc-connection-descriptor element specifies the default jdbc
  +	The attribute element allows to add custom attributes.
  +
  +    The jdbc-connection-descriptor element specifies the default jdbc
   	connection for the repository.
   
   	class-descriptor elements specify o/r mapping information for
   	persistent classes.
     -->
  -<!ELEMENT descriptor-repository (documentation?, jdbc-connection-descriptor*, class-descriptor*)>
  +<!ELEMENT descriptor-repository (documentation?, attribute*, jdbc-connection-descriptor*,
class-descriptor*)>
   
   <!--
   	The version attribute is used to bind a repository.xml
  @@ -43,7 +45,9 @@
   <!ELEMENT database-repository (jdbc-connection-descriptor*)>
   
   <!--
  -	The jdbc-connection-descriptor element specifies the a jdbc
  +	The attribute element allows to add custom attributes.
  +
  +    The jdbc-connection-descriptor element specifies the a jdbc
   	connection for the repository.
   
   	A connection-pool element may be used to define connection pool
  @@ -53,7 +57,9 @@
       define which sequence manager implementation should be used within
       the defined connection.
     -->
  -<!ELEMENT jdbc-connection-descriptor (documentation?, connection-pool?, sequence-manager?)>
  +<!ELEMENT jdbc-connection-descriptor (documentation?, attribute*, 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.
  @@ -131,11 +137,14 @@
   	password CDATA #IMPLIED
   >
   
  +
   <!--
   	The connection-pool element specifies the connection pooling
   	parameter.
   -->
   <!ELEMENT connection-pool (documentation?)>
  +
  +
   <!--
   	maxActive
   	maximum number of connections that can be borrowed from the
  @@ -366,7 +375,7 @@
   	If a different sort order is intended the id attribute may be used to
   	hold a unique number identifying the decriptors position in the sequence of
   	field-descriptors.
  -	The order of the numbers for the field-descriptors must correspond to 
  +	The order of the numbers for the field-descriptors must correspond to
   	the order of columns in the mapped table.
   
   	The name attribute holds the name of the persistent classes attribute.
  @@ -443,11 +452,13 @@
   	scale CDATA #IMPLIED
   >
   
  +
   <!--
     An attribute element allows arbitrary name/value pairs to
     be represented in the repository.
     -->
   <!ELEMENT attribute (documentation?)>
  +
   <!--
   	The attribute-name identifies the name of the attribute.
   	The attribute-value identifies the value of the attribute.
  
  
  
  1.1                  db-ojb/src/test/org/apache/ojb/Test_Repository.xml
  
  Index: Test_Repository.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
  This is a test repository used in junit test org.apache.ojb.broker.metadata.MetadataTest
  Runtime reading of repository files.
  DO NOT CHANGE!
  -->
  <!DOCTYPE descriptor-repository SYSTEM "repository.dtd">
  
  
  <descriptor-repository version="1.0" isolation-level="read-uncommitted">
  
      <!--
          NOTE: This is a test descriptor used within
          the junit test suite, DO NOT change any value.
      -->
  
      <!-- add some custom attributes -->
      <attribute
          attribute-name="attribute-repository-1"
          attribute-value="attribute-repository-test-value-1">
      </attribute>
  
      <attribute
          attribute-name="attribute-repository-2"
          attribute-value="attribute-repository-test-value-2">
      </attribute>
  
      <jdbc-connection-descriptor
          jcd-alias="runtime"
          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>
  
          <!-- add some custom attributes -->
          <attribute
              attribute-name="attribute-connection-1"
              attribute-value="attribute-connection-test-value-1">
          </attribute>
  
          <attribute
              attribute-name="attribute-connection-2"
              attribute-value="attribute-connection-test-value-2">
          </attribute>
  
      </jdbc-connection-descriptor>
  
  </descriptor-repository>
  
  
  

Mime
View raw message