# HG changeset patch # User cavaliet # Date 1370014788 -7200 # Node ID dbe15daa39f11026c7fd34299bbef06b8c436df8 # Parent 730072d4e7810de71003edae83f08be48ab19519 good config with aixweb app diff -r 730072d4e781 -r dbe15daa39f1 .hgignore --- a/.hgignore Fri May 31 16:14:20 2013 +0200 +++ b/.hgignore Fri May 31 17:39:48 2013 +0200 @@ -22,4 +22,6 @@ syntax: regexp ^virtualenv/web/project-boot\.py$ syntax: regexp -^\.settings$ \ No newline at end of file +^\.settings$ +syntax: regexp +^run/log/log\.txt$ \ No newline at end of file diff -r 730072d4e781 -r dbe15daa39f1 README.md diff -r 730072d4e781 -r dbe15daa39f1 creation/Finalisation_1.indd diff -r 730072d4e781 -r dbe15daa39f1 creation/Finalisation_1.pdf diff -r 730072d4e781 -r dbe15daa39f1 creation/Links/IRI-rub_webdoc_DETAIL.jpg diff -r 730072d4e781 -r dbe15daa39f1 creation/Links/bc30-1000pxl.jpg diff -r 730072d4e781 -r dbe15daa39f1 host-site/fonts/museo300-regular-webfont.eot diff -r 730072d4e781 -r dbe15daa39f1 host-site/fonts/museo300-regular-webfont.svg diff -r 730072d4e781 -r dbe15daa39f1 host-site/fonts/museo300-regular-webfont.ttf diff -r 730072d4e781 -r dbe15daa39f1 host-site/fonts/museo300-regular-webfont.woff diff -r 730072d4e781 -r dbe15daa39f1 host-site/fonts/museo900-regular-webfont.eot diff -r 730072d4e781 -r dbe15daa39f1 host-site/fonts/museo900-regular-webfont.svg diff -r 730072d4e781 -r dbe15daa39f1 host-site/fonts/museo900-regular-webfont.ttf diff -r 730072d4e781 -r dbe15daa39f1 host-site/fonts/museo900-regular-webfont.woff diff -r 730072d4e781 -r dbe15daa39f1 host-site/images/design/bg.png diff -r 730072d4e781 -r dbe15daa39f1 host-site/images/design/down-over.png diff -r 730072d4e781 -r dbe15daa39f1 host-site/images/design/down.png diff -r 730072d4e781 -r dbe15daa39f1 host-site/images/design/recherche.png diff -r 730072d4e781 -r dbe15daa39f1 host-site/images/design/social.png diff -r 730072d4e781 -r dbe15daa39f1 host-site/index.html diff -r 730072d4e781 -r dbe15daa39f1 host-site/index_files/laposte.jpg diff -r 730072d4e781 -r dbe15daa39f1 host-site/index_files/logo.png diff -r 730072d4e781 -r dbe15daa39f1 host-site/index_files/orange.jpg diff -r 730072d4e781 -r dbe15daa39f1 host-site/index_files/style.css diff -r 730072d4e781 -r dbe15daa39f1 host-site/index_files/vivendi.png diff -r 730072d4e781 -r dbe15daa39f1 player/css/styles.css diff -r 730072d4e781 -r dbe15daa39f1 player/data/rigoletto.json diff -r 730072d4e781 -r dbe15daa39f1 player/fonts/Futura-CondensedExtraBold.svg diff -r 730072d4e781 -r dbe15daa39f1 player/fonts/Futura-CondensedExtraBold.ttf diff -r 730072d4e781 -r dbe15daa39f1 player/fonts/Futura-CondensedExtraBold.woff diff -r 730072d4e781 -r dbe15daa39f1 player/fonts/Futura-Medium.svg diff -r 730072d4e781 -r dbe15daa39f1 player/fonts/Futura-Medium.ttf diff -r 730072d4e781 -r dbe15daa39f1 player/fonts/Futura-Medium.woff diff -r 730072d4e781 -r dbe15daa39f1 player/img/sprites.png diff -r 730072d4e781 -r dbe15daa39f1 player/index.html diff -r 730072d4e781 -r dbe15daa39f1 player/js/ldt-serializer.js diff -r 730072d4e781 -r dbe15daa39f1 player/js/metadataplayer-core.js diff -r 730072d4e781 -r dbe15daa39f1 player/js/player.js diff -r 730072d4e781 -r dbe15daa39f1 player/lib/jquery-ui.min.js diff -r 730072d4e781 -r dbe15daa39f1 player/lib/jquery.min.js diff -r 730072d4e781 -r dbe15daa39f1 player/lib/underscore-min.js diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/__init__.py diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/config.py.tmpl diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/django_wsgi.py --- a/src/aixweb/django_wsgi.py Fri May 31 16:14:20 2013 +0200 +++ b/src/aixweb/django_wsgi.py Fri May 31 17:39:48 2013 +0200 @@ -1,6 +1,6 @@ import os -os.environ['DJANGO_SETTINGS_MODULE'] = 'ldtplatform.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'aixweb.settings' import django.core.handlers.wsgi diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/locale/en/LC_MESSAGES/django.mo diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/locale/en/LC_MESSAGES/django.po diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/locale/fr/LC_MESSAGES/django.mo diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/locale/fr/LC_MESSAGES/django.po diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/locale/ja/LC_MESSAGES/django.mo diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/locale/ja/LC_MESSAGES/django.po diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/migrations/0001_initial.py diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/migrations/0002_iri_url_update.py diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/migrations/0003_recalculate_contentstat.py diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/migrations/__init__.py diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/models.py diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/modwsgi.wsgi diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/settings.py --- a/src/aixweb/settings.py Fri May 31 16:14:20 2013 +0200 +++ b/src/aixweb/settings.py Fri May 31 17:39:48 2013 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- #@PydevCodeAnalysisIgnore import os.path -import ldtplatform +import aixweb # Django settings for project. DEBUG = True @@ -105,7 +105,7 @@ ) -ROOT_URLCONF = 'ldtplatform.urls' +ROOT_URLCONF = 'aixweb.urls' TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". @@ -148,7 +148,7 @@ 'ldt.indexation', 'hashcut', 'chunked_uploads', - 'ldtplatform', + 'aixweb', ) #AUTH_PROFILE_MODULE = 'user.UserProfile' @@ -213,7 +213,7 @@ ANONYMOUS_USER_ID = -1 -WEB_VERSION = ldtplatform.get_version() +WEB_VERSION = aixweb.get_version() DIVISIONS_FOR_STAT_ANNOTATION = 64 @@ -252,7 +252,7 @@ SRC_BASE_URL = BASE_URL + __name__.split('.')[0] + '/' if not "SRC_BASE_URL" in locals(): - SRC_BASE_URL = BASE_URL + 'ldtplatform/' + SRC_BASE_URL = BASE_URL + 'aixweb/' if not "LOGIN_URL" in locals(): LOGIN_URL = SRC_BASE_URL + 'accounts/login/' diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/static/aixweb/img/logo_festival_aix.png diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/templates/admin/base_site.html diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/templates/ldt/ldt_utils/workspace.html diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/templates/metadatacomposer/aix/composer_header.html diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/templates/metadatacomposer/aix/composer_header_css.html diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/templates/metadatacomposer/aix/composer_player_css.html diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/templates/registration/login.html diff -r 730072d4e781 -r dbe15daa39f1 src/aixweb/urls.py diff -r 730072d4e781 -r dbe15daa39f1 src/manage.py --- a/src/manage.py Fri May 31 16:14:20 2013 +0200 +++ b/src/manage.py Fri May 31 17:39:48 2013 +0200 @@ -3,7 +3,7 @@ import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ldtplatform.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aixweb.settings") from django.core.management import execute_from_command_line diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/lib/lib_create_env.py diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/lib/patch.py diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/Django-1.5.2.dev20130524113953.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/IRI-django-registration-e23626c256c0.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/MySQL-python-1.2.3.win-amd64-py2.7.exe diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/MySQL-python-1.2.3.win32-py2.7.exe diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/MySQL-python-1.2.4b4.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/PIL-1.1.7.win32-py2.7.exe diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/Pillow-2.0.0.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/PyYAML-3.10.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/defusedxml-0.4.1.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/distribute-0.6.34.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/django-chunked-uploads-0.5.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/django-extensions-1.1.1.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/django-guardian-e311bc1040222321ad1bfb74ac8e8fea9748d674.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/django-haystack-2.0.0.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/django-oauth-plus-2.1.0.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/django-openid-consumer-0.1.1.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/django-social-auth-0.7.23.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/django-tagging-0.3.1.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/django-tastypie-0.9.15.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/httplib2-0.8.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/jezdez-setuptools_hg-b025f18e170b.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/jpegsrc.v8d.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/ldt-1.50.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/lxml-2.3-py2.7-win32.egg diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/lxml-3.2.1.tar.bz2 diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/mimeparse-0.1.3.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/oauth2-1.5.211.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/platform-b4559d14b9ac.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/psycopg2-2.4.6.win32-py2.7-pg9.2.2-release.exe diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/psycopg2-2.5.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/pyelasticsearch-0.5.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/python-dateutil-2.1.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/python-digest-1.7.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/python-openid-2.2.5.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/requests-1.2.0.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/setuptools_hg-0.4.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/simplejson-3.3.0.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/six-1.3.0.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/sorl-thumbnail-v11.12.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/south-0.7.6.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/whoosh-2.5.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/res/src/zlib-1.2.8.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/sync/virtualenv_support/distribute-0.6.34.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/sync/virtualenv_support/pip-1.3.1.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/create_python_env.py diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/env/.keepme diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/res/README diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/res/patch/.keepme diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/res/patch/django_contrib_auth_views.diff diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/res/patch/oauth2.diff diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/res/patch/social_auth_views_diff.diff diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/res/res_create_env.py diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/res/srvr_requirements.txt diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/virtualenv_support/__init__.py diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/virtualenv_support/distribute-0.6.34.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/virtualenv_support/pip-1.3.1.tar.gz diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/virtualenv_support/setuptools-0.6c11-py2.5.egg diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/virtualenv_support/setuptools-0.6c11-py2.6.egg diff -r 730072d4e781 -r dbe15daa39f1 virtualenv/web/virtualenv_support/setuptools-0.6c11-py2.7.egg diff -r 730072d4e781 -r dbe15daa39f1 web/.htaccess.tmpl --- a/web/.htaccess.tmpl Fri May 31 16:14:20 2013 +0200 +++ b/web/.htaccess.tmpl Fri May 31 17:39:48 2013 +0200 @@ -1,1 +1,1 @@ -RedirectMatch permanent /~ymh/platform/?$ /~ymh/platform/platform +RedirectMatch permanent /aix/?$ /aix/aixweb