added feeds

diff --git a/war/src/main/resources/feeds.json b/war/src/main/resources/feeds.json
index a06ae41..7ec9e49 100644 (file)
--- a/war/src/main/resources/feeds.json
+++ b/war/src/main/resources/feeds.json
@@ -56,8 +56,13 @@
                         "language": "en"
                 }, {
                         "id": "en_linux",
-                        "label": "Linux",
-                        "title": "Linux",
+                        "label": "Linux & OSS",
+                        "title": "Linux and OpenSource Software",
+                        "language": "en"
+                }, {
+                        "id": "en_space",
+                        "label": "Space",
+                        "title": "Space",
                         "language": "en"
                 }
         ],
@@ -90,6 +95,7 @@
                 "http://www.generation-nt.com/export/rss.xml": { "categories": ["technologie"] },
                 "http://www.europe1.fr/var/export/rss/europe1/sciences.xml": { "categories": ["technologie"] },
                 "http://www.europe1.fr/var/export/rss/europe1/technologies.xml": { "categories": ["technologie"]},
+                "http://www.esa.int/rssfeed/France": { "categories": ["technologie"]},
                 "http://feeds.feedburner.com/lesnumeriques/news": { "categories": ["technologie"] },
                 "https://www.nextinpact.com/rss/acces-libre.xml": { "categories": ["technologie"] },
                 "http://www.zdnet.fr/feeds/rss/actualites/": { "categories": ["technologie"] },
@@ -110,14 +116,12 @@
                 "https://www.digitaltrends.com/computing/feed/": { "categories": ["en_technologie"]},
                 "http://www.zdnet.com/news/rss.xml": { "categories": ["en_technologie"]},
                 "https://www.androidheadlines.com/feed": { "categories": ["en_technologie"]},
-                "https://www.nasa.gov/rss/dyn/breaking_news.rss": { "categories": ["en_technologie"]},
                 "http://www.computerweekly.com/rss/RSS-Feed.xml": { "categories": ["en_technologie"]},
                 "https://www.theverge.com/rss/index.xml": { "categories": ["en_technologie"]},
                 "https://www.engadget.com/rss.xml": { "categories": ["en_technologie"]},
                 "http://feeds.feedburner.com/TheBoyGeniusReport?format=xml": { "categories": ["en_technologie"]},
                 "https://www.popsci.com/rss-technology.xml?loc=contentwell&lnk=tech&dom=section-1": { "categories": ["en_technologie"]},
                 "https://gizmodo.com/rss": { "categories": ["en_technologie"]},
-                "https://www.space.com/home/feed/site.xml": { "categories": ["en_technologie"]},
                 "http://feeds.feedburner.com/d0od?format=xml": { "categories": ["en_linux"]},
                 "https://www.debian.org/News/news": { "categories": ["en_linux"]},
                 "http://www.markshuttleworth.com/feed": { "categories": ["en_linux"]},
@@ -125,7 +129,15 @@
                 "http://feeds.feedburner.com/LinuxJournal-BreakingNews?format=xml": { "categories": ["en_linux"]},
                 "https://www.gnome.org/feed/": { "categories": ["en_linux"]},
                 "http://linuxreviews.org/en.rss": { "categories": ["en_linux"]},
-                "http://www.linux-magazine.com/rss/feed/lmi_news": { "categories": ["en_linux"]}
+                "http://www.linux-magazine.com/rss/feed/lmi_news": { "categories": ["en_linux"]},
+                "http://lxer.com/module/newswire/headlines.rss": { "categories": ["en_linux"]},
+                "https://opensource.com/feed": { "categories": ["en_linux"]},
+                "https://www.space.com/home/feed/site.xml": { "categories": ["en_space"]},
+                "https://www.nasa.gov/rss/dyn/breaking_news.rss": { "categories": ["en_space"]},
+                "http://www.esa.int/rssfeed/Our_Activities/Space_News": { "categories": ["en_space"]},
+                "https://phys.org/rss-feed/space-news/": { "categories": ["en_space"]},
+                "http://spacenews.com/feed/": { "categories": ["en_space"]},
+                "https://feeds.feedburner.com/ISF": { "categories": ["en_space"]}
         },
         "entities": {
                 "blacklist": [