svn commit: r1364822 - in /ofbiz/trunk/framework: entity/src/org/ofbiz/entity/serialize/XmlSerializer.java service/src/org/ofbiz/service/ModelService.java

[jo...@apache.org]

Author: jonesde
Date: Mon Jul 23 22:10:29 2012
New Revision: 1364822

URL: http://svn.apache.org/viewvc?rev=1364822&view=rev
Log:
Changed so that cus-obj element value is not in a CDATA block; it is already hex encoded so does not need to be in a CDATA block, and in entity exports of the RuntimeData entity it ends up being causing a nested CDATA block, which is not allowed

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java?rev=1364822&r1=1364821&r2=1364822&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java Mon Jul 23 22:10:29 2012
@@ -264,7 +264,8 @@ public class XmlSerializer {
             } else {
                 String byteHex = StringUtil.toHexString(objBytes);
                 Element element = document.createElement("cus-obj");
-                element.appendChild(document.createCDATASection(byteHex));
+                // this is hex encoded so does not need to be in a CDATA block
+                element.appendChild(document.createTextNode(byteHex));
                 return element;
             }
         } else {
@@ -499,4 +500,4 @@ public class XmlSerializer {
         }
         return formatter;
     }
-}
\ No newline at end of file
+}

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java?rev=1364822&r1=1364821&r2=1364822&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java Mon Jul 23 22:10:29 2012
@@ -1631,7 +1631,7 @@ public class ModelService extends Abstra
         cusObjElement.appendChild(cusObjElement0);
         Element cusObjElement1 = document.createElement("xsd:documentation");
         cusObjElement0.appendChild(cusObjElement1);
-        cusObjElement1.setTextContent("Object content need to be in CDATA such as <cus-obj><![CDATA[--byteHex--]]></cus-obj>");
+        cusObjElement1.setTextContent("Object content is hex encoded so does not need to be in a CDATA block.");
         schema.appendChild(cusObjElement);
 
         /*-----------------------------------*/