avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pro...@apache.org
Subject cvs commit: jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource DefaultDataSourceSelector-schema.xml
Date Tue, 16 Jul 2002 18:09:40 GMT
proyal      2002/07/16 11:09:40

  Modified:    src/java/org/apache/avalon/cornerstone/blocks/datasource
                        DefaultDataSourceSelector-schema.xml
  Log:
  added <interleave> for jdbc settings since we
  don't care about order of children.
  
  Revision  Changes    Path
  1.2       +23 -21    jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector-schema.xml
  
  Index: DefaultDataSourceSelector-schema.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector-schema.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultDataSourceSelector-schema.xml	13 Jul 2002 19:55:38 -0000	1.1
  +++ DefaultDataSourceSelector-schema.xml	16 Jul 2002 18:09:40 -0000	1.2
  @@ -19,29 +19,31 @@
           <element name="data-source">
               <attribute name="name"/>
               <attribute name="class"><value>org.apache.avalon.excalibur.datasource.JdbcDataSource</value></attribute>
  -            <element name="pool-controller">
  -                <attribute name="min">
  -                    <data type="integer">
  -                        <param name="minInclusive">1</param>
  -                    </data>
  -                </attribute>
  -                <attribute name="max">
  -                    <data type="integer">
  -                        <param name="minInclusive">1</param>
  -                    </data>
  -                </attribute>
  +            <interleave>
  +                <element name="pool-controller">
  +                    <attribute name="min">
  +                        <data type="integer">
  +                            <param name="minInclusive">1</param>
  +                        </data>
  +                    </attribute>
  +                    <attribute name="max">
  +                        <data type="integer">
  +                            <param name="minInclusive">1</param>
  +                        </data>
  +                    </attribute>
  +                    <optional>
  +                        <attribute name="connection-class"/>
  +                        <element name="keep-alive"><text/></element>
  +                    </optional>
  +                </element>
  +                <element name="auto-commit"><data type="boolean"/></element>
  +                <element name="driver"><text/></element>
  +                <element name="dburl"><text/></element>
                   <optional>
  -                    <attribute name="connection-class"/>
  -                    <element name="keep-alive"><text/></element>
  +                    <element name="user"><text/></element>
  +                    <element name="password"><text/></element>
                   </optional>
  -            </element>
  -            <element name="auto-commit"><data type="boolean"/></element>
  -            <element name="driver"><text/></element>
  -            <element name="dburl"><text/></element>
  -            <optional>
  -                <element name="user"><text/></element>
  -                <element name="password"><text/></element>
  -            </optional>
  +            </interleave>
           </element>
       </define>
   </grammar>
  
  
  

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


Mime
View raw message