Re: Review Request: OOZIE-580 use xml element to handle string escape when configure evaluator

[Angelo K. Huang]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/2427/
-----------------------------------------------------------

(Updated 2011-10-24 23:56:50.909726)


Review request for oozie.


Summary
-------

try {
        String valueElem = "<value>"+value+"</value>";
        XmlUtils.parseXml(valueElem);
}
catch (JDOMException ex) {
        // It should not happen, so escape the characters for xml
        value = XmlUtils.escapeCharsForXML(value);
}

With above check, for element CDATA can be avoided for escaping, EX:

For these two elements, first one has to convert because of '&', however second 
one can be avoided.
 
    <property>
      <name>test.ampsign</name>
      
<value>http://app1.soln-stage.nova.cp.vip.ne1.yahoo.com/nova-webservices?urlSigner=signUrl&namespace=nova.proxy</value>
    </property>
    <property>
      <name>test.cdata</name>
      
<value><![CDATA[?redirect=http%3A%2F%2Fapp1.soln-stage.nova.cp.vip.ne1.yahoo.com%3A4080%2Fnova-webservices%2Fv1%2FurlSigner%2FsignUrl&amp;namespace=nova.proxy&amp;keyDBHash=Vsy6n_C7K6NG0z4R2eBlKg--]]></value>
    </property>


*** & has to convert to &amp; ***
*** <![CDATA[]] does not need to convert. ***

    <property>
      <name>test.ampsign</name>
      
<value>http://app1.soln-stage.nova.cp.vip.ne1.yahoo.com/nova-webservices?urlSigner=signUrl&amp;namespace=nova.proxy</value>
    </property>
    <property>
      <name>test.cdata</name>
      
<value><![CDATA[?redirect=http%3A%2F%2Fapp1.soln-stage.nova.cp.vip.ne1.yahoo.com%3A4080%2Fnova-webservices%2Fv1%2FurlSigner%2FsignUrl&namespace=nova.proxy&keyDBHash=Vsy6n_C7K6NG0z4R2eBlKg--]]></value>
    </property>


This addresses bug OOZIE-580.
    https://issues.apache.org/jira/browse/OOZIE-580


Diffs (updated)
-----

  /trunk/core/src/main/java/org/apache/oozie/DagELFunctions.java 1185461 
  
/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java 
1185461 
  
/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
 1185461 
  /trunk/release-log.txt 1185461 

Diff: https://reviews.apache.org/r/2427/diff


Testing
-------


Thanks,

Angelo K.