cvs commit: cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation FlowVelocityGenerator.java

[joerg]

joerg       2004/03/05 16:11:07

  Modified:    src/blocks/scratchpad/java/org/apache/cocoon/generation
                        FlowVelocityGenerator.java
  Log:
  bug 18116: fix documentation: property/@key => property/@name, fixed 
Component/ServiceException
  
  Revision  Changes    Path
  1.7       +4 -4      
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/FlowVelocityGenerator.java
  
  Index: FlowVelocityGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/FlowVelocityGenerator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FlowVelocityGenerator.java        5 Mar 2004 10:07:26 -0000       1.6
  +++ FlowVelocityGenerator.java        6 Mar 2004 00:11:07 -0000       1.7
  @@ -30,13 +30,13 @@
   import java.util.Set;
   
   import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.service.ServiceException;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.components.flow.FlowHelper;
  @@ -139,7 +139,7 @@
    * Child Elements:
    *
    * <dl>
  - * <dt>&lt;property key="propertyKey" value="propertyValue"/&gt; (optional; 
0..n)</dt>
  + * <dt>&lt;property name="propertyName" value="propertyValue"/&gt; 
(optional; 0..n)</dt>
    * <dd>An additional property to pass along to the Velocity template
    * engine during initialization</dd>
    *
  @@ -1052,7 +1052,7 @@
           } catch (SAXException e) {
               getLogger().error("VelocityGenerator.generate()", e);
               throw e;
  -        } catch (ComponentException e) {
  +        } catch (ServiceException e) {
               getLogger().error("Could not get parser", e);
               throw new ProcessingException("Exception in 
VelocityGenerator.generate()", e);
           } catch (ProcessingException e) {