Refactor usage pattern of xmldoc info tag.

This updates func_channel.c and main/message.c to use a generic xpointer
include instead of including info from each channel driver.  Now the
name attribute of info is CHANNEL or CHANNEL_EXAMPLES to be included in
documentation for func_channel.  Setting the name attribute of info to
MessageToInfo or MessageFromInfo causes it to be included in the
MessageSend application and AMI action.

Change-Id: I89fd8276a3250824241a618009714267d3a8d1ea

diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index 9ab90aed81fbc025962db9e0aa27c42bdca695fe..b64d43c662f3c34cc56bcc72a61495bc369ff3b9 100644 (file)
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -23,7 +23,7 @@
  ***/
 
 /*** DOCUMENTATION
-<info name="OOH323CHANNEL" language="en_US" tech="OOH323">
+<info name="CHANNEL" language="en_US" tech="OOH323">
        <enumlist>
                <enum name="faxdetect">
                        <para>R/W Fax Detect</para>

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index ac55f5864e263ace1bcb27cb13283f68f43f5ec0..2e139a2342891a1f5852aaa3abb6d800b2ed71fc 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -180,7 +180,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>This application will Accept the R2 call either with charge or no charge.</para>
                </description>
        </application>
-       <info name="DAHDICHANNEL" language="en_US" tech="DAHDI">
+       <info name="CHANNEL" language="en_US" tech="DAHDI">
                <enumlist>
                        <enum name="dahdi_channel">
                                <para>R/O DAHDI channel related to this channel.</para>

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index bd773fc84497b80695ff9ca189ad30588f9fd850..db5e4fa4d3b567d421d02659c7e5c3f6e4edc865 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -213,7 +213,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>Gets or sets a variable that is sent to a remote IAX2 peer during call setup.</para>
                </description>
        </function>
-       <info name="IAXCHANNEL" language="en_US" tech="IAX">
+       <info name="CHANNEL" language="en_US" tech="IAX">
                <enumlist>
                        <enum name="osptoken">
                                <para>R/O Get the peer's osptoken.</para>

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4be53c2182cd41d590b1b43241a521ae543fc623..a30a18117f72e04abd0396ba50e4fa1ef965fc0d 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -568,11 +568,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        for all of the sip peers will be retrieved.</para>
                </description>
        </manager>
-       <info name="SIPMessageFromInfo" language="en_US" tech="SIP">
+       <info name="MessageFromInfo" language="en_US" tech="SIP">
                <para>The <literal>from</literal> parameter can be a configured peer name
                or in the form of "display-name" &lt;URI&gt;.</para>
        </info>
-       <info name="SIPMessageToInfo" language="en_US" tech="SIP">
+       <info name="MessageToInfo" language="en_US" tech="SIP">
                <para>Specifying a prefix of <literal>sip:</literal> will send the
                message as a SIP MESSAGE request.</para>
        </info>

diff --git a/channels/pjsip/dialplan_functions.c b/channels/pjsip/dialplan_functions.c
index 380a05eed00381b39d2ca6b6a06b3b9ebaf22f90..ecf5105f8c7bcb544620cf2f290ea7ad2651d266 100644 (file)
--- a/channels/pjsip/dialplan_functions.c
+++ b/channels/pjsip/dialplan_functions.c
@@ -109,7 +109,7 @@
                <ref type="function">PJSIP_MEDIA_OFFER</ref>
        </see-also>
 </function>
-<info name="PJSIPCHANNEL" language="en_US" tech="PJSIP">
+<info name="CHANNEL" language="en_US" tech="PJSIP">
        <enumlist>
                <enum name="rtp">
                        <para>R/O Retrieve media related information.</para>
@@ -411,7 +411,7 @@
                </enum>
        </enumlist>
 </info>
-<info name="PJSIPCHANNEL_EXAMPLES" language="en_US" tech="PJSIP">
+<info name="CHANNEL_EXAMPLES" language="en_US" tech="PJSIP">
        <example title="PJSIP specific CHANNEL examples">
                ; Log the current Call-ID
                same => n,Log(NOTICE, ${CHANNEL(pjsip,call-id)})

diff --git a/channels/sip/dialplan_functions.c b/channels/sip/dialplan_functions.c
index e53981d65725481c5b723eeca14d8167c7a1f58e..b859c601bc9e5e147149397fb656483d3a4ccbaa 100644 (file)
--- a/channels/sip/dialplan_functions.c
+++ b/channels/sip/dialplan_functions.c
@@ -24,7 +24,7 @@
  ***/
 
 /*** DOCUMENTATION
-<info name="SIPCHANNEL" language="en_US" tech="SIP">
+<info name="CHANNEL" language="en_US" tech="SIP">
        <enumlist>
                <enum name="peerip">
                        <para>R/O Get the IP address of the peer.</para>

diff --git a/doc/appdocsxml.xslt b/doc/appdocsxml.xslt
index 6e4c5ac500dc60a94aba1f157f81f4de335ae9c4..f067decaef29141eb9cccb93c2d996fcbb81122d 100644 (file)
--- a/doc/appdocsxml.xslt
+++ b/doc/appdocsxml.xslt
@@ -6,7 +6,10 @@
 
     <xsl:template match="node()|@*">
         <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
+            <xsl:for-each select="node()|@*">
+                <xsl:sort select="@tech"/>
+                <xsl:apply-templates select="."/>
+            </xsl:for-each>
         </xsl:copy>
     </xsl:template>
 

diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index 5efc09c4f992c1045d05e41d74d75847a7ebb378..673de51d0905103c70d458b1878a682c42275b97 100644 (file)
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -233,11 +233,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                                <para>R/W The maximum number of forwards allowed.</para>
                                        </enum>
                                </enumlist>
-                               <xi:include xpointer="xpointer(/docs/info[@name='SIPCHANNEL'])" />
-                               <xi:include xpointer="xpointer(/docs/info[@name='PJSIPCHANNEL'])" />
-                               <xi:include xpointer="xpointer(/docs/info[@name='IAXCHANNEL'])" />
-                               <xi:include xpointer="xpointer(/docs/info[@name='DAHDICHANNEL'])" />
-                               <xi:include xpointer="xpointer(/docs/info[@name='OOH323CHANNEL'])" />
+                               <xi:include xpointer="xpointer(/docs/info[@name='CHANNEL'])" />
                        </parameter>
                </syntax>
                <description>
@@ -263,7 +259,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                ; Log the current state of the channel
                                same => n,Log(NOTICE, This channel is: ${CHANNEL(state)})
                        </example>
-                       <xi:include xpointer="xpointer(/docs/info[@name='PJSIPCHANNEL_EXAMPLES'])" />
+                       <xi:include xpointer="xpointer(/docs/info[@name='CHANNEL_EXAMPLES'])" />
                </description>
        </function>
  ***/

