[Checkins] SVN: bluebream/trunk/ merged ccomb-zcml-reorg

Christophe Combelles ccomb at free.fr
Sun Sep 19 03:44:30 EDT 2010


Log message for revision 116610:
  merged ccomb-zcml-reorg
  Reorganized zcml files for testing, debug and deploy
  

Changed:
  U   bluebream/trunk/CHANGES.txt
  U   bluebream/trunk/setup.py
  U   bluebream/trunk/src/bluebream/bluebream_base/project_template/deploy.ini_tmpl
  A   bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/debug.zcml_tmpl
  A   bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/deploy.zcml_tmpl
  D   bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/overrides.zcml_tmpl
  D   bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/site.zcml_tmpl
  U   bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/zope-debug.conf
  A   bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/zope-deploy.conf
  D   bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/zope.conf
  U   bluebream/trunk/src/bluebream/bluebream_base/project_template/setup.py_tmpl
  A   bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/bluebream.zcml_tmpl
  U   bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/configure.zcml_tmpl
  A   bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/overrides.zcml
  U   bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/securitypolicy.zcml_tmpl
  U   bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/tests/ftesting.zcml_tmpl
  U   bluebream/trunk/src/bluebream/bluebream_base/tests/bluebream.txt

-=-
Modified: bluebream/trunk/CHANGES.txt
===================================================================
--- bluebream/trunk/CHANGES.txt	2010-09-19 06:05:49 UTC (rev 116609)
+++ bluebream/trunk/CHANGES.txt	2010-09-19 07:44:29 UTC (rev 116610)
@@ -1,11 +1,12 @@
 Changelog
 *********
 
-1.0b5 (unreleased)
+1.0c1 (unreleased)
 ------------------
 
 - Include `zope.location`, `zope.keyreference` and `zope.intid`
   from `site.zcml` file.
+- Reorganized zcml files (for deploy, debug and testing)
 
 1.0b4 (2010-08-26)
 ------------------

