Fixed #627 -- BACKWARDS-INCOMPATIBLE CHANGE. Admin is now an app, not a middleware. See BackwardsIncompatibleChanges for a full list of changes and information on how to update your code.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@948 bcc190cf-cafb-0310-a4f2-bffc1f526a37

6 files changed, 0 insertions, 82 deletions

diff --git a/django/conf/project_template/settings/__init__.py b/django/conf/project_template/settings/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/django/conf/project_template/settings/__init__.py
+++ /dev/null
diff --git a/django/conf/project_template/settings/admin.py b/django/conf/project_template/settings/admin.py
deleted file mode 100644
index 603886a5f2..0000000000
--- a/django/conf/project_template/settings/admin.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Django settings for {{ project_name }} project admin site.
-
-from main import *
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates".
-)
-ROOT_URLCONF = '{{ project_name }}.settings.urls.admin'
-MIDDLEWARE_CLASSES = (
-    'django.middleware.sessions.SessionMiddleware',
-    'django.middleware.admin.AdminUserRequired',
-    'django.middleware.common.CommonMiddleware',
-)
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
diff --git a/django/conf/project_template/settings/main.py b/django/conf/project_template/settings/main.py
deleted file mode 100644
index 1bde7df10a..0000000000
--- a/django/conf/project_template/settings/main.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Django settings for {{ project_name }} project.
-
-DEBUG = True
-
-ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-LANGUAGE_CODE = 'en-us'
-
-DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
-DATABASE_NAME = ''             # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-
-SITE_ID = 1
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
-MEDIA_URL = ''
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = ''
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-#     'django.core.template.loaders.app_directories.load_template_source',
-    'django.core.template.loaders.filesystem.load_template_source',
-#     'django.core.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    "django.middleware.common.CommonMiddleware",
-    "django.middleware.doc.XViewMiddleware",
-)
-
-ROOT_URLCONF = '{{ project_name }}.settings.urls.main'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates".
-)
-
-INSTALLED_APPS = (
-)
diff --git a/django/conf/project_template/settings/urls/__init__.py b/django/conf/project_template/settings/urls/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/django/conf/project_template/settings/urls/__init__.py
+++ /dev/null
diff --git a/django/conf/project_template/settings/urls/admin.py b/django/conf/project_template/settings/urls/admin.py
deleted file mode 100644
index c3eb86d3cb..0000000000
--- a/django/conf/project_template/settings/urls/admin.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.conf.urls.defaults import *
-
-urlpatterns = patterns('',
-    (r'^admin/', include('django.conf.urls.admin')),
-    (r'^r/', include('django.conf.urls.shortcut')),
-)
diff --git a/django/conf/project_template/settings/urls/main.py b/django/conf/project_template/settings/urls/main.py
deleted file mode 100644
index f9b993a52c..0000000000
--- a/django/conf/project_template/settings/urls/main.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.conf.urls.defaults import *
-
-urlpatterns = patterns('',
-    # Example:
-    # (r'^{{ project_name }}/', include('{{ project_name }}.apps.foo.urls.foo')),
-)