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.

3 files changed, 36 insertions, 0 deletions

diff --git a/repoze/bfg/includes/__init__.py b/repoze/bfg/includes/__init__.py
new file mode 100644
index 000000000..9faa798e8
--- /dev/null
+++ b/repoze/bfg/includes/__init__.py
@@ -0,0 +1 @@
+# includes package: referred to by generated apps
diff --git a/repoze/bfg/includes/configure.zcml b/repoze/bfg/includes/configure.zcml
new file mode 100644
index 000000000..e25d749ca
--- /dev/null
+++ b/repoze/bfg/includes/configure.zcml
@@ -0,0 +1,20 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+	           i18n_domain="repoze.bfg">
+
+  <include package="z3c.pt" />
+
+  <adapter
+      factory="repoze.bfg.traversal.ModelGraphTraverser"
+      provides="repoze.bfg.interfaces.ITraverserFactory"
+      for="*"
+  />
+
+  <adapter
+      factory="repoze.bfg.urldispatch.RoutesModelTraverser"
+      provides="repoze.bfg.interfaces.ITraverserFactory"
+      for="repoze.bfg.interfaces.IRoutesContext"
+  />
+
+  <include file="meta.zcml" />
+
+</configure>
diff --git a/repoze/bfg/includes/meta.zcml b/repoze/bfg/includes/meta.zcml
new file mode 100644
index 000000000..591a7be8a
--- /dev/null
+++ b/repoze/bfg/includes/meta.zcml
@@ -0,0 +1,15 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:meta="http://namespaces.zope.org/meta">
+
+  <meta:directives namespace="http://namespaces.repoze.org/bfg">
+
+    <meta:directive
+        name="view"
+        schema="repoze.bfg.zcml.IViewDirective"
+        handler="repoze.bfg.zcml.view"
+        />
+
+  </meta:directives>
+
+</configure>