Kill MultiRemoteStaticDirect... nobody was really using it anyway

[mediagoblin.git] / mediagoblin / routing.py

diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index c60f121c369485576766f84526dc057d85721f8c..adbe62537313b8ff2aa06a4807ad4c71f9766374 100644 (file)
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -1,5 +1,5 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# GNU MediaGoblin -- federated, autonomous media hosting
+# 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
@@ -16,6 +16,16 @@
 
 from routes import Mapper
 
+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
+from mediagoblin.webfinger.routing import webfinger_well_known_routes, \
+    webfinger_routes
+from mediagoblin.admin.routing import admin_routes
+
+
 def get_mapper():
     mapping = Mapper()
     mapping.minimization = False
@@ -23,8 +33,14 @@ def get_mapper():
     mapping.connect(
         "index", "/",
         controller="mediagoblin.views:root_view")
-    mapping.connect(
-        "test_submit", "/test_submit/",
-        controller="mediagoblin.views:submit_test")
+
+    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')
+    mapping.extend(webfinger_well_known_routes, '/.well-known')
+    mapping.extend(webfinger_routes, '/api/webfinger')
+    mapping.extend(admin_routes, '/a')
 
     return mapping