cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp EsqlConnection.java
Date Wed, 17 Apr 2002 13:09:03 GMT
cziegeler    02/04/17 06:09:02

  Modified:    .        build.xml
               src/java/org/apache/cocoon/components/language/markup/xsp
                        EsqlConnection.java
  Log:
  Inverting handling of jdbc3 for EsqlConnection.java
  
  Revision  Changes    Path
  1.199     +4 -4      xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.198
  retrieving revision 1.199
  diff -u -r1.198 -r1.199
  --- build.xml	14 Apr 2002 01:29:43 -0000	1.198
  +++ build.xml	17 Apr 2002 13:09:02 -0000	1.199
  @@ -470,13 +470,13 @@
     <target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
   
     <target name="filter-jdbc" unless="jdbc3.present">
  -    <filter token="JDBC3_START" value="/*"/>
  -    <filter token="JDBC3_END" value="*/"/>
  +    <filter token="JDBC3_START" value=""/>
  +    <filter token="JDBC3_END" value=""/>
     </target>
   
     <target name="nofilter-jdbc" if="jdbc3.present">
  -    <filter token="JDBC3_START" value=""/>
  -    <filter token="JDBC3_END" value=""/>
  +    <filter token="JDBC3_START" value="*/"/>
  +    <filter token="JDBC3_END" value="/*"/>
     </target>
   
     <!-- =================================================================== -->
  
  
  
  1.7       +3 -3      xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/EsqlConnection.java
  
  Index: EsqlConnection.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/EsqlConnection.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EsqlConnection.java	28 Mar 2002 16:14:37 -0000	1.6
  +++ EsqlConnection.java	17 Apr 2002 13:09:02 -0000	1.7
  @@ -60,7 +60,7 @@
    *
    * based on the orginal esql.xsl
    * @author <a href="mailto:tcurdt@dff.st">Torsten Curdt</a>
  - * @version CVS $Id: EsqlConnection.java,v 1.6 2002/03/28 16:14:37 tcurdt Exp $
  + * @version CVS $Id: EsqlConnection.java,v 1.7 2002/04/17 13:09:02 cziegeler Exp $
    */
   
   public class EsqlConnection implements Connection {
  @@ -233,7 +233,7 @@
       return(connection.prepareCall(s,i1,i2));
     }
   
  -@JDBC3_START@
  +  /* @JDBC3_START@
       public void setHoldability(int holdability)
           throws SQLException
       {
  @@ -316,7 +316,7 @@
       {
           return connection.prepareStatement(sql, columnNames);
       }
  -@JDBC3_END@
  +@JDBC3_END@ */
   
   }
   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message