5 files changed, 32 insertions, 64 deletions
diff --git a/docs/tutorials/wiki2/src/views/tutorial.ini b/docs/tutorials/wiki2/src/views/development.ini
index 85f131c2e..85f131c2e 100644
--- a/docs/tutorials/wiki2/src/views/tutorial.ini
+++ b/docs/tutorials/wiki2/src/views/development.ini
diff --git a/docs/tutorials/wiki2/src/views/setup.py b/docs/tutorials/wiki2/src/views/setup.py
index eeac5c397..5dabb69a2 100644
--- a/docs/tutorials/wiki2/src/views/setup.py
+++ b/docs/tutorials/wiki2/src/views/setup.py
@@ -40,7 +40,7 @@ setup(name='tutorial',
       install_requires = requires,
       entry_points = """\
       [paste.app_factory]
-      app = tutorial.run:app
+      app = tutorial:app
       """
       )
 
diff --git a/docs/tutorials/wiki2/src/views/tutorial/__init__.py b/docs/tutorials/wiki2/src/views/tutorial/__init__.py
index cbdfd3ac6..2d00cccc2 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/__init__.py
@@ -1,2 +1,32 @@
-# A package
+from pyramid.configuration import Configurator
+from paste.deploy.converters import asbool
+
+from tutorial.models import initialize_sql
+
+def app(global_config, **settings):
+    """ This function returns a WSGI application.
+    
+    It is usually called by the PasteDeploy framework during 
+    ``paster serve``.
+    """
+    db_string = settings.get('db_string')
+    if db_string is None:
+        raise ValueError("No 'db_string' value in application configuration.")
+    db_echo = settings.get('db_echo', 'false')
+    initialize_sql(db_string, asbool(db_echo))
+    config = Configurator(settings=settings)
+    config.begin()
+    config.add_static_view('static', 'templates/static')
+    config.add_route('home', '/', view='tutorial.views.view_wiki')
+    config.add_route('view_page', '/:pagename',
+                     view='tutorial.views.view_page',
+                     view_renderer='tutorial:templates/view.pt')
+    config.add_route('add_page', '/add_page/:pagename',
+                     view='tutorial.views.add_page',
+                     view_renderer='tutorial:templates/view.pt')
+    config.add_route('edit_page', '/:pagename/edit_page',
+                     view='tutorial.views.edit_page',
+                     view_renderer='tutorial:templates/edit.pt')
+    config.end()
+    return config.make_wsgi_app()
 
diff --git a/docs/tutorials/wiki2/src/views/tutorial/configure.zcml b/docs/tutorials/wiki2/src/views/tutorial/configure.zcml
deleted file mode 100644
index 3a2e13a7a..000000000
--- a/docs/tutorials/wiki2/src/views/tutorial/configure.zcml
+++ /dev/null
@@ -1,38 +0,0 @@
-<configure xmlns="http://pylonshq.com/pyramid">
-
-  <!-- this must be included for the view declarations to work -->
-  <include package="pyramid.includes" />
-
-  <static
-    path="templates/static"
-    name="static"
-    />
-
-  <route
-    pattern=""
-    name="view_wiki"
-    view=".views.view_wiki"
-    />
-    
-  <route
-     pattern=":pagename"
-     name="view_page"
-     view=".views.view_page"
-     view_renderer="templates/view.pt"
-     />
-
-  <route
-     pattern="add_page/:pagename"
-     name="add_page"
-     view=".views.add_page"
-     view_renderer="templates/edit.pt"
-     />
-
-  <route
-     pattern=":pagename/edit_page"
-     name="edit_page"
-     view=".views.edit_page"
-     view_renderer="templates/edit.pt"
-     />
-
-</configure>
diff --git a/docs/tutorials/wiki2/src/views/tutorial/run.py b/docs/tutorials/wiki2/src/views/tutorial/run.py
deleted file mode 100644
index 7225987ee..000000000
--- a/docs/tutorials/wiki2/src/views/tutorial/run.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from pyramid.configuration import Configurator
-from paste.deploy.converters import asbool
-
-from tutorial.models import initialize_sql
-
-def app(global_config, **settings):
-    """ This function returns a WSGI application.
-    
-    It is usually called by the PasteDeploy framework during 
-    ``paster serve``.
-    """
-    zcml_file = settings.get('configure_zcml', 'configure.zcml')
-    db_string = settings.get('db_string')
-    if db_string is None:
-        raise ValueError(
-            "No 'db_string' value in application configuration.")
-    db_echo = settings.get('db_echo', 'false')
-    initialize_sql(db_string, asbool(db_echo))
-    config = Configurator(settings=settings)
-    config.begin()
-    config.load_zcml(zcml_file)
-    config.end()
-    return config.make_wsgi_app()
-