Changeset 8508

Timestamp:

10/08/12 15:54:43 (7 years ago)

Author:

mnagni

Message:

Incomplete - # 22534: Add versiojn number to the gui page
 http://team.ceda.ac.uk/trac/ceda/ticket/22534
Failed the deployment in cidev.
Fix a configuration problem with DJANGO manage/settings files

Location:

mauRepo/HPFos/trunk/hpfos/HPFos

Files:

• manage.py (modified) (1 diff)
• settings.py (modified) (1 diff)
• settings_local.py (modified) (1 diff)
• template/500.html (added)
• wsgi.py (modified) (1 diff)

mauRepo/HPFos/trunk/hpfos/HPFos/manage.py

@@ -1 +1 @@
 #!/usr/bin/env python
-import os
-import sys
+from django.core.management import execute_manager
+import imp
+try:
+    imp.find_module('settings') # Assumed to be in the same directory.
+except ImportError:
+    import sys
+    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
+    sys.exit(1)
+
+import settings
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "hpfos.HPFos.settings")
-
-    from django.core.management import execute_from_command_line
-
-    execute_from_command_line(sys.argv)
+    execute_manager(settings)

mauRepo/HPFos/trunk/hpfos/HPFos/settings.py

@@ -10 +10 @@
 PROJECT = os.path.dirname(SRC)
 
-DEBUG = True
+DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 

mauRepo/HPFos/trunk/hpfos/HPFos/settings_local.py

@@ -34 +34 @@
 #MOLES3_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3_dev1'
 #MOLES3_DB_CONNECTION = 'postgresql://badc:yps937g@cidev-db.jc.rl.ac.uk:5432/Moles3'
+DEBUG = True

mauRepo/HPFos/trunk/hpfos/HPFos/wsgi.py

@@ -1 @@
-"""
-WSGI config for HPFos project.
-
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
-
-Usually you will have the standard Django WSGI application here, but it also
-might make sense to replace the whole Django WSGI application with a custom one
-that later delegates to the Django one. For example, you could introduce WSGI
-middleware here, or combine a Django application with an application of another
-framework.
-
-"""
+import sys
+import site
 import os
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "HPFos.settings")
+#this is the path to the virtualenv python site-package dir
+vepath = 'VEPATH_PAR'
+#this is the path to dir parent to the django project 
+djangoPath = 'DJANGO_PATH'
 
-# This application object is used by any WSGI server configured to use this
-# file. This includes Django's development server, if the WSGI_APPLICATION
-# setting points here.
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
+#this is the project's name
+projectLibPath = 'PROJECT_LIB_PATH'
 
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)
+#EXAMPLE
+#vepath = '/home/jenkins/testEnv/pyEnv/ve/cedaManager/lib/python2.6/site-packages'
+#djangoPath = '/home/jenkins/testEnv/pyEnv/ve/cedaManager/lib/python2.6/site-packages/cedaManager/src/MolesManager'
+#projectLib = '/home/jenkins/testEnv/pyEnv/ve/cedaManager/lib/python2.6/site-packages/cedaManager/src'
+
+#this is the project's name
+#projectName = ''
+
+ALLDIRS = [vepath, projectLibPath, djangoPath]
+
+# Remember original sys.path.
+prev_sys_path = list(sys.path)
+
+# Add each new site-packages directory.
+for directory in ALLDIRS:
+    site.addsitedir(directory)
+
+# Reorder sys.path so new directories at the front.
+new_sys_path = []
+for item in list(sys.path):
+    if item not in prev_sys_path:
+        new_sys_path.append(item)
+        sys.path.remove(item)
+sys.path[:0] = new_sys_path
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()
+