Author: alexsmirnov Date: 2007-08-16 12:27:56 -0400 (Thu, 16 Aug 2007) New Revision: 315 Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/XMLEntities.properties branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/output_xml.properties Log: fix encoding html entities Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2007-08-14 00:17:53 UTC (rev 314) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2007-08-16 16:27:56 UTC (rev 315) @@ -1,7 +1,7 @@ /** * License Agreement. * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * Rich Faces - Natural Ajax for Java Server Faces (JSF) * * Copyright (C) 2007 Exadel, Inc. * @@ -1422,15 +1422,15 @@ { cleanLength++; } - else if ('<' == ch || '>' == ch) - { - cleanLength++; // no escaping in this case, as specified in 15.2 - } - else if ( - ('&' == ch) && ((i + 1) < end) && ('{' == chars[i + 1])) - { - cleanLength++; // no escaping in this case, as specified in 15.2 - } +// else if ('<' == ch || '>' == ch) +// { +// cleanLength++; // no escaping in this case, as specified in 15.2 +// } +// else if ( +// ('&' == ch) && ((i + 1) < end) && ('{' == chars[i + 1])) +// { +// cleanLength++; // no escaping in this case, as specified in 15.2 +// } else { if (cleanLength > 0) Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/XMLEntities.properties =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/XMLEntities.properties 2007-08-14 00:17:53 UTC (rev 314) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/XMLEntities.properties 2007-08-16 16:27:56 UTC (rev 315) @@ -14,9 +14,9 @@ # limitations under the License. ########################################################################## # -# $Id: XMLEntities.properties,v 1.1 2006/06/14 06:12:18 alexsmirnov Exp $ +# $Id: XMLEntities.properties,v 1.1.2.1 2007/01/10 19:33:34 alexsmirnov Exp $ # -# @version $Revision: 1.1 $ $Date: 2006/06/14 06:12:18 $ +# @version $Revision: 1.1.2.1 $ $Date: 2007/01/10 19:33:34 $ # @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a> # This file must be encoded in UTF-8; see org.ajax4jsf.xml.serializer.CharInfo # Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/output_xml.properties =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/output_xml.properties 2007-08-14 00:17:53 UTC (rev 314) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/output_xml.properties 2007-08-16 16:27:56 UTC (rev 315) @@ -14,7 +14,7 @@ # limitations under the License. ########################################################################## # -# $Id: output_xml.properties,v 1.1 2006/06/14 06:12:16 alexsmirnov Exp $ +# $Id: output_xml.properties,v 1.1.2.1 2007/01/10 19:33:36 alexsmirnov Exp $ # # Specify defaults when method="xml". These defaults serve as a base for # other defaults, such as output_html and output_text.