Author: mjordan Date: Sat Sep 20 18:41:55 2014 New Revision: 423619 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423619 Log: rest-api/api-docs: Correct basePath in resources to match top resources file
The resources.json file that defines the resource JSON files used with ARI references a basePath of 'http://localhost:8088/ari'. This does not match what is defined in the resource files themselves, 'http://localhost:8088/stasis'. The correct base path is the one that includes 'ari' in the URL; this patch updates the various resource JSON files to have the correct basePath. ASTERISK-24339 #close Reported by: Bradley Watkins ........ Merged revisions 423617 from http://svn.asterisk.org/svn/asterisk/branches/12 ........ Merged revisions 423618 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/rest-api/api-docs/applications.json trunk/rest-api/api-docs/asterisk.json trunk/rest-api/api-docs/bridges.json trunk/rest-api/api-docs/channels.json trunk/rest-api/api-docs/deviceStates.json trunk/rest-api/api-docs/endpoints.json trunk/rest-api/api-docs/events.json trunk/rest-api/api-docs/mailboxes.json trunk/rest-api/api-docs/playbacks.json trunk/rest-api/api-docs/recordings.json trunk/rest-api/api-docs/sounds.json Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/rest-api/api-docs/applications.json URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/applications.json?view=diff&rev=423619&r1=423618&r2=423619 ============================================================================== --- trunk/rest-api/api-docs/applications.json (original) +++ trunk/rest-api/api-docs/applications.json Sat Sep 20 18:41:55 2014 @@ -4,7 +4,7 @@ "_svn_revision": "$Revision$", "apiVersion": "1.5.0", "swaggerVersion": "1.1", - "basePath": "http://localhost:8088/stasis";, + "basePath": "http://localhost:8088/ari";, "resourcePath": "/api-docs/applications.{format}", "apis": [ { Modified: trunk/rest-api/api-docs/asterisk.json URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/asterisk.json?view=diff&rev=423619&r1=423618&r2=423619 ============================================================================== --- trunk/rest-api/api-docs/asterisk.json (original) +++ trunk/rest-api/api-docs/asterisk.json Sat Sep 20 18:41:55 2014 @@ -4,7 +4,7 @@ "_svn_revision": "$Revision$", "apiVersion": "1.5.0", "swaggerVersion": "1.1", - "basePath": "http://localhost:8088/stasis";, + "basePath": "http://localhost:8088/ari";, "resourcePath": "/api-docs/asterisk.{format}", "apis": [ { Modified: trunk/rest-api/api-docs/bridges.json URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/bridges.json?view=diff&rev=423619&r1=423618&r2=423619 ============================================================================== --- trunk/rest-api/api-docs/bridges.json (original) +++ trunk/rest-api/api-docs/bridges.json Sat Sep 20 18:41:55 2014 @@ -4,7 +4,7 @@ "_svn_revision": "$Revision$", "apiVersion": "1.5.0", "swaggerVersion": "1.1", - "basePath": "http://localhost:8088/stasis";, + "basePath": "http://localhost:8088/ari";, "resourcePath": "/api-docs/bridges.{format}", "apis": [ { Modified: trunk/rest-api/api-docs/channels.json URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/channels.json?view=diff&rev=423619&r1=423618&r2=423619 ============================================================================== --- trunk/rest-api/api-docs/channels.json (original) +++ trunk/rest-api/api-docs/channels.json Sat Sep 20 18:41:55 2014 @@ -4,7 +4,7 @@ "_svn_revision": "$Revision$", "apiVersion": "1.5.0", "swaggerVersion": "1.1", - "basePath": "http://localhost:8088/stasis";, + "basePath": "http://localhost:8088/ari";, "resourcePath": "/api-docs/channels.{format}", "apis": [ { Modified: trunk/rest-api/api-docs/deviceStates.json URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/deviceStates.json?view=diff&rev=423619&r1=423618&r2=423619 ============================================================================== --- trunk/rest-api/api-docs/deviceStates.json (original) +++ trunk/rest-api/api-docs/deviceStates.json Sat Sep 20 18:41:55 2014 @@ -4,7 +4,7 @@ "_svn_revision": "$Revision$", "apiVersion": "1.5.0", "swaggerVersion": "1.1", - "basePath": "http://localhost:8088/stasis";, + "basePath": "http://localhost:8088/ari";, "resourcePath": "/api-docs/deviceStates.{format}", "apis": [ { Modified: trunk/rest-api/api-docs/endpoints.json URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/endpoints.json?view=diff&rev=423619&r1=423618&r2=423619 ============================================================================== --- trunk/rest-api/api-docs/endpoints.json (original) +++ trunk/rest-api/api-docs/endpoints.json Sat Sep 20 18:41:55 2014 @@ -4,7 +4,7 @@ "_svn_revision": "$Revision$", "apiVersion": "1.5.0", "swaggerVersion": "1.1", - "basePath": "http://localhost:8088/stasis";, + "basePath": "http://localhost:8088/ari";, "resourcePath": "/api-docs/endpoints.{format}", "apis": [ { Modified: trunk/rest-api/api-docs/events.json URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/events.json?view=diff&rev=423619&r1=423618&r2=423619 ============================================================================== --- trunk/rest-api/api-docs/events.json (original) +++ trunk/rest-api/api-docs/events.json Sat Sep 20 18:41:55 2014 @@ -4,7 +4,7 @@ "_svn_revision": "$Revision$", "apiVersion": "1.5.0", "swaggerVersion": "1.2", - "basePath": "http://localhost:8088/stasis";, + "basePath": "http://localhost:8088/ari";, "resourcePath": "/api-docs/events.{format}", "apis": [ { Modified: trunk/rest-api/api-docs/mailboxes.json URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/mailboxes.json?view=diff&rev=423619&r1=423618&r2=423619 ============================================================================== --- trunk/rest-api/api-docs/mailboxes.json (original) +++ trunk/rest-api/api-docs/mailboxes.json Sat Sep 20 18:41:55 2014 @@ -4,7 +4,7 @@ "_svn_revision": "$Revision$", "apiVersion": "1.5.0", "swaggerVersion": "1.1", - "basePath": "http://localhost:8088/stasis";, + "basePath": "http://localhost:8088/ari";, "resourcePath": "/api-docs/mailboxes.{format}", "apis": [ { Modified: trunk/rest-api/api-docs/playbacks.json URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/playbacks.json?view=diff&rev=423619&r1=423618&r2=423619 ============================================================================== --- trunk/rest-api/api-docs/playbacks.json (original) +++ trunk/rest-api/api-docs/playbacks.json Sat Sep 20 18:41:55 2014 @@ -4,7 +4,7 @@ "_svn_revision": "$Revision$", "apiVersion": "1.5.0", "swaggerVersion": "1.1", - "basePath": "http://localhost:8088/stasis";, + "basePath": "http://localhost:8088/ari";, "resourcePath": "/api-docs/playbacks.{format}", "apis": [ { Modified: trunk/rest-api/api-docs/recordings.json URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/recordings.json?view=diff&rev=423619&r1=423618&r2=423619 ============================================================================== --- trunk/rest-api/api-docs/recordings.json (original) +++ trunk/rest-api/api-docs/recordings.json Sat Sep 20 18:41:55 2014 @@ -4,7 +4,7 @@ "_svn_revision": "$Revision$", "apiVersion": "1.5.0", "swaggerVersion": "1.1", - "basePath": "http://localhost:8088/stasis";, + "basePath": "http://localhost:8088/ari";, "resourcePath": "/api-docs/recordings.{format}", "apis": [ { Modified: trunk/rest-api/api-docs/sounds.json URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/sounds.json?view=diff&rev=423619&r1=423618&r2=423619 ============================================================================== --- trunk/rest-api/api-docs/sounds.json (original) +++ trunk/rest-api/api-docs/sounds.json Sat Sep 20 18:41:55 2014 @@ -4,7 +4,7 @@ "_svn_revision": "$Revision$", "apiVersion": "1.5.0", "swaggerVersion": "1.1", - "basePath": "http://localhost:8088/stasis";, + "basePath": "http://localhost:8088/ari";, "resourcePath": "/api-docs/sounds.{format}", "apis": [ { -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
