Author: brian Date: Sat Nov 17 16:13:12 2007 New Revision: 6319 Added: freeswitch/trunk/conf/autoload_configs/alsa.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/alsa.conf.xml freeswitch/trunk/conf/autoload_configs/cdr.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/cdr.conf.xml freeswitch/trunk/conf/autoload_configs/conference.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/conference.conf.xml freeswitch/trunk/conf/autoload_configs/console.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/console.conf.xml freeswitch/trunk/conf/autoload_configs/dialplan_directory.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/dialplan_directory.conf.xml freeswitch/trunk/conf/autoload_configs/dingaling.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/dingaling.conf.xml freeswitch/trunk/conf/autoload_configs/enum.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/enum.conf.xml freeswitch/trunk/conf/autoload_configs/event_multicast.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/event_multicast.conf.xml freeswitch/trunk/conf/autoload_configs/event_socket.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/event_socket.conf.xml freeswitch/trunk/conf/autoload_configs/iax.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/iax.conf.xml freeswitch/trunk/conf/autoload_configs/ivr.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/ivr.conf.xml freeswitch/trunk/conf/autoload_configs/java.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/java.conf.xml freeswitch/trunk/conf/autoload_configs/limit.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/limit.conf.xml freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/local_stream.conf.xml freeswitch/trunk/conf/autoload_configs/modules.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/modules.conf.xml freeswitch/trunk/conf/autoload_configs/openmrcp.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/openmrcp.conf.xml freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/portaudio.conf.xml freeswitch/trunk/conf/autoload_configs/rss.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/rss.conf.xml freeswitch/trunk/conf/autoload_configs/sofia.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/conf/autoload_configs/spidermonkey.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/spidermonkey.conf.xml freeswitch/trunk/conf/autoload_configs/switch.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/switch.conf.xml freeswitch/trunk/conf/autoload_configs/syslog.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/syslog.conf.xml freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/voicemail.conf.xml freeswitch/trunk/conf/autoload_configs/wanpipe.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/wanpipe.conf.xml freeswitch/trunk/conf/autoload_configs/woomera.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/woomera.conf.xml freeswitch/trunk/conf/autoload_configs/xml_cdr.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/xml_cdr.conf.xml freeswitch/trunk/conf/autoload_configs/xml_curl.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/xml_curl.conf.xml freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/xml_rpc.conf.xml freeswitch/trunk/conf/autoload_configs/zeroconf.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/zeroconf.conf.xml Removed: freeswitch/trunk/conf/alsa.conf.xml freeswitch/trunk/conf/cdr.conf.xml freeswitch/trunk/conf/conference.conf.xml freeswitch/trunk/conf/console.conf.xml freeswitch/trunk/conf/dialplan_directory.conf.xml freeswitch/trunk/conf/dingaling.conf.xml freeswitch/trunk/conf/enum.conf.xml freeswitch/trunk/conf/event_multicast.conf.xml freeswitch/trunk/conf/event_socket.conf.xml freeswitch/trunk/conf/iax.conf.xml freeswitch/trunk/conf/ivr.conf.xml freeswitch/trunk/conf/java.conf.xml freeswitch/trunk/conf/limit.conf.xml freeswitch/trunk/conf/local_stream.conf.xml freeswitch/trunk/conf/modules.conf.xml freeswitch/trunk/conf/openmrcp.conf.xml freeswitch/trunk/conf/portaudio.conf.xml freeswitch/trunk/conf/rss.conf.xml freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/conf/spidermonkey.conf.xml freeswitch/trunk/conf/switch.conf.xml freeswitch/trunk/conf/syslog.conf.xml freeswitch/trunk/conf/voicemail.conf.xml freeswitch/trunk/conf/wanpipe.conf.xml freeswitch/trunk/conf/woomera.conf.xml freeswitch/trunk/conf/xml_cdr.conf.xml freeswitch/trunk/conf/xml_curl.conf.xml freeswitch/trunk/conf/xml_rpc.conf.xml freeswitch/trunk/conf/zeroconf.conf.xml Modified: freeswitch/trunk/conf/freeswitch.xml Log: kaboom Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Sat Nov 17 16:13:12 2007 @@ -21,78 +21,7 @@ <X-PRE-PROCESS cmd="include" data="vars.xml"/> <section name="configuration" description="Various Configuration"> - <!-- drop in configs --> <X-PRE-PROCESS cmd="include" data="autoload_configs/*.xml"/> - - <X-PRE-PROCESS cmd="include" data="switch.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="modules.conf.xml"/> - - <!-- Order doesn't matter, but for clarity these are in same order as modules.conf.xml. - If they aren't loaded by modules.conf.xml, then they are ignored. - --> - <!-- Loggers --> - <X-PRE-PROCESS cmd="include" data="console.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="syslog.conf.xml"/> - - <!-- Multi-Faceted --> - <X-PRE-PROCESS cmd="include" data="enum.conf.xml"/> - - <!-- XML Interfaces --> - <X-PRE-PROCESS cmd="include" data="xml_rpc.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="xml_cdr.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="xml_curl.conf.xml"/> - <!-- none for mod_xml_cdr --> - - <!-- Event Handlers --> - <XX-PRE-PROCESS cmd="include" data="cdr.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="event_multicast.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="event_socket.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="zeroconf.conf.xml"/> - - <!-- Directory Interfaces --> - <!-- none for mod_ldap; dialplan_directory.conf.xml has ldap connection info --> - - <!-- Endpoints --> - <X-PRE-PROCESS cmd="include" data="dingaling.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="iax.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="portaudio.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="alsa.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="sofia.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="wanpipe.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="woomera.conf.xml"/> - - <!-- Applications --> - <!-- none for mod_bridgecall, mod_commands, mod_echo, mod_park, mod_playback --> - <X-PRE-PROCESS cmd="include" data="conference.conf.xml"/> - <!-- ivr.conf is used by mod_dptools --> - <X-PRE-PROCESS cmd="include" data="ivr.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="voicemail.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="limit.conf.xml"/> - - <!-- Dialplan Interfaces --> - <X-PRE-PROCESS cmd="include" data="dialplan_directory.conf.xml"/> - <!-- mod_dialplan_xml is configured in the separate "dialplan" section. --> - - <!-- Codec Interfaces --> - <!-- no configuration needed --> - <!-- File Format Interfaces --> - <!-- no configuration needed --> - <!-- Timers --> - <!-- no configuration needed --> - - <!-- Languages --> - <X-PRE-PROCESS cmd="include" data="spidermonkey.conf.xml"/> - <!-- none for mod_perl --> - <X-PRE-PROCESS cmd="include" data="java.conf.xml"/> - - <!-- ASR /TTS --> - <!-- none for mod_cepstral --> - <X-PRE-PROCESS cmd="include" data="rss.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="openmrcp.conf.xml"/> - - <!-- Say --> - <!-- none for mod_say_en --> - <X-PRE-PROCESS cmd="include" data="local_stream.conf.xml"/> </section> <section name="dialplan" description="Regex/XML Dialplan">