[Zope3-checkins] SVN: Zope3/branches/baijum-zope-app-zcmlfiles/ Fixed warnings, use zope.app.zcmlfiles directly in ZCML files.

Baiju M baiju.m.mail at gmail.com
Sat Dec 23 08:38:50 EST 2006


Log message for revision 71647:
  Fixed warnings, use zope.app.zcmlfiles directly in ZCML files.
  

Changed:
  U   Zope3/branches/baijum-zope-app-zcmlfiles/doc/CHANGES.txt
  U   Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/PACKAGE.cfg
  U   Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/apidoc/codemodule/browser/tests.py
  U   Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/apidoc/codemodule/tests.py
  U   Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/apidoc/zcmlmodule/tests.py
  U   Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/zcmlfiles/ftesting.zcml
  U   Zope3/branches/baijum-zope-app-zcmlfiles/zopeskel/etc/ftesting-base.zcml
  U   Zope3/branches/baijum-zope-app-zcmlfiles/zopeskel/etc/site.zcml

-=-
Modified: Zope3/branches/baijum-zope-app-zcmlfiles/doc/CHANGES.txt
===================================================================
--- Zope3/branches/baijum-zope-app-zcmlfiles/doc/CHANGES.txt	2006-12-23 13:33:07 UTC (rev 71646)
+++ Zope3/branches/baijum-zope-app-zcmlfiles/doc/CHANGES.txt	2006-12-23 13:38:48 UTC (rev 71647)
@@ -81,6 +81,11 @@
 
     Restructuring
 
+      - Implemented "Loading Configuration from the zope.app Egg" proposal.
+        Now zope.app is a namespace package.  ZCML files in zope.app package
+        is moved to zope.app.zcmlfiles (a new package with only ZCML files).
+        Now creating individual eggs of zope.app.* packages is possible.
+
       - ``ClientForm`` changed from a file based module to a package.
 
       - Changed internal widget API to allow retrieving the current value

Modified: Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/PACKAGE.cfg
===================================================================
--- Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/PACKAGE.cfg	2006-12-23 13:33:07 UTC (rev 71646)
+++ Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/PACKAGE.cfg	2006-12-23 13:38:48 UTC (rev 71647)
@@ -69,6 +69,7 @@
 wsgi
 zopeappgenerations
 zapi
+zcmlfiles
 
 # BBB 2006/05/01 -- to be removed after 12 months
 

Modified: Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/apidoc/codemodule/browser/tests.py
===================================================================
--- Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/apidoc/codemodule/browser/tests.py	2006-12-23 13:33:07 UTC (rev 71646)
+++ Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/apidoc/codemodule/browser/tests.py	2006-12-23 13:38:48 UTC (rev 71647)
@@ -13,7 +13,7 @@
 ##############################################################################
 """Tests for the Code Documentation Module
 
-$Id: tests.py 29269 2005-02-23 22:22:48Z srichter $
+$Id$
 """
 import os
 import unittest
@@ -51,9 +51,9 @@
     xmlns:meta="http://namespaces.zope.org/meta"
     i18n_domain="zope">
   <meta:provides feature="devmode" />
-  <include package="zope.app" file="meta.zcml" />
+  <include package="zope.app.zcmlfiles" file="meta.zcml" />
   <include package="zope.app.apidoc" file="meta.zcml" />
-  <include package="zope.app" file="menus.zcml" />
+  <include package="zope.app.zcmlfiles" file="menus.zcml" />
 </configure>
 '''
 
@@ -106,7 +106,7 @@
     global old_source_file
     old_source_file = zope.app.appsetup.appsetup.__config_source
     zope.app.appsetup.appsetup.__config_source = os.path.join(
-        os.path.dirname(zope.app.__file__), 'meta.zcml')
+        os.path.dirname(zope.app.zcmlfiles.__file__), 'meta.zcml')
 
     # Register the index.html view for codemodule.class_.Class
     from zope.publisher.browser import BrowserView

Modified: Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/apidoc/codemodule/tests.py
===================================================================
--- Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/apidoc/codemodule/tests.py	2006-12-23 13:33:07 UTC (rev 71646)
+++ Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/apidoc/codemodule/tests.py	2006-12-23 13:38:48 UTC (rev 71647)
@@ -32,14 +32,14 @@
         xmlns:meta="http://namespaces.zope.org/meta"
         i18n_domain="zope">
       <meta:provides feature="devmode" />
-      <include package="zope.app" file="meta.zcml" />
-      <include package="zope.app" file="menus.zcml" />
+      <include package="zope.app.zcmlfiles" file="meta.zcml" />
+      <include package="zope.app.zcmlfiles" file="menus.zcml" />
     </configure>
     '''
     xmlconfig.string(meta)
 
