[Zope3-checkins] SVN: Zope3/trunk/ zope.app.container is a part of zope.app, so it's special

[Jim Fulton]

Log message for revision 30732:
  zope.app.container is a part of zope.app, so it's special
  functional testing configuration should be included directly, *not*
  through package-includes.
  

Changed:
  U   Zope3/trunk/ftesting.zcml
  D   Zope3/trunk/package-includes/zope.app.container.browser-ftesting.zcml
  U   Zope3/trunk/src/zope/app/PACKAGE.cfg
  A   Zope3/trunk/src/zope/app/ftesting.zcml
  U   Zope3/trunk/zopeskel/etc/ftesting.zcml

-=-
Modified: Zope3/trunk/ftesting.zcml
===================================================================
--- Zope3/trunk/ftesting.zcml	2005-06-10 11:08:03 UTC (rev 30731)
+++ Zope3/trunk/ftesting.zcml	2005-06-10 11:15:50 UTC (rev 30732)
@@ -7,6 +7,7 @@
   <!-- used for functional testing setup -->
 
   <include package="zope.app" />
+  <include package="zope.app" file="ftesting.zcml" />
 
   <include files="package-includes/*-meta.zcml" />
   <include files="package-includes/*-configure.zcml" />

Deleted: Zope3/trunk/package-includes/zope.app.container.browser-ftesting.zcml
===================================================================
--- Zope3/trunk/package-includes/zope.app.container.browser-ftesting.zcml	2005-06-10 11:08:03 UTC (rev 30731)
+++ Zope3/trunk/package-includes/zope.app.container.browser-ftesting.zcml	2005-06-10 11:15:50 UTC (rev 30732)
@@ -1 +0,0 @@
-<include package="zope.app.container.browser.ftests" />

Modified: Zope3/trunk/src/zope/app/PACKAGE.cfg
===================================================================
--- Zope3/trunk/src/zope/app/PACKAGE.cfg	2005-06-10 11:08:03 UTC (rev 30731)
+++ Zope3/trunk/src/zope/app/PACKAGE.cfg	2005-06-10 11:15:50 UTC (rev 30732)
@@ -21,6 +21,7 @@
 
 browser.zcml
 configure.zcml
+ftesting.zcml
 menus.zcml
 meta.zcml
 

Added: Zope3/trunk/src/zope/app/ftesting.zcml
===================================================================
--- Zope3/trunk/src/zope/app/ftesting.zcml	2005-06-10 11:08:03 UTC (rev 30731)
+++ Zope3/trunk/src/zope/app/ftesting.zcml	2005-06-10 11:15:50 UTC (rev 30732)
@@ -0,0 +1,9 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:i18n="http://namespaces.zope.org/i18n"
+    i18n_domain="zope"
+    >
+
+<include package=".container.browser.ftests" />
+
+</configure>


Property changes on: Zope3/trunk/src/zope/app/ftesting.zcml
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: Zope3/trunk/zopeskel/etc/ftesting.zcml
===================================================================
--- Zope3/trunk/zopeskel/etc/ftesting.zcml	2005-06-10 11:08:03 UTC (rev 30731)
+++ Zope3/trunk/zopeskel/etc/ftesting.zcml	2005-06-10 11:15:50 UTC (rev 30732)
@@ -7,6 +7,7 @@
   <!-- used for functional testing setup -->
 
   <include package="zope.app" />
+  <include package="zope.app" file="ftesting.zcml" />
 
   <include files="package-includes/*-meta.zcml" />
   <include files="package-includes/*-configure.zcml" />