[Checkins] SVN: zam.api/trunk/src/zam/api/ Simplify ftesting setup, removed duplicated configuration.

[Roger Ineichen]

Log message for revision 85325:
  Simplify ftesting setup, removed duplicated configuration.
  I have no idea why the duplication configuration didn't conflict

Changed:
  U   zam.api/trunk/src/zam/api/app.zcml
  U   zam.api/trunk/src/zam/api/ftesting.zcml

-=-
Modified: zam.api/trunk/src/zam/api/app.zcml
===================================================================
--- zam.api/trunk/src/zam/api/app.zcml	2008-04-13 14:09:29 UTC (rev 85324)
+++ zam.api/trunk/src/zam/api/app.zcml	2008-04-13 14:57:51 UTC (rev 85325)
@@ -116,15 +116,15 @@
   <include package="zam.api" />
 
 
-  <!-- from zope.app.i18n move this to another package -->
   <!-- Setup charset negotiation -->
+  <!-- from zope.app.i18n -->
+  <!-- fix dependency in zope and move this to another package -->
   <adapter
       factory="zope.publisher.http.HTTPCharsets"
       for="zope.publisher.interfaces.http.IHTTPRequest"
       provides="zope.i18n.interfaces.IUserPreferredCharsets"
       />
 
-  <!-- Setup charset negotiation --><!-- move this to another package -->
   <adapter
       factory="zope.app.publisher.browser.ModifiableBrowserLanguages"
       for="zope.publisher.interfaces.http.IHTTPRequest"

Modified: zam.api/trunk/src/zam/api/ftesting.zcml
===================================================================
--- zam.api/trunk/src/zam/api/ftesting.zcml	2008-04-13 14:09:29 UTC (rev 85324)
+++ zam.api/trunk/src/zam/api/ftesting.zcml	2008-04-13 14:57:51 UTC (rev 85325)
@@ -5,8 +5,8 @@
     xmlns:z3c="http://namespaces.zope.org/z3c"
     i18n_domain="zope">
 
-  <!-- This is the general zam.api ftesting.zcml and can be reused as base for
-       all different ftesting setup in zam.* and zamplugin.* packages.
+  <!-- This is the general zam.api ftesting.zcml and can be used for mixin
+       ftesting setup for any kind of zam plugins.
   -->
 
   <!-- Turn on the devmode -->
@@ -36,28 +36,7 @@
         />
   </class>
 
-  <!-- from zope.app.i18n move this to another package -->
-  <!-- Setup charset negotiation -->
-  <adapter
-      factory="zope.publisher.http.HTTPCharsets"
-      for="zope.publisher.interfaces.http.IHTTPRequest"
-      provides="zope.i18n.interfaces.IUserPreferredCharsets"
-      />
 
-  <!-- Setup charset negotiation --><!-- move this to another package -->
-  <adapter
-      factory="zope.app.publisher.browser.ModifiableBrowserLanguages"
-      for="zope.publisher.interfaces.http.IHTTPRequest"
-      provides="zope.i18n.interfaces.IModifiableUserPreferredLanguages"
-      />
-
-  <class class="zope.publisher.http.HTTPRequest">
-    <implements
-        interface="zope.annotation.interfaces.IAttributeAnnotatable"
-        />
-  </class>
-
-
   <!-- load security policy -->
   <include package="zope.securitypolicy" />
 
@@ -69,51 +48,70 @@
       title="Everybody"
       description="All users have this role implicitly"
       />
-  <role id="zope.Manager" title="Site Manager" />
-  <role id="zope.Member" title="Site Member" />
+  <role
+      id="zope.Manager"
+      title="Site Manager"
+      />
+  <role
+      id="zope.Member"
+      title="Site Member"
+      />
 
-  <grant permission="zope.View"
-                  role="zope.Anonymous" />
-  <grant permission="zope.app.dublincore.view"
-                  role="zope.Anonymous" />
+  <grant
+      permission="zope.View"
+      role="zope.Anonymous"
+      />
+  <grant
+      permission="zope.app.dublincore.view"
+      role="zope.Anonymous"
+      />
+  <grantAll
+      role="zope.Manager"
+      />
 
-  <grantAll role="zope.Manager" />
 
-
   <!-- setup principals -->
   <unauthenticatedPrincipal
       id="zope.anybody"
-      title="Unauthenticated User" />
+      title="Unauthenticated User"
+      />
 
   <unauthenticatedGroup
-    id="zope.Anybody"
-    title="Unauthenticated Users"
-    />
+      id="zope.Anybody"
+      title="Unauthenticated Users"
+      />
 
   <authenticatedGroup
-    id="zope.Authenticated"
-    title="Authenticated Users"
-    />
+      id="zope.Authenticated"
+      title="Authenticated Users"
+      />
 
   <everybodyGroup
-    id="zope.Everybody"
-    title="All Users"
-    />
+      id="zope.Everybody"
+      title="All Users"
+      />
 
+  <!-- setup test principals -->
   <principal
       id="zope.mgr"
       title="Manager"
       login="mgr"
-      password="mgrpw" />
+      password="mgrpw"
+      />
+  <grant
+      role="zope.Manager"
+      principal="zope.mgr"
+      />
 
-  <grant role="zope.Manager" principal="zope.mgr" />
-
   <principal
       id="zope.globalmgr"
       title="Manager"
       login="globalmgr"
-      password="globalmgrpw" />
+      password="globalmgrpw"
+      />
+  <grant
+      role="zope.Manager"
+      principal="zope.globalmgr"
+      />
 
-  <grant role="zope.Manager" principal="zope.globalmgr" />
-
 </configure>