summaryrefslogtreecommitdiff
path: root/coip/urls.py
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-06-19 23:39:34 +0200
committerLeif Johansson <leifj@sunet.se>2011-06-19 23:39:34 +0200
commita987b0cbf7874c4c547536270b80e432561ddfd8 (patch)
tree416546b83a5c591d65f55b72a49024122ae55a33 /coip/urls.py
parent3cb58a9e9c9aae32ae1b22c3d8e83528df766764 (diff)
initial opensocial people service
Diffstat (limited to 'coip/urls.py')
-rw-r--r--coip/urls.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/coip/urls.py b/coip/urls.py
index 637bfa8..4b1bc6f 100644
--- a/coip/urls.py
+++ b/coip/urls.py
@@ -1,12 +1,13 @@
-from django.conf.urls.defaults import *
-
-# Uncomment the next two lines to enable the admin:
+from django.conf.urls.defaults import patterns,include
from django.contrib import admin
from django.contrib.auth.views import login
from settings import ADMIN_MEDIA_ROOT
from settings import MEDIA_ROOT
from django.http import HttpResponseRedirect
from coip.apps.auth.views import logout
+from coip.apps.opensocial import opensocial_v1
+from coip.apps.api import v1_api
+
admin.autodiscover()
def welcome(request):
@@ -64,4 +65,7 @@ urlpatterns = patterns('',
(r'^ctree/(?P<id>[0-9]+).json$', 'coip.apps.name.views.ctree'),
(r'^rtree.json$', 'coip.apps.name.views.rtree'),
(r'^rtree/(?P<id>[0-9]+).json$', 'coip.apps.name.views.rtree'),
+ # APIs
+ (r'^api/', include(v1_api.urls)),
+ (r'^opensocial/', include(opensocial_v1.urls))
)