dlr         01/10/04 10:39:39

  Modified:    src/services/java/org/apache/fulcrum/velocity
                        TurbineVelocity.java
  Log:
  Patch by Michael Stack <[EMAIL PROTECTED]> to include some
  functionality present in VelocityService.
  
  Revision  Changes    Path
  1.4       +34 -6     
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/velocity/TurbineVelocity.java
  
  Index: TurbineVelocity.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/velocity/TurbineVelocity.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- TurbineVelocity.java      2001/10/02 20:09:47     1.3
  +++ TurbineVelocity.java      2001/10/04 17:39:39     1.4
  @@ -72,7 +72,8 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
  - * @version $Id: TurbineVelocity.java,v 1.3 2001/10/02 20:09:47 dlr Exp $
  + * @author <a href="mailto:[EMAIL PROTECTED]";>Michael Stack</a>
  + * @version $Id: TurbineVelocity.java,v 1.4 2001/10/04 17:39:39 dlr Exp $
    */
   public abstract class TurbineVelocity
   {
  @@ -97,7 +98,7 @@
        * @param context A Context.
        * @param template The path to the template file.
        * @return The processed template.
  -     * @exception Exception, a generic exception.
  +     * @exception Exception Error processing template.
        */
       public static String handleRequest(Context context, String template)
           throws Exception
  @@ -125,13 +126,40 @@
        * @param filename A String with the filename of the template.
        * @param out A OutputStream where we will write the process template as
        * a String.
  -     * @exception Exception, a generic exception.
  +     *
  +     * @exception Exception Error processing template.
  +     *
  +     * @see org.apache.fulcrum.velocity.VelocityService#handleRequest(Context,
  +     * String, OutputStream)
        */
  -    public static void handleRequest(Context context,
  -                              String template,
  -                              OutputStream out)
  +    public static void handleRequest(Context context, String template,
  +                                     OutputStream out)
           throws Exception
       {
           getService().handleRequest(context, template, out);
  +    }
  +
  +    /**
  +     * Process the request and fill in the template with the values
  +     * you set in the Context.
  +     *
  +     * @param context A Context.
  +     * @param template The path to the template file.
  +     * @param out A OutputStream where we will write the process template as
  +     * a String.
  +     * @param charset The character set to use when writing the result.
  +     * @param encoding The encoding to use when merging context and template.
  +     *
  +     * @exception Exception Error processing template.
  +     *
  +     * @see org.apache.fulcrum.velocity.VelocityService#handleRequest(Context,
  +     * String, OutputStream)
  +     */
  +    public static void handleRequest(Context context, String template,
  +                                     OutputStream out, String charset,
  +                                     String encoding)
  +        throws Exception
  +    {
  +        getService().handleRequest(context, template, out, charset, encoding);
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to