Merge lp:~elachuni/ubuntu-webcatalog/name-change into lp:ubuntu-webcatalog

[Anthony Lenton]

Updated the name of the site to "Ubuntu Apps Directory".

Overview
========
Updated the name of the site to "Apps Directory".

Details
=======
The only crucial update was the UI main header on the front page.
Several other comments were updated too for consistency, but the name of the package was left unchanged, as were several references in config.

While I was there, I updated the schema to always use Django 1.3's schema as a base (as it will now pull in 1.3.1 by default).

[Michael Nelson (michael.nelson)]

{{{
16:32 < achuni> noodles: real quickie when you have a minute: https://code.launchpad.net/~elachuni/ubuntu-webcatalog/name-change/+merge/75011
16:32 < noodles> sure
16:33 < noodles> achuni: sorry - I'm sure the discussion has already occured, but s/Apps Directory/Ubuntu Apps Directory ?
16:34 < achuni> noodles: it hasn't, and I'll need to check
16:34 < achuni> noodles: unluckily, sg isn't around atm
16:35 < noodles> OK, "Apps Directory" just sounds quite vague...
16:35 < achuni> yeah
16:36 < achuni> noodles: let's leave that unapproved until I verify
16:36 < noodles> achuni: sure. Also, I'm assuming you've grepped for 'catalog' or similar, and than tests all pass :)
16:36 * noodles marks needs-info
}}}

review: Needs Information

[lp:~elachuni/ubuntu-webcatalog/name-change]

53. By Anthony Lenton on 2011-09-12

s/Apps Directory/Ubuntu Apps Directory/

54. By Anthony Lenton on 2011-09-12

Added missing sso_api schema section.

55. By Anthony Lenton on 2011-09-12

Added [sso_api] section to dev settings.

=== modified file 'LICENSE'
--- LICENSE	2011-04-12 14:02:57 +0000
+++ LICENSE	2011-09-12 18:55:18 +0000
@@ -1,7 +1,7 @@
-Ubuntu-Webcatalog is Copyright 2011 Canonical Ltd.
+Apps Directory is Copyright 2011 Canonical Ltd.
 
 Canonical Ltd ("Canonical") distributes the source code for the
-Ubuntu Webcatalog under the GNU Affero General Public
+Apps Directory under the GNU Affero General Public
 License, version 3 ("AGPLv3").  The full text of this licence is
 given below.
 
 
=== modified file 'debian/control'
--- debian/control	2011-07-27 08:54:23 +0000
+++ debian/control	2011-09-12 18:55:18 +0000
@@ -26,5 +26,5 @@
  python-wsgi-oops,
  python-apt,
  python-ubuntu-rnr-client
-Description: Ubuntu Web Catalog
+Description: Apps Directory
  Providing web access to the Ubuntu Software Center.
 
=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	2011-08-10 18:58:04 +0000
+++ django_project/config/main.cfg	2011-09-12 18:55:18 +0000
@@ -99,3 +99,9 @@
 
 [rnr]
 rnr_service_root = http://reviews.ubuntu.com/reviews/api/1.0
+
+[sso_api]
+sso_api_service_root = https://login.staging.ubuntu.com/api/1.0
+sso_api_auth_username = insert-your-sso-api-username-here
+sso_api_auth_password = insert-your-sso-api-password-here
+sso_auth_mode_no_ubuntu_sso_plaintext_only = True
 
=== modified file 'fabtasks/__init__.py'
--- fabtasks/__init__.py	2011-04-07 08:57:13 +0000
+++ fabtasks/__init__.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of Ubuntu web catalog
+#   This file is part of Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'fabtasks/bootstrap.py'
--- fabtasks/bootstrap.py	2011-07-19 15:44:09 +0000
+++ fabtasks/bootstrap.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of Ubuntu web catalog
+#   This file is part of Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'fabtasks/django.py'
--- fabtasks/django.py	2011-07-07 13:08:38 +0000
+++ fabtasks/django.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of Ubuntu web catalog
+#   This file is part of Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'fabtasks/upgrade_from_package.py'
--- fabtasks/upgrade_from_package.py	2011-06-20 20:41:36 +0000
+++ fabtasks/upgrade_from_package.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of Ubuntu web catalog
+#   This file is part of Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/__init__.py'
--- src/webcatalog/__init__.py	2011-06-17 15:33:40 +0000
+++ src/webcatalog/__init__.py	2011-09-12 18:55:18 +0000
@@ -1,1 +1,18 @@
+#   -*- coding: utf-8 -*-
+#   This file is part of the Apps Directory
+#   Copyright (C) 2011 Canonical Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 __version__ = '0.1-1; r19'
 
