[svn-commits] kmoore: trunk r372796 - in /trunk: ./ channels/ include/asterisk/doxygen/ mai...

[SVN commits to the Digium repositories]

Author: kmoore
Date: Mon Sep 10 14:49:30 2012
New Revision: 372796

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=372796
Log:
Deprecate chan_gtalk, chan_jingle, and res_jabber

chan_gtalk, chan_jingle, and res_jabber are now deprecated in favor of
using chan_motif and res_xmpp. They are a feature-equivalent
replacement and are written to be more easily maintainable.

(closes issue ASTERISK-20298)
Review: https://reviewboard.asterisk.org/r/2082/
Reported-by: Leif Madsen
........

Merged revisions 372795 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/channels/chan_gtalk.c
    trunk/channels/chan_jingle.c
    trunk/include/asterisk/doxygen/architecture.h
    trunk/main/devicestate.c
    trunk/res/res_jabber.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=372796&r1=372795&r2=372796
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Mon Sep 10 14:49:30 2012
@@ -36,7 +36,8 @@
 	<depend>iksemel</depend>
 	<depend>res_jabber</depend>
 	<use type="external">openssl</use>
-	<support_level>extended</support_level>
+	<support_level>deprecated</support_level>
+	<replacement>chan_motif</replacement>
  ***/
 
 #include "asterisk.h"

Modified: trunk/channels/chan_jingle.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_jingle.c?view=diff&rev=372796&r1=372795&r2=372796
==============================================================================
--- trunk/channels/chan_jingle.c (original)
+++ trunk/channels/chan_jingle.c Mon Sep 10 14:49:30 2012
@@ -32,7 +32,8 @@
 	<depend>res_jabber</depend>
 	<use type="external">openssl</use>
 	<defaultenabled>no</defaultenabled>
-	<support_level>extended</support_level>
+	<support_level>deprecated</support_level>
+	<replacement>chan_motif</replacement>
  ***/
 
 #include "asterisk.h"

Modified: trunk/include/asterisk/doxygen/architecture.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/doxygen/architecture.h?view=diff&rev=372796&r1=372795&r2=372796
==============================================================================
--- trunk/include/asterisk/doxygen/architecture.h (original)
+++ trunk/include/asterisk/doxygen/architecture.h Mon Sep 10 14:49:30 2012
@@ -185,7 +185,7 @@
  - res_ael_share.c
  - res_crypto.c
  - res_curl.c
- - res_jabber.c
+ - res_xmpp.c
  - res_monitor.c
  - res_smdi.c
  - res_speech.c

Modified: trunk/main/devicestate.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/devicestate.c?view=diff&rev=372796&r1=372795&r2=372796
==============================================================================
--- trunk/main/devicestate.c (original)
+++ trunk/main/devicestate.c Mon Sep 10 14:49:30 2012
@@ -70,7 +70,7 @@
  *	The CLI command "show hints" show last known state
  *
  *	\note None of these handle user states, like an IM presence
- *	system. res_jabber.c can subscribe and watch such states
+ *	system. res_xmpp.c can subscribe and watch such states
  *	in jabber/xmpp based systems.
  *
  *	\section AstDevStateArch Architecture for devicestates

Modified: trunk/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_jabber.c?view=diff&rev=372796&r1=372795&r2=372796
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Mon Sep 10 14:49:30 2012
@@ -34,7 +34,8 @@
         <defaultenabled>no</defaultenabled>
 	<depend>iksemel</depend>
 	<use type="external">openssl</use>
-	<support_level>extended</support_level>
+	<support_level>deprecated</support_level>
+	<replacement>res_xmpp</replacement>
  ***/
 
 #include "asterisk.h"