Move ZCML to an includes package so we can use repoze.bfg better as

a namespace package.  Adjust the code generator to use it.

Remove the direct-run hair from the paster template's ``run.py`` module.

2 files changed, 6 insertions, 6 deletions

diff --git a/repoze/bfg/paster_template/+package+/configure.zcml b/repoze/bfg/paster_template/+package+/configure.zcml
index 174b27354..c9bb92565 100644
--- a/repoze/bfg/paster_template/+package+/configure.zcml
+++ b/repoze/bfg/paster_template/+package+/configure.zcml
@@ -3,7 +3,7 @@
 	   i18n_domain="repoze.bfg">
 
   <!-- this must be included for the view declarations to work -->
-  <include package="repoze.bfg" />
+  <include package="repoze.bfg.includes" />
 
   <bfg:view
      for=".models.IMyModel"
diff --git a/repoze/bfg/paster_template/+package+/run.py_tmpl b/repoze/bfg/paster_template/+package+/run.py_tmpl
index 42bc0ef02..0f714f7c7 100644
--- a/repoze/bfg/paster_template/+package+/run.py_tmpl
+++ b/repoze/bfg/paster_template/+package+/run.py_tmpl
@@ -2,12 +2,12 @@ from repoze.bfg.router import make_app
 from repoze.bfg.registry import get_options
 
 def app(global_config, **kw):
+    """ This function returns a repoze.bfg.router.Router object.  It
+    is usually called by the PasteDeploy framework during ``paster
+    serve``"""
     # paster app config callback
     from {{package}}.models import get_root
     import {{package}}
-    return make_app(get_root, {{package}}, options=get_options(kw))
+    options = get_options(kw)
+    return make_app(get_root, {{package}}, options=options)
 
-if __name__ == '__main__':
-    from paste import httpserver
-    httpserver.serve(app(None), host='0.0.0.0', port='6543')
-