X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Frouting.py;h=1393f01c6a175417b818bb9096a45e79d2343eef;hb=2e76016c9a6ae42a43f610e0f19ea3c45875bf8c;hp=ae56f8cb54a69083636f01183136c19821014326;hpb=12a100e4d8bdda7bd2353403a7e08e3a94669498;p=mediagoblin.git

diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index ae56f8cb..1393f01c 100644
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -14,27 +14,34 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from routes import Mapper
+import logging
 
+from mediagoblin.tools.routing import add_route, mount, url_map
+from mediagoblin.tools.pluginapi import PluginManager
+from mediagoblin.moderation.routing import moderation_routes
 from mediagoblin.auth.routing import auth_routes
-from mediagoblin.submit.routing import submit_routes
-from mediagoblin.user_pages.routing import user_routes
-from mediagoblin.edit.routing import edit_routes
-from mediagoblin.listings.routing import tag_routes
 
 
-def get_mapper():
-    mapping = Mapper()
-    mapping.minimization = False
+_log = logging.getLogger(__name__)
 
-    mapping.connect(
-        "index", "/",
-        controller="mediagoblin.views:root_view")
 
-    mapping.extend(auth_routes, '/auth')
-    mapping.extend(submit_routes, '/submit')
-    mapping.extend(user_routes, '/u')
-    mapping.extend(edit_routes, '/edit')
-    mapping.extend(tag_routes, '/tag')
+def get_url_map():
+    add_route('index', '/', 'mediagoblin.views:root_view')
+    add_route('terms_of_service','/terms_of_service',
+        'mediagoblin.views:terms_of_service')
+    mount('/auth', auth_routes)
+    mount('/mod', moderation_routes)
 
-    return mapping
+    import mediagoblin.submit.routing
+    import mediagoblin.user_pages.routing
+    import mediagoblin.edit.routing
+    import mediagoblin.webfinger.routing
+    import mediagoblin.listings.routing
+    import mediagoblin.notifications.routing
+    import mediagoblin.oauth.routing
+
+    
+    for route in PluginManager().get_routes():
+        add_route(*route)
+
+    return url_map