[asterisk-commits] dlee: branch dlee/ari-event-remodel2 r393466 - in /team/dlee/ari-event-remode...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Jul 2 13:37:15 CDT 2013
Author: dlee
Date: Tue Jul 2 13:37:09 2013
New Revision: 393466
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=393466
Log:
s/ari_model/ari_model_validators/
Added:
team/dlee/ari-event-remodel2/res/stasis_http/ari_model_validators.c
- copied, changed from r393454, team/dlee/ari-event-remodel2/res/stasis_http/ari_model.c
team/dlee/ari-event-remodel2/res/stasis_http/ari_model_validators.h
- copied, changed from r393454, team/dlee/ari-event-remodel2/res/stasis_http/ari_model.h
team/dlee/ari-event-remodel2/rest-api-templates/ari_model_validators.c.mustache
- copied, changed from r393454, team/dlee/ari-event-remodel2/rest-api-templates/ari_model.c.mustache
team/dlee/ari-event-remodel2/rest-api-templates/ari_model_validators.h.mustache
- copied, changed from r393454, team/dlee/ari-event-remodel2/rest-api-templates/ari_model.h.mustache
Removed:
team/dlee/ari-event-remodel2/res/stasis_http/ari_model.c
team/dlee/ari-event-remodel2/res/stasis_http/ari_model.h
team/dlee/ari-event-remodel2/rest-api-templates/ari_model.c.mustache
team/dlee/ari-event-remodel2/rest-api-templates/ari_model.h.mustache
Modified:
team/dlee/ari-event-remodel2/res/Makefile
team/dlee/ari-event-remodel2/res/res_ari_model.c
team/dlee/ari-event-remodel2/res/res_stasis_http_asterisk.c
team/dlee/ari-event-remodel2/res/res_stasis_http_bridges.c
team/dlee/ari-event-remodel2/res/res_stasis_http_channels.c
team/dlee/ari-event-remodel2/res/res_stasis_http_endpoints.c
team/dlee/ari-event-remodel2/res/res_stasis_http_events.c
team/dlee/ari-event-remodel2/res/res_stasis_http_playback.c
team/dlee/ari-event-remodel2/res/res_stasis_http_recordings.c
team/dlee/ari-event-remodel2/res/res_stasis_http_sounds.c
team/dlee/ari-event-remodel2/rest-api-templates/make_ari_stubs.py
team/dlee/ari-event-remodel2/rest-api-templates/res_stasis_http_resource.c.mustache
team/dlee/ari-event-remodel2/tests/test_ari_model.c
Modified: team/dlee/ari-event-remodel2/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/res/Makefile?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/res/Makefile (original)
+++ team/dlee/ari-event-remodel2/res/Makefile Tue Jul 2 13:37:09 2013
@@ -83,8 +83,8 @@
res_stasis_http.so: stasis_http/ari_websockets.o
stasis_http/ari_websockets.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_stasis_http_asterisk)
-res_ari_model.so: stasis_http/ari_model.o
-stasis_http/ari_model.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_model)
+res_ari_model.so: stasis_http/ari_model_validators.o
+stasis_http/ari_model_validators.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_ari_model)
# Dependencies for res_stasis_http_*.so are generated, so they're in this file
include stasis_http.make
Modified: team/dlee/ari-event-remodel2/res/res_ari_model.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/res/res_ari_model.c?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/res/res_ari_model.c (original)
+++ team/dlee/ari-event-remodel2/res/res_ari_model.c Tue Jul 2 13:37:09 2013
@@ -31,7 +31,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "stasis_http/ari_model.h"
+#include "stasis_http/ari_model_validators.h"
#include "asterisk/logger.h"
#include "asterisk/module.h"
#include "asterisk/utils.h"
Modified: team/dlee/ari-event-remodel2/res/res_stasis_http_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/res/res_stasis_http_asterisk.c?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/res/res_stasis_http_asterisk.c (original)
+++ team/dlee/ari-event-remodel2/res/res_stasis_http_asterisk.c Tue Jul 2 13:37:09 2013
@@ -45,7 +45,7 @@
#include "asterisk/stasis_app.h"
#include "stasis_http/resource_asterisk.h"
#if defined(AST_DEVMODE)
-#include "stasis_http/ari_model.h"
+#include "stasis_http/ari_model_validators.h"
#endif
/*!
Modified: team/dlee/ari-event-remodel2/res/res_stasis_http_bridges.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/res/res_stasis_http_bridges.c?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/res/res_stasis_http_bridges.c (original)
+++ team/dlee/ari-event-remodel2/res/res_stasis_http_bridges.c Tue Jul 2 13:37:09 2013
@@ -45,7 +45,7 @@
#include "asterisk/stasis_app.h"
#include "stasis_http/resource_bridges.h"
#if defined(AST_DEVMODE)
-#include "stasis_http/ari_model.h"
+#include "stasis_http/ari_model_validators.h"
#endif
/*!
Modified: team/dlee/ari-event-remodel2/res/res_stasis_http_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/res/res_stasis_http_channels.c?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/res/res_stasis_http_channels.c (original)
+++ team/dlee/ari-event-remodel2/res/res_stasis_http_channels.c Tue Jul 2 13:37:09 2013
@@ -45,7 +45,7 @@
#include "asterisk/stasis_app.h"
#include "stasis_http/resource_channels.h"
#if defined(AST_DEVMODE)
-#include "stasis_http/ari_model.h"
+#include "stasis_http/ari_model_validators.h"
#endif
/*!
Modified: team/dlee/ari-event-remodel2/res/res_stasis_http_endpoints.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/res/res_stasis_http_endpoints.c?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/res/res_stasis_http_endpoints.c (original)
+++ team/dlee/ari-event-remodel2/res/res_stasis_http_endpoints.c Tue Jul 2 13:37:09 2013
@@ -45,7 +45,7 @@
#include "asterisk/stasis_app.h"
#include "stasis_http/resource_endpoints.h"
#if defined(AST_DEVMODE)
-#include "stasis_http/ari_model.h"
+#include "stasis_http/ari_model_validators.h"
#endif
/*!
Modified: team/dlee/ari-event-remodel2/res/res_stasis_http_events.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/res/res_stasis_http_events.c?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/res/res_stasis_http_events.c (original)
+++ team/dlee/ari-event-remodel2/res/res_stasis_http_events.c Tue Jul 2 13:37:09 2013
@@ -45,7 +45,7 @@
#include "asterisk/stasis_app.h"
#include "stasis_http/resource_events.h"
#if defined(AST_DEVMODE)
-#include "stasis_http/ari_model.h"
+#include "stasis_http/ari_model_validators.h"
#endif
static void stasis_http_event_websocket_ws_cb(struct ast_websocket *ws_session,
Modified: team/dlee/ari-event-remodel2/res/res_stasis_http_playback.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/res/res_stasis_http_playback.c?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/res/res_stasis_http_playback.c (original)
+++ team/dlee/ari-event-remodel2/res/res_stasis_http_playback.c Tue Jul 2 13:37:09 2013
@@ -45,7 +45,7 @@
#include "asterisk/stasis_app.h"
#include "stasis_http/resource_playback.h"
#if defined(AST_DEVMODE)
-#include "stasis_http/ari_model.h"
+#include "stasis_http/ari_model_validators.h"
#endif
/*!
Modified: team/dlee/ari-event-remodel2/res/res_stasis_http_recordings.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/res/res_stasis_http_recordings.c?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/res/res_stasis_http_recordings.c (original)
+++ team/dlee/ari-event-remodel2/res/res_stasis_http_recordings.c Tue Jul 2 13:37:09 2013
@@ -45,7 +45,7 @@
#include "asterisk/stasis_app.h"
#include "stasis_http/resource_recordings.h"
#if defined(AST_DEVMODE)
-#include "stasis_http/ari_model.h"
+#include "stasis_http/ari_model_validators.h"
#endif
/*!
Modified: team/dlee/ari-event-remodel2/res/res_stasis_http_sounds.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/res/res_stasis_http_sounds.c?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/res/res_stasis_http_sounds.c (original)
+++ team/dlee/ari-event-remodel2/res/res_stasis_http_sounds.c Tue Jul 2 13:37:09 2013
@@ -45,7 +45,7 @@
#include "asterisk/stasis_app.h"
#include "stasis_http/resource_sounds.h"
#if defined(AST_DEVMODE)
-#include "stasis_http/ari_model.h"
+#include "stasis_http/ari_model_validators.h"
#endif
/*!
Copied: team/dlee/ari-event-remodel2/res/stasis_http/ari_model_validators.c (from r393454, team/dlee/ari-event-remodel2/res/stasis_http/ari_model.c)
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/res/stasis_http/ari_model_validators.c?view=diff&rev=393466&p1=team/dlee/ari-event-remodel2/res/stasis_http/ari_model.c&r1=393454&p2=team/dlee/ari-event-remodel2/res/stasis_http/ari_model_validators.c&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/res/stasis_http/ari_model.c (original)
+++ team/dlee/ari-event-remodel2/res/stasis_http/ari_model_validators.c Tue Jul 2 13:37:09 2013
@@ -24,7 +24,7 @@
* !!!!! DO NOT EDIT !!!!!
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* This file is generated by a mustache template. Please see the original
- * template in rest-api-templates/ari_model.h.mustache
+ * template in rest-api-templates/ari_model_validators.h.mustache
*/
#include "asterisk.h"
@@ -33,7 +33,7 @@
#include "asterisk/logger.h"
#include "asterisk/module.h"
-#include "ari_model.h"
+#include "ari_model_validators.h"
int ari_validate_asterisk_info(struct ast_json *json)
{
Copied: team/dlee/ari-event-remodel2/res/stasis_http/ari_model_validators.h (from r393454, team/dlee/ari-event-remodel2/res/stasis_http/ari_model.h)
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/res/stasis_http/ari_model_validators.h?view=diff&rev=393466&p1=team/dlee/ari-event-remodel2/res/stasis_http/ari_model.h&r1=393454&p2=team/dlee/ari-event-remodel2/res/stasis_http/ari_model_validators.h&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/res/stasis_http/ari_model.h (original)
+++ team/dlee/ari-event-remodel2/res/stasis_http/ari_model_validators.h Tue Jul 2 13:37:09 2013
@@ -24,7 +24,7 @@
* !!!!! DO NOT EDIT !!!!!
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* This file is generated by a mustache template. Please see the original
- * template in rest-api-templates/ari_model.h.mustache
+ * template in rest-api-templates/ari_model_validators.h.mustache
*/
#ifndef _ASTERISK_ARI_MODEL_H
Copied: team/dlee/ari-event-remodel2/rest-api-templates/ari_model_validators.c.mustache (from r393454, team/dlee/ari-event-remodel2/rest-api-templates/ari_model.c.mustache)
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/rest-api-templates/ari_model_validators.c.mustache?view=diff&rev=393466&p1=team/dlee/ari-event-remodel2/rest-api-templates/ari_model.c.mustache&r1=393454&p2=team/dlee/ari-event-remodel2/rest-api-templates/ari_model_validators.c.mustache&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/rest-api-templates/ari_model.c.mustache (original)
+++ team/dlee/ari-event-remodel2/rest-api-templates/ari_model_validators.c.mustache Tue Jul 2 13:37:09 2013
@@ -22,7 +22,7 @@
/*
{{> do-not-edit}}
* This file is generated by a mustache template. Please see the original
- * template in rest-api-templates/ari_model.h.mustache
+ * template in rest-api-templates/ari_model_validators.h.mustache
*/
#include "asterisk.h"
@@ -31,7 +31,7 @@
#include "asterisk/logger.h"
#include "asterisk/module.h"
-#include "ari_model.h"
+#include "ari_model_validators.h"
{{#apis}}
{{#api_declaration}}
{{#models}}
Copied: team/dlee/ari-event-remodel2/rest-api-templates/ari_model_validators.h.mustache (from r393454, team/dlee/ari-event-remodel2/rest-api-templates/ari_model.h.mustache)
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/rest-api-templates/ari_model_validators.h.mustache?view=diff&rev=393466&p1=team/dlee/ari-event-remodel2/rest-api-templates/ari_model.h.mustache&r1=393454&p2=team/dlee/ari-event-remodel2/rest-api-templates/ari_model_validators.h.mustache&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/rest-api-templates/ari_model.h.mustache (original)
+++ team/dlee/ari-event-remodel2/rest-api-templates/ari_model_validators.h.mustache Tue Jul 2 13:37:09 2013
@@ -22,7 +22,7 @@
/*
{{> do-not-edit}}
* This file is generated by a mustache template. Please see the original
- * template in rest-api-templates/ari_model.h.mustache
+ * template in rest-api-templates/ari_model_validators.h.mustache
*/
#ifndef _ASTERISK_ARI_MODEL_H
Modified: team/dlee/ari-event-remodel2/rest-api-templates/make_ari_stubs.py
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/rest-api-templates/make_ari_stubs.py?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/rest-api-templates/make_ari_stubs.py (original)
+++ team/dlee/ari-event-remodel2/rest-api-templates/make_ari_stubs.py Tue Jul 2 13:37:09 2013
@@ -56,8 +56,10 @@
Transform(rel('models.wiki.mustache'),
'doc/rest-api/%s REST Data Models.wiki' % WIKI_PREFIX),
Transform(rel('stasis_http.make.mustache'), 'res/stasis_http.make'),
- Transform(rel('ari_model.h.mustache'), 'res/stasis_http/ari_model.h'),
- Transform(rel('ari_model.c.mustache'), 'res/stasis_http/ari_model.c'),
+ Transform(rel('ari_model_validators.h.mustache'),
+ 'res/stasis_http/ari_model_validators.h'),
+ Transform(rel('ari_model_validators.c.mustache'),
+ 'res/stasis_http/ari_model_validators.c'),
]
Modified: team/dlee/ari-event-remodel2/rest-api-templates/res_stasis_http_resource.c.mustache
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/rest-api-templates/res_stasis_http_resource.c.mustache?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/rest-api-templates/res_stasis_http_resource.c.mustache (original)
+++ team/dlee/ari-event-remodel2/rest-api-templates/res_stasis_http_resource.c.mustache Tue Jul 2 13:37:09 2013
@@ -50,7 +50,7 @@
#include "asterisk/stasis_app.h"
#include "stasis_http/resource_{{name}}.h"
#if defined(AST_DEVMODE)
-#include "stasis_http/ari_model.h"
+#include "stasis_http/ari_model_validators.h"
#endif
{{#apis}}
Modified: team/dlee/ari-event-remodel2/tests/test_ari_model.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/tests/test_ari_model.c?view=diff&rev=393466&r1=393465&r2=393466
==============================================================================
--- team/dlee/ari-event-remodel2/tests/test_ari_model.c (original)
+++ team/dlee/ari-event-remodel2/tests/test_ari_model.c Tue Jul 2 13:37:09 2013
@@ -36,7 +36,7 @@
#include "asterisk/utils.h"
#include "asterisk/module.h"
#include "asterisk/test.h"
-#include "../res/stasis_http/ari_model.h"
+#include "../res/stasis_http/ari_model_validators.h"
AST_TEST_DEFINE(validate_byte)
{
More information about the asterisk-commits
mailing list