Author: kmoore Date: Thu Aug 1 12:07:52 2013 New Revision: 395985 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395985 Log: Fix documentation replication issues
This prevents XML documentation duplication by expanding channel and bridge snapshot tags into channel and bridge snapshot parameter sets with a given prefix or defaulting to no prefix. This also prevents documentation from becoming fractured and out of date by keeping all variations of the documentation in template form such that it only needs to be updated once and keeps maintenance to a minimum. Review: https://reviewboard.asterisk.org/r/2708/ Added: trunk/doc/snapshots.xslt (with props) Modified: trunk/CHANGES trunk/Makefile trunk/UPGRADE.txt trunk/apps/app_agent_pool.c trunk/apps/app_meetme.c trunk/apps/app_minivm.c trunk/apps/app_queue.c trunk/apps/app_stack.c trunk/apps/confbridge/confbridge_manager.c trunk/channels/chan_dahdi.c trunk/channels/chan_sip.c trunk/channels/sig_pri.c trunk/configure.ac trunk/contrib/scripts/install_prereq trunk/doc/appdocsxml.dtd trunk/funcs/func_global.c trunk/include/asterisk/autoconfig.h.in trunk/main/Makefile trunk/main/aoc.c trunk/main/core_local.c trunk/main/features.c trunk/main/manager.c trunk/main/manager_bridges.c trunk/main/manager_channels.c trunk/main/manager_mwi.c trunk/main/rtp_engine.c trunk/main/stasis_bridges.c trunk/main/stasis_channels.c trunk/main/xml.c trunk/makeopts.in trunk/res/parking/parking_manager.c trunk/res/res_agi.c Modified: trunk/CHANGES URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/CHANGES (original) +++ trunk/CHANGES Thu Aug 1 12:07:52 2013 @@ -115,6 +115,13 @@ * UserEvent will now handle duplicate keys by overwriting the previous value assigned to the key. UserEvent invocations will also be distributed to any interested res_stasis applications. + + +Build System +------------------ + * Asterisk now optionally uses libxslt to improve XML documentation generation + and maintainability. If libxslt is not available on the system, some XML + documentation will be incomplete. Core Modified: trunk/Makefile URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Thu Aug 1 12:07:52 2013 @@ -444,6 +444,7 @@ $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \ done $(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http"; + $(INSTALL) -m 644 doc/snapshots.xslt "$(DESTDIR)$(ASTDATADIR)/static-http"; if [ -d doc/tex/asterisk ] ; then \ $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ for n in doc/tex/asterisk/* ; do \ @@ -466,6 +467,7 @@ @printf "Building Documentation For: " @echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@ @echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@ + @echo "<?xml-stylesheet type=\"text/xsl\" href=\"snapshots.xslt\"?>" > $@ @echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\";>" >> $@ @for x in $(MOD_SUBDIRS); do \ printf "$$x " ; \ @@ -489,6 +491,7 @@ @printf "Building Documentation For: " @echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@ @echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@ + @echo "<?xml-stylesheet type=\"text/xsl\" href=\"snapshots.xslt\"?>" > $@ @echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\";>" >> $@ @for x in $(MOD_SUBDIRS); do \ printf "$$x " ; \ @@ -571,6 +574,7 @@ fi $(INSTALL) -m 644 doc/core-*.xml "$(DESTDIR)$(ASTDATADIR)/documentation" + $(INSTALL) -m 644 doc/snapshots.xslt "$(DESTDIR)$(ASTDATADIR)/documentation" $(INSTALL) -m 644 doc/appdocsxml.dtd "$(DESTDIR)$(ASTDATADIR)/documentation" $(INSTALL) -m 644 doc/asterisk.8 "$(DESTDIR)$(ASTMANDIR)/man8" $(INSTALL) -m 644 contrib/scripts/astgenkey.8 "$(DESTDIR)$(ASTMANDIR)/man8" Modified: trunk/UPGRADE.txt URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE.txt?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/UPGRADE.txt (original) +++ trunk/UPGRADE.txt Thu Aug 1 12:07:52 2013 @@ -96,6 +96,11 @@ - The Uniqueid field for a channel is now a stable identifier, and will not change due to transfers, parking, etc. +Build System: + - Asterisk now optionally uses libxslt to improve XML documentation generation + and maintainability. If libxslt is not available on the system, some XML + documentation will be incomplete. + Core: - The following channel variables have changed behavior which is described in the CHANGES file: TRANSFER_CONTEXT, BRIDGEPEER, BRIDGEPVTCALLID, Modified: trunk/apps/app_agent_pool.c URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_agent_pool.c?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/apps/app_agent_pool.c (original) +++ trunk/apps/app_agent_pool.c Thu Aug 1 12:07:52 2013 @@ -202,49 +202,12 @@ <para>Epoche time when the agent logged in.</para> <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> </parameter> - <parameter name="Channel"> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter[@name='Channel']/para)" /> - <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> - </parameter> - <parameter name="ChannelState"> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter[@name='ChannelState']/para)" /> - <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> - </parameter> - <parameter name="ChannelStateDesc"> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter[@name='ChannelStateDesc']/para)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter[@name='ChannelStateDesc']/enumlist)" /> - <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> - </parameter> - <parameter name="CallerIDNum"> - <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> - </parameter> - <parameter name="CallerIDName"> - <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> - </parameter> - <parameter name="ConnectedLineNum"> - <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> - </parameter> - <parameter name="ConnectedLineName"> - <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> - </parameter> - <parameter name="AccountCode"> - <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> - </parameter> - <parameter name="Context"> - <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> - </parameter> - <parameter name="Exten"> - <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> - </parameter> - <parameter name="Priority"> - <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> - </parameter> - <parameter name="Uniqueid"> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter[@name='Uniqueid']/para)" /> - <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> - </parameter> + <channel_snapshot/> <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" /> </syntax> + <description> + <para>The channel snapshot is present if the Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para> + </description> <see-also> <ref type="manager">Agents</ref> </see-also> Modified: trunk/apps/app_meetme.c URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/apps/app_meetme.c (original) +++ trunk/apps/app_meetme.c Thu Aug 1 12:07:52 2013 @@ -567,7 +567,7 @@ <parameter name="Usernum"> <para>The identifier of the MeetMe user who joined.</para> </parameter> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> </syntax> <see-also> <ref type="managerEvent">MeetmeLeave</ref> @@ -580,7 +580,7 @@ <synopsis>Raised when a user leaves a MeetMe conference.</synopsis> <syntax> <xi:include xpointer="xpointer(/docs/managerEvent[@name='MeetmeJoin']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <parameter name="Duration"> <para>The length of time in seconds that the Meetme user was in the conference.</para> </parameter> @@ -606,7 +606,7 @@ <synopsis>Raised when a MeetMe user has started talking.</synopsis> <syntax> <xi:include xpointer="xpointer(/docs/managerEvent[@name='MeetmeJoin']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <parameter name="Duration"> <para>The length of time in seconds that the Meetme user has been in the conference at the time of this event.</para> </parameter> @@ -624,7 +624,7 @@ <synopsis>Raised when a MeetMe user begins or ends talking.</synopsis> <syntax> <xi:include xpointer="xpointer(/docs/managerEvent[@name='MeetmeJoin']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <xi:include xpointer="xpointer(/docs/managerEvent[@name='MeetmeTalkRequest']/managerEventInstance/syntax/parameter)" /> </syntax> </managerEventInstance> @@ -634,7 +634,7 @@ <synopsis>Raised when a MeetMe user is muted or unmuted.</synopsis> <syntax> <xi:include xpointer="xpointer(/docs/managerEvent[@name='MeetmeJoin']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <xi:include xpointer="xpointer(/docs/managerEvent[@name='MeetmeTalkRequest']/managerEventInstance/syntax/parameter)" /> </syntax> </managerEventInstance> Modified: trunk/apps/app_minivm.c URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_minivm.c?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/apps/app_minivm.c (original) +++ trunk/apps/app_minivm.c Thu Aug 1 12:07:52 2013 @@ -500,7 +500,7 @@ <managerEventInstance class="EVENT_FLAG_CALL"> <synopsis>Raised when a notification is sent out by a MiniVoiceMail application</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <parameter name="Action"> <para>What action was taken. Currently, this will always be <literal>SentNotification</literal></para> </parameter> Modified: trunk/apps/app_queue.c URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/apps/app_queue.c (original) +++ trunk/apps/app_queue.c Thu Aug 1 12:07:52 2013 @@ -1018,7 +1018,7 @@ <managerEventInstance class="EVENT_FLAG_AGENT"> <synopsis>Raised when a caller joins a Queue.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Queue'])" /> <parameter name="Position"> <para>This channel's current position in the queue.</para> @@ -1037,7 +1037,7 @@ <managerEventInstance class="EVENT_FLAG_AGENT"> <synopsis>Raised when a caller leaves a Queue.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Queue'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueCallerJoin']/managerEventInstance/syntax/parameter[@name='Count'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueCallerJoin']/managerEventInstance/syntax/parameter[@name='Position'])" /> @@ -1051,7 +1051,7 @@ <managerEventInstance class="EVENT_FLAG_AGENT"> <synopsis>Raised when a caller abandons the queue.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Queue'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueCallerJoin']/managerEventInstance/syntax/parameter[@name='Position'])" /> <parameter name="OriginalPosition"> @@ -1067,8 +1067,8 @@ <managerEventInstance class="EVENT_FLAG_AGENT"> <synopsis>Raised when an queue member is notified of a caller in the queue.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='DialBegin']/managerEventInstance/syntax/parameter[contains(@name, 'Dest')])" /> + <channel_snapshot/> + <channel_snapshot prefix="Dest"/> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Queue'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='MemberName'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Interface'])" /> @@ -1084,8 +1084,8 @@ <managerEventInstance class="EVENT_FLAG_AGENT"> <synopsis>Raised when a queue member is notified of a caller in the queue and fails to answer.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='DialBegin']/managerEventInstance/syntax/parameter[contains(@name, 'Dest')])" /> + <channel_snapshot/> + <channel_snapshot prefix="Dest"/> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Queue'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='MemberName'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Interface'])" /> @@ -1102,8 +1102,8 @@ <managerEventInstance class="EVENT_FLAG_AGENT"> <synopsis>Raised when a queue member has finished servicing a caller in the queue.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='DialBegin']/managerEventInstance/syntax/parameter[contains(@name, 'Dest')])" /> + <channel_snapshot/> + <channel_snapshot prefix="Dest"/> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Queue'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='MemberName'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Interface'])" /> @@ -1129,8 +1129,8 @@ <managerEventInstance class="EVENT_FLAG_AGENT"> <synopsis>Raised when a queue member hangs up on a caller in the queue.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='DialBegin']/managerEventInstance/syntax/parameter[contains(@name, 'Dest')])" /> + <channel_snapshot/> + <channel_snapshot prefix="Dest"/> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Queue'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='MemberName'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Interface'])" /> @@ -1145,8 +1145,8 @@ <managerEventInstance class="EVENT_FLAG_AGENT"> <synopsis>Raised when a queue member answers and is bridged to a caller in the queue.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='DialBegin']/managerEventInstance/syntax/parameter[contains(@name, 'Dest')])" /> + <channel_snapshot/> + <channel_snapshot prefix="Dest"/> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Queue'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='MemberName'])" /> <xi:include xpointer="xpointer(/docs/managerEvent[@name='QueueMemberStatus']/managerEventInstance/syntax/parameter[@name='Interface'])" /> Modified: trunk/apps/app_stack.c URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_stack.c?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/apps/app_stack.c (original) +++ trunk/apps/app_stack.c Thu Aug 1 12:07:52 2013 @@ -211,7 +211,7 @@ <managerEventInstance class="EVENT_FLAG_DIALPLAN"> <synopsis>Raised when a variable local to the gosub stack frame is set due to a subroutine call.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <parameter name="Variable"> <para>The LOCAL variable being set.</para> <note><para>The variable name will always be enclosed with Modified: trunk/apps/confbridge/confbridge_manager.c URL: http://svnview.digium.com/svn/asterisk/trunk/apps/confbridge/confbridge_manager.c?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/apps/confbridge/confbridge_manager.c (original) +++ trunk/apps/confbridge/confbridge_manager.c Thu Aug 1 12:07:52 2013 @@ -44,7 +44,7 @@ <parameter name="Conference"> <para>The name of the Confbridge conference.</para> </parameter> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" /> + <bridge_snapshot/> </syntax> <see-also> <ref type="managerEvent">ConfbridgeEnd</ref> @@ -59,7 +59,7 @@ <parameter name="Conference"> <para>The name of the Confbridge conference.</para> </parameter> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" /> + <bridge_snapshot/> </syntax> <see-also> <ref type="managerEvent">ConfbridgeStart</ref> @@ -74,8 +74,8 @@ <parameter name="Conference"> <para>The name of the Confbridge conference.</para> </parameter> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <bridge_snapshot/> + <channel_snapshot/> </syntax> <see-also> <ref type="managerEvent">ConfbridgeLeave</ref> @@ -90,8 +90,8 @@ <parameter name="Conference"> <para>The name of the Confbridge conference.</para> </parameter> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <bridge_snapshot/> + <channel_snapshot/> </syntax> <see-also> <ref type="managerEvent">ConfbridgeJoin</ref> @@ -106,7 +106,7 @@ <parameter name="Conference"> <para>The name of the Confbridge conference.</para> </parameter> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" /> + <bridge_snapshot/> </syntax> <see-also> <ref type="managerEvent">ConfbridgeStopRecord</ref> @@ -121,7 +121,7 @@ <parameter name="Conference"> <para>The name of the Confbridge conference.</para> </parameter> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" /> + <bridge_snapshot/> </syntax> <see-also> <ref type="managerEvent">ConfbridgeRecord</ref> @@ -136,8 +136,8 @@ <parameter name="Conference"> <para>The name of the Confbridge conference.</para> </parameter> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <bridge_snapshot/> + <channel_snapshot/> </syntax> <see-also> <ref type="managerEvent">ConfbridgeUnmute</ref> @@ -152,8 +152,8 @@ <parameter name="Conference"> <para>The name of the Confbridge conference.</para> </parameter> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <bridge_snapshot/> + <channel_snapshot/> </syntax> <see-also> <ref type="managerEvent">ConfbridgeMute</ref> @@ -161,7 +161,6 @@ </see-also> </managerEventInstance> </managerEvent> - <managerEvent language="en_US" name="ConfbridgeTalking"> <managerEventInstance class="EVENT_FLAG_CALL"> <synopsis>Raised when a confbridge participant unmutes.</synopsis> @@ -169,8 +168,8 @@ <parameter name="Conference"> <para>The name of the Confbridge conference.</para> </parameter> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='BridgeCreate']/managerEventInstance/syntax/parameter)" /> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <bridge_snapshot/> + <channel_snapshot/> <parameter name="TalkingStatus"> <enumlist> <enum name="on"/> Modified: trunk/channels/chan_dahdi.c URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/channels/chan_dahdi.c (original) +++ trunk/channels/chan_dahdi.c Thu Aug 1 12:07:52 2013 @@ -362,7 +362,7 @@ <managerEventInstance class="EVENT_FLAG_CALL"> <synopsis>Raised when a DAHDI channel is created or an underlying technology is associated with a DAHDI channel.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <parameter name="DAHDISpan"> <para>The DAHDI span associated with this channel.</para> </parameter> Modified: trunk/channels/chan_sip.c URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/channels/chan_sip.c (original) +++ trunk/channels/chan_sip.c Thu Aug 1 12:07:52 2013 @@ -643,7 +643,7 @@ <managerEventInstance class="EVENT_FLAG_CALL"> <synopsis>Raised when a SIP session times out.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <parameter name="Source"> <para>The source of the session timeout.</para> <enumlist> Modified: trunk/channels/sig_pri.c URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_pri.c?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/channels/sig_pri.c (original) +++ trunk/channels/sig_pri.c Thu Aug 1 12:07:52 2013 @@ -31,7 +31,7 @@ <managerEventInstance class="EVENT_FLAG_CALL"> <synopsis>Published when a malicious call ID request arrives.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <parameter name="MCallerIDNumValid"> </parameter> <parameter name="MCallerIDNum"> Modified: trunk/configure.ac URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/configure.ac (original) +++ trunk/configure.ac Thu Aug 1 12:07:52 2013 @@ -413,6 +413,7 @@ AST_LIBCURL_CHECK_CONFIG([], [7.10.1]) AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit], [, use 'internal' Editline otherwise]) AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2]) +AST_EXT_LIB_SETUP([LIBXSLT], [LibXSLT], [libxslt]) AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl]) AST_EXT_LIB_SETUP([LUA], [Lua], [lua]) AST_EXT_LIB_SETUP([MISDN], [mISDN user], [misdn]) @@ -564,6 +565,9 @@ AC_MSG_NOTICE(*** or install the 'libxml2' development package.) exit 1 fi + + AST_EXT_LIB_CHECK([LIBXSLT], [xslt], [xsltLoadStylesheetPI], [libxslt/xsltInternals.h], [${LIBXML2_LIB}], [${LIBXML2_INCLUDE}]) + fi # some embedded systems omit internationalization (locale) support Modified: trunk/contrib/scripts/install_prereq URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/scripts/install_prereq?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/contrib/scripts/install_prereq (original) +++ trunk/contrib/scripts/install_prereq Thu Aug 1 12:07:52 2013 @@ -28,14 +28,14 @@ PACKAGES_DEBIAN="$PACKAGES_DEBIAN libopenh323-dev libvpb-dev libgtk2.0-dev libmysqlclient-dev libbluetooth-dev libradiusclient-ng-dev freetds-dev" PACKAGES_DEBIAN="$PACKAGES_DEBIAN libsnmp-dev libiksemel-dev libcorosync-dev libnewt-dev libpopt-dev libical-dev libspandsp-dev libjack-dev" PACKAGES_DEBIAN="$PACKAGES_DEBIAN libresample-dev libc-client-dev binutils-dev libsrtp-dev libgsm1-dev libedit-dev doxygen libjansson-dev libldap-dev" -PACKAGES_DEBIAN="$PACKAGES_DEBIAN subversion git" +PACKAGES_DEBIAN="$PACKAGES_DEBIAN subversion git libxslt1-dev" PACKAGES_RH="automake gcc gcc-c++ ncurses-devel openssl-devel libxml2-devel unixODBC-devel libcurl-devel libogg-devel libvorbis-devel speex-devel" PACKAGES_RH="$PACKAGES_RH spandsp-devel freetds-devel net-snmp-devel iksemel-devel corosynclib-devel newt-devel popt-devel libtool-ltdl-devel lua-devel" PACKAGES_RH="$PACKAGES_RH libsqlite3x-devel radiusclient-ng-devel portaudio-devel postgresql-devel libresample-devel neon-devel libical-devel" PACKAGES_RH="$PACKAGES_RH openldap-devel gmime22-devel sqlite2-devel mysql-devel bluez-libs-devel jack-audio-connection-kit-devel gsm-devel libedit-devel libuuid-devel" -PACKAGES_RH="$PACKAGES_RH jansson-devel libsrtp-devel pjproject-devel subversion git" - -PACKAGES_OBSD="popt gmake wget libxml libogg libvorbis curl iksemel spandsp speex iodbc freetds-0.63p1-msdblib mysql-client gmime sqlite sqlite3 jack" +PACKAGES_RH="$PACKAGES_RH jansson-devel libsrtp-devel pjproject-devel subversion git libxslt-devel" + +PACKAGES_OBSD="popt gmake wget libxml libogg libvorbis curl iksemel spandsp speex iodbc freetds-0.63p1-msdblib mysql-client gmime sqlite sqlite3 jack libxslt" KVERS=`uname -r` Modified: trunk/doc/appdocsxml.dtd URL: http://svnview.digium.com/svn/asterisk/trunk/doc/appdocsxml.dtd?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/doc/appdocsxml.dtd (original) +++ trunk/doc/appdocsxml.dtd Thu Aug 1 12:07:52 2013 @@ -76,8 +76,14 @@ <!ELEMENT synopsis (#PCDATA)> - <!ELEMENT syntax (parameter|dataType|category|matchInfo|xi:include)*> + <!ELEMENT syntax (parameter|dataType|category|matchInfo|xi:include|channel_snapshot|bridge_snapshot)*> <!ATTLIST syntax argsep CDATA ","> + + <!ELEMENT channel_snapshot (#PCDATA)> + <!ATTLIST channel_snapshot prefix CDATA ""> + + <!ELEMENT bridge_snapshot (#PCDATA)> + <!ATTLIST bridge_snapshot prefix CDATA ""> <!ELEMENT description (para|note|warning|variablelist|enumlist|info|xi:include)*> Added: trunk/doc/snapshots.xslt URL: http://svnview.digium.com/svn/asterisk/trunk/doc/snapshots.xslt?view=auto&rev=395985 ============================================================================== --- trunk/doc/snapshots.xslt (added) +++ trunk/doc/snapshots.xslt Thu Aug 1 12:07:52 2013 @@ -1,0 +1,115 @@ +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> + <xsl:output omit-xml-declaration="yes" indent="yes"/> + + <xsl:param name="pNewType" select="'myNewType'"/> + + <xsl:template match="node()|@*"> + <xsl:copy> + <xsl:apply-templates select="node()|@*"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="channel_snapshot"> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'Channel')"/> + </xsl:attribute> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'ChannelState')"/> + </xsl:attribute> + <para>A numeric code for the channel's current state, related to <xsl:value-of select="concat(@prefix,'ChannelStateDesc')"/></para> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'ChannelStateDesc')"/> + </xsl:attribute> + <enumlist> + <enum name="Down"/> + <enum name="Rsrvd"/> + <enum name="OffHook"/> + <enum name="Dialing"/> + <enum name="Ring"/> + <enum name="Ringing"/> + <enum name="Up"/> + <enum name="Busy"/> + <enum name="Dialing Offhook"/> + <enum name="Pre-ring"/> + <enum name="Unknown"/> + </enumlist> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'CallerIDNum')"/> + </xsl:attribute> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'CallerIDName')"/> + </xsl:attribute> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'ConnectedLineNum')"/> + </xsl:attribute> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'ConnectedLineName')"/> + </xsl:attribute> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'AccountCode')"/> + </xsl:attribute> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'Context')"/> + </xsl:attribute> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'Exten')"/> + </xsl:attribute> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'Priority')"/> + </xsl:attribute> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'Uniqueid')"/> + </xsl:attribute> + </xsl:element> + </xsl:template> + + <xsl:template match="bridge_snapshot"> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'BridgeUniqueid')"/> + </xsl:attribute> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'BridgeType')"/> + </xsl:attribute> + <para>The type of bridge</para> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'BridgeTechnology')"/> + </xsl:attribute> + <para>Technology in use by the bridge</para> + </xsl:element> + <xsl:element name="parameter"> + <xsl:attribute name="name"> + <xsl:value-of select="concat(@prefix,'BridgeNumChannels')"/> + </xsl:attribute> + <para>Number of channels in the bridge</para> + </xsl:element> + </xsl:template> +</xsl:stylesheet> Propchange: trunk/doc/snapshots.xslt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/doc/snapshots.xslt ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: trunk/doc/snapshots.xslt ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: trunk/funcs/func_global.c URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_global.c?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/funcs/func_global.c (original) +++ trunk/funcs/func_global.c Thu Aug 1 12:07:52 2013 @@ -87,7 +87,7 @@ <managerEventInstance class="EVENT_FLAG_DIALPLAN"> <synopsis>Raised when a variable is shared between channels.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <parameter name="Variable"> <para>The SHARED variable being set.</para> <note><para>The variable name will always be enclosed with Modified: trunk/include/asterisk/autoconfig.h.in URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/include/asterisk/autoconfig.h.in (original) +++ trunk/include/asterisk/autoconfig.h.in Thu Aug 1 12:07:52 2013 @@ -393,6 +393,9 @@ /* Define if your system has the LIBXML2 libraries. */ #undef HAVE_LIBXML2 + +/* Define to 1 if you have the LibXSLT library. */ +#undef HAVE_LIBXSLT /* Define to 1 if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H Modified: trunk/main/Makefile URL: http://svnview.digium.com/svn/asterisk/trunk/main/Makefile?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/main/Makefile (original) +++ trunk/main/Makefile Thu Aug 1 12:07:52 2013 @@ -33,6 +33,7 @@ ASTSSL_LIBS:=$(OPENSSL_LIB) AST_LIBS+=$(BKTR_LIB) AST_LIBS+=$(LIBXML2_LIB) +AST_LIBS+=$(LIBXSLT_LIB) AST_LIBS+=$(SQLITE3_LIB) AST_LIBS+=$(ASTSSL_LIBS) AST_LIBS+=$(JANSSON_LIB) Modified: trunk/main/aoc.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/aoc.c?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/main/aoc.c (original) +++ trunk/main/aoc.c Thu Aug 1 12:07:52 2013 @@ -44,7 +44,7 @@ <managerEventInstance class="EVENT_FLAG_AOC"> <synopsis>Raised when an Advice of Charge message is sent at the beginning of a call.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <parameter name="Chargeable" /> <parameter name="RateType"> <enumlist> @@ -91,7 +91,7 @@ <managerEventInstance class="EVENT_FLAG_AOC"> <synopsis>Raised when an Advice of Charge message is sent during a call.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <parameter name="Charge" /> <parameter name="Type"> <enumlist> @@ -144,7 +144,7 @@ <managerEventInstance class="EVENT_FLAG_AOC"> <synopsis>Raised when an Advice of Charge message is sent at the end of a call.</synopsis> <syntax> - <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" /> + <channel_snapshot/> <parameter name="ChargingAssociation" /> <parameter name="Number" /> <parameter name="Plan" /> Modified: trunk/main/core_local.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/core_local.c?view=diff&rev=395985&r1=395984&r2=395985 ============================================================================== --- trunk/main/core_local.c (original) +++ trunk/main/core_local.c Thu Aug 1 12:07:52 2013 @@ -72,82 +72,8 @@ <managerEventInstance class="EVENT_FLAG_CALL"> <synopsis>Raised when two halves of a Local Channel form a bridge.</synopsis> <syntax> - <parameter name="LocalOneChannel"> - </parameter> [... 1297 lines stripped ...] -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
