Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
Date: 14 Jan 2003 10:09:44 -0000
Message-ID: <20030114100944.628.qmail@icarus.apache.org>
From: cziegeler@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit:
 xml-cocoon2/src/blocks/php/java/org/apache/cocoon/generation
 PhpGenerator.java

cziegeler    2003/01/14 02:09:44

  Modified:    src/blocks/jsp/java/org/apache/cocoon/generation
                        JspGenerator.java
               src/blocks/databases/java/org/apache/cocoon/transformation
                        SQLTransformer.java
               src/blocks/php/java/org/apache/cocoon/generation
                        PhpGenerator.java
  Log:
  Updating to changed interfaces of excalibur
  
  Revision  Changes    Path
  1.3       +3 -2      xml-cocoon2/src/blocks/jsp/java/org/apache/cocoon/generation/JspGenerator.java
  
  Index: JspGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/blocks/jsp/java/org/apache/cocoon/generation/JspGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JspGenerator.java	14 Jan 2003 10:04:24 -0000	1.2
  +++ JspGenerator.java	14 Jan 2003 10:09:44 -0000	1.3
  @@ -50,6 +50,7 @@
   */
   package org.apache.cocoon.generation;
   
  +import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -137,7 +138,7 @@
           } catch (Exception e) {
               throw new ProcessingException("Exception JspGenerator.generate()",e);
           } finally {
  -            this.manager.release(parser);
  +            this.manager.release((Component)parser);
               this.manager.release(engine);
           }
       }
  
  
  
  1.9       +2 -2      xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
  
  Index: SQLTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SQLTransformer.java	14 Jan 2003 10:04:25 -0000	1.8
  +++ SQLTransformer.java	14 Jan 2003 10:09:44 -0000	1.9
  @@ -217,7 +217,7 @@
           this.queries.clear();
           this.outUri = null;
           this.outPrefix = null;
  -        this.manager.release(this.parser);
  +        this.manager.release((Component)this.parser);
           this.parser = null;
           this.manager.release(this.compiler);
           this.compiler = null;
  
  
  
  1.4       +3 -3      xml-cocoon2/src/blocks/php/java/org/apache/cocoon/generation/PhpGenerator.java
  
  Index: PhpGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/blocks/php/java/org/apache/cocoon/generation/PhpGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PhpGenerator.java	14 Jan 2003 10:04:25 -0000	1.3
  +++ PhpGenerator.java	14 Jan 2003 10:09:44 -0000	1.4
  @@ -62,10 +62,10 @@
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   
  +import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.logger.Logger;
   
  -
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.http.HttpEnvironment;
   
  @@ -209,7 +209,7 @@
               throw new ProcessingException(e.toString(), e);
           } finally {
               this.resolver.release( inputSource );
  -            this.manager.release(parser);
  +            this.manager.release( (Component)parser );
           }
       }
   }
  
  
  

----------------------------------------------------------------------
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