From 176c5f171112b0e4f7b4c377d54a1fa441ff78aa Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 9 Apr 2013 18:55:07 -0400
Subject: [PATCH] added planetstack.urls

---
 plstackapi/planetstack/settings.py |  3 ++-
 plstackapi/planetstack/urls.py     | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 plstackapi/planetstack/urls.py

diff --git a/plstackapi/planetstack/settings.py b/plstackapi/planetstack/settings.py
index 7e223a1..3593ad4 100644
--- a/plstackapi/planetstack/settings.py
+++ b/plstackapi/planetstack/settings.py
@@ -128,8 +128,9 @@ INSTALLED_APPS = (
     'django.contrib.admindocs',
     'rest_framework',
     'django_extensions',
-    'plstackapi.planetstack',
     'django_evolution',
+    'plstackapi.planetstack',
+    'plstackapi.core',
 )
 
 # A sample logging configuration. The only tangible logging
diff --git a/plstackapi/planetstack/urls.py b/plstackapi/planetstack/urls.py
new file mode 100644
index 0000000..c0a4443
--- /dev/null
+++ b/plstackapi/planetstack/urls.py
@@ -0,0 +1,26 @@
+from django.conf.urls import patterns, include, url
+
+# Uncomment the next two lines to enable the admin:
+from django.contrib import admin
+from plstackapi.planetstack.api_root import api_root
+from rest_framework import generics
+
+admin.autodiscover()
+
+urlpatterns = patterns('',
+    # Examples:
+    # url(r'^$', 'planetstack.views.home', name='home'),
+    # url(r'^planetstack/', include('planetstack.foo.urls')),
+
+    # Uncomment the admin/doc line below to enable admin documentation:
+    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+
+    # Uncomment the next line to enable the admin:
+    url(r'^admin/', include(admin.site.urls)),
+
+    url(r'^plstackapi/$', api_root),
+    
+    #Adding in rest_framework urls
+    url(r'^plstackapi/', include('rest_framework.urls', namespace='rest_framework')),
+    
+)
-- 
2.43.0