Remove remaining traces of mod_spidermonkey

diff --git a/conf/curl/autoload_configs/spidermonkey.conf.xml b/conf/curl/autoload_configs/spidermonkey.conf.xml
deleted file mode 100644 (file)
index 2e6dc6a..0000000
--- a/conf/curl/autoload_configs/spidermonkey.conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<configuration name="spidermonkey.conf" description="Spider Monkey JavaScript Plug-Ins">
-  <modules>
-    <load module="mod_spidermonkey_teletone"/>
-    <load module="mod_spidermonkey_core_db"/>
-    <load module="mod_spidermonkey_socket"/>
-    <!--<load module="mod_spidermonkey_odbc"/>-->
-  </modules>
-</configuration>

diff --git a/conf/insideout/autoload_configs/modules.conf.xml b/conf/insideout/autoload_configs/modules.conf.xml
index 520903fe04a84de1cd6c43200cc379121b25204b..7d056a5b2a1edb10a73b6768bd64033b17001935 100644 (file)
--- a/conf/insideout/autoload_configs/modules.conf.xml
+++ b/conf/insideout/autoload_configs/modules.conf.xml
@@ -78,7 +78,6 @@
     <!-- Timers -->
 
     <!-- Languages -->
-    <!-- <load module="mod_spidermonkey"/> -->
     <load module="mod_v8"/>
     <!-- <load module="mod_perl"/> -->
     <!-- <load module="mod_python"/> -->

diff --git a/conf/insideout/dialplan/default/00_pizza_demo.xml b/conf/insideout/dialplan/default/00_pizza_demo.xml
index e7fcca204ad5b463344b81ce7545cf26a4cd7fb8..4b308fe1595fdfd8f3afa705104143f367c31398 100644 (file)
--- a/conf/insideout/dialplan/default/00_pizza_demo.xml
+++ b/conf/insideout/dialplan/default/00_pizza_demo.xml
@@ -1,7 +1,7 @@
 <include>
   <extension name="pizza_demo">
     <condition field="destination_number" expression="^(pizza|74992)$"/>
-    <condition field="${module_exists(mod_spidermonkey)}" expression="true"/>
+    <condition field="${module_exists(mod_v8)}" expression="true"/>
     <condition field="${module_exists(mod_pocketsphinx)}" expression="true">
       <action application="javascript" data="ps_pizza.js"/>
     </condition>

diff --git a/conf/sbc/dialplan/default/00_pizza_demo.xml b/conf/sbc/dialplan/default/00_pizza_demo.xml
index e7fcca204ad5b463344b81ce7545cf26a4cd7fb8..4b308fe1595fdfd8f3afa705104143f367c31398 100644 (file)
--- a/conf/sbc/dialplan/default/00_pizza_demo.xml
+++ b/conf/sbc/dialplan/default/00_pizza_demo.xml
@@ -1,7 +1,7 @@
 <include>
   <extension name="pizza_demo">
     <condition field="destination_number" expression="^(pizza|74992)$"/>
-    <condition field="${module_exists(mod_spidermonkey)}" expression="true"/>
+    <condition field="${module_exists(mod_v8)}" expression="true"/>
     <condition field="${module_exists(mod_pocketsphinx)}" expression="true">
       <action application="javascript" data="ps_pizza.js"/>
     </condition>

diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml
index 4cd8f8e1ce99eac99ecc4a47cf58649c887508e5..995a5afb680446e8cf1857ba76419271ba628fb4 100644 (file)
--- a/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@@ -107,7 +107,6 @@
     <!-- <load module="mod_posix_timer"/> -->
 
     <!-- Languages -->
-    <!-- <load module="mod_spidermonkey"/> -->
     <load module="mod_v8"/>
     <!-- <load module="mod_perl"/> -->
     <!-- <load module="mod_python"/> -->

diff --git a/conf/vanilla/dialplan/default/00_pizza_demo.xml b/conf/vanilla/dialplan/default/00_pizza_demo.xml
index e7fcca204ad5b463344b81ce7545cf26a4cd7fb8..4b308fe1595fdfd8f3afa705104143f367c31398 100644 (file)
--- a/conf/vanilla/dialplan/default/00_pizza_demo.xml
+++ b/conf/vanilla/dialplan/default/00_pizza_demo.xml
@@ -1,7 +1,7 @@
 <include>
   <extension name="pizza_demo">
     <condition field="destination_number" expression="^(pizza|74992)$"/>
-    <condition field="${module_exists(mod_spidermonkey)}" expression="true"/>
+    <condition field="${module_exists(mod_v8)}" expression="true"/>
     <condition field="${module_exists(mod_pocketsphinx)}" expression="true">
       <action application="javascript" data="ps_pizza.js"/>
     </condition>

diff --git a/configure.ac b/configure.ac
index fcd0161870bcf4b8d7dfd80a356c433e1ddc2cd3..df70f635657fd93493ce3c2d6ea1aae95d671c77 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1556,7 +1556,6 @@ AC_CONFIG_FILES([Makefile
                src/mod/languages/mod_yaml/Makefile
                src/mod/languages/mod_basic/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_graylog2/Makefile
                src/mod/loggers/mod_logfile/Makefile

diff --git a/debian/copyright b/debian/copyright
index 954a73e017ba5880befd6c61a28c1767e52d8380..809466c74ad99b24ff072acefcb8f7eb521dbe95 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1563,10 +1563,6 @@ Files: src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
 Copyright: 1998 Doug Rabson
 License: BSD-2-clause
 
-Files: src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.c
-Copyright: 2007, Jonas Gauffin <jonas.gauffin@gmail.com>
-License: MPL-1.1
-
 Files: src/mod/languages/mod_java/modjava.c
 Copyright: 2007, Damjan Jovanovic <d a m j a n d o t j o v a t g m a i l d o t c o m>
 License: MPL-1.1