diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln
index 6fac09141b..3e4451ad7b 100644
--- a/Freeswitch.2017.sln
+++ b/Freeswitch.2017.sln
@@ -396,8 +396,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spy", "src\mod\applicat
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_httapi", "src\mod\applications\mod_httapi\mod_httapi.2017.vcxproj", "{4748FF56-CA85-4809-97D6-A94C0FAC1D77}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_abstraction", "src\mod\applications\mod_abstraction\mod_abstraction.2017.vcxproj", "{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sms", "src\mod\applications\mod_sms\mod_sms.2017.vcxproj", "{2469B306-B027-4FF2-8815-C9C1EA2CAE79}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xmlrpc-c", "xmlrpc-c", "{9DE35039-A8F6-4FBF-B1B6-EB527F802411}"
@@ -1757,17 +1755,6 @@ Global
{4748FF56-CA85-4809-97D6-A94C0FAC1D77}.Release|Win32.Build.0 = Release|Win32
{4748FF56-CA85-4809-97D6-A94C0FAC1D77}.Release|x64.ActiveCfg = Release|x64
{4748FF56-CA85-4809-97D6-A94C0FAC1D77}.Release|x64.Build.0 = Release|x64
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.All|Win32.ActiveCfg = Release|x64
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.All|x64.ActiveCfg = Release|x64
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.All|x64.Build.0 = Release|x64
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|Win32.ActiveCfg = Debug|Win32
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|Win32.Build.0 = Debug|Win32
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|x64.ActiveCfg = Debug|x64
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|x64.Build.0 = Debug|x64
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|Win32.ActiveCfg = Release|Win32
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|Win32.Build.0 = Release|Win32
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|x64.ActiveCfg = Release|x64
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|x64.Build.0 = Release|x64
{2469B306-B027-4FF2-8815-C9C1EA2CAE79}.All|Win32.ActiveCfg = Release|x64
{2469B306-B027-4FF2-8815-C9C1EA2CAE79}.All|x64.ActiveCfg = Release|x64
{2469B306-B027-4FF2-8815-C9C1EA2CAE79}.All|x64.Build.0 = Release|x64
@@ -2588,7 +2575,6 @@ Global
{50AAC2CE-BFC9-4912-87CC-C6381850D735} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{A61D7CB4-75A5-4A55-8CA1-BE5AF615D921} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{4748FF56-CA85-4809-97D6-A94C0FAC1D77} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{2469B306-B027-4FF2-8815-C9C1EA2CAE79} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{9DE35039-A8F6-4FBF-B1B6-EB527F802411} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
diff --git a/build/modules.conf.in b/build/modules.conf.in
index 16c251f3be..45162bbd38 100755
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -1,4 +1,3 @@
-#applications/mod_abstraction
applications/mod_av
#applications/mod_avmd
#applications/mod_bert
diff --git a/build/modules.conf.most b/build/modules.conf.most
index 20478c359b..1fbb5c3326 100755
--- a/build/modules.conf.most
+++ b/build/modules.conf.most
@@ -1,4 +1,3 @@
-applications/mod_abstraction
applications/mod_av
applications/mod_avmd
applications/mod_bert
diff --git a/conf/vanilla/autoload_configs/abstraction.conf.xml b/conf/vanilla/autoload_configs/abstraction.conf.xml
deleted file mode 100644
index 7244681374..0000000000
--- a/conf/vanilla/autoload_configs/abstraction.conf.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/configure.ac b/configure.ac
index dcd560543c..10fa1a9346 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2088,7 +2088,6 @@ AC_CONFIG_FILES([Makefile
tests/unit/Makefile
src/Makefile
src/mod/Makefile
- src/mod/applications/mod_abstraction/Makefile
src/mod/applications/mod_avmd/Makefile
src/mod/applications/mod_bert/Makefile
src/mod/applications/mod_blacklist/Makefile
diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index e9db3c512c..78845f1899 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -516,7 +516,6 @@ Recommends:
freeswitch-meta-codecs (= \${binary:Version}),
freeswitch-music,
freeswitch-sounds,
- freeswitch-mod-abstraction (= \${binary:Version}),
freeswitch-mod-avmd (= \${binary:Version}),
freeswitch-mod-blacklist (= \${binary:Version}),
freeswitch-mod-callcenter (= \${binary:Version}),
@@ -601,7 +600,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
freeswitch-meta-mod-say (= \${binary:Version}),
freeswitch-music,
freeswitch-sounds,
- freeswitch-mod-abstraction (= \${binary:Version}),
freeswitch-mod-avmd (= \${binary:Version}),
freeswitch-mod-av (= \${binary:Version}),
freeswitch-mod-blacklist (= \${binary:Version}),
@@ -831,7 +829,6 @@ Architecture: amd64 armhf arm64
Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
freeswitch-meta-codecs-dbg (= \${binary:Version}),
freeswitch-meta-mod-say (= \${binary:Version}),
- freeswitch-mod-abstraction-dbg (= \${binary:Version}),
freeswitch-mod-avmd-dbg (= \${binary:Version}),
freeswitch-mod-av-dbg (= \${binary:Version}),
freeswitch-mod-blacklist-dbg (= \${binary:Version}),
diff --git a/debian/control-modules b/debian/control-modules
index 5e8bd3e56d..fba6b2813e 100755
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -3,11 +3,6 @@
## mod/applications
-Module: applications/mod_abstraction
-Description: Abstraction layer for APIs
- This module provides a way to create new API functions via regex
- rewriting.
-
Module: applications/mod_av
Description: mod_av
Adds mod_av.
diff --git a/freeswitch.spec b/freeswitch.spec
index b87b4802e0..fa79373621 100755
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -227,14 +227,6 @@ FreeSWITCH development files
######################################################################################################################
# FreeSWITCH Application Modules
######################################################################################################################
-%package application-abstraction
-Summary: FreeSWITCH mod_abstraction
-Group: System/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description application-abstraction
-Provide an abstraction to FreeSWITCH API calls
-
%package application-avmd
Summary: FreeSWITCH voicemail detector
Group: System/Libraries
@@ -1205,7 +1197,6 @@ The Python ESL module allows for native interaction with FreeSWITCH over the eve
Summary: Basic vanilla config set for the FreeSWITCH Open Source telephone platform.
Group: System/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: freeswitch-application-abstraction
Requires: freeswitch-application-avmd
Requires: freeswitch-application-blacklist
Requires: freeswitch-application-callcenter
@@ -1299,7 +1290,7 @@ export QA_RPATHS=$[ 0x0001|0x0002 ]
# Application Modules
#
######################################################################################################################
-APPLICATION_MODULES_AC="applications/mod_abstraction applications/mod_avmd applications/mod_blacklist \
+APPLICATION_MODULES_AC="applications/mod_avmd applications/mod_blacklist \
applications/mod_callcenter applications/mod_cidlookup \
applications/mod_commands applications/mod_conference applications/mod_curl"
APPLICATION_MODULES_DE="applications/mod_db applications/mod_directory applications/mod_distributor \
@@ -1758,7 +1749,6 @@ fi
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/*.xml
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/extensions.conf
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/mime.types
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/abstraction.conf.xml
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/acl.conf.xml
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/amr.conf.xml
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/amrwb.conf.xml
@@ -1885,9 +1875,6 @@ fi
# Application Packages
#
######################################################################################################################
-%files application-abstraction
-%{MODINSTDIR}/mod_abstraction.so*
-
%files application-avmd
%{MODINSTDIR}/mod_avmd.so*
diff --git a/src/mod/applications/mod_abstraction/Makefile.am b/src/mod/applications/mod_abstraction/Makefile.am
deleted file mode 100644
index 8ab961eeb2..0000000000
--- a/src/mod/applications/mod_abstraction/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_abstraction
-
-mod_LTLIBRARIES = mod_abstraction.la
-mod_abstraction_la_SOURCES = mod_abstraction.c
-mod_abstraction_la_CFLAGS = $(AM_CFLAGS)
-mod_abstraction_la_LIBADD = $(switch_builddir)/libfreeswitch.la
-mod_abstraction_la_LDFLAGS = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/applications/mod_abstraction/conf/autoload_configs/abstraction.conf.xml b/src/mod/applications/mod_abstraction/conf/autoload_configs/abstraction.conf.xml
deleted file mode 100644
index d4b1dfd274..0000000000
--- a/src/mod/applications/mod_abstraction/conf/autoload_configs/abstraction.conf.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/src/mod/applications/mod_abstraction/mod_abstraction.2017.vcxproj b/src/mod/applications/mod_abstraction/mod_abstraction.2017.vcxproj
deleted file mode 100644
index e6a7666b80..0000000000
--- a/src/mod/applications/mod_abstraction/mod_abstraction.2017.vcxproj
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- mod_abstraction
- {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}
- mod_abstraction
- Win32Proj
-
-
-
- DynamicLibrary
- MultiByte
- $(DefaultPlatformToolset)
-
-
- DynamicLibrary
- MultiByte
- $(DefaultPlatformToolset)
-
-
- DynamicLibrary
- MultiByte
- $(DefaultPlatformToolset)
-
-
- DynamicLibrary
- MultiByte
- $(DefaultPlatformToolset)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
-
-
-
-
-
-
-
- false
-
-
-
-
-
-
- X64
-
-
-
-
-
-
- false
-
-
- MachineX64
-
-
-
-
-
-
-
-
- false
-
-
-
-
-
-
- X64
-
-
-
-
-
-
- false
-
-
- MachineX64
-
-
-
-
-
-
-
- {202d7a4e-760d-4d0e-afa1-d7459ced30ff}
- false
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/mod/applications/mod_abstraction/mod_abstraction.c b/src/mod/applications/mod_abstraction/mod_abstraction.c
deleted file mode 100644
index 11144462ec..0000000000
--- a/src/mod/applications/mod_abstraction/mod_abstraction.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Marc Olivier Chouinard
- *
- *
- * mod_abstraction.c -- Abstraction
- *
- */
-#include
-
-/* Prototypes */
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_abstraction_shutdown);
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_abstraction_runtime);
-SWITCH_MODULE_LOAD_FUNCTION(mod_abstraction_load);
-
-const char *global_cf = "abstraction.conf";
-
-/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime)
- * Defines a switch_loadable_module_function_table_t and a static const char[] modname
- */
-SWITCH_MODULE_DEFINITION(mod_abstraction, mod_abstraction_load, mod_abstraction_shutdown, NULL);
-
-SWITCH_STANDARD_API(api_abstraction_function)
-{
- const char *api_name = switch_event_get_header(stream->param_event, "API-Command");
- switch_xml_t cfg, xml, x_apis, x_api;
-
- if (!(xml = switch_xml_open_cfg(global_cf, &cfg, NULL))) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf);
- goto end;
- }
-
- if (!(x_apis = switch_xml_child(cfg, "apis"))) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No apis group\n");
- goto end;
- }
-
- if ((x_api = switch_xml_find_child_multi(x_apis, "api", "name", api_name , NULL))) {
- const char *parse = switch_xml_attr_soft(x_api, "parse");
- const char *destination = switch_xml_attr_soft(x_api, "destination");
- const char *arguments = switch_xml_attr_soft(x_api, "argument");
-
- int proceed;
- switch_regex_t *re = NULL;
- int ovector[30];
-
- if ((proceed = switch_regex_perform(cmd, parse, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
- const char *api_args = NULL;
- char *substituted = NULL;
-
- if (cmd && strchr(parse, '(')) {
- uint32_t len = (uint32_t) (strlen(cmd) + strlen(arguments) + 10) * proceed;
- if (!(substituted = malloc(len))) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
- goto end;
- }
- memset(substituted, 0, len);
- switch_perform_substitution(re, proceed, arguments, cmd , substituted, len, ovector);
- api_args = substituted;
- } else {
- api_args = arguments;
- }
- switch_api_execute(destination, api_args, session, stream);
-
- switch_safe_free(substituted);
- } else {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No match for API %s (%s != %s)\n", api_name, parse, cmd);
- }
- switch_regex_safe_free(re);
-
- } else {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "API %s doesn't exist inside the xml structure. You might have forgot to reload the module after editing it\n", api_name);
- }
-
-end:
- if (xml)
- switch_xml_free(xml);
-
-
- return SWITCH_STATUS_SUCCESS;
-}
-
-/* Macro expands to: switch_status_t mod_abstraction_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */
-SWITCH_MODULE_LOAD_FUNCTION(mod_abstraction_load)
-{
- switch_status_t status = SWITCH_STATUS_TERM;
- switch_api_interface_t *api_interface;
- switch_xml_t cfg, xml, x_apis, x_api;
- int count = 0;
-
- /* connect my internal structure to the blank pointer passed to me */
- *module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
- if (!(xml = switch_xml_open_cfg(global_cf, &cfg, NULL))) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf);
- goto end;
- }
-
- if (!(x_apis = switch_xml_child(cfg, "apis"))) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No apis group\n");
- goto end;
- }
-
- for (x_api = switch_xml_child(x_apis, "api"); x_api; x_api = x_api->next) {
- const char *name = switch_xml_attr_soft(x_api, "name");
- const char *description = switch_xml_attr_soft(x_api, "description");
- const char *syntax = switch_xml_attr_soft(x_api, "syntax");
- SWITCH_ADD_API(api_interface, name, description, api_abstraction_function, syntax);
- count++;
-
- }
- if (count > 0) {
- status = SWITCH_STATUS_SUCCESS;
- } else {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No API abstraction defined\n");
- }
-end:
- if (xml)
- switch_xml_free(xml);
-
- return status;
-}
-
-/*
- Called when the system shuts down
- Macro expands to: switch_status_t mod_abstraction_shutdown() */
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_abstraction_shutdown)
-{
- /* Cleanup dynamically allocated config settings */
- return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
diff --git a/w32/Setup/Setup.2017.wixproj b/w32/Setup/Setup.2017.wixproj
index e99a1760a6..e449a5a55a 100644
--- a/w32/Setup/Setup.2017.wixproj
+++ b/w32/Setup/Setup.2017.wixproj
@@ -89,14 +89,6 @@
Binaries;Content;Satellites
INSTALLFOLDER
-
- mod_abstraction
- {60c542ee-6882-4ea2-8c21-5ab6db1ba73f}
- True
- True
- Binaries;Content;Satellites
- INSTALLFOLDER
-
mod_avmd
{990baa76-89d3-4e38-8479-c7b28784efc8}