From b0bcc011eaea7c1755edd03f587a6b9997ce301c Mon Sep 17 00:00:00 2001 From: Travis Cross <tc@traviscross.com> Date: Wed, 26 Mar 2014 17:49:24 +0000 Subject: [PATCH] Deprecate mod_spidermonkey We consider mod_spidermonkey to be completely replaced by mod_v8 (and more generally by mod_lua) at this point. We've barely supported mod_spidermonkey for years. Everyone should stop using it. We're keeping this around for awhile in case people are relying on C extensions to mod_spidermonkey and need time to migrate. This module may or may not be part of a v1.4 release depending on whether we find anyone cares. It definitely will not be part of the next release after v1.4. --- build/modules.conf.in | 1 - configure.ac | 2 +- src/include/switch.h | 3 --- src/mod/.gitignore | 3 --- src/mod/legacy/languages/mod_spidermonkey/.gitignore | 3 +++ src/mod/{ => legacy}/languages/mod_spidermonkey/Makefile.am | 0 .../languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj | 0 .../languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj | 0 .../languages/mod_spidermonkey/mod_spidermonkey.2012.vcxproj | 0 .../{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey.c | 0 .../{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey.h | 0 .../languages/mod_spidermonkey/mod_spidermonkey.vcproj | 0 .../mod_spidermonkey/mod_spidermonkey_core_db.2008.vcproj | 0 .../mod_spidermonkey/mod_spidermonkey_core_db.2010.vcxproj | 0 .../mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj | 0 .../languages/mod_spidermonkey/mod_spidermonkey_core_db.c | 0 .../languages/mod_spidermonkey/mod_spidermonkey_core_db.vcproj | 0 .../mod_spidermonkey/mod_spidermonkey_curl.2008.vcproj | 0 .../mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj | 0 .../mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj | 0 .../languages/mod_spidermonkey/mod_spidermonkey_curl.c | 0 .../languages/mod_spidermonkey/mod_spidermonkey_curl.vcproj | 0 .../mod_spidermonkey/mod_spidermonkey_odbc.2008.vcproj | 0 .../mod_spidermonkey/mod_spidermonkey_odbc.2010.vcxproj | 0 .../mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj | 0 .../languages/mod_spidermonkey/mod_spidermonkey_odbc.c | 0 .../languages/mod_spidermonkey/mod_spidermonkey_odbc.vcproj | 0 .../languages/mod_spidermonkey/mod_spidermonkey_skel.c | 0 .../mod_spidermonkey/mod_spidermonkey_socket.2008.vcproj | 0 .../mod_spidermonkey/mod_spidermonkey_socket.2010.vcxproj | 0 .../mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj | 0 .../languages/mod_spidermonkey/mod_spidermonkey_socket.c | 0 .../languages/mod_spidermonkey/mod_spidermonkey_socket.vcproj | 0 .../mod_spidermonkey/mod_spidermonkey_teletone.2008.vcproj | 0 .../mod_spidermonkey/mod_spidermonkey_teletone.2010.vcxproj | 0 .../mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj | 0 .../languages/mod_spidermonkey/mod_spidermonkey_teletone.c | 0 .../mod_spidermonkey/mod_spidermonkey_teletone.vcproj | 0 38 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 src/mod/legacy/languages/mod_spidermonkey/.gitignore rename src/mod/{ => legacy}/languages/mod_spidermonkey/Makefile.am (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey.2012.vcxproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey.c (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey.h (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey.vcproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_core_db.2008.vcproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_core_db.2010.vcxproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_core_db.c (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_core_db.vcproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_curl.2008.vcproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_curl.c (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_curl.vcproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_odbc.2008.vcproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_odbc.2010.vcxproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_odbc.c (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_odbc.vcproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_skel.c (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_socket.2008.vcproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_socket.2010.vcxproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_socket.c (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_socket.vcproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_teletone.2008.vcproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_teletone.2010.vcxproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_teletone.c (100%) rename src/mod/{ => legacy}/languages/mod_spidermonkey/mod_spidermonkey_teletone.vcproj (100%) diff --git a/build/modules.conf.in b/build/modules.conf.in index 721a913a09..5399f7adef 100644 --- a/build/modules.conf.in +++ b/build/modules.conf.in @@ -117,7 +117,6 @@ languages/mod_lua #languages/mod_managed #languages/mod_perl #languages/mod_python -#languages/mod_spidermonkey #languages/mod_v8 #languages/mod_yaml loggers/mod_console diff --git a/configure.ac b/configure.ac index 0f5c030b09..bf880e063e 100644 --- a/configure.ac +++ b/configure.ac @@ -1434,10 +1434,10 @@ AC_CONFIG_FILES([Makefile src/mod/languages/mod_managed/Makefile src/mod/languages/mod_perl/Makefile src/mod/languages/mod_python/Makefile - src/mod/languages/mod_spidermonkey/Makefile src/mod/languages/mod_v8/Makefile src/mod/languages/mod_yaml/Makefile src/mod/legacy/languages/mod_lua/Makefile + src/mod/legacy/languages/mod_spidermonkey/Makefile src/mod/loggers/mod_console/Makefile src/mod/loggers/mod_logfile/Makefile src/mod/loggers/mod_syslog/Makefile diff --git a/src/include/switch.h b/src/include/switch.h index 2386ae8a7f..e7de12f396 100644 --- a/src/include/switch.h +++ b/src/include/switch.h @@ -232,9 +232,6 @@ * - libsndfile (http://www.mega-nerd.com/libsndfile/) * * Languages - * mod_spidermonkey - * - spidermonkey (http://www.mozilla.org/js/spidermonkey/) - * * mod_perl * - perl (http://www.perl.org/) * diff --git a/src/mod/.gitignore b/src/mod/.gitignore index 319e1e6991..d799cbe58b 100644 --- a/src/mod/.gitignore +++ b/src/mod/.gitignore @@ -63,9 +63,6 @@ /languages/mod_lua/mod_lua.log /languages/mod_managed/freeswitch_wrap.cpp /languages/mod_python/Makefile -/languages/mod_spidermonkey/Makefile -/languages/mod_spidermonkey/Makefile.in -/languages/mod_spidermonkey/mod_spidermonkey.log /loggers/mod_console/Makefile /loggers/mod_logfile/Makefile /loggers/mod_syslog/Makefile diff --git a/src/mod/legacy/languages/mod_spidermonkey/.gitignore b/src/mod/legacy/languages/mod_spidermonkey/.gitignore new file mode 100644 index 0000000000..1ce7a516b6 --- /dev/null +++ b/src/mod/legacy/languages/mod_spidermonkey/.gitignore @@ -0,0 +1,3 @@ +Makefile +Makefile.in +mod_spidermonkey.log diff --git a/src/mod/languages/mod_spidermonkey/Makefile.am b/src/mod/legacy/languages/mod_spidermonkey/Makefile.am similarity index 100% rename from src/mod/languages/mod_spidermonkey/Makefile.am rename to src/mod/legacy/languages/mod_spidermonkey/Makefile.am diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2012.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2012.vcxproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey.2012.vcxproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2012.vcxproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.c similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey.c rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.c diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.h similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey.h rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.h diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.vcproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.vcproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.2008.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2008.vcproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.2008.vcproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2008.vcproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.2010.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2010.vcxproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.2010.vcxproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2010.vcxproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.c similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.c rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.c diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.vcproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_core_db.vcproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.vcproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2008.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2008.vcproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2008.vcproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2008.vcproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.c similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.c diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.vcproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.vcproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.vcproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.2008.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2008.vcproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.2008.vcproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2008.vcproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.2010.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2010.vcxproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.2010.vcxproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2010.vcxproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.c similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.c rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.c diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.vcproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_odbc.vcproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.vcproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_skel.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_skel.c similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_skel.c rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_skel.c diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.2008.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2008.vcproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.2008.vcproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2008.vcproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.2010.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2010.vcxproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.2010.vcxproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2010.vcxproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.c similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.c rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.c diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.vcproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.vcproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.vcproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.2008.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2008.vcproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.2008.vcproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2008.vcproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.2010.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2010.vcxproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.2010.vcxproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2010.vcxproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.c similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.c rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.c diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.vcproj similarity index 100% rename from src/mod/languages/mod_spidermonkey/mod_spidermonkey_teletone.vcproj rename to src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.vcproj