break out jingle profiles

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6694 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/conf/autoload_configs/dingaling.conf.xml b/conf/autoload_configs/dingaling.conf.xml
index 6b155bbfbf59d8e5bfe382ba82e20fe0378a5f8b..e68c8b4b44547e990d868ce7c67e616fdeb3c854 100644 (file)
--- a/conf/autoload_configs/dingaling.conf.xml
+++ b/conf/autoload_configs/dingaling.conf.xml
@@ -4,53 +4,6 @@
     <param name="codec-prefs" value="PCMU"/>
   </settings>
 
-  <!-- *NOTE* change <x-profile></x-profile> to <profile></profile> to enable -->
-
-  <!-- Client Profile (Original mode) -->
-  <x-profile type="client">
-    <param name="name" value="$${xmpp_client_profile}"/>
-    <param name="login" value="myjid@myserver.com/talk"/>
-    <param name="password" value="mypass"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="public"/>
-    <param name="message" value="Jingle all the way"/>
-    <param name="rtp-ip" value="$${bind_server_ip}"/>
-    <!-- <param name="ext-rtp-ip" value="$${external_rtp_ip"/> -->
-    <param name="auto-login" value="true"/>
-    <!-- SASL "plain" or "md5" -->
-    <param name="sasl" value="plain"/>
-    <!-- if the server where the jabber is hosted is not the same as the one in the jid -->
-    <!--<param name="server" value="alternate.server.com"/>-->
-    <!-- Enable TLS or not -->
-    <param name="tls" value="true"/>
-    <!-- disable to trade async for more calls -->
-    <param name="use-rtp-timer" value="true"/>
-    <!-- default extension (if one cannot be determined) -->
-    <param name="exten" value="888"/>
-    <!-- VAD choose one -->
-    <!-- <param name="vad" value="in"/> -->
-    <!-- <param name="vad" value="out"/> -->
-    <param name="vad" value="both"/>
-    <!--<param name="avatar" value="/path/to/tiny.jpg"/>-->
-  </x-profile>
-
-  <!-- Component (Server to Server Login) -->
-  <x-profile type="component">
-    <param name="name" value="$${xmpp_server_profile}"/>
-    <param name="password" value="secret"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="public"/>
-    <param name="rtp-ip" value="$${bind_server_ip}"/>
-    <param name="server" value="jabber.server.org:5347"/>
-    <!-- disable to trade async for more calls -->
-    <param name="use-rtp-timer" value="true"/>
-    <!-- "_auto_" means the extension will be automaticly set to the called jid -->
-    <param name="exten" value="_auto_"/>
-    <!--<param name="vad" value="both"/>-->
-    <!--<param name="avatar" value="/path/to/tiny.jpg"/>-->
-    <!--If you have ODBC support and a working dsn you can use it instead of SQLite-->
-    <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
-
-  </x-profile>
+  <X-PRE-PROCESS cmd="include" data="../jingle_profiles/*.xml"/>
 
 </configuration>

diff --git a/conf/jingle_profiles/client.noload b/conf/jingle_profiles/client.noload
new file mode 100644 (file)
index 0000000..800d9d2
--- /dev/null
+++ b/conf/jingle_profiles/client.noload
@@ -0,0 +1,29 @@
+<include>
+  <!-- Client Profile (Original mode) -->
+  <profile type="client">
+    <param name="name" value="%JABBERCLIENTNAME%"/>
+    <param name="login" value="%JABBERLOGIN%/%JABBERRESOURCE%"/>
+    <param name="password" value="%JABBERPASSWORD%"/>
+    <param name="dialplan" value="XML"/>
+    <param name="context" value="public"/>
+    <param name="message" value="Jingle all the way"/>
+    <param name="rtp-ip" value="$${bind_server_ip}"/>
+    <!-- <param name="ext-rtp-ip" value="$${external_rtp_ip"/> -->
+    <param name="auto-login" value="true"/>
+    <!-- SASL "plain" or "md5" -->
+    <param name="sasl" value="plain"/>
+    <!-- if the server where the jabber is hosted is not the same as the one in the jid -->
+    <!--<param name="server" value="alternate.server.com"/>-->
+    <!-- Enable TLS or not -->
+    <param name="tls" value="true"/>
+    <!-- disable to trade async for more calls -->
+    <param name="use-rtp-timer" value="true"/>
+    <!-- default extension (if one cannot be determined) -->
+    <param name="exten" value="888"/>
+    <!-- VAD choose one -->
+    <!-- <param name="vad" value="in"/> -->
+    <!-- <param name="vad" value="out"/> -->
+    <param name="vad" value="both"/>
+    <!--<param name="avatar" value="%JABBERAVATAR%"/>-->
+  </profile>
+</include>