Modified: bluebream/trunk/setup.py
===================================================================
--- bluebream/trunk/setup.py	2010-09-19 06:05:49 UTC (rev 116609)
+++ bluebream/trunk/setup.py	2010-09-19 07:44:29 UTC (rev 116610)
@@ -20,7 +20,7 @@
 
 setup(
     name="bluebream",
-    version='1.0b5dev',
+    version='1.0c1dev',
     author="Zope Foundation and Contributors",
     author_email="bluebream at zope.org",
     url="http://bluebream.zope.org",

Modified: bluebream/trunk/src/bluebream/bluebream_base/project_template/deploy.ini_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/deploy.ini_tmpl	2010-09-19 06:05:49 UTC (rev 116609)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/deploy.ini_tmpl	2010-09-19 07:44:29 UTC (rev 116610)
@@ -8,4 +8,4 @@
 
 [DEFAULT]
 # set the name of the zope.conf file
-zope_conf = %(here)s/etc/zope.conf
+zope_conf = %(here)s/etc/zope-deploy.conf

Copied: bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/debug.zcml_tmpl (from rev 116607, bluebream/branches/ccomb-zcml-reorg/src/bluebream/bluebream_base/project_template/etc/debug.zcml_tmpl)
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/debug.zcml_tmpl	                        (rev 0)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/debug.zcml_tmpl	2010-09-19 07:44:29 UTC (rev 116610)
@@ -0,0 +1,22 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:zcml="http://namespaces.zope.org/zcml">
+
+  <include package="${ns_prefix}${package}" />
+
+  <principal
+     zcml:condition="have devmode"
+     id="zope.manager"
+     title="Manager"
+     login="admin"
+     password="admin"
+     password_manager="Plain Text"
+     />
+
+  <grant
+     zcml:condition="have devmode"
+     role="zope.Manager"
+     principal="zope.manager"
+     />
+
+
+</configure>

Copied: bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/deploy.zcml_tmpl (from rev 116607, bluebream/branches/ccomb-zcml-reorg/src/bluebream/bluebream_base/project_template/etc/deploy.zcml_tmpl)
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/deploy.zcml_tmpl	                        (rev 0)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/deploy.zcml_tmpl	2010-09-19 07:44:29 UTC (rev 116610)
@@ -0,0 +1,22 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:zcml="http://namespaces.zope.org/zcml">
+
+  <include package="${ns_prefix}${package}" />
+
+  <principal
+     zcml:condition="have devmode"
+     id="zope.manager"
+     title="Manager"
+     login="admin"
+     password="admin"
+     password_manager="Plain Text"
+     />
+
+  <grant
+     zcml:condition="have devmode"
+     role="zope.Manager"
+     principal="zope.manager"
+     />
+
+
+</configure>

Deleted: bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/overrides.zcml_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/overrides.zcml_tmpl	2010-09-19 06:05:49 UTC (rev 116609)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/overrides.zcml_tmpl	2010-09-19 07:44:29 UTC (rev 116610)
@@ -1,7 +0,0 @@
-<configure
-   xmlns="http://namespaces.zope.org/zope"
-   xmlns:browser="http://namespaces.zope.org/browser">
-
-   <!-- ZCML declarations to override the default definitions -->
-
-</configure>

Deleted: bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/site.zcml_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/site.zcml_tmpl	2010-09-19 06:05:49 UTC (rev 116609)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/site.zcml_tmpl	2010-09-19 07:44:29 UTC (rev 116610)
@@ -1,57 +0,0 @@
-<configure
-   xmlns="http://namespaces.zope.org/zope"
-   xmlns:browser="http://namespaces.zope.org/browser">
-
-  <include package="zope.component" file="meta.zcml" />
-  <include package="zope.security" file="meta.zcml" />
-  <include package="zope.publisher" file="meta.zcml" />
-  <include package="zope.i18n" file="meta.zcml" />
-  <include package="zope.browserresource" file="meta.zcml" />
-  <include package="zope.browsermenu" file="meta.zcml" />
-  <include package="zope.browserpage" file="meta.zcml" />
-  <include package="zope.securitypolicy" file="meta.zcml" />
-  <include package="zope.principalregistry" file="meta.zcml" />
-  <include package="zope.app.publication" file="meta.zcml" />
-  <include package="zope.app.form.browser" file="meta.zcml" />
-  <include package="zope.app.container.browser" file="meta.zcml" />
-  <include package="zope.app.pagetemplate" file="meta.zcml" />
-  <include package="zope.app.publisher.xmlrpc" file="meta.zcml" />
-
-  <include package="zope.browserresource" />
-  <include package="zope.copypastemove" />
-  <include package="zope.publisher" />
-  <include package="zope.component" />
-  <include package="zope.traversing" />
-  <include package="zope.location" />
-  <include package="zope.site" />
-  <include package="zope.annotation" />
-  <include package="zope.principalregistry" />
-  <include package="zope.container" />
-  <include package="zope.componentvocabulary" />
-  <include package="zope.formlib" />
-  <include package="zope.app.appsetup" />
-  <include package="zope.app.security" />
-  <include package="zope.app.publication" />
-  <include package="zope.app.form.browser" />
-  <include package="zope.app.basicskin" />
-  <include package="zope.browsermenu" />
-  <include package="zope.principalregistry" />
-  <include package="zope.authentication" />
-  <include package="zope.securitypolicy" />
-  <include package="zope.login" />
-  <include package="zope.session" />
-  <include package="zope.error" />
-  <include package="zope.app.zcmlfiles" file="menus.zcml" />
-  <include package="zope.app.authentication" />
-  <include package="zope.app.security.browser" />
-  <include package="zope.traversing.browser" />
-  <include package="zope.app.pagetemplate" />
-  <include package="zope.app.schema" />
-  <include package="zope.app.http" />
-  <include package="zope.keyreference" />
-  <include package="zope.intid" />
-
-  <includeOverrides file="overrides.zcml" />
-  <include package="${ns_prefix}${package}" />
-
-</configure>

Modified: bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/zope-debug.conf
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/zope-debug.conf	2010-09-19 06:05:49 UTC (rev 116609)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/zope-debug.conf	2010-09-19 07:44:29 UTC (rev 116610)
@@ -1,5 +1,5 @@
 # Identify the component configuration used to define the site:
-site-definition etc/site.zcml
+site-definition etc/debug.zcml
 
 <zodb>
 

Copied: bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/zope-deploy.conf (from rev 116607, bluebream/branches/ccomb-zcml-reorg/src/bluebream/bluebream_base/project_template/etc/zope-deploy.conf)
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/zope-deploy.conf	                        (rev 0)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/zope-deploy.conf	2010-09-19 07:44:29 UTC (rev 116610)
@@ -0,0 +1,36 @@
+# Identify the component configuration used to define the site:
+site-definition etc/deploy.zcml
+
+<zodb>
+
+  <filestorage>
+    path var/filestorage/Data.fs
+    blob-dir var/blob
+  </filestorage>
+
+# Uncomment this if you want to connect to a ZEO server instead:
+#  <zeoclient>
+#    server localhost:8100
+#    storage 1
+#    # ZEO client cache, in bytes
+#    cache-size 20MB
+#    # Uncomment to have a persistent disk cache
+#    #client zeo1
+#  </zeoclient>
+</zodb>
+
+<eventlog>
+  # This sets up logging to both a file and to standard output (STDOUT).
+  # The "path" setting can be a relative or absolute filesystem path or
+  # the tokens STDOUT or STDERR.
+
+  <logfile>
+    path var/log/z3.log
+    formatter zope.exceptions.log.Formatter
+  </logfile>
+
+  <logfile>
+    path STDOUT
+    formatter zope.exceptions.log.Formatter
+  </logfile>
+</eventlog>

Deleted: bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/zope.conf
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/zope.conf	2010-09-19 06:05:49 UTC (rev 116609)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/etc/zope.conf	2010-09-19 07:44:29 UTC (rev 116610)
@@ -1,36 +0,0 @@
-# Identify the component configuration used to define the site:
-site-definition etc/site.zcml
-
-<zodb>
-
-  <filestorage>
-    path var/filestorage/Data.fs
-    blob-dir var/blob
-  </filestorage>
-
-# Uncomment this if you want to connect to a ZEO server instead:
-#  <zeoclient>
-#    server localhost:8100
-#    storage 1
-#    # ZEO client cache, in bytes
-#    cache-size 20MB
-#    # Uncomment to have a persistent disk cache
-#    #client zeo1
-#  </zeoclient>
-</zodb>
-
-<eventlog>
-  # This sets up logging to both a file and to standard output (STDOUT).
-  # The "path" setting can be a relative or absolute filesystem path or
-  # the tokens STDOUT or STDERR.
-
-  <logfile>
-    path var/log/z3.log
-    formatter zope.exceptions.log.Formatter
-  </logfile>
-
-  <logfile>
-    path STDOUT
-    formatter zope.exceptions.log.Formatter
-  </logfile>
-</eventlog>

Modified: bluebream/trunk/src/bluebream/bluebream_base/project_template/setup.py_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/setup.py_tmpl	2010-09-19 06:05:49 UTC (rev 116609)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/setup.py_tmpl	2010-09-19 07:44:29 UTC (rev 116610)
@@ -53,6 +53,8 @@
                         'zope.app.testing',
                         'zope.testbrowser',
                         'zope.login',
+                        'zope.keyreference',
+                        'zope.intid',
                         'zope.app.zcmlfiles',
                         ],
       entry_points = """

Copied: bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/bluebream.zcml_tmpl (from rev 116607, bluebream/branches/ccomb-zcml-reorg/src/bluebream/bluebream_base/project_template/src/+package+/bluebream.zcml_tmpl)
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/bluebream.zcml_tmpl	                        (rev 0)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/bluebream.zcml_tmpl	2010-09-19 07:44:29 UTC (rev 116610)
@@ -0,0 +1,60 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <include package="zope.component" file="meta.zcml" />
+  <include package="zope.security" file="meta.zcml" />
+  <include package="zope.publisher" file="meta.zcml" />
+  <include package="zope.i18n" file="meta.zcml" />
+  <include package="zope.browserresource" file="meta.zcml" />
+  <include package="zope.browsermenu" file="meta.zcml" />
+  <include package="zope.browserpage" file="meta.zcml" />
+  <include package="zope.securitypolicy" file="meta.zcml" />
+  <include package="zope.principalregistry" file="meta.zcml" />
+  <include package="zope.app.publication" file="meta.zcml" />
+  <include package="zope.app.form.browser" file="meta.zcml" />
+  <include package="zope.app.container.browser" file="meta.zcml" />
+  <include package="zope.app.pagetemplate" file="meta.zcml" />
+  <include package="zope.app.publisher.xmlrpc" file="meta.zcml" />
+  <include package="zope.browserresource" />
+  <include package="zope.copypastemove" />
+  <include package="zope.publisher" />
+  <include package="zope.component" />
+  <include package="zope.traversing" />
+  <include package="zope.location" />
+  <include package="zope.site" />
+  <include package="zope.annotation" />
+  <include package="zope.principalregistry" />
+  <include package="zope.container" />
+  <include package="zope.componentvocabulary" />
+  <include package="zope.formlib" />
+  <include package="zope.app.appsetup" />
+  <include package="zope.app.security" />
+  <include package="zope.app.publication" />
+  <include package="zope.app.form.browser" />
+  <include package="zope.app.basicskin" />
+  <include package="zope.browsermenu" />
+  <include package="zope.principalregistry" />
+  <include package="zope.authentication" />
+  <include package="zope.securitypolicy" />
+  <include package="zope.login" />
+  <include package="zope.session" />
+  <include package="zope.error" />
+  <include package="zope.app.zcmlfiles" file="menus.zcml" />
+  <include package="zope.app.authentication" />
+  <include package="zope.app.security.browser" />
+  <include package="zope.traversing.browser" />
+  <include package="zope.app.pagetemplate" />
+  <include package="zope.app.schema" />
+  <include package="zope.app.http" />
+  <include package="zope.keyreference" />
+  <include package="zope.intid" />
+
+  <!-- enable the apidoc -->
+  <!-- enable this when apidoc works
+  <include zcml:condition="have devmode"
+           package="zope.app.apidoc" file="meta.zcml" />
+  <include zcml:condition="have devmode"
+           package="zope.app.apidoc" />
+  -->
+
+</configure>
+

Modified: bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/configure.zcml_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/configure.zcml_tmpl	2010-09-19 06:05:49 UTC (rev 116609)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/configure.zcml_tmpl	2010-09-19 07:44:29 UTC (rev 116610)
@@ -3,8 +3,14 @@
    xmlns:browser="http://namespaces.zope.org/browser"
    i18n_domain="${project}">
 
-  <include file="securitypolicy.zcml" />
+  <include file="bluebream.zcml" />
 
+  <!-- Overrides -->
+  <includeOverrides package="${ns_prefix}${package}" file="overrides.zcml" />
+
+  <!-- Security Policy -->
+  <include package="${ns_prefix}${package}" file="securitypolicy.zcml" />
+
   <!-- The following registration (defaultView) register 'index' as
        the default view for a container.  The name of default view
        can be changed to a different value, for example, 'index.html'.

Copied: bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/overrides.zcml (from rev 116607, bluebream/branches/ccomb-zcml-reorg/src/bluebream/bluebream_base/project_template/src/+package+/overrides.zcml)
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/overrides.zcml	                        (rev 0)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/overrides.zcml	2010-09-19 07:44:29 UTC (rev 116610)
@@ -0,0 +1,7 @@
+<configure
+   xmlns="http://namespaces.zope.org/zope"
+   xmlns:browser="http://namespaces.zope.org/browser">
+
+   <!-- ZCML declarations to override the default definitions -->
+
+</configure>

Modified: bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/securitypolicy.zcml_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/securitypolicy.zcml_tmpl	2010-09-19 06:05:49 UTC (rev 116609)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/securitypolicy.zcml_tmpl	2010-09-19 07:44:29 UTC (rev 116610)
@@ -4,8 +4,6 @@
 
   <!-- This file contains sample security policy definition -->
 
-  <include package="zope.securitypolicy" />
-
   <securityPolicy 
      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 

Modified: bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/tests/ftesting.zcml_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/tests/ftesting.zcml_tmpl	2010-09-19 06:05:49 UTC (rev 116609)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+package+/tests/ftesting.zcml_tmpl	2010-09-19 07:44:29 UTC (rev 116610)
@@ -2,52 +2,19 @@
    xmlns="http://namespaces.zope.org/zope"
    i18n_domain="${project}">
 
-  <include package="zope.component" file="meta.zcml" />
-  <include package="zope.security" file="meta.zcml" />
-  <include package="zope.publisher" file="meta.zcml" />
-  <include package="zope.browserresource" file="meta.zcml" />
-  <include package="zope.browsermenu" file="meta.zcml" />
-  <include package="zope.browserpage" file="meta.zcml" />
-  <include package="zope.securitypolicy" file="meta.zcml" />
-  <include package="zope.principalregistry" file="meta.zcml" />
-  <include package="zope.app.publication" file="meta.zcml" />
+<!-- This file is mostly identical to site.zcml, except the manager password -->
 
-  <include package="zope.component" />
-  <include package="zope.traversing" />
-  <include package="zope.site" />
-  <include package="zope.annotation" />
-  <include package="zope.container" />
-  <include package="zope.componentvocabulary" />
-  <include package="zope.app.appsetup" />
-  <include package="zope.app.security" />
-  <include package="zope.app.publication" />
-  <include package="zope.principalregistry" />
+  <include package="${ns_prefix}${package}" />
 
-  <!-- Typical functional testing security setup -->
-  <securityPolicy
-      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
-      />
-
-  <unauthenticatedPrincipal
-      id="zope.anybody"
-      title="Unauthenticated User"
-      />
-  <grant
-      permission="zope.View"
-      principal="zope.anybody"
-      />
-
-  <principal
-      id="zope.mgr"
+  <principal 
+      id="zope.manager"
       title="Manager"
       login="mgr"
       password="mgrpw"
+      password_manager="Plain Text"
       />
+  <grant role="zope.Manager"
+         principal="zope.manager" />
 
-  <role id="zope.Manager" title="Site Manager" />
-  <grantAll role="zope.Manager" />
-  <grant role="zope.Manager" principal="zope.mgr" />
 
-  <include package="${ns_prefix}${package}" />
-
 </configure>

Modified: bluebream/trunk/src/bluebream/bluebream_base/tests/bluebream.txt
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/tests/bluebream.txt	2010-09-19 06:05:49 UTC (rev 116609)
+++ bluebream/trunk/src/bluebream/bluebream_base/tests/bluebream.txt	2010-09-19 07:44:29 UTC (rev 116610)
@@ -71,14 +71,16 @@
 sample/debug.ini
 sample/deploy.ini
 sample/setup.py
-sample/etc/overrides.zcml
-sample/etc/site.zcml
+sample/etc/debug.zcml
+sample/etc/deploy.zcml
 sample/etc/zope-debug.conf
-sample/etc/zope.conf
+sample/etc/zope-deploy.conf
 sample/extends-cache/README.txt
 sample/src/sample/__init__.py
+sample/src/sample/bluebream.zcml
 sample/src/sample/configure.zcml
 sample/src/sample/debug.py
+sample/src/sample/overrides.zcml
 sample/src/sample/securitypolicy.zcml
 sample/src/sample/startup.py
 sample/src/sample/tests/__init__.py
@@ -140,15 +142,17 @@
 sample.main/debug.ini
 sample.main/deploy.ini
 sample.main/setup.py
-sample.main/etc/overrides.zcml
-sample.main/etc/site.zcml
+sample.main/etc/debug.zcml
+sample.main/etc/deploy.zcml
 sample.main/etc/zope-debug.conf
-sample.main/etc/zope.conf
+sample.main/etc/zope-deploy.conf
 sample.main/extends-cache/README.txt
 sample.main/src/sample/__init__.py
 sample.main/src/sample/main/__init__.py
+sample.main/src/sample/main/bluebream.zcml
 sample.main/src/sample/main/configure.zcml
 sample.main/src/sample/main/debug.py
+sample.main/src/sample/main/overrides.zcml
 sample.main/src/sample/main/securitypolicy.zcml
 sample.main/src/sample/main/startup.py
 sample.main/src/sample/main/tests/__init__.py
@@ -215,16 +219,18 @@
 sample.app.main/debug.ini
 sample.app.main/deploy.ini
 sample.app.main/setup.py
-sample.app.main/etc/overrides.zcml
-sample.app.main/etc/site.zcml
+sample.app.main/etc/debug.zcml
+sample.app.main/etc/deploy.zcml
 sample.app.main/etc/zope-debug.conf
-sample.app.main/etc/zope.conf
+sample.app.main/etc/zope-deploy.conf
 sample.app.main/extends-cache/README.txt
 sample.app.main/src/sample/__init__.py
 sample.app.main/src/sample/app/__init__.py
 sample.app.main/src/sample/app/main/__init__.py
+sample.app.main/src/sample/app/main/bluebream.zcml
 sample.app.main/src/sample/app/main/configure.zcml
 sample.app.main/src/sample/app/main/debug.py
+sample.app.main/src/sample/app/main/overrides.zcml
 sample.app.main/src/sample/app/main/securitypolicy.zcml
 sample.app.main/src/sample/app/main/startup.py
 sample.app.main/src/sample/app/main/tests/__init__.py
@@ -290,15 +296,17 @@
 foobar.foobar/debug.ini
 foobar.foobar/deploy.ini
 foobar.foobar/setup.py
-foobar.foobar/etc/overrides.zcml
-foobar.foobar/etc/site.zcml
+foobar.foobar/etc/debug.zcml
+foobar.foobar/etc/deploy.zcml
 foobar.foobar/etc/zope-debug.conf
-foobar.foobar/etc/zope.conf
+foobar.foobar/etc/zope-deploy.conf
 foobar.foobar/extends-cache/README.txt
 foobar.foobar/src/foobar/__init__.py
 foobar.foobar/src/foobar/foobar/__init__.py
+foobar.foobar/src/foobar/foobar/bluebream.zcml
 foobar.foobar/src/foobar/foobar/configure.zcml
 foobar.foobar/src/foobar/foobar/debug.py
+foobar.foobar/src/foobar/foobar/overrides.zcml
 foobar.foobar/src/foobar/foobar/securitypolicy.zcml
 foobar.foobar/src/foobar/foobar/startup.py
 foobar.foobar/src/foobar/foobar/tests/__init__.py
@@ -362,15 +370,17 @@
 sampleproject/debug.ini
 sampleproject/deploy.ini
 sampleproject/setup.py
-sampleproject/etc/overrides.zcml
-sampleproject/etc/site.zcml
+sampleproject/etc/debug.zcml
+sampleproject/etc/deploy.zcml
 sampleproject/etc/zope-debug.conf
-sampleproject/etc/zope.conf
+sampleproject/etc/zope-deploy.conf
 sampleproject/extends-cache/README.txt
 sampleproject/src/sample/__init__.py
 sampleproject/src/sample/main/__init__.py
+sampleproject/src/sample/main/bluebream.zcml
 sampleproject/src/sample/main/configure.zcml
 sampleproject/src/sample/main/debug.py
+sampleproject/src/sample/main/overrides.zcml
 sampleproject/src/sample/main/securitypolicy.zcml
 sampleproject/src/sample/main/startup.py
 sampleproject/src/sample/main/tests/__init__.py



More information about the checkins mailing list