cvs commit: jakarta-velocity/src/java/org/apache/velocity/anakia AnakiaTask.java

[jon]

jon         01/03/04 15:44:36

  Modified:    src/java/org/apache/velocity/anakia AnakiaTask.java
  Log:
  fixed anakia to allow you to specify the template.encoding
  
  Revision  Changes    Path
  1.15      +11 -3     
jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaTask.java
  
  Index: AnakiaTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaTask.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- AnakiaTask.java   2001/03/04 21:24:14     1.14
  +++ AnakiaTask.java   2001/03/04 23:44:35     1.15
  @@ -90,7 +90,7 @@
    * <a href="http://jakarta.apache.org/velocity/anakia.html">Website</a>.
    *   
    * @author <a href="[EMAIL PROTECTED]">Jon S. Stevens</a>
  - * @version $Id: AnakiaTask.java,v 1.14 2001/03/04 21:24:14 jon Exp $
  + * @version $Id: AnakiaTask.java,v 1.15 2001/03/04 23:44:35 jon Exp $
    */
   public class AnakiaTask extends MatchingTask
   {
  @@ -212,7 +212,7 @@
       {
           this.velocityPropertiesFile = velocityPropertiesFile;
       }
  -    
  +
       /**
        * Turn on/off last modified checking. by default, it is on.
        */
  @@ -360,8 +360,16 @@
   
                   VelocityContext context = new VelocityContext();
   
  +                XMLOutputter xout = new XMLOutputter();
  +                String encoding = Runtime.getString(Runtime.TEMPLATE_ENCODING);
  +                if (encoding == null || encoding.length() == 0)
  +                {
  +                    encoding = "ISO-8859-1";
  +                }
  +                xout.setEncoding (encoding);
  +                
                   context.put ("root", root.getRootElement());
  -                context.put ("xmlout", new XMLOutputter());
  +                context.put ("xmlout", xout);
                   context.put ("relativePath", getRelativePath(xmlFile));
                   context.put ("treeWalk", new TreeWalker());
                   context.put ("xpath", new XPathTool() );