diff --git a/conf/jingle_profiles/client.xml b/conf/jingle_profiles/client.xml
new file mode 100644 (file)
index 0000000..66a7bed
--- /dev/null
+++ b/conf/jingle_profiles/client.xml
@@ -0,0 +1,29 @@
+<include>
+  <!-- Client Profile (Original mode) -->
+  <x-profile type="client">
+    <param name="name" value="$${xmpp_client_profile}"/>
+    <param name="login" value="myjid@myserver.com/talk"/>
+    <param name="password" value="mypass"/>
+    <param name="dialplan" value="XML"/>
+    <param name="context" value="public"/>
+    <param name="message" value="Jingle all the way"/>
+    <param name="rtp-ip" value="$${bind_server_ip}"/>
+    <!-- <param name="ext-rtp-ip" value="$${external_rtp_ip"/> -->
+    <param name="auto-login" value="true"/>
+    <!-- SASL "plain" or "md5" -->
+    <param name="sasl" value="plain"/>
+    <!-- if the server where the jabber is hosted is not the same as the one in the jid -->
+    <!--<param name="server" value="alternate.server.com"/>-->
+    <!-- Enable TLS or not -->
+    <param name="tls" value="true"/>
+    <!-- disable to trade async for more calls -->
+    <param name="use-rtp-timer" value="true"/>
+    <!-- default extension (if one cannot be determined) -->
+    <param name="exten" value="888"/>
+    <!-- VAD choose one -->
+    <!-- <param name="vad" value="in"/> -->
+    <!-- <param name="vad" value="out"/> -->
+    <param name="vad" value="both"/>
+    <!--<param name="avatar" value="/path/to/tiny.jpg"/>-->
+  </x-profile>
+</include>

diff --git a/conf/jingle_profiles/server.noload b/conf/jingle_profiles/server.noload
new file mode 100644 (file)
index 0000000..4e9e496
--- /dev/null
+++ b/conf/jingle_profiles/server.noload
@@ -0,0 +1,19 @@
+<include>
+  <!-- Component (Server to Server Login) -->
+  <profile type="component">
+    <param name="name" value="%JABBERPROFILENAME%"/>
+    <param name="password" value="secret"/>
+    <param name="dialplan" value="XML"/>
+    <param name="context" value="public"/>
+    <param name="rtp-ip" value="$${bind_server_ip}"/>
+    <param name="server" value="%JABBERSERVER%:%JABBERPORT%"/>
+    <!-- disable to trade async for more calls -->
+    <param name="use-rtp-timer" value="true"/>
+    <!-- "_auto_" means the extension will be automaticly set to the called jid -->
+    <param name="exten" value="_auto_"/>
+    <!--<param name="vad" value="both"/>-->
+    <!--<param name="avatar" value="%JABBERAVATAR%%"/>-->
+    <!--If you have ODBC support and a working dsn you can use it instead of SQLite-->
+    <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
+  </profile>
+</include>

diff --git a/conf/jingle_profiles/server.xml b/conf/jingle_profiles/server.xml
new file mode 100644 (file)
index 0000000..f370385
--- /dev/null
+++ b/conf/jingle_profiles/server.xml
@@ -0,0 +1,19 @@
+<include>
+  <!-- Component (Server to Server Login) -->
+  <x-profile type="component">
+    <param name="name" value="$${xmpp_server_profile}"/>
+    <param name="password" value="secret"/>
+    <param name="dialplan" value="XML"/>
+    <param name="context" value="public"/>
+    <param name="rtp-ip" value="$${bind_server_ip}"/>
+    <param name="server" value="jabber.server.org:5347"/>
+    <!-- disable to trade async for more calls -->
+    <param name="use-rtp-timer" value="true"/>
+    <!-- "_auto_" means the extension will be automaticly set to the called jid -->
+    <param name="exten" value="_auto_"/>
+    <!--<param name="vad" value="both"/>-->
+    <!--<param name="avatar" value="/path/to/tiny.jpg"/>-->
+    <!--If you have ODBC support and a working dsn you can use it instead of SQLite-->
+    <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
+  </x-profile>
+</include>