[asterisk-commits] dlee: branch dlee/stasis-http r379110 - in /team/dlee/stasis-http: cog/ rest-...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Jan 15 08:51:40 CST 2013
Author: dlee
Date: Tue Jan 15 08:51:36 2013
New Revision: 379110
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=379110
Log:
Updated copyright and revision in .json API's
Modified:
team/dlee/stasis-http/cog/stasis_cog.py
team/dlee/stasis-http/rest-api/asterisk.json
team/dlee/stasis-http/rest-api/bridges.json
team/dlee/stasis-http/rest-api/channels.json
team/dlee/stasis-http/rest-api/endpoints.json
team/dlee/stasis-http/rest-api/recordings.json
team/dlee/stasis-http/rest-api/resources.json
Modified: team/dlee/stasis-http/cog/stasis_cog.py
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/cog/stasis_cog.py?view=diff&rev=379110&r1=379109&r2=379110
==============================================================================
--- team/dlee/stasis-http/cog/stasis_cog.py (original)
+++ team/dlee/stasis-http/cog/stasis_cog.py Tue Jan 15 08:51:36 2013
@@ -229,8 +229,8 @@
with open(resources_file) as fp:
resources = json.load(fp)
- self.author = self.author or resources.get('author')
- self.copyright = self.copyright or resources.get('copyright')
+ self.author = self.author or resources.get('_author')
+ self.copyright = self.copyright or resources.get('_copyright')
for api in resources['apis']:
# Path in json is URI relative, so we need to drop the initial /api/
@@ -246,8 +246,8 @@
with open(api_declaration_file) as fp:
resource = json.load(fp)
- self.author = self.author or resource.get('author')
- self.copyright = self.copyright or resource.get('copyright')
+ self.author = self.author or resource.get('_author')
+ self.copyright = self.copyright or resource.get('_copyright')
for api in resource['apis']:
resource_path = api['path'].split('/')
Modified: team/dlee/stasis-http/rest-api/asterisk.json
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/rest-api/asterisk.json?view=diff&rev=379110&r1=379109&r2=379110
==============================================================================
--- team/dlee/stasis-http/rest-api/asterisk.json (original)
+++ team/dlee/stasis-http/rest-api/asterisk.json Tue Jan 15 08:51:36 2013
@@ -1,6 +1,7 @@
{
- "copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
- "author": "David M. Lee, II <dlee at digium.com>",
+ "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
+ "_author": "David M. Lee, II <dlee at digium.com>",
+ "_svn_revision": "$Revision$",
"apiVersion": "0.0.1",
"swaggerVersion": "1.1",
"resourcePath": "/asterisk",
Modified: team/dlee/stasis-http/rest-api/bridges.json
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/rest-api/bridges.json?view=diff&rev=379110&r1=379109&r2=379110
==============================================================================
--- team/dlee/stasis-http/rest-api/bridges.json (original)
+++ team/dlee/stasis-http/rest-api/bridges.json Tue Jan 15 08:51:36 2013
@@ -1,6 +1,7 @@
{
- "copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
- "author": "David M. Lee, II <dlee at digium.com>",
+ "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
+ "_author": "David M. Lee, II <dlee at digium.com>",
+ "_svn_revision": "$Revision$",
"apiVersion": "0.0.1",
"swaggerVersion": "1.1",
"resourcePath": "/bridges.json",
Modified: team/dlee/stasis-http/rest-api/channels.json
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/rest-api/channels.json?view=diff&rev=379110&r1=379109&r2=379110
==============================================================================
--- team/dlee/stasis-http/rest-api/channels.json (original)
+++ team/dlee/stasis-http/rest-api/channels.json Tue Jan 15 08:51:36 2013
@@ -1,6 +1,7 @@
{
- "copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
- "author": "David M. Lee, II <dlee at digium.com>",
+ "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
+ "_author": "David M. Lee, II <dlee at digium.com>",
+ "_svn_revision": "$Revision$",
"apiVersion": "0.0.1",
"swaggerVersion": "1.1",
"resourcePath": "/channels",
Modified: team/dlee/stasis-http/rest-api/endpoints.json
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/rest-api/endpoints.json?view=diff&rev=379110&r1=379109&r2=379110
==============================================================================
--- team/dlee/stasis-http/rest-api/endpoints.json (original)
+++ team/dlee/stasis-http/rest-api/endpoints.json Tue Jan 15 08:51:36 2013
@@ -1,6 +1,7 @@
{
- "copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
- "author": "David M. Lee, II <dlee at digium.com>",
+ "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
+ "_author": "David M. Lee, II <dlee at digium.com>",
+ "_svn_revision": "$Revision$",
"apiVersion": "0.0.1",
"swaggerVersion": "1.1",
"resourcePath": "/endpoints",
Modified: team/dlee/stasis-http/rest-api/recordings.json
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/rest-api/recordings.json?view=diff&rev=379110&r1=379109&r2=379110
==============================================================================
--- team/dlee/stasis-http/rest-api/recordings.json (original)
+++ team/dlee/stasis-http/rest-api/recordings.json Tue Jan 15 08:51:36 2013
@@ -1,6 +1,7 @@
{
- "copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
- "author": "David M. Lee, II <dlee at digium.com>",
+ "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
+ "_author": "David M. Lee, II <dlee at digium.com>",
+ "_svn_revision": "$Revision$",
"apiVersion": "0.0.1",
"swaggerVersion": "1.1",
"resourcePath": "/recordings",
Modified: team/dlee/stasis-http/rest-api/resources.json
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/rest-api/resources.json?view=diff&rev=379110&r1=379109&r2=379110
==============================================================================
--- team/dlee/stasis-http/rest-api/resources.json (original)
+++ team/dlee/stasis-http/rest-api/resources.json Tue Jan 15 08:51:36 2013
@@ -1,7 +1,7 @@
{
- "copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
- "author": "David M. Lee, II <dlee at digium.com>",
- "_revision": ""$Revision$"
+ "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
+ "_author": "David M. Lee, II <dlee at digium.com>",
+ "_svn_revision": "$Revision$",
"apiVersion": "0.0.1",
"swaggerVersion": "1.1",
"basePath": "http://localhost:8088/stasis",
More information about the asterisk-commits
mailing list