[svn-commits] kharwell: trunk r402562 - in /trunk: ./ res/ res/ari/ rest-api/ rest-api/api-...

[SVN commits to the Digium repositories]

Author: kharwell
Date: Fri Nov  8 11:59:16 2013
New Revision: 402562

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402562
Log:
ARI playback: Rename ARI Playback to Playbacks

Before playback was the only non plural resource.  It has been renamed to
playbacks for consistency.

(closes issue ASTERISK-22737)
Reported by: Paul Belanger
........

Merged revisions 402560 from http://svn.asterisk.org/svn/asterisk/branches/12

Added:
    trunk/res/ari/resource_playbacks.c
      - copied unchanged from r402560, branches/12/res/ari/resource_playbacks.c
    trunk/res/ari/resource_playbacks.h
      - copied unchanged from r402560, branches/12/res/ari/resource_playbacks.h
    trunk/res/res_ari_playbacks.c
      - copied unchanged from r402560, branches/12/res/res_ari_playbacks.c
    trunk/rest-api/api-docs/playbacks.json
      - copied unchanged from r402560, branches/12/rest-api/api-docs/playbacks.json
Removed:
    trunk/res/ari/resource_playback.c
    trunk/res/ari/resource_playback.h
    trunk/res/res_ari_playback.c
    trunk/rest-api/api-docs/playback.json
Modified:
    trunk/   (props changed)
    trunk/res/ari.make
    trunk/rest-api/resources.json

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Fri Nov  8 11:59:16 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-402555
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-402555,402560

Modified: trunk/res/ari.make
URL: http://svnview.digium.com/svn/asterisk/trunk/res/ari.make?view=diff&rev=402562&r1=402561&r2=402562
==============================================================================
--- trunk/res/ari.make (original)
+++ trunk/res/ari.make Fri Nov  8 11:59:16 2013
@@ -41,9 +41,9 @@
 
 ari/resource_sounds.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_sounds)
 
-res_ari_playback.so: ari/resource_playback.o
+res_ari_playbacks.so: ari/resource_playbacks.o
 
-ari/resource_playback.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_playback)
+ari/resource_playbacks.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_playbacks)
 
 res_ari_events.so: ari/resource_events.o
 

Modified: trunk/rest-api/resources.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/resources.json?view=diff&rev=402562&r1=402561&r2=402562
==============================================================================
--- trunk/rest-api/resources.json (original)
+++ trunk/rest-api/resources.json Fri Nov  8 11:59:16 2013
@@ -31,7 +31,7 @@
 			"description": "Sound resources"
 		},
 		{
-			"path": "/api-docs/playback.{format}",
+			"path": "/api-docs/playbacks.{format}",
 			"description": "Playback control resources"
 		},
 		{