Fix.

12 files changed, 48 insertions, 47 deletions

diff --git a/docs/tutorials/bfgwiki2/src/authorization/CHANGES.txt b/docs/tutorials/bfgwiki2/src/authorization/CHANGES.txt
index 1544cf53b..ffa255da8 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/CHANGES.txt
+++ b/docs/tutorials/bfgwiki2/src/authorization/CHANGES.txt
@@ -1,3 +1,4 @@
-0.1
+0.0
+---
 
-  Initial version
+- Initial version
diff --git a/docs/tutorials/bfgwiki2/src/authorization/setup.py b/docs/tutorials/bfgwiki2/src/authorization/setup.py
index cebe55362..764e8c0ea 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/setup.py
+++ b/docs/tutorials/bfgwiki2/src/authorization/setup.py
@@ -20,22 +20,19 @@ if sys.version_info[:3] < (2,5,0):
     requires.append('pysqlite')
 
 setup(name='tutorial',
-      version='0.1',
+      version='0.0',
       description='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
-        "Development Status :: 3 - Alpha",
-        "Intended Audience :: Developers",
         "Programming Language :: Python",
+        "Framework :: BFG",
         "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
-        "Topic :: Internet :: WWW/HTTP :: WSGI",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
       author='',
       author_email='',
       url='',
-      keywords='web wsgi bfg zope',
+      keywords='web wsgi bfg',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py
index 3aa984656..9009fbc59 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py
@@ -1,6 +1,5 @@
-from repoze.bfg.router import make_app
+from repoze.bfg.configuration import Configurator
 
-import tutorial
 from tutorial.models import DBSession
 from tutorial.models import initialize_sql
 from tutorial.models import RootFactory
@@ -24,6 +23,8 @@ def app(global_config, **settings):
     if db_string is None:
         raise ValueError("No 'db_string' value in application configuration.")
     initialize_sql(db_string)
+    config = Configurator(root_factory=RootFactory, settings=settings)
+    config.load_zcml('configure.zcml')
+    return config.make_wsgi_app()
 
-    return make_app(RootFactory, tutorial, settings=settings)
 
diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/CHANGES.txt b/docs/tutorials/bfgwiki2/src/basiclayout/CHANGES.txt
index 1544cf53b..e14f633ab 100644
--- a/docs/tutorials/bfgwiki2/src/basiclayout/CHANGES.txt
+++ b/docs/tutorials/bfgwiki2/src/basiclayout/CHANGES.txt
@@ -1,3 +1,5 @@
-0.1
+0.0
+---
+
+- Initial version
 
-  Initial version
diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/setup.py b/docs/tutorials/bfgwiki2/src/basiclayout/setup.py
index 1a9e74692..764e8c0ea 100644
--- a/docs/tutorials/bfgwiki2/src/basiclayout/setup.py
+++ b/docs/tutorials/bfgwiki2/src/basiclayout/setup.py
@@ -13,28 +13,26 @@ requires = [
     'transaction',
     'repoze.tm2',
     'zope.sqlalchemy',
+    'docutils'
     ]
 
 if sys.version_info[:3] < (2,5,0):
     requires.append('pysqlite')
 
 setup(name='tutorial',
-      version='0.1',
+      version='0.0',
       description='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
-        "Development Status :: 3 - Alpha",
-        "Intended Audience :: Developers",
         "Programming Language :: Python",
+        "Framework :: BFG",
         "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
-        "Topic :: Internet :: WWW/HTTP :: WSGI",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
       author='',
       author_email='',
       url='',
-      keywords='web wsgi bfg zope',
+      keywords='web wsgi bfg',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py
index 8d48b7bc8..b4663e495 100644
--- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py
+++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/run.py
@@ -1,8 +1,8 @@
-from repoze.bfg.router import make_app
+from repoze.bfg.configuration import Configurator
 
-import tutorial
 from tutorial.models import DBSession
 from tutorial.models import initialize_sql
+from tutorial.models import RootFactory
 
 class Cleanup:
     def __init__(self, cleaner):
@@ -23,5 +23,6 @@ def app(global_config, **settings):
     if db_string is None:
         raise ValueError("No 'db_string' value in application configuration.")
     initialize_sql(db_string)
-    return make_app(None, tutorial, settings=settings)
-
+    config = Configurator(root_factory=RootFactory, settings=settings)
+    config.load_zcml('configure.zcml')
+    return config.make_wsgi_app()
diff --git a/docs/tutorials/bfgwiki2/src/models/CHANGES.txt b/docs/tutorials/bfgwiki2/src/models/CHANGES.txt
index 1544cf53b..e14f633ab 100644
--- a/docs/tutorials/bfgwiki2/src/models/CHANGES.txt
+++ b/docs/tutorials/bfgwiki2/src/models/CHANGES.txt
@@ -1,3 +1,5 @@
-0.1
+0.0
+---
+
+- Initial version
 
-  Initial version
diff --git a/docs/tutorials/bfgwiki2/src/models/setup.py b/docs/tutorials/bfgwiki2/src/models/setup.py
index 1a9e74692..764e8c0ea 100644
--- a/docs/tutorials/bfgwiki2/src/models/setup.py
+++ b/docs/tutorials/bfgwiki2/src/models/setup.py
@@ -13,28 +13,26 @@ requires = [
     'transaction',
     'repoze.tm2',
     'zope.sqlalchemy',
+    'docutils'
     ]
 
 if sys.version_info[:3] < (2,5,0):
     requires.append('pysqlite')
 
 setup(name='tutorial',
-      version='0.1',
+      version='0.0',
       description='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
-        "Development Status :: 3 - Alpha",
-        "Intended Audience :: Developers",
         "Programming Language :: Python",
+        "Framework :: BFG",
         "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
-        "Topic :: Internet :: WWW/HTTP :: WSGI",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
       author='',
       author_email='',
       url='',
-      keywords='web wsgi bfg zope',
+      keywords='web wsgi bfg',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/run.py b/docs/tutorials/bfgwiki2/src/models/tutorial/run.py
index 8d48b7bc8..b4663e495 100644
--- a/docs/tutorials/bfgwiki2/src/models/tutorial/run.py
+++ b/docs/tutorials/bfgwiki2/src/models/tutorial/run.py
@@ -1,8 +1,8 @@
-from repoze.bfg.router import make_app
+from repoze.bfg.configuration import Configurator
 
-import tutorial
 from tutorial.models import DBSession
 from tutorial.models import initialize_sql
+from tutorial.models import RootFactory
 
 class Cleanup:
     def __init__(self, cleaner):
@@ -23,5 +23,6 @@ def app(global_config, **settings):
     if db_string is None:
         raise ValueError("No 'db_string' value in application configuration.")
     initialize_sql(db_string)
-    return make_app(None, tutorial, settings=settings)
-
+    config = Configurator(root_factory=RootFactory, settings=settings)
+    config.load_zcml('configure.zcml')
+    return config.make_wsgi_app()
diff --git a/docs/tutorials/bfgwiki2/src/views/CHANGES.txt b/docs/tutorials/bfgwiki2/src/views/CHANGES.txt
index 1544cf53b..e14f633ab 100644
--- a/docs/tutorials/bfgwiki2/src/views/CHANGES.txt
+++ b/docs/tutorials/bfgwiki2/src/views/CHANGES.txt
@@ -1,3 +1,5 @@
-0.1
+0.0
+---
+
+- Initial version
 
-  Initial version
diff --git a/docs/tutorials/bfgwiki2/src/views/setup.py b/docs/tutorials/bfgwiki2/src/views/setup.py
index cebe55362..764e8c0ea 100644
--- a/docs/tutorials/bfgwiki2/src/views/setup.py
+++ b/docs/tutorials/bfgwiki2/src/views/setup.py
@@ -20,22 +20,19 @@ if sys.version_info[:3] < (2,5,0):
     requires.append('pysqlite')
 
 setup(name='tutorial',
-      version='0.1',
+      version='0.0',
       description='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
-        "Development Status :: 3 - Alpha",
-        "Intended Audience :: Developers",
         "Programming Language :: Python",
+        "Framework :: BFG",
         "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
-        "Topic :: Internet :: WWW/HTTP :: WSGI",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
       author='',
       author_email='',
       url='',
-      keywords='web wsgi bfg zope',
+      keywords='web wsgi bfg',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/run.py b/docs/tutorials/bfgwiki2/src/views/tutorial/run.py
index 8d48b7bc8..b4663e495 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial/run.py
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial/run.py
@@ -1,8 +1,8 @@
-from repoze.bfg.router import make_app
+from repoze.bfg.configuration import Configurator
 
-import tutorial
 from tutorial.models import DBSession
 from tutorial.models import initialize_sql
+from tutorial.models import RootFactory
 
 class Cleanup:
     def __init__(self, cleaner):
@@ -23,5 +23,6 @@ def app(global_config, **settings):
     if db_string is None:
         raise ValueError("No 'db_string' value in application configuration.")
     initialize_sql(db_string)
-    return make_app(None, tutorial, settings=settings)
-
+    config = Configurator(root_factory=RootFactory, settings=settings)
+    config.load_zcml('configure.zcml')
+    return config.make_wsgi_app()