Revision e28a4841 snf-astakos-app/astakos/urls.py

b/snf-astakos-app/astakos/urls.py
33 33

  
34 34
from django.conf.urls import include, patterns
35 35

  
36
from astakos.im.settings import BASE_URL, BASE_PATH, ACCOUNTS_PREFIX, \
37
    VIEWS_PREFIX, KEYSTONE_PREFIX, WEBLOGIN_PREFIX, ADMIN_PREFIX
36
from astakos.im.settings import BASE_PATH, ACCOUNTS_PREFIX, \
37
    VIEWS_PREFIX, KEYSTONE_PREFIX, WEBLOGIN_PREFIX, ADMIN_PREFIX, OA2_PREFIX
38 38
from snf_django.lib.api.utils import prefix_pattern
39 39
from snf_django.utils.urls import \
40 40
    extend_with_root_redirects, extend_endpoint_with_slash
41 41
from astakos.im.settings import astakos_services
42
from astakos.oa2.backends import DjangoBackend, AstakosBackend
43 42

  
44 43
urlpatterns = []
45 44

  
......
47 46
extend_endpoint_with_slash(urlpatterns, astakos_services, 'astakos_ui')
48 47
extend_endpoint_with_slash(urlpatterns, astakos_services, 'astakos_weblogin')
49 48

  
50
oa2_backend = DjangoBackend(BASE_URL, 'oa2')
51
astakos_oa2_backend = AstakosBackend(BASE_URL, 'oa2/services', 'services')
52

  
53 49
astakos_patterns = patterns(
54 50
    '',
55 51
    (prefix_pattern(VIEWS_PREFIX), include('astakos.im.urls')),
......
57 53
    (prefix_pattern(KEYSTONE_PREFIX), include('astakos.api.keystone_urls')),
58 54
    (prefix_pattern(WEBLOGIN_PREFIX), include('astakos.im.weblogin_urls')),
59 55
    (prefix_pattern(ADMIN_PREFIX), include('astakos.admin.admin_urls')),
56
    (prefix_pattern(OA2_PREFIX), include('astakos.oa2.urls')),
60 57
)
61 58

  
62 59

  
......
68 65
# set utility redirects
69 66
extend_with_root_redirects(urlpatterns, astakos_services,
70 67
                           'astakos_ui', BASE_PATH)
71

  
72
urlpatterns += oa2_backend.get_url_patterns()
73
#urlpatterns += astakos_oa2_backend.get_url_patterns()

Also available in: Unified diff