diff --git a/main/message.c b/main/message.c
index c15975b63156ae726b20b96bdcccd742fcdcb8c3..d4e48fb4a76629a71cb0db7d88b02ba7fe9acf6e 100644 (file)
--- a/main/message.c
+++ b/main/message.c
@@ -123,16 +123,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <syntax>
                        <parameter name="to" required="true">
                                <para>A To URI for the message.</para>
-                               <xi:include xpointer="xpointer(/docs/info[@name='PJSIPMessageToInfo'])" />
-                               <xi:include xpointer="xpointer(/docs/info[@name='SIPMessageToInfo'])" />
-                               <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageToInfo'])" />
+                               <xi:include xpointer="xpointer(/docs/info[@name='MessageToInfo'])" />
                        </parameter>
                        <parameter name="from" required="false">
                                <para>A From URI for the message if needed for the
                                message technology being used to send this message.</para>
-                               <xi:include xpointer="xpointer(/docs/info[@name='PJSIPMessageFromInfo'])" />
-                               <xi:include xpointer="xpointer(/docs/info[@name='SIPMessageFromInfo'])" />
-                               <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageFromInfo'])" />
+                               <xi:include xpointer="xpointer(/docs/info[@name='MessageFromInfo'])" />
                        </parameter>
                </syntax>
                <description>
@@ -168,16 +164,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
                        <parameter name="To" required="true">
                                <para>The URI the message is to be sent to.</para>
-                               <xi:include xpointer="xpointer(/docs/info[@name='PJSIPMessageToInfo'])" />
-                               <xi:include xpointer="xpointer(/docs/info[@name='SIPMessageToInfo'])" />
-                               <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageToInfo'])" />
+                               <xi:include xpointer="xpointer(/docs/info[@name='MessageToInfo'])" />
                        </parameter>
                        <parameter name="From">
                                <para>A From URI for the message if needed for the
                                message technology being used to send this message.</para>
-                               <xi:include xpointer="xpointer(/docs/info[@name='PJSIPMessageFromInfo'])" />
-                               <xi:include xpointer="xpointer(/docs/info[@name='SIPMessageFromInfo'])" />
-                               <xi:include xpointer="xpointer(/docs/info[@name='XMPPMessageFromInfo'])" />
+                               <xi:include xpointer="xpointer(/docs/info[@name='MessageFromInfo'])" />
                        </parameter>
                        <parameter name="Body">
                                <para>The message body text.  This must not contain any newlines as that

diff --git a/res/res_pjsip_messaging.c b/res/res_pjsip_messaging.c
index 594c0fdac38c9bb70e76e82138d77115525ad21f..4e5ad26521a227d29bd8c4c40aecbd46a7664dcb 100644 (file)
--- a/res/res_pjsip_messaging.c
+++ b/res/res_pjsip_messaging.c
@@ -24,11 +24,11 @@
  ***/
 
 /*** DOCUMENTATION
-       <info name="PJSIPMessageFromInfo" language="en_US" tech="PJSIP">
+       <info name="MessageFromInfo" language="en_US" tech="PJSIP">
                <para>The <literal>from</literal> parameter can be a configured endpoint
                or in the form of "display-name" &lt;URI&gt;.</para>
        </info>
-       <info name="PJSIPMessageToInfo" language="en_US" tech="PJSIP">
+       <info name="MessageToInfo" language="en_US" tech="PJSIP">
                <para>Specifying a prefix of <literal>pjsip:</literal> will send the
                message as a SIP MESSAGE request.</para>
        </info>

diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index ed35cd169ea8f852311049a46c0b9478f43ac309..cd4b248708c42c5d22e1a3ceacecaa4b94670ff8 100644 (file)
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -278,11 +278,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>Sends a message to a Jabber Client.</para>
                </description>
        </manager>
-       <info name="XMPPMessageToInfo" language="en_US" tech="XMPP">
+       <info name="MessageToInfo" language="en_US" tech="XMPP">
                <para>Specifying a prefix of <literal>xmpp:</literal> will send the
                message as an XMPP chat message.</para>
        </info>
-       <info name="XMPPMessageFromInfo" language="en_US" tech="XMPP">
+       <info name="MessageFromInfo" language="en_US" tech="XMPP">
                <para>Specifying a prefix of <literal>xmpp:</literal> will specify the
                account defined in <literal>xmpp.conf</literal> to send the message from.
                Note that this field is required for XMPP messages.</para>