cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: cocoon-2.2/src/java/org/apache/cocoon CompilingProcessor.java Cocoon.java
Date Fri, 17 Oct 2003 22:03:42 GMT
bloritsch    2003/10/17 15:03:42

  Modified:    src/java/org/apache/cocoon Cocoon.java
  Added:       src/java/org/apache/cocoon CompilingProcessor.java
  Log:
  Updates to allow for processing beans
  
  Revision  Changes    Path
  1.20      +10 -10    cocoon-2.2/src/java/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Cocoon.java	17 Oct 2003 17:49:24 -0000	1.19
  +++ Cocoon.java	17 Oct 2003 22:03:42 -0000	1.20
  @@ -59,7 +59,6 @@
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.Serviceable;
  -import org.apache.cocoon.components.CocoonComponentManager;
   import org.apache.cocoon.components.ComponentContext;
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.components.language.generator.ProgramGenerator;
  @@ -93,7 +92,7 @@
                      Initializable,
                      Disposable,
                      Modifiable,
  -                   Processor,
  +                   CompilingProcessor,
                      Contextualizable {
   
       /** The application context */
  @@ -351,10 +350,10 @@
               throw new IllegalStateException("You cannot process a Disposed Cocoon engine.");
           }
   
  -        Object key = CocoonComponentManager.startProcessing(environment);
  +/*        Object key = CocoonComponentManager.startProcessing(environment);
           CocoonComponentManager.enterEnvironment(environment,
                                                   this.serviceManager,
  -                                                this);
  +                                                this);              */
           try {
               boolean result;
               if (this.getLogger().isDebugEnabled()) {
  @@ -379,14 +378,14 @@
               environment.tryResetResponse();
               throw any;
           } finally {
  -            CocoonComponentManager.leaveEnvironment();
  -            CocoonComponentManager.endProcessing(environment, key);
  +//            CocoonComponentManager.leaveEnvironment();
  +//            CocoonComponentManager.endProcessing(environment, key);
               if (this.getLogger().isDebugEnabled()) {
                   --activeRequestCount;
               }
   
               // TODO (CZ): This is only for testing - remove it later on
  -            CocoonComponentManager.checkEnvironment(this.getLogger());
  +//            CocoonComponentManager.checkEnvironment(this.getLogger());
           }
       }
   
  @@ -459,15 +458,16 @@
               }
   
               programGenerator = (ProgramGenerator) this.serviceManager.lookup(ProgramGenerator.ROLE);
  -            source = environment.resolveURI(fileName);
  +/*            source = environment.resolveURI(fileName);
               CompiledComponent xsp = programGenerator.load(this.serviceManager,
                       source,
                       markupLanguage, programmingLanguage, environment);
               if (getLogger().isDebugEnabled()) {
                   getLogger().debug("XSP generation complete:" + xsp);
               }
  +            */
           } finally {
  -            environment.release(source);
  +            //environment.release(source);
               this.serviceManager.release(programGenerator);
           }
       }
  
  
  
  1.1                  cocoon-2.2/src/java/org/apache/cocoon/CompilingProcessor.java
  
  Index: CompilingProcessor.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
      must not be used to endorse or promote products derived from this  software
      without  prior written permission. For written permission, please contact
      apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation. For more  information on the
   Apache Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.cocoon;
  
  import org.apache.cocoon.environment.Environment;
  
  /**
   * CompilingProcessor does XYZ
   *
   * @author <a href="bloritsch.at.apache.org">Berin Loritsch</a>
   * @version CVS $Revision: 1.1 $
   */
  public interface CompilingProcessor extends Processor
  {
      String ROLE = CompilingProcessor.class.getName();
  
      /**
       * Process the given <code>Environment</code> to generate Java code for
specified XSP files.
       *
       * @param fileName a <code>String</code> value
       * @param environment an <code>Environment</code> value
       * @exception Exception if an error occurs
       */
      public void precompile( String fileName,
                              Environment environment,
                              String markupLanguage,
                              String programmingLanguage )
              throws Exception;
  }
  
  
  

Mime
View raw message