cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From giac...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/generation ComposerGenerator.java FileGenerator.java ServerPagesGenerator.java
Date Tue, 12 Jun 2001 20:03:47 GMT
giacomo     01/06/12 13:03:47

  Modified:    src/org/apache/cocoon/components/language/markup/xsp Tag:
                        cocoon_20_branch XSPGenerator.java
               src/org/apache/cocoon/generation Tag: cocoon_20_branch
                        ComposerGenerator.java FileGenerator.java
                        ServerPagesGenerator.java
  Log:
  Applied patch to correct the compose method
  Submitted by:	Peter Royal <proyal@managingpartners.com>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +3 -2      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java
  
  Index: XSPGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -u -r1.2 -r1.2.2.1
  --- XSPGenerator.java	2001/05/10 21:16:41	1.2
  +++ XSPGenerator.java	2001/06/12 20:03:40	1.2.2.1
  @@ -8,6 +8,7 @@
   package org.apache.cocoon.components.language.markup.xsp;
   
   import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
  @@ -21,7 +22,7 @@
    * Base class for XSP-generated <code>ServerPagesGenerator</code> classes
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:41 $
  + * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/06/12 20:03:40 $
    */
   public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent,
Contextualizable, Recyclable {
     protected Context avalonContext = null;
  @@ -37,7 +38,7 @@
      *
      * @param manager The global component manager
      */
  -  public void compose(ComponentManager manager) {
  +  public void compose(ComponentManager manager) throws ComponentException {
       super.compose(manager);
     }
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.2.1 +4 -2      xml-cocoon2/src/org/apache/cocoon/generation/ComposerGenerator.java
  
  Index: ComposerGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ComposerGenerator.java,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -u -r1.1.1.1 -r1.1.1.1.2.1
  --- ComposerGenerator.java	2001/05/09 20:49:40	1.1.1.1
  +++ ComposerGenerator.java	2001/06/12 20:03:44	1.1.1.1.2.1
  @@ -8,14 +8,16 @@
   package org.apache.cocoon.generation;
   
   import org.apache.avalon.framework.component.Composable;
  +import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
  +
   import org.apache.cocoon.Cocoon;
   
   /**
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:40 $
  + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/06/12 20:03:44 $
    */
   public abstract class ComposerGenerator extends AbstractGenerator
   implements Composable {
  @@ -27,7 +29,7 @@
        * Set the current <code>ComponentManager</code> instance used by this
        * <code>Composable</code>.
        */
  -    public void compose(ComponentManager manager) {
  +    public void compose(ComponentManager manager) throws ComponentException {
           this.manager=manager;
       }
   }
  
  
  
  1.9.2.3   +2 -2      xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java
  
  Index: FileGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java,v
  retrieving revision 1.9.2.2
  retrieving revision 1.9.2.3
  diff -u -u -r1.9.2.2 -r1.9.2.3
  --- FileGenerator.java	2001/06/07 22:07:21	1.9.2.2
  +++ FileGenerator.java	2001/06/12 20:03:45	1.9.2.3
  @@ -39,7 +39,7 @@
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.9.2.2 $ $Date: 2001/06/07 22:07:21 $
  + * @version CVS $Revision: 1.9.2.3 $ $Date: 2001/06/12 20:03:45 $
    */
   public class FileGenerator extends ComposerGenerator
   implements Cacheable, Recyclable {
  @@ -51,7 +51,7 @@
        * Set the current <code>ComponentManager</code> instance used by this
        * <code>Composable</code>.
        */
  -    public void compose(ComponentManager manager) {
  +    public void compose(ComponentManager manager) throws ComponentException {
           super.compose(manager);
       }
   
  
  
  
  1.7.2.2   +3 -2      xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java
  
  Index: ServerPagesGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -u -r1.7.2.1 -r1.7.2.2
  --- ServerPagesGenerator.java	2001/06/08 15:38:36	1.7.2.1
  +++ ServerPagesGenerator.java	2001/06/12 20:03:45	1.7.2.2
  @@ -16,6 +16,7 @@
   import java.util.Map;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  @@ -47,7 +48,7 @@
    * delegating actual SAX event generation.
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.7.2.1 $ $Date: 2001/06/08 15:38:36 $
  + * @version CVS $Revision: 1.7.2.2 $ $Date: 2001/06/12 20:03:45 $
    */
   public class ServerPagesGenerator
     extends ServletGenerator
  @@ -69,7 +70,7 @@
      *
      * @param manager The global component manager
      */
  -  public void compose(ComponentManager manager) {
  +  public void compose(ComponentManager manager) throws ComponentException {
       super.compose(manager);
   
       if (programGenerator == null) {
  
  
  

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