X-Git-Url: https://code.grnet.gr/git/pithos/blobdiff_plain/7ff57991be57309f4a447351c8b3426532c028ad:/pithos/urls.py..8c306eab5737f1d09c6f8d01f0de3ce02d3e3ed9:/snf-pithos-app/pithos/urls.py diff --git a/pithos/urls.py b/snf-pithos-app/pithos/urls.py similarity index 87% rename from pithos/urls.py rename to snf-pithos-app/pithos/urls.py index ca9f372..cd7c58f 100644 --- a/pithos/urls.py +++ b/snf-pithos-app/pithos/urls.py @@ -1,18 +1,18 @@ # Copyright 2011 GRNET S.A. All rights reserved. -# +# # Redistribution and use in source and binary forms, with or # without modification, are permitted provided that the following # conditions are met: -# +# # 1. Redistributions of source code must retain the above # copyright notice, this list of conditions and the following # disclaimer. -# +# # 2. Redistributions in binary form must reproduce the above # copyright notice, this list of conditions and the following # disclaimer in the documentation and/or other materials # provided with the distribution. -# +# # THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -25,7 +25,7 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -# +# # The views and conclusions contained in the software and # documentation are those of the authors and should not be # interpreted as representing official policies, either expressed @@ -35,8 +35,8 @@ from django.conf.urls.defaults import include, patterns urlpatterns = patterns('', - (r'^v1(?:$|/)', include('pithos.api.urls')), - (r'^v1\.0(?:$|/)', include('pithos.api.urls')), - (r'^public/(?P.+?)/?$', 'pithos.api.public.public_demux'), - (r'^ui', include('pithos.ui.urls')) + (r'v1(?:$|/)', include('pithos.api.urls')), + (r'v1\.0(?:$|/)', include('pithos.api.urls')), + (r'public/(?P.+?)/?$', 'pithos.api.public.public_demux'), + (r'ui', include('pithos.ui.urls')) )