You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by pr...@apache.org on 2002/07/13 21:55:38 UTC

cvs commit: jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource DefaultDataSourceSelector-schema.xml DefaultDataSourceSelector.java

proyal      2002/07/13 12:55:38

  Modified:    src/java/org/apache/avalon/cornerstone/blocks/datasource
                        DefaultDataSourceSelector.java
  Added:       src/java/org/apache/avalon/cornerstone/blocks/datasource
                        DefaultDataSourceSelector-schema.xml
  Log:
  Added configuration schema.
  
  Schema only supports JdbcDataSource currently
  
  Revision  Changes    Path
  1.21      +3 -0      jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java
  
  Index: DefaultDataSourceSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- DefaultDataSourceSelector.java	20 May 2002 04:27:47 -0000	1.20
  +++ DefaultDataSourceSelector.java	13 Jul 2002 19:55:38 -0000	1.21
  @@ -53,6 +53,9 @@
       private Configuration m_configuration;
       private Map m_dataSources;
   
  +    /**
  +     * @phoenix:configuration-schema type="relax-ng"
  +     */
       public void configure( final Configuration configuration )
       {
           m_configuration = configuration;
  
  
  
  1.1                  jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector-schema.xml
  
  Index: DefaultDataSourceSelector-schema.xml
  ===================================================================
  <?xml version="1.0"?>
  <grammar
      xmlns="http://relaxng.org/ns/structure/1.0"
      datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
      xmlns:a="http://jakarta.apache.org/phoenix/schema-annotations/1.0"
  >
      <start>
          <element name="root">
              <element name="data-sources">
                  <oneOrMore>
                      <ref name="datasource"/>
                  </oneOrMore>
              </element>
          </element>
      </start>
  
      <define name="datasource" combine="choice">
          <a:description>JDBC Data Source</a:description>
          <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>
                  <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>
                  <element name="user"><text/></element>
                  <element name="password"><text/></element>
              </optional>
          </element>
      </define>
  </grammar>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>