[Zope3-checkins] CVS: Zope3 - products_ftesting.zcml.in:1.1 .cvsignore:1.11 MANIFEST.in:1.11 overrides.zcml.in:1.2 products.zcml.in:1.12 sample_principals.zcml:1.8 ftesting.zcml:1.18

[Sidnei da Silva]

Update of /cvs-repository/Zope3
In directory cvs.zope.org:/tmp/cvs-serv27108

Modified Files:
	.cvsignore MANIFEST.in overrides.zcml.in products.zcml.in 
	sample_principals.zcml ftesting.zcml 
Added Files:
	products_ftesting.zcml.in 
Log Message:
Added products_ftesting.zcml.in, which can be used by product developers to include some other zcml files needed to setup stuff for functional testing. Also, rewrapped some .in files and removed whitespaces.


=== Added File Zope3/products_ftesting.zcml.in ===
<configure xmlns="http://namespaces.zope.org/zope">

  <!-- Here you can include zcml from your custom products -->
  <!-- which may be needed if you have some special setup -->
  <!-- done in zcml. -->

  <!-- For example, you may want to include overrides.zcml on -->
  <!-- functional tests to make sure that the system will-->
  <!-- behave as expected in the presence of overrides.-->
  <!-- Example:
       <includeOverrides file="overrides.zcml" />
  -->

</configure>


=== Zope3/.cvsignore 1.10 => 1.11 ===
--- Zope3/.cvsignore:1.10	Mon Aug  4 11:29:51 2003
+++ Zope3/.cvsignore	Wed Jan 28 11:30:47 2004
@@ -1,3 +1,4 @@
+products_ftesting.zcml
 principals.zcml
 products.zcml
 overrides.zcml


=== Zope3/MANIFEST.in 1.10 => 1.11 ===
--- Zope3/MANIFEST.in:1.10	Mon Jun 30 11:45:11 2003
+++ Zope3/MANIFEST.in	Wed Jan 28 11:30:47 2004
@@ -7,7 +7,7 @@
 include site.zcml sample_principals.zcml
 include *.zcml.in
 
-recursive-include src *.h *.c 
+recursive-include src *.h *.c
 recursive-include src *.txt
 recursive-include src *.conf *.zcml *.in
 recursive-include src *.css *.gif *.html *.js *.pt *.xml *.jpg


=== Zope3/overrides.zcml.in 1.1 => 1.2 ===
--- Zope3/overrides.zcml.in:1.1	Mon Aug  4 07:11:16 2003
+++ Zope3/overrides.zcml.in	Wed Jan 28 11:30:47 2004
@@ -1,9 +1,9 @@
-<configure xmlns='http://namespaces.zope.org/zope'
-           xmlns:browser='http://namespaces.zope.org/browser'
-           >
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:browser="http://namespaces.zope.org/browser">
 
-<!-- Provide local overrides of standard configurations-->
+  <!-- Provide local overrides of standard configurations -->
+
+  <!-- For example, define a different default skin -->
+  <!-- <browser:skin name="" layers="default" /> -->
 
-<!-- For example, define a different default skin --> 
-<!-- <browser:skin name="" layers="default" /> -->
 </configure>


=== Zope3/products.zcml.in 1.11 => 1.12 ===
--- Zope3/products.zcml.in:1.11	Wed Jan 14 17:55:15 2004
+++ Zope3/products.zcml.in	Wed Jan 28 11:30:47 2004
@@ -1,14 +1,13 @@
-<configure xmlns='http://namespaces.zope.org/zope'>
+<configure xmlns="http://namespaces.zope.org/zope">
 
-<!-- add include directives for products here -->
+  <!-- Add include directives for your custom products -->
+  <!-- or 3rd-party installed products here. -->
 
-<!-- The default security policy, including roles
-     stuff.
-  -->
-<include package="zope.products.securitypolicy"/>
+  <!-- The default security policy, including roles. -->
+  <include package="zope.products.securitypolicy"/>
 
-<!-- Example:
-<include package="zopeproducts.demo.jobboard" />
--->
+  <!-- Example:
+       <include package="zopeproducts.demo.jobboard" />
+  -->
 
 </configure>


=== Zope3/sample_principals.zcml 1.7 => 1.8 ===
--- Zope3/sample_principals.zcml:1.7	Sun Dec 14 03:25:32 2003
+++ Zope3/sample_principals.zcml	Wed Jan 28 11:30:47 2004
@@ -1,33 +1,35 @@
-<!--# Use this as an example for setting up your principals file.
-      Don't simply copy this file to principals.zcml unless you
-      absolutely know it will only be used for development.
-   -->
+<!-- Use this as an example for setting up your principals -->
+<!-- file. Don't simply copy this file to principals.zcml -->
+<!-- unless you absolutely know it will only be used for -->
+<!-- development. -->
 <configure xmlns='http://namespaces.zope.org/zope'>
 
-
-<unauthenticatedPrincipal 
-    id="zope.anybody" 
+  <unauthenticatedPrincipal
+    id="zope.anybody"
     title="Unauthenticated User" />
 
-<principal
+  <principal
     id="zope.sample_manager"
     title="Sample Manager"
-
     login="gandalf"
     password="123"
-
     />
 
-<principal
+  <principal
     id="zope.sample_member"
     title="Sample ordinary user (member)"
-
     login="frodo"
     password="456"
+    />
 
+  <grant
+    role="zope.Manager"
+    principal="zope.sample_manager"
     />
 
-<grant role="zope.Manager" principal="zope.sample_manager" />
-<grant role="zope.Member"  principal="zope.sample_member" />
+  <grant
+    role="zope.Member"
+    principal="zope.sample_member"
+    />
 
 </configure>


=== Zope3/ftesting.zcml 1.17 => 1.18 ===
--- Zope3/ftesting.zcml:1.17	Tue Jan 27 17:16:57 2004
+++ Zope3/ftesting.zcml	Wed Jan 28 11:30:47 2004
@@ -1,8 +1,8 @@
 <configure xmlns="http://namespaces.zope.org/zope"
-           i18n_domain="zope"
-           >
+           i18n_domain="zope">
 
-  <!-- This file is the equivalent of site.zcml used for functional testing -->
+  <!-- This file is the equivalent of site.zcml and it is -->
+  <!-- used for functional testing setup -->
 
   <include package="zope.app" />
   <include file="products.zcml" />
@@ -20,5 +20,7 @@
       password="mgrpw" />
 
   <grant role="zope.Manager" principal="zope.mgr" />
+
+  <include file="products_ftesting.zcml" />
 
 </configure>