-    meta = os.path.join(os.path.dirname(zope.app.__file__), 'meta.zcml')
-    context = xmlconfig.file(meta, zope.app)
+    meta = os.path.join(os.path.dirname(zope.app.zcmlfiles.__file__), 'meta.zcml')
+    context = xmlconfig.file(meta, zope.app.zcmlfiles)
     context.provideFeature('devmode')
     meta = os.path.join(os.path.dirname(zope.app.apidoc.__file__), 'meta.zcml')
     context = xmlconfig.file(meta, zope.app.apidoc, context)

Modified: Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/apidoc/zcmlmodule/tests.py
===================================================================
--- Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/apidoc/zcmlmodule/tests.py	2006-12-23 13:33:07 UTC (rev 71646)
+++ Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/apidoc/zcmlmodule/tests.py	2006-12-23 13:38:48 UTC (rev 71647)
@@ -31,8 +31,8 @@
 from zope.app.apidoc.zcmlmodule import Namespace, Directive
 from zope.app.apidoc.zcmlmodule import ZCMLModule
 from zope.app.apidoc.tests import Root
+import zope.app.zcmlfiles
 
-
 def setUp(test):
     placelesssetup.setUp()
 
@@ -40,13 +40,13 @@
     ztapi.provideAdapter(None, IPhysicallyLocatable,
                          LocationPhysicallyLocatable)
 
-    config_file = os.path.join(os.path.dirname(zope.app.__file__), 'meta.zcml')
+    config_file = os.path.join(os.path.dirname(zope.app.zcmlfiles.__file__), 'meta.zcml')
 
     # Fix up path for tests.
     global old_context
     old_context = zope.app.appsetup.appsetup.getConfigContext()
     zope.app.appsetup.appsetup.__config_context = xmlconfig.file(
-        config_file, zope.app, execute=False)
+        config_file, zope.app.zcmlfiles, execute=False)
 
 def tearDown(test):
     placelesssetup.tearDown()

Modified: Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/zcmlfiles/ftesting.zcml
===================================================================
--- Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/zcmlfiles/ftesting.zcml	2006-12-23 13:33:07 UTC (rev 71646)
+++ Zope3/branches/baijum-zope-app-zcmlfiles/src/zope/app/zcmlfiles/ftesting.zcml	2006-12-23 13:38:48 UTC (rev 71647)
@@ -4,8 +4,8 @@
     i18n_domain="zope"
     >
 
-<include package=".container.browser.ftests" />
-<include package=".pagetemplate.ftests" />
-<include package=".form.browser.ftests" file="i18n.zcml" />
+<include package="zope.app.container.browser.ftests" />
+<include package="zope.app.pagetemplate.ftests" />
+<include package="zope.app.form.browser.ftests" file="i18n.zcml" />
 
 </configure>

Modified: Zope3/branches/baijum-zope-app-zcmlfiles/zopeskel/etc/ftesting-base.zcml
===================================================================
--- Zope3/branches/baijum-zope-app-zcmlfiles/zopeskel/etc/ftesting-base.zcml	2006-12-23 13:33:07 UTC (rev 71646)
+++ Zope3/branches/baijum-zope-app-zcmlfiles/zopeskel/etc/ftesting-base.zcml	2006-12-23 13:38:48 UTC (rev 71647)
@@ -9,8 +9,8 @@
 
   <include files="package-includes/*-meta.zcml" />
 
-  <include package="zope.app" />
-  <include package="zope.app" file="ftesting.zcml" />
+  <include package="zope.app.zcmlfiles" />
+  <include package="zope.app.zcmlfiles" file="ftesting.zcml" />
 
   <include files="package-includes/*-configure.zcml" />
   <include files="package-includes/*-ftesting.zcml" />

Modified: Zope3/branches/baijum-zope-app-zcmlfiles/zopeskel/etc/site.zcml
===================================================================
--- Zope3/branches/baijum-zope-app-zcmlfiles/zopeskel/etc/site.zcml	2006-12-23 13:33:07 UTC (rev 71646)
+++ Zope3/branches/baijum-zope-app-zcmlfiles/zopeskel/etc/site.zcml	2006-12-23 13:38:48 UTC (rev 71647)
@@ -2,7 +2,7 @@
 
   <include files="package-includes/*-meta.zcml" />
 
-  <include package="zope.app" />
+  <include package="zope.app.zcmlfiles" />
 
   <include files="package-includes/*-configure.zcml" />
 



More information about the Zope3-Checkins mailing list