bodewig 2003/01/15 06:26:26
Modified: src/main/org/apache/tools/ant/util Tag: ANT_15_BRANCH
DOMElementWriter.java
src/testcases/org/apache/tools/ant/util Tag: ANT_15_BRANCH
DOMElementWriterTest.java
Log:
&x should better be &#x
Revision Changes Path
No revision
No revision
1.11.2.2 +4 -4
jakarta-ant/src/main/org/apache/tools/ant/util/DOMElementWriter.java
Index: DOMElementWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/DOMElementWriter.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- DOMElementWriter.java 15 Jan 2003 14:15:01 -0000 1.11.2.1
+++ DOMElementWriter.java 15 Jan 2003 14:26:26 -0000 1.11.2.2
@@ -245,12 +245,12 @@
*
* <p>Also ensure that we are not including an <code>]]></code>
* marker by replacing that sequence with
- * <code>&x5d;&x5d;&gt;</code>.</p>
+ * <code>&#x5d;&#x5d;&gt;</code>.</p>
*
* <p>See XML 1.0 2.2 <a
- *
href="http://www.w3.org/TR/1998/REC-xml-19980210#charsets";>http://www.w3.org/TR/1998/REC-xml-19980210#charsets</a>.
and
+ *
href="http://www.w3.org/TR/1998/REC-xml-19980210#charsets";>http://www.w3.org/TR/1998/REC-xml-19980210#charsets</a>
and
* 2.7 <a
- *
href="http://www.w3.org/TR/1998/REC-xml-19980210#sec-cdata-sect";>http://www.w3.org/TR/1998/REC-xml-19980210#sec-cdata-sect</a></p>
+ *
href="http://www.w3.org/TR/1998/REC-xml-19980210#sec-cdata-sect";>http://www.w3.org/TR/1998/REC-xml-19980210#sec-cdata-sect</a>.</p>
*/
public String encodedata(final String value) {
@@ -266,7 +266,7 @@
int cdEnd = result.indexOf("]]>");
while (cdEnd != -1) {
sb.setLength(cdEnd);
- sb.append("&x5d;&x5d;>")
+ sb.append("]]>")
.append(result.substring(cdEnd+3));
result = sb.toString();
cdEnd = result.indexOf("]]>");
No revision
No revision
1.6.2.2 +5 -5
jakarta-ant/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java
Index: DOMElementWriterTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- DOMElementWriterTest.java 15 Jan 2003 14:15:01 -0000 1.6.2.1
+++ DOMElementWriterTest.java 15 Jan 2003 14:26:26 -0000 1.6.2.2
@@ -123,11 +123,11 @@
public void testCDATAEndEncoding() {
assertEquals("]>", w.encodedata("]>"));
assertEquals("]]", w.encodedata("]]"));
- assertEquals("&x5d;&x5d;>", w.encodedata("]]>"));
- assertEquals("&x5d;&x5d;>A", w.encodedata("]]>A"));
- assertEquals("A&x5d;&x5d;>", w.encodedata("A]]>"));
- assertEquals("A&x5d;&x5d;>A", w.encodedata("A]]>A"));
- assertEquals("A&x5d;&x5d;>B&x5d;&x5d;>C",
+ assertEquals("]]>", w.encodedata("]]>"));
+ assertEquals("]]>A", w.encodedata("]]>A"));
+ assertEquals("A]]>", w.encodedata("A]]>"));
+ assertEquals("A]]>A", w.encodedata("A]]>A"));
+ assertEquals("A]]>B]]>C",
w.encodedata("A]]>B]]>C"));
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
