[asterisk-commits] kmoore: branch kmoore/stasis-bridging-channel_events r388297 - in /team/kmoor...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Fri May 10 08:40:25 2013
New Revision: 388297

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388297
Log:
Multiple revisions 388276,388294

........
  r388276 | kmoore | 2013-05-10 08:16:22 -0500 (Fri, 10 May 2013) | 21 lines
  
  Add channel events for res_stasis apps
  
  This change adds a framework in res_stasis for handling events from
  channel topics. JSON event generation and validation code is created
  from event documentation in rest-api/api-docs/events.json to assist in
  JSON event generation, ensure consistency, and ensure that accurate
  documentation is available for ALL events that are received by
  res_stasis applications.
  
  The userevent application has been refactored along with the code that
  handles userevent channel blob events to pass the headers as key/value
  pairs in the JSON blob. As a side-effect, app_userevent now handles
  duplicate keys by overwriting the previous value.
  
  Review: https://reviewboard.asterisk.org/r/2428/
  (closes issue ASTERISK-21180)
  Patch-By: Kinsey Moore <kmoore at digium.com>
  ........
  
  Merged revisions 388275 from http://svn.asterisk.org/svn/asterisk/trunk
........
  r388294 | kmoore | 2013-05-10 08:23:36 -0500 (Fri, 10 May 2013) | 2 lines
  
  Add the bridging-specific portion of the res_stasis channel events merge
........

Merged revisions 388276,388294 from http://svn.asterisk.org/svn/asterisk/team/group/bridge_construction

Modified:
    team/kmoore/stasis-bridging-channel_events/   (props changed)
    team/kmoore/stasis-bridging-channel_events/res/stasis_http/resource_endpoints.h

Propchange: team/kmoore/stasis-bridging-channel_events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 10 08:40:25 2013
@@ -1,1 +1,1 @@
-/team/group/bridge_construction:1-388273
+/team/group/bridge_construction:1-388296

Modified: team/kmoore/stasis-bridging-channel_events/res/stasis_http/resource_endpoints.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridging-channel_events/res/stasis_http/resource_endpoints.h?view=diff&rev=388297&r1=388296&r2=388297
==============================================================================
--- team/kmoore/stasis-bridging-channel_events/res/stasis_http/resource_endpoints.h (original)
+++ team/kmoore/stasis-bridging-channel_events/res/stasis_http/resource_endpoints.h Fri May 10 08:40:25 2013
@@ -83,8 +83,8 @@
  * JSON models
  *
  * Endpoint
+ * - resource: string (required)
  * - technology: string (required)
- * - name: string (required)
  */
 
 #endif /* _ASTERISK_RESOURCE_ENDPOINTS_H */