cziegeler    01/04/24 01:41:08

  Modified:    src/org/apache/cocoon/components/language/programming/java
                        Tag: xml-cocoon2 Jikes.java
               src/org/apache/cocoon/transformation Tag: xml-cocoon2
                        SQLTransformer.java
  Log:
  Quick patches - C2 compiles again
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.11  +2 -2      
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Jikes.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- Jikes.java        2001/04/23 17:52:30     1.1.2.10
  +++ Jikes.java        2001/04/24 08:41:04     1.1.2.11
  @@ -16,7 +16,7 @@
    * This class wraps IBM's <i>Jikes</i> Java compiler
    * NOTE: inspired by the Apache Jasper implementation.
    * @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
  - * @version $Revision: 1.1.2.10 $ $Date: 2001/04/23 17:52:30 $
  + * @version $Revision: 1.1.2.11 $ $Date: 2001/04/24 08:41:04 $
    * @since 2.0
    */
   
  @@ -58,7 +58,7 @@
                       sleep(SLEEP_TIME);
                   }
               } catch (Exception e) {
  -               getLogger().warn("Jikes.run()", e);
  +               // getLogger().warn("Jikes.run()", e);
               }
           }
       }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.26  +15 -8     
xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java
  
  Index: SQLTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v
  retrieving revision 1.1.2.25
  retrieving revision 1.1.2.26
  diff -u -r1.1.2.25 -r1.1.2.26
  --- SQLTransformer.java       2001/04/23 17:53:10     1.1.2.25
  +++ SQLTransformer.java       2001/04/24 08:41:07     1.1.2.26
  @@ -25,6 +25,7 @@
   import org.apache.avalon.component.ComponentSelector;
   import org.apache.avalon.component.Composable;
   import org.apache.avalon.component.Component;
  +import org.apache.log.Logger;
   import org.apache.excalibur.pool.Poolable;
   import org.apache.avalon.Disposable;
   import org.apache.excalibur.datasource.DataSourceComponent;
  @@ -48,7 +49,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
    *         (PWR Organisation & Entwicklung)
  - * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/04/23 17:53:10 $ $Author: 
dims $
  + * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/04/24 08:41:07 $ $Author: 
cziegeler $
    */
   
   public class SQLTransformer extends AbstractTransformer implements 
Composable, Poolable, Disposable {
  @@ -430,6 +431,12 @@
           }
       }
   
  +    public final Logger getTheLogger()
  +    {
  +        return getLogger();
  +    }
  +
  +
       class Query {
   
           /** Who's your daddy? **/
  @@ -504,7 +511,7 @@
                       try {
                           sb.append(query.getColumnValue(av.name));
                       } catch (SQLException e) {
  -                        getLogger().debug("SQLTransformer", e);
  +                        transformer.getTheLogger().debug("SQLTransformer", 
e);
                           close();
                           throw e;
                       }
  @@ -532,10 +539,10 @@
                           md = rs.getMetaData();
                   }
               } catch (SQLException e) {
  -                getLogger().error("Caught a SQLException", e);
  +                transformer.getTheLogger().error("Caught a SQLException", e);
                   throw e;
               } catch (ComponentException cme) {
  -                getLogger().error("Could not use connection: " + connection, 
cme);
  +                transformer.getTheLogger().error("Could not use connection: 
" + connection, cme);
               } finally {
                   conn.close();
                   if (datasource != null) dbSelector.release(datasource);
  @@ -546,7 +553,7 @@
               try {
                   return transformer.getStringValue(rs.getObject(i));
               } catch (SQLException e) {
  -                getLogger().debug("SQLTransformer", e);
  +                transformer.getTheLogger().debug("SQLTransformer", e);
                   close();
                   throw e;
               }
  @@ -556,7 +563,7 @@
               try {
                   return transformer.getStringValue(rs.getObject(name));
               } catch (SQLException e) {
  -                getLogger().debug("SQLTransformer", e);
  +                transformer.getTheLogger().debug("SQLTransformer", e);
                   close();
                   throw e;
               }
  @@ -574,7 +581,7 @@
                   }
                   return true;
               } catch (SQLException e) {
  -                getLogger().debug("SQLTransformer", e);
  +                transformer.getTheLogger().debug("SQLTransformer", e);
                   close();
                   throw e;
               }
  @@ -603,7 +610,7 @@
                       try {
                           transformer.data(getColumnValue(i));
                       } catch (SQLException e) {
  -                        getLogger().debug("SQLTransformer", e);
  +                        transformer.getTheLogger().debug("SQLTransformer", 
e);
                           close();
                           throw e;
                       }
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to