=== modified file 'src/webcatalog/admin.py'
--- src/webcatalog/admin.py	2011-07-20 21:30:25 +0000
+++ src/webcatalog/admin.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Admin classes for the web catalog app."""
+"""Admin classes for the Apps Directory."""
 
 from __future__ import (
     absolute_import,
 
=== modified file 'src/webcatalog/api/__init__.py'
--- src/webcatalog/api/__init__.py	2011-06-27 16:31:36 +0000
+++ src/webcatalog/api/__init__.py	2011-09-12 18:55:18 +0000
@@ -1,4 +1,4 @@
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/api/forms.py'
--- src/webcatalog/api/forms.py	2011-07-27 16:44:52 +0000
+++ src/webcatalog/api/forms.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Forms for using within the Ubuntu Web Catalog API."""
+"""Forms for using within the Apps Directory API."""
 
 from __future__ import absolute_import
 
 
=== modified file 'src/webcatalog/api/handlers.py'
--- src/webcatalog/api/handlers.py	2011-07-29 15:57:17 +0000
+++ src/webcatalog/api/handlers.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Piston handlers for the  Ubuntu Web Catalog API."""
+"""Piston handlers for the  Apps Directory API."""
 
 from __future__ import absolute_import
 
 
=== modified file 'src/webcatalog/api/urls.py'
--- src/webcatalog/api/urls.py	2011-07-28 18:49:26 +0000
+++ src/webcatalog/api/urls.py	2011-09-12 18:55:18 +0000
@@ -1,4 +1,4 @@
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 )
 from webcatalog.auth import SSOOAuthAuthentication
 
-auth = SSOOAuthAuthentication(realm="Ubuntu Web Catalog")
+auth = SSOOAuthAuthentication(realm="Ubuntu Apps Directory")
 
 class CSRFExemptResource(Resource):
     """A Custom Resource that is csrf exempt"""
 
=== modified file 'src/webcatalog/auth.py'
--- src/webcatalog/auth.py	2011-06-27 16:31:36 +0000
+++ src/webcatalog/auth.py	2011-09-12 18:55:18 +0000
@@ -1,4 +1,5 @@
-#   This file is part of the Ubuntu Web Catalog
+#   -*- coding: utf-8 -*-
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/context_processors.py'
--- src/webcatalog/context_processors.py	2011-06-29 09:24:48 +0000
+++ src/webcatalog/context_processors.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Context processors web catalog app."""
+"""Context processors for the Apps Directory."""
 
 from django.conf import settings
 
 
=== modified file 'src/webcatalog/department_filters.py'
--- src/webcatalog/department_filters.py	2011-04-19 18:46:21 +0000
+++ src/webcatalog/department_filters.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2011-07-02 04:53:26 +0000
+++ src/webcatalog/forms.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Forms used by the web catalog."""
+"""Forms used by the Apps Directory."""
 
 from __future__ import (
     absolute_import,
 
=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2011-07-19 11:59:10 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/management/commands/import_for_purchase_apps.py'
--- src/webcatalog/management/commands/import_for_purchase_apps.py	2011-07-04 13:03:21 +0000
+++ src/webcatalog/management/commands/import_for_purchase_apps.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/management/commands/import_ratings_stats.py'
--- src/webcatalog/management/commands/import_ratings_stats.py	2011-08-09 19:23:03 +0000
+++ src/webcatalog/management/commands/import_ratings_stats.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/middleware/exception.py'
--- src/webcatalog/middleware/exception.py	2011-06-18 23:17:11 +0000
+++ src/webcatalog/middleware/exception.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Exception logging middleware for the web catalog app."""
+"""Exception logging middleware for the Apps Directory."""
 
 import logging
 import re
 
=== modified file 'src/webcatalog/models/__init__.py'
--- src/webcatalog/models/__init__.py	2011-07-27 16:52:06 +0000
+++ src/webcatalog/models/__init__.py	2011-09-12 18:55:18 +0000
@@ -1,4 +1,4 @@
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2011-08-09 19:47:52 +0000
+++ src/webcatalog/models/applications.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/models/oauthtoken.py'
--- src/webcatalog/models/oauthtoken.py	2011-07-28 20:39:00 +0000
+++ src/webcatalog/models/oauthtoken.py	2011-09-12 18:55:18 +0000
@@ -1,4 +1,4 @@
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py	2011-07-28 20:39:00 +0000
+++ src/webcatalog/schema.py	2011-09-12 18:55:18 +0000
@@ -1,3 +1,22 @@
+#   -*- coding: utf-8 -*-
+#   This file is part of the Apps Directory
+#   Copyright (C) 2011 Canonical Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""configglue schema for the Apps Directory."""
+
 import django
 
 from configglue.pyschema import ConfigSection
@@ -8,20 +27,9 @@
     LinesConfigOption,
     StringConfigOption,
     )
-from django_configglue.schema import (
-    Django112Schema,
-    schemas,
-    )
+from django_configglue.schema import schemas
 
-# Currently we've updated to latest configglue/django-configglue
-# but they remove a registered schema for django 1.1.1, which is
-# the currently installed django version on our servers, resulting in:
-# http://razorgirl.info/job/software-center-agent-deploy/23/console
-# So we register the 112 schema to match until we upgrade. Once we
-# upgraded this should still work without updating (as the version
-# will be 1.3).
-schemas.register(Django112Schema, '1.1.1')
-DjangoSchema = schemas.get(django.get_version())
+DjangoSchema = schemas.get('1.3')
 
 
 class WebCatalogSchema(DjangoSchema):
@@ -67,3 +75,11 @@
     rnr = ConfigSection()
     rnr.rnr_service_root = StringConfigOption(
         default="http://reviews.ubuntu.com/reviews/api/1.0")
+
+    sso_api = ConfigSection()
+    sso_api.sso_api_service_root = StringConfigOption()
+    sso_api.sso_api_auth_username = StringConfigOption()
+    sso_api.sso_api_auth_password = StringConfigOption()
+    sso_api.sso_api_identity_prefix = StringConfigOption()
+    sso_api.sso_auth_mode_no_ubuntu_sso_plaintext_only = BoolConfigOption()
+    sso_api.token_cache_expiry_hours = IntConfigOption(default=4)
 
=== modified file 'src/webcatalog/templates/webcatalog/department_overview.html'
--- src/webcatalog/templates/webcatalog/department_overview.html	2011-07-20 15:27:06 +0000
+++ src/webcatalog/templates/webcatalog/department_overview.html	2011-09-12 18:55:18 +0000
@@ -1,8 +1,8 @@
 {% extends "webcatalog/base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Ubuntu web catalog" %} &mdash; {{ dept.name }}{% endblock %}
-{% block header %}{% trans "Ubuntu web catalog" %} &mdash; {{ dept.name }}{% endblock %}
+{% block title %}{% trans "Ubuntu Apps Directory" %} &mdash; {{ dept.name }}{% endblock %}
+{% block header %}{% trans "Ubuntu Apps Directory" %} &mdash; {{ dept.name }}{% endblock %}
 
 {% block content %}
     {% include "webcatalog/breadcrumbs_snippet.html" %}
 
=== modified file 'src/webcatalog/templates/webcatalog/index.html'
--- src/webcatalog/templates/webcatalog/index.html	2011-06-23 14:51:21 +0000
+++ src/webcatalog/templates/webcatalog/index.html	2011-09-12 18:55:18 +0000
@@ -1,8 +1,8 @@
 {% extends "webcatalog/base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Ubuntu web catalog" %}{% endblock %}
-{% block header %}{% trans "Ubuntu web catalog" %}{% endblock %}
+{% block title %}{% trans "Ubuntu Apps Directory" %}{% endblock %}
+{% block header %}{% trans "Ubuntu Apps Directory" %}{% endblock %}
 {% block search %}{% endblock %}
 
 {% block content %}
 
=== modified file 'src/webcatalog/templatetags/webcatalog.py'
--- src/webcatalog/templatetags/webcatalog.py	2011-08-15 11:24:19 +0000
+++ src/webcatalog/templatetags/webcatalog.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Custom template tags for the webcatalog app."""
+"""Custom template tags for the Apps Directory."""
 
 from __future__ import (
     absolute_import,
 
=== modified file 'src/webcatalog/tests/__init__.py'
--- src/webcatalog/tests/__init__.py	2011-07-28 20:39:00 +0000
+++ src/webcatalog/tests/__init__.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2011-08-09 19:48:37 +0000
+++ src/webcatalog/tests/factory.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/tests/helpers.py'
--- src/webcatalog/tests/helpers.py	2011-06-27 14:26:40 +0000
+++ src/webcatalog/tests/helpers.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Helpers for testing the web catalog."""
+"""Helpers for testing the Apps Directory."""
 
 from __future__ import (
     absolute_import,
 
=== modified file 'src/webcatalog/tests/test_api.py'
--- src/webcatalog/tests/test_api.py	2011-07-29 15:57:17 +0000
+++ src/webcatalog/tests/test_api.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""WebCatalog API tests."""
+"""Apps Directory API tests."""
 
 from __future__ import absolute_import
 
 
=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2011-08-09 19:23:03 +0000
+++ src/webcatalog/tests/test_commands.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Test cases for the web catalog management commands."""
+"""Test cases for the Apps Directory management commands."""
 
 from __future__ import (
     absolute_import,
 
=== modified file 'src/webcatalog/tests/test_department_filters.py'
--- src/webcatalog/tests/test_department_filters.py	2011-04-13 02:24:17 +0000
+++ src/webcatalog/tests/test_department_filters.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/tests/test_forms.py'
--- src/webcatalog/tests/test_forms.py	2011-08-09 19:47:52 +0000
+++ src/webcatalog/tests/test_forms.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Test cases for the web catalog forms."""
+"""Test cases for the Apps Directory forms."""
 
 from __future__ import (
     absolute_import,
 
=== modified file 'src/webcatalog/tests/test_handlers.py'
--- src/webcatalog/tests/test_handlers.py	2011-07-29 15:57:17 +0000
+++ src/webcatalog/tests/test_handlers.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Ubuntu Web Catalog handlers tests."""
+"""Apps Directory handlers tests."""
 
 from __future__ import absolute_import
 
 
=== modified file 'src/webcatalog/tests/test_models.py'
--- src/webcatalog/tests/test_models.py	2011-07-04 11:52:26 +0000
+++ src/webcatalog/tests/test_models.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
 
=== modified file 'src/webcatalog/tests/test_templatetags.py'
--- src/webcatalog/tests/test_templatetags.py	2011-07-21 13:38:37 +0000
+++ src/webcatalog/tests/test_templatetags.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Tests for the webcatalog template tags."""
+"""Tests for the Apps Directory template tags."""
 
 from __future__ import (
     absolute_import,
 
=== modified file 'src/webcatalog/tests/test_utilities.py'
--- src/webcatalog/tests/test_utilities.py	2011-07-01 15:32:24 +0000
+++ src/webcatalog/tests/test_utilities.py	2011-09-12 18:55:18 +0000
@@ -1,3 +1,22 @@
+#   -*- coding: utf-8 -*-
+#   This file is part of the Apps Directory
+#   Copyright (C) 2011 Canonical Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the Apps Directory utilities."""
+
 import os
 
 from webcatalog.tests.factory import TestCaseWithFactory
 
=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2011-08-15 11:24:19 +0000
+++ src/webcatalog/tests/test_views.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Test cases for the Ubuntu web catalog views."""
+"""Test cases for the Apps Directory views."""
 
 from __future__ import (
     absolute_import,
 
=== modified file 'src/webcatalog/urls.py'
--- src/webcatalog/urls.py	2011-07-07 20:54:45 +0000
+++ src/webcatalog/urls.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Url configuration for the Ubuntu Web Catalog."""
+"""Url configuration for the Apps Directory."""
 
 from __future__ import (
     absolute_import,
 
=== modified file 'src/webcatalog/utilities.py'
--- src/webcatalog/utilities.py	2011-07-01 15:27:44 +0000
+++ src/webcatalog/utilities.py	2011-09-12 18:55:18 +0000
@@ -1,4 +1,5 @@
-#   This file is part of the Ubuntu Web Catalog
+#   -*- coding: utf-8 -*-
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -14,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Utilities used by various modules of the web catalog."""
+"""Utilities used by various modules of the Apps Directory."""
 
 
 from __future__ import absolute_import
 
=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2011-07-07 20:54:45 +0000
+++ src/webcatalog/views.py	2011-09-12 18:55:18 +0000
@@ -1,5 +1,5 @@
 #   -*- coding: utf-8 -*-
-#   This file is part of the Ubuntu Web Catalog
+#   This file is part of the Apps Directory
 #   Copyright (C) 2011 Canonical Ltd.
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Views for the web catalog app."""
+"""Views for the Apps Directory app."""
 
 from __future__ import (
     absolute_import,
 
=== modified file 'src/webcatalog/wsgi.py'
--- src/webcatalog/wsgi.py	2011-06-20 20:52:04 +0000
+++ src/webcatalog/wsgi.py	2011-09-12 18:55:18 +0000
@@ -1,3 +1,22 @@
+#   -*- coding: utf-8 -*-
+#   This file is part of the Apps Directory
+#   Copyright (C) 2011 Canonical Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""wsgi stack for the Apps Directory."""
+
 import logging.config
 import platform