svn commit: r427594 - in /incubator/solr/trunk/src: java/org/apache/solr/util/XML.java test/org/apache/solr/util/TestXMLEscaping.java

[yonik]

Author: yonik
Date: Tue Aug  1 07:53:45 2006
New Revision: 427594

URL: http://svn.apache.org/viewvc?rev=427594&view=rev
Log:
escape > to avoid illegal ]]> in content

Modified:
    incubator/solr/trunk/src/java/org/apache/solr/util/XML.java
    incubator/solr/trunk/src/test/org/apache/solr/util/TestXMLEscaping.java

Modified: incubator/solr/trunk/src/java/org/apache/solr/util/XML.java
URL: 
http://svn.apache.org/viewvc/incubator/solr/trunk/src/java/org/apache/solr/util/XML.java?rev=427594&r1=427593&r2=427594&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/util/XML.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/util/XML.java Tue Aug  1 
07:53:45 2006
@@ -32,7 +32,7 @@
   // many chars less than 0x20 are *not* valid XML, even when escaped!
   // for example, <foo>&#0;<foo> is invalid XML.
   private static final String[] chardata_escapes=
-  
{"#0;","#1;","#2;","#3;","#4;","#5;","#6;","#7;","#8;",null,null,"#11;","#12;",null,"#14;","#15;","#16;","#17;","#18;","#19;","#20;","#21;","#22;","#23;","#24;","#25;","#26;","#27;","#28;","#29;","#30;","#31;",null,null,null,null,null,null,"&amp;",null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,"&lt;"};
+  
{"#0;","#1;","#2;","#3;","#4;","#5;","#6;","#7;","#8;",null,null,"#11;","#12;",null,"#14;","#15;","#16;","#17;","#18;","#19;","#20;","#21;","#22;","#23;","#24;","#25;","#26;","#27;","#28;","#29;","#30;","#31;",null,null,null,null,null,null,"&amp;",null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,"&lt;",null,"&gt;"};
 
   private static final String[] attribute_escapes=
   
{"#0;","#1;","#2;","#3;","#4;","#5;","#6;","#7;","#8;",null,null,"#11;","#12;",null,"#14;","#15;","#16;","#17;","#18;","#19;","#20;","#21;","#22;","#23;","#24;","#25;","#26;","#27;","#28;","#29;","#30;","#31;",null,null,"&quot;",null,null,null,"&amp;",null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,"&lt;"};

Modified: 
incubator/solr/trunk/src/test/org/apache/solr/util/TestXMLEscaping.java
URL: 
http://svn.apache.org/viewvc/incubator/solr/trunk/src/test/org/apache/solr/util/TestXMLEscaping.java?rev=427594&r1=427593&r2=427594&view=diff
==============================================================================
--- incubator/solr/trunk/src/test/org/apache/solr/util/TestXMLEscaping.java 
(original)
+++ incubator/solr/trunk/src/test/org/apache/solr/util/TestXMLEscaping.java Tue 
Aug  1 07:53:45 2006
@@ -28,7 +28,7 @@
   }
 
   public void testAmpAndTagAscii() throws IOException {
-    doSimpleTest("Bonnie & Cl<em>y</em>de","Bonnie &amp; 
Cl&lt;em>y&lt;/em>de");
+    doSimpleTest("Bonnie & Cl<em>y</em>de","Bonnie &amp; 
Cl&lt;em&gt;y&lt;/em&gt;de");
   }
 
   public void testAmpWithAccents() throws IOException {
@@ -43,7 +43,11 @@
 
   public void testAmpAndTagWithAccents() throws IOException {
     // 00e9 is unicode eacute
-    doSimpleTest("Les \u00e9v\u00e9nements <chez/> Bonnie & Clyde","Les 
\u00e9v\u00e9nements &lt;chez/> Bonnie &amp; Clyde");
+    doSimpleTest("Les \u00e9v\u00e9nements <chez/> Bonnie & Clyde","Les 
\u00e9v\u00e9nements &lt;chez/&gt; Bonnie &amp; Clyde");
+  }
+
+  public void testGt() throws IOException {
+    doSimpleTest("a ]]> b","a ]]&gt; b");
   }
 }