<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/18124">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Benjamin Keith Ford: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">xmldoc: Fix issue with xmlstarlet validation<br><br>Added the missing xml-stylesheet and Xinclude namespace<br>declarations in pjsip_config.xml and pjsip_manager.xml.<br><br>Updated make_xml_documentation to show detailed errors when<br>xmlstarlet is the validator. It's now run once with the '-q'<br>option to suppress harmless/expected messages and if it actually<br>fails, it's run again without '-q' but with '-e' to show<br>the actual errors.<br><br>Change-Id: I4bdc9d2ea6741e8d2e5eb82df60c68ccc59e1f5e<br>---<br>M build_tools/make_xml_documentation<br>M res/res_pjsip/pjsip_config.xml<br>M res/res_pjsip/pjsip_manager.xml<br>3 files changed, 8 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/build_tools/make_xml_documentation b/build_tools/make_xml_documentation</span><br><span>index fafb81c..54144ce 100755</span><br><span>--- a/build_tools/make_xml_documentation</span><br><span>+++ b/build_tools/make_xml_documentation</span><br><span>@@ -224,7 +224,8 @@</span><br><span> if [ "${XMLLINT}" != ":" ] ; then</span><br><span> ${XMLLINT} --dtdvalid "${source_tree}/doc/appdocsxml.dtd" --path "${source_tree}/doc" --noout "${i}" || { echo "" ; exit 1 ; }</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- ${XMLSTARLET} val -d "${source_tree}/doc/appdocsxml.dtd" "${i}" || { echo "" ; exit 1 ; }</span><br><span style="color: hsl(120, 100%, 40%);">+ ${XMLSTARLET} val -q -d "${source_tree}/doc/appdocsxml.dtd" "${i}" ||</span><br><span style="color: hsl(120, 100%, 40%);">+ ${XMLSTARLET} val -e -d "${source_tree}/doc/appdocsxml.dtd" "${i}" || { echo "" ; exit 1 ; }</span><br><span> fi</span><br><span> fi</span><br><span> ${SED} -r "/^\s*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"</span><br><span>@@ -241,7 +242,8 @@</span><br><span> if [ "${XMLLINT}" != ":" ] ; then</span><br><span> ${XMLLINT} --dtdvalid "${source_tree}/doc/appdocsxml.dtd" --path "${source_tree}/doc" --noout "${output_file}" || exit 1</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- ${XMLSTARLET} val -d "${source_tree}/doc/appdocsxml.dtd" "${output_file}" || exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+ ${XMLSTARLET} val -q -d "${source_tree}/doc/appdocsxml.dtd" "${output_file}" ||</span><br><span style="color: hsl(120, 100%, 40%);">+ ${XMLSTARLET} val -e -d "${source_tree}/doc/appdocsxml.dtd" "${output_file}" || { echo "" ; exit 1 ; }</span><br><span> fi</span><br><span> fi</span><br><span> </span><br><span>diff --git a/res/res_pjsip/pjsip_config.xml b/res/res_pjsip/pjsip_config.xml</span><br><span>index c51c644..6470ab6 100644</span><br><span>--- a/res/res_pjsip/pjsip_config.xml</span><br><span>+++ b/res/res_pjsip/pjsip_config.xml</span><br><span>@@ -1,6 +1,7 @@</span><br><span> <?xml version="1.0" encoding="UTF-8"?></span><br><span> <!DOCTYPE docs SYSTEM "appdocsxml.dtd"></span><br><span style="color: hsl(0, 100%, 40%);">-<docs></span><br><span style="color: hsl(120, 100%, 40%);">+<?xml-stylesheet type="text/xsl" href="appdocsxml.xslt"?></span><br><span style="color: hsl(120, 100%, 40%);">+<docs xmlns:xi="http://www.w3.org/2001/XInclude"></span><br><span> <configInfo name="res_pjsip" language="en_US"></span><br><span> <synopsis>SIP Resource using PJProject</synopsis></span><br><span> <configFile name="pjsip.conf"></span><br><span>diff --git a/res/res_pjsip/pjsip_manager.xml b/res/res_pjsip/pjsip_manager.xml</span><br><span>index a0047aa..810a5e3 100644</span><br><span>--- a/res/res_pjsip/pjsip_manager.xml</span><br><span>+++ b/res/res_pjsip/pjsip_manager.xml</span><br><span>@@ -1,6 +1,7 @@</span><br><span> <?xml version="1.0" encoding="UTF-8"?></span><br><span> <!DOCTYPE docs SYSTEM "appdocsxml.dtd"></span><br><span style="color: hsl(0, 100%, 40%);">-<docs></span><br><span style="color: hsl(120, 100%, 40%);">+<?xml-stylesheet type="text/xsl" href="appdocsxml.xslt"?></span><br><span style="color: hsl(120, 100%, 40%);">+<docs xmlns:xi="http://www.w3.org/2001/XInclude"></span><br><span> <manager name="PJSIPQualify" language="en_US"></span><br><span> <synopsis></span><br><span> Qualify a chan_pjsip endpoint.</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/18124">change 18124</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/18124"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I4bdc9d2ea6741e8d2e5eb82df60c68ccc59e1f5e </div>
<div style="display:none"> Gerrit-Change-Number: 18124 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>