jon 01/03/14 18:43:29
Modified: src/java/org/apache/velocity/anakia AnakiaTask.java
Added: src/java/org/apache/velocity/anakia OutputWrapper.java
Log:
moved to using the OutputWrapper class which fixes some stylesheet
issues.
also attempt to make sure that we are passing in the right encoding
values
Revision Changes Path
1.22 +7 -5
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- AnakiaTask.java 2001/03/14 22:03:19 1.21
+++ AnakiaTask.java 2001/03/15 02:43:29 1.22
@@ -93,7 +93,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.21 2001/03/14 22:03:19 jvanzyl Exp $
+ * @version $Id: AnakiaTask.java,v 1.22 2001/03/15 02:43:29 jon Exp $
*/
public class AnakiaTask extends MatchingTask
{
@@ -360,16 +360,18 @@
VelocityContext context = new VelocityContext();
- XMLOutputter xout = new XMLOutputter();
String encoding = Runtime.getString(Runtime.TEMPLATE_ENCODING);
- if (encoding == null || encoding.length() == 0)
+ if (encoding == null || encoding.length() == 0
+ || encoding.equals("8859-1") || encoding.equals("8859_1"))
{
encoding = "ISO-8859-1";
}
- xout.setEncoding (encoding);
+ OutputWrapper ow = new OutputWrapper();
+ ow.setEncoding (encoding);
+
context.put ("root", root.getRootElement());
- context.put ("xmlout", xout);
+ context.put ("xmlout", ow );
context.put ("relativePath", getRelativePath(xmlFile));
context.put ("treeWalk", new TreeWalker());
context.put ("xpath", new XPathTool() );
1.1
jakarta-velocity/src/java/org/apache/velocity/anakia/OutputWrapper.java
Index: OutputWrapper.java
===================================================================
package org.apache.velocity.anakia;
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, 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 acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Velocity", 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 [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* 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 (INCLUDING, 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/>.
*/
import java.io.IOException;
import java.io.StringWriter;
import org.jdom.Element;
import org.jdom.output.XMLOutputter;
/**
* This class extends XMLOutputter in order to provide
* a way to walk an Element tree into a String.
*
* @author <a href="[EMAIL PROTECTED]">Jon S. Stevens</a>
* @version $Id: OutputWrapper.java,v 1.1 2001/03/15 02:43:29 jon Exp $
*/
public class OutputWrapper extends XMLOutputter
{
/**
* Empty constructor
*/
public OutputWrapper()
{
}
/**
* This method walks an Element tree into a String. The cool
* thing about it is that it will strip off the first Element.
* For example, if you have:
* <p>
* <td> foo <strong>bar</strong> ack </td>
* </p>
* It will output
* <p>
* foo <strong>bar</strong> ack </td>
* </p>
*/
public String outputString(Element element, boolean strip)
{
StringWriter buff = new StringWriter();
String name = element.getName();
try
{
output (element, buff);
}
catch (IOException e)
{
}
String output = buff.toString();
output = output.substring(name.length()+2,output.length());
output = output.substring(0, output.length()-(name.length()+3));
return output;
}
}
