You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2001/01/06 07:36:16 UTC

cvs commit: xml-cocoon/webapp/docs/samples/xsp esql.xsp

bloritsch    01/01/05 22:36:16

  Modified:    .        Tag: xml-cocoon2 changes.xml
               webapp   Tag: xml-cocoon2 cocoon.xconf
               webapp/docs/samples/xsp Tag: xml-cocoon2 esql.xsp
  Log:
  Updated samples to use new DataSourceComponent.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.9.2.19  +4 -1      xml-cocoon/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/changes.xml,v
  retrieving revision 1.9.2.18
  retrieving revision 1.9.2.19
  diff -u -r1.9.2.18 -r1.9.2.19
  --- changes.xml	2001/01/04 22:39:20	1.9.2.18
  +++ changes.xml	2001/01/06 06:36:15	1.9.2.19
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.9.2.18 2001/01/04 22:39:20 dims Exp $
  +  $Id: changes.xml,v 1.9.2.19 2001/01/06 06:36:15 bloritsch Exp $
   -->
   
   <changes title="History of Changes">
  @@ -22,6 +22,9 @@
    </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="BL" type="add">
  +    Added DataSourceComponent framework to Cocoon and esql logicsheet.
  +  </action>
     <action dev="RB" type="add"> 
      SVG serializer now uses Batik.
     </action>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.11  +9 -0      xml-cocoon/webapp/Attic/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/webapp/Attic/cocoon.xconf,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- cocoon.xconf	2001/01/04 22:39:31	1.1.2.10
  +++ cocoon.xconf	2001/01/06 06:36:15	1.1.2.11
  @@ -64,6 +64,15 @@
       <parameter name="auto-reload" value="true"/>
     </component>
   
  +  <component role="org.apache.cocoon.components.datasource.DataSourceComponentSelector" class="org.apache.cocoon.CocoonComponentSelector">
  +    <component-instance name="personnel" class="org.apache.cocoon.components.datasource.JdbcDataSource">
  +      <driver>postgresql.Driver</driver>
  +      <dburl>jdbc:postgresql://localhost/test</dburl>
  +      <user>test</user>
  +      <password>test</password>
  +    </component-instance>
  +  </component>
  +
     <!-- these components is used as a PoolController for the sitemap component pools  -->
     <component role="org.apache.avalon.util.pool.PoolController" class="org.apache.cocoon.util.ComponentPoolController"/>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +1 -4      xml-cocoon/webapp/docs/samples/xsp/Attic/esql.xsp
  
  Index: esql.xsp
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/webapp/docs/samples/xsp/Attic/esql.xsp,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- esql.xsp	2000/10/27 19:08:17	1.1.2.1
  +++ esql.xsp	2001/01/06 06:36:16	1.1.2.2
  @@ -13,10 +13,7 @@
      <content>
      
      <esql:execute-query inner-method="no">
  -    <esql:driver>postgresql.Driver</esql:driver>
  -    <esql:dburl>jdbc:postgresql://localhost/test</esql:dburl>
  -    <esql:username>test</esql:username>
  -    <esql:password>test</esql:password>
  +    <esql:use-connection>personnel</esql:use-connection>
       <esql:query>select * from department_table</esql:query>
       <esql:results>
        <para><esql:get-string column="name"/></para>