You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ge...@apache.org on 2004/02/19 20:22:03 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/anakia AnakiaTask.java OutputWrapper.java
geirm 2004/02/19 11:22:03
Modified: src/java/org/apache/velocity/anakia AnakiaTask.java
OutputWrapper.java
Log:
change how encoding is set in XMLOutputter to comply w/ API changes
in JDOM
Revision Changes Path
1.35 +6 -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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- AnakiaTask.java 3 May 2003 23:15:36 -0000 1.34
+++ AnakiaTask.java 19 Feb 2004 19:22:03 -0000 1.35
@@ -71,6 +71,7 @@
import org.jdom.Document;
import org.jdom.JDOMException;
+import org.jdom.output.Format;
import org.jdom.input.SAXBuilder;
import org.apache.velocity.Template;
@@ -380,8 +381,10 @@
encoding = "ISO-8859-1";
}
- OutputWrapper ow = new OutputWrapper();
- ow.setEncoding (encoding);
+ Format f = Format.getRawFormat();
+ f.setEncoding(encoding);
+
+ OutputWrapper ow = new OutputWrapper(f);
context.put ("root", root.getRootElement());
context.put ("xmlout", ow );
1.7 +9 -4 jakarta-velocity/src/java/org/apache/velocity/anakia/OutputWrapper.java
Index: OutputWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/anakia/OutputWrapper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OutputWrapper.java 3 May 2003 23:15:36 -0000 1.6
+++ OutputWrapper.java 19 Feb 2004 19:22:03 -0000 1.7
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,7 @@
import org.jdom.Element;
import org.jdom.output.XMLOutputter;
+import org.jdom.output.Format;
/**
* This class extends XMLOutputter in order to provide
@@ -76,7 +77,12 @@
public OutputWrapper()
{
}
-
+
+ public OutputWrapper(Format f)
+ {
+ super(f);
+ }
+
/**
* This method walks an Element tree into a String. The cool
* thing about it is that it will strip off the first Element.
@@ -92,7 +98,6 @@
public String outputString(Element element, boolean strip)
{
StringWriter buff = new StringWriter();
- String name = element.getName();
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org