From ajax4jsf-svn-commits at lists.jboss.org Thu Aug 16 12:27:56 2007
Content-Type: multipart/mixed; boundary="===============8458656831082634528=="
MIME-Version: 1.0
From: ajax4jsf-svn-commits at lists.jboss.org
To: ajax4jsf-svn-commits at lists.jboss.org
Subject: [ajax4jsf-svn-commits] JBoss Ajax4JSF SVN: r315 -
 branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer.
Date: Thu, 16 Aug 2007 12:27:56 -0400
Message-ID: <E1ILiCS-0002xX-8O@committer01.frg.pub.inap.atl.jboss.com>

--===============8458656831082634528==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/To=
XHTMLStream.java
   branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/XM=
LEntities.properties
   branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/ou=
tput_xml.properties
Log:
fix encoding html entities

Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serial=
izer/ToXHTMLStream.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/T=
oXHTMLStream.java	2007-08-14 00:17:53 UTC (rev 314)
+++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/T=
oXHTMLStream.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 ('<' =3D=3D ch || '>' =3D=3D ch)
-            {
-                cleanLength++; // no escaping in this case, as specified i=
n 15.2
-            }
-            else if (
-                ('&' =3D=3D ch) && ((i + 1) < end) && ('{' =3D=3D chars[i =
+ 1]))
-            {
-                cleanLength++; // no escaping in this case, as specified i=
n 15.2
-            }
+//            else if ('<' =3D=3D ch || '>' =3D=3D ch)
+//            {
+//                cleanLength++; // no escaping in this case, as specified=
 in 15.2
+//            }
+//            else if (
+//                ('&' =3D=3D ch) && ((i + 1) < end) && ('{' =3D=3D 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/serial=
izer/XMLEntities.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/X=
MLEntities.properties	2007-08-14 00:17:53 UTC (rev 314)
+++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/X=
MLEntities.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 Ex=
p $
 #
-# @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=3D"mailto:arkin(a)intalio.com">Assaf Arkin</a>
 # This file must be encoded in UTF-8; see org.ajax4jsf.xml.serializer.Char=
Info
 #

Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serial=
izer/output_xml.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/o=
utput_xml.properties	2007-08-14 00:17:53 UTC (rev 314)
+++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/xml/serializer/o=
utput_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=3D"xml".  These defaults serve as a base fo=
r =

 # other defaults, such as output_html and output_text.


--===============8458656831082634528==--