Merge branch 'dezcml' of github.com:Pylons/pyramid into dezcml

4 files changed, 8 insertions, 45 deletions

diff --git a/pyramid/paster_templates/alchemy/+package+/configure.zcml b/pyramid/paster_templates/alchemy/+package+/configure.zcml
deleted file mode 100644
index 9450b9049..000000000
--- a/pyramid/paster_templates/alchemy/+package+/configure.zcml
+++ /dev/null
@@ -1,23 +0,0 @@
-<configure xmlns="http://pylonshq.com/pyramid">
-
-  <!-- this must be included for the view declarations to work -->
-  <include package="pyramid.includes" />
-
-  <view
-     context=".models.MyApp"
-     view=".views.view_root"
-     renderer="templates/root.pt"
-     />
-
-  <view
-     context=".models.MyModel"
-     view=".views.view_model"
-     renderer="templates/model.pt"
-     />
-
-  <static
-     name="static"
-     path="templates/static"
-     />
-
-</configure>
diff --git a/pyramid/paster_templates/alchemy/+package+/run.py_tmpl b/pyramid/paster_templates/alchemy/+package+/run.py_tmpl
index 610b9ed2d..2e349f482 100644
--- a/pyramid/paster_templates/alchemy/+package+/run.py_tmpl
+++ b/pyramid/paster_templates/alchemy/+package+/run.py_tmpl
@@ -9,7 +9,6 @@ def app(global_config, **settings):
     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.")
@@ -17,7 +16,11 @@ def app(global_config, **settings):
     get_root = appmaker(db_string, asbool(db_echo))
     config = Configurator(settings=settings, root_factory=get_root)
     config.begin()
-    config.load_zcml(zcml_file)
+    config.add_static_view('static', 'templates/static')
+    config.add_view('.views.view_root', context='.models.MyApp', 
+                    renderer="templates/root.pt")
+    config.add_view('.views.view_model', context='.models.MyModel',
+                    renderer="templates/model.pt")
     config.end()
     return config.make_wsgi_app()
 
diff --git a/pyramid/paster_templates/routesalchemy/+package+/configure.zcml b/pyramid/paster_templates/routesalchemy/+package+/configure.zcml
deleted file mode 100644
index 47adfbefb..000000000
--- a/pyramid/paster_templates/routesalchemy/+package+/configure.zcml
+++ /dev/null
@@ -1,18 +0,0 @@
-<configure xmlns="http://pylonshq.com/pyramid">
-
-  <!-- this must be included for the view declarations to work -->
-  <include package="pyramid.includes" />
-
-  <route 
-    pattern=""
-    name="home"
-    view=".views.my_view"
-    view_renderer="templates/mytemplate.pt"
-    />
-
-  <static
-    name="static"
-    path="templates/static"
-    />
-
-</configure>
diff --git a/pyramid/paster_templates/routesalchemy/+package+/run.py_tmpl b/pyramid/paster_templates/routesalchemy/+package+/run.py_tmpl
index 695cd12fe..9edcd28c8 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/run.py_tmpl
+++ b/pyramid/paster_templates/routesalchemy/+package+/run.py_tmpl
@@ -9,7 +9,6 @@ def app(global_config, **settings):
     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.")
@@ -17,7 +16,9 @@ def app(global_config, **settings):
     initialize_sql(db_string, asbool(db_echo))
     config = Configurator(settings=settings)
     config.begin()
-    config.load_zcml(zcml_file)
+    config.add_static_view('static', 'templates/static')
+    config.add_route('home', '/', view='.views.my_view',
+                     renderer='templates/mytemplate.pt')
     config.end()
     return config.make_wsgi_app()