restructuring of mailx

haystack · Nov 13, 2012 · dd310d7 · dd310d7
1 parent d1e8c77
commit dd310d7
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 10 deletions.
diff --git a/modules/__init__.py → browser/__init__.py b/modules/__init__.py → browser/__init__.py
diff --git a/modules/browser/templates/base.html → browser/templates/base.html b/modules/browser/templates/base.html → browser/templates/base.html
diff --git a/modules/browser/templates/index.html → browser/templates/index.html b/modules/browser/templates/index.html → browser/templates/index.html
diff --git a/modules/browser/views.py → browser/views.py b/modules/browser/views.py → browser/views.py
diff --git a/config/settings.py b/config/settings.py
@@ -1,7 +1,6 @@
 # This file contains python variables that configure Lamson for email processing.
 import sys, os
 import logging
-sys.path.append('./modules')
 
 
 # You may add additional parameters such as `username' and `password' if your
@@ -11,13 +10,13 @@
 
 receiver_config = {'host': '0.0.0.0', 'port': 25}
 
-handlers = ['modules.handler.main']
+handlers = ['smtp_handler.main']
 
 router_defaults = {'host': '\*\\.mit\\.edu'}
 
 template_config = {'dir': 'modules', 'module': 'templates'}
 
 # hook django
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "browser.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "http_handler.settings")
 
 # the config/boot.py will turn these values into variables set in settings
diff --git a/modules/browser/__init__.py → http_handler/__init__.py b/modules/browser/__init__.py → http_handler/__init__.py
diff --git a/modules/browser/settings.py → http_handler/settings.py b/modules/browser/settings.py → http_handler/settings.py
@@ -97,10 +97,10 @@
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
-ROOT_URLCONF = 'browser.urls'
+ROOT_URLCONF = 'http_handler.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'browser.wsgi.application'
+WSGI_APPLICATION = 'http_handler.wsgi.application'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -115,8 +115,10 @@
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'http_handler',
+    'schema',
     'browser',
-    'handler'
+    'smtp_handler',
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:

diff --git a/modules/browser/urls.py → http_handler/urls.py b/modules/browser/urls.py → http_handler/urls.py
diff --git a/modules/browser/wsgi.py → http_handler/wsgi.py b/modules/browser/wsgi.py → http_handler/wsgi.py
@@ -1,5 +1,5 @@
 """
-WSGI config for browser project.
+WSGI config for mailx 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
@@ -15,7 +15,7 @@
 """
 import os
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "browser.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "http_handler.settings")
 
 # This application object is used by any WSGI server configured to use this
 # file. This includes Django's development server, if the WSGI_APPLICATION

diff --git a/modules/manage.py → manage.py b/modules/manage.py → manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "browser.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "http_handler.settings")
 
     from django.core.management import execute_from_command_line
 

diff --git a/modules/handler/__init__.py → schema/__init__.py b/modules/handler/__init__.py → schema/__init__.py
diff --git a/modules/handler/models.py → schema/models.py b/modules/handler/models.py → schema/models.py
diff --git a/smtp_handler/__init__.py b/smtp_handler/__init__.py
diff --git a/modules/handler/main.py → smtp_handler/main.py b/modules/handler/main.py → smtp_handler/main.py
@@ -1,7 +1,7 @@
 import logging, time, base64, email
 from lamson.routing import route, stateless
 from config.settings import relay
-from models import *
+from schema.models import *
 from email.utils import *
 from lamson.mail import MailResponse