Skip to content

Commit 559a97e

Browse files
andywolkandywolk
authored
Merge pull request #2715 from signalwire/rss
[mod_rss] Remove from tree
2 parents b752476 + 4d7a7f9 commit 559a97e

File tree

20 files changed

+1
-896
lines changed

20 files changed

+1
-896
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ Release/
145145
/src/mod/applications/mod_nibblebill/Makefile
146146
/src/mod/applications/mod_osp/Makefile
147147
/src/mod/applications/mod_osp/Makefile.in
148-
/src/mod/applications/mod_rss/Makefile
149148
/src/mod/applications/mod_snipe_hunt/Makefile
150149
/src/mod/applications/mod_test/test/Makefile
151150
/src/mod/applications/mod_test/test/Makefile.in

‎Freeswitch.2017.sln

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
7979
conf\vanilla\autoload_configs\logfile.conf.xml = conf\vanilla\autoload_configs\logfile.conf.xml
8080
conf\vanilla\autoload_configs\modules.conf.xml = conf\vanilla\autoload_configs\modules.conf.xml
8181
conf\vanilla\autoload_configs\openmrcp.conf.xml = conf\vanilla\autoload_configs\openmrcp.conf.xml
82-
conf\vanilla\autoload_configs\rss.conf.xml = conf\vanilla\autoload_configs\rss.conf.xml
8382
conf\vanilla\autoload_configs\sofia.conf.xml = conf\vanilla\autoload_configs\sofia.conf.xml
8483
conf\vanilla\autoload_configs\switch.conf.xml = conf\vanilla\autoload_configs\switch.conf.xml
8584
conf\vanilla\autoload_configs\syslog.conf.xml = conf\vanilla\autoload_configs\syslog.conf.xml
@@ -199,8 +198,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_
199198
{BED7539C-0099-4A14-AD5D-30828F15A171} = {BED7539C-0099-4A14-AD5D-30828F15A171}
200199
EndProjectSection
201200
EndProject
202-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.2017.vcxproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}"
203-
EndProject
204201
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_conference", "src\mod\applications\mod_conference\mod_conference.2017.vcxproj", "{C24FB505-05D7-4319-8485-7540B44C8603}"
205202
EndProject
206203
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\applications\mod_dptools\mod_dptools.2017.vcxproj", "{B5881A85-FE70-4F64-8607-2CAAE52669C6}"
@@ -716,17 +713,6 @@ Global
716713
{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|Win32.Build.0 = Release|Win32
717714
{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|x64.ActiveCfg = Release|x64
718715
{CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|x64.Build.0 = Release|x64
719-
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|Win32.ActiveCfg = Release|x64
720-
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|x64.ActiveCfg = Release|x64
721-
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|x64.Build.0 = Release|x64
722-
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|Win32.ActiveCfg = Debug|Win32
723-
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|Win32.Build.0 = Debug|Win32
724-
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|x64.ActiveCfg = Debug|x64
725-
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|x64.Build.0 = Debug|x64
726-
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|Win32.ActiveCfg = Release|Win32
727-
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|Win32.Build.0 = Release|Win32
728-
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|x64.ActiveCfg = Release|x64
729-
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|x64.Build.0 = Release|x64
730716
{C24FB505-05D7-4319-8485-7540B44C8603}.All|Win32.ActiveCfg = Release|x64
731717
{C24FB505-05D7-4319-8485-7540B44C8603}.All|x64.ActiveCfg = Release|x64
732718
{C24FB505-05D7-4319-8485-7540B44C8603}.All|x64.Build.0 = Release|x64
@@ -2467,7 +2453,6 @@ Global
24672453
{30A5B29C-983E-4580-9FD0-D647CCDCC7EB} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
24682454
{1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}
24692455
{CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
2470-
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
24712456
{C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
24722457
{B5881A85-FE70-4F64-8607-2CAAE52669C6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
24732458
{05515420-16DE-4E63-BE73-85BE85BA5142} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0}

‎build/modules.conf.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ applications/mod_httapi
3434
#applications/mod_prefix
3535
#applications/mod_rad_auth
3636
#applications/mod_redis
37-
#applications/mod_rss
3837
applications/mod_signalwire
3938
applications/mod_sms
4039
#applications/mod_snapshot

‎build/modules.conf.most

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ applications/mod_oreka
3434
applications/mod_prefix
3535
#applications/mod_rad_auth
3636
applications/mod_redis
37-
applications/mod_rss
3837
applications/mod_signalwire
3938
applications/mod_sms
4039
applications/mod_snapshot

‎conf/curl/autoload_configs/rss.conf.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎conf/insideout/autoload_configs/modules.conf.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
<!-- <load module="mod_flite"/> -->
8686
<!-- <load module="mod_pocketsphinx"/> -->
8787
<!-- <load module="mod_openmrcp"/> -->
88-
<!-- <load module="mod_rss"/> -->
8988

9089
<!-- Say -->
9190
<load module="mod_say_en"/>

‎conf/insideout/autoload_configs/rss.conf.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎conf/vanilla/autoload_configs/modules.conf.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
<!-- <load module="mod_flite"/> -->
121121
<!-- <load module="mod_pocketsphinx"/> -->
122122
<!-- <load module="mod_tts_commandline"/> -->
123-
<!-- <load module="mod_rss"/> -->
124123

125124
<!-- Say -->
126125
<load module="mod_say_en"/>

‎conf/vanilla/autoload_configs/rss.conf.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2121,7 +2121,6 @@ AC_CONFIG_FILES([Makefile
21212121
src/mod/applications/mod_rad_auth/Makefile
21222122
src/mod/applications/mod_random/Makefile
21232123
src/mod/applications/mod_redis/Makefile
2124-
src/mod/applications/mod_rss/Makefile
21252124
src/mod/applications/mod_skel/Makefile
21262125
src/mod/applications/mod_signalwire/Makefile
21272126
src/mod/applications/mod_sms/Makefile

‎debian/bootstrap.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,6 @@ Recommends:
540540
freeswitch-mod-oreka (= \${binary:Version}),
541541
freeswitch-mod-pgsql (= \${binary:Version}),
542542
freeswitch-mod-redis (= \${binary:Version}),
543-
freeswitch-mod-rss (= \${binary:Version}),
544543
freeswitch-mod-sms (= \${binary:Version}),
545544
freeswitch-mod-snapshot (= \${binary:Version}),
546545
freeswitch-mod-spandsp (= \${binary:Version}),
@@ -624,7 +623,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
624623
freeswitch-mod-pgsql (= \${binary:Version}),
625624
freeswitch-mod-png (= \${binary:Version}),
626625
freeswitch-mod-redis (= \${binary:Version}),
627-
freeswitch-mod-rss (= \${binary:Version}),
628626
freeswitch-mod-signalwire (= \${binary:Version}),
629627
freeswitch-mod-shout (= \${binary:Version}),
630628
freeswitch-mod-sms (= \${binary:Version}),
@@ -849,7 +847,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
849847
freeswitch-mod-pgsql-dbg (= \${binary:Version}),
850848
freeswitch-mod-png-dbg (= \${binary:Version}),
851849
freeswitch-mod-redis-dbg (= \${binary:Version}),
852-
freeswitch-mod-rss-dbg (= \${binary:Version}),
853850
freeswitch-mod-sms-dbg (= \${binary:Version}),
854851
freeswitch-mod-snapshot-dbg (= \${binary:Version}),
855852
freeswitch-mod-spandsp-dbg (= \${binary:Version}),

‎debian/control-modules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,6 @@ Description: Redis limit backend
178178
This module provides a mechanism to use Redis as a backend data
179179
store.
180180

181-
Module: applications/mod_rss
182-
Description: RSS browser
183-
This module provides an RSS browser.
184-
185181
Module: applications/mod_skel
186182
Description: Adds mod_skel
187183
Adds mod_skel.

‎freeswitch.spec

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -468,15 +468,6 @@ Requires: %{name} = %{version}-%{release}
468468
Provides FreeSWITCH mod_redis, access to the redis key value pair db system from
469469
FreeSWITCH
470470

471-
%package application-rss
472-
Summary: FreeSWITCH mod_rss
473-
Group: System/Libraries
474-
Requires: %{name} = %{version}-%{release}
475-
476-
%description application-rss
477-
Provides FreeSWITCH mod_rss, edisrse and read an XML based RSS feed, then read
478-
the entries aloud via a TTS engine
479-
480471
%package application-signalwire
481472
Summary: FreeSWITCH mod_signalwire
482473
Group: System/Libraries
@@ -1191,7 +1182,6 @@ Requires: freeswitch-application-limit
11911182
Requires: freeswitch-application-memcache
11921183
Requires: freeswitch-application-nibblebill
11931184
Requires: freeswitch-application-redis
1194-
Requires: freeswitch-application-rss
11951185
Requires: freeswitch-application-signalwire
11961186
Requires: freeswitch-application-sms
11971187
Requires: freeswitch-application-snapshot
@@ -1271,7 +1261,7 @@ APPLICATION_MODULES_DE+="applications/mod_esl"
12711261
APPLICATION_MODULES_FR="applications/mod_fifo applications/mod_fsk applications/mod_fsv applications/mod_hash \
12721262
applications/mod_httapi applications/mod_http_cache applications/mod_lcr applications/mod_limit \
12731263
applications/mod_memcache applications/mod_mongo applications/mod_nibblebill applications/mod_rad_auth \
1274-
applications/mod_redis applications/mod_rss "
1264+
applications/mod_redis "
12751265

12761266
APPLICATION_MODULES_SZ="applications/mod_signalwire applications/mod_sms applications/mod_snapshot \
12771267
applications/mod_spandsp applications/mod_spy \
@@ -1769,7 +1759,6 @@ fi
17691759
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/pre_load_modules.conf.xml
17701760
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/presence_map.conf.xml
17711761
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/redis.conf.xml
1772-
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/rss.conf.xml
17731762
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/rtmp.conf.xml
17741763
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/shout.conf.xml
17751764
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/signalwire.conf.xml
@@ -1925,9 +1914,6 @@ fi
19251914
%files application-redis
19261915
%{MODINSTDIR}/mod_redis.so*
19271916

1928-
%files application-rss
1929-
%{MODINSTDIR}/mod_rss.so*
1930-
19311917
%files application-signalwire
19321918
%{MODINSTDIR}/mod_signalwire.so*
19331919

‎src/mod/applications/mod_rss/Makefile.am

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/mod/applications/mod_rss/conf/autoload_configs/rss.conf.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/mod/applications/mod_rss/conf/dialplan/rss.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/mod/applications/mod_rss/mod_rss.2017.vcxproj

Lines changed: 0 additions & 141 deletions
This file was deleted.

0 commit comments

Comments
 (0)