cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp EsqlConnection.java
Date Fri, 23 Nov 2001 20:28:47 GMT
bloritsch    01/11/23 12:28:47

  Modified:    .        build.xml
               src/org/apache/cocoon/components/language/markup/xsp
                        EsqlConnection.java
  Added:       lib      batik-bridge.jar batik-css.jar batik-dom.jar
                        batik-ext.jar batik-extension.jar batik-parser.jar
                        batik-script.jar batik-svg-dom.jar
                        batik-transcoder.jar batik-util.jar batik-xml.jar
  Removed:     lib      batik-libs.jar
  Log:
  upgrade batik with proper jars, make cocoon compile with jdk1.4
  
  Revision  Changes    Path
  1.106     +17 -1     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- build.xml	2001/11/23 12:04:36	1.105
  +++ build.xml	2001/11/23 20:28:43	1.106
  @@ -295,6 +295,10 @@
             <classpath refid="classpath"/>
       </available>
   
  +    <available property="jdbc3.present" classname="java.sql.Savepoint">
  +      <classpath refid="classpath"/>
  +    </available>
  +
       <ClassAvailable classpathref="classpath" 
                       property="php.present" 
                       classname="net.php.servlet"/>
  @@ -325,6 +329,18 @@
   
     </target>
     
  +  <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="*/"/>
  +  </target>
  +
  +  <target name="nofilter-jdbc" if="jdbc3.present">
  +    <filter token="JDBC3_START" value=""/>
  +    <filter token="JDBC3_END" value=""/>
  +  </target>
  +
     <!-- =================================================================== -->
     <!-- Macro for optional warnings                                         -->
     <!-- =================================================================== -->
  @@ -456,7 +472,7 @@
     <!-- =================================================================== -->
     <!-- Prepares the source code                                            -->
     <!-- =================================================================== -->
  -  <target name="prepare-src-main" depends="prepare,generate-java-code">
  +  <target name="prepare-src-main" depends="prepare,generate-java-code,prepare-jdbc">
       <mkdir dir="${build.src}"/>
       <mkdir dir="${build.dest}"/>
       <copy todir="${build.src}" filtering="on">
  
  
  
  1.1                  xml-cocoon2/lib/batik-bridge.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-cocoon2/lib/batik-css.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-cocoon2/lib/batik-dom.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-cocoon2/lib/batik-ext.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-cocoon2/lib/batik-extension.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-cocoon2/lib/batik-parser.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-cocoon2/lib/batik-script.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-cocoon2/lib/batik-svg-dom.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-cocoon2/lib/batik-transcoder.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-cocoon2/lib/batik-util.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-cocoon2/lib/batik-xml.jar
  
  	<<Binary file>>
  
  
  1.2       +85 -0     xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/EsqlConnection.java
  
  Index: EsqlConnection.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/EsqlConnection.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EsqlConnection.java	2001/10/17 14:12:14	1.1
  +++ EsqlConnection.java	2001/11/23 20:28:47	1.2
  @@ -189,5 +189,90 @@
       return(connection.prepareCall(s,i1,i2));
     }
   
  +@JDBC3_START@
  +    public void setHoldability(int holdability)
  +        throws SQLException
  +    {
  +        connection.setHoldability(holdability);
  +    }
  +
  +    public int getHoldability()
  +        throws SQLException
  +    {
  +        return connection.getHoldability();
  +    }
  +
  +    public java.sql.Savepoint setSavepoint()
  +        throws SQLException
  +    {
  +        return connection.setSavepoint();
  +    }
  +
  +    public java.sql.Savepoint setSavepoint(String savepoint)
  +        throws SQLException
  +    {
  +        return connection.setSavepoint(savepoint);
  +    }
  +
  +    public void rollback(java.sql.Savepoint savepoint)
  +        throws SQLException
  +    {
  +        connection.rollback(savepoint);
  +    }
  +
  +    public void releaseSavepoint(java.sql.Savepoint savepoint)
  +        throws SQLException
  +    {
  +        connection.releaseSavepoint(savepoint);
  +    }
  +
  +    public java.sql.Statement createStatement(int resulSetType,
  +                                           int resultSetConcurrency,
  +                                           int resultSetHoldability)
  +        throws SQLException
  +    {
  +        return connection.createStatement(resulSetType, resultSetConcurrency, resultSetHoldability);
  +    }
  +
  +    public java.sql.PreparedStatement prepareStatement(String sql,
  +                                        int resulSetType,
  +                                        int resultSetConcurrency,
  +                                        int resultSetHoldability)
  +        throws SQLException
  +    {
  +        return connection.prepareStatement(sql, resulSetType, resultSetConcurrency, resultSetHoldability);
  +    }
  +
  +    public java.sql.CallableStatement prepareCall(String sql,
  +                                        int resulSetType,
  +                                        int resultSetConcurrency,
  +                                        int resultSetHoldability)
  +        throws SQLException
  +    {
  +        return connection.prepareCall(sql, resulSetType, resultSetConcurrency, resultSetHoldability);
  +    }
  +
  +    public java.sql.PreparedStatement prepareStatement(String sql,
  +                                        int autoGeneratedKeys)
  +        throws SQLException
  +    {
  +        return connection.prepareStatement(sql, autoGeneratedKeys);
  +    }
  +
  +    public java.sql.PreparedStatement prepareStatement(String sql,
  +                                        int[] columnIndexes)
  +        throws SQLException
  +    {
  +        return prepareStatement(sql, columnIndexes);
  +    }
  +
  +    public java.sql.PreparedStatement prepareStatement(String sql,
  +                                        String[] columnNames)
  +        throws SQLException
  +    {
  +        return prepareStatement(sql, columnNames);
  +    }
  +@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