[Checkins] SVN: zwiki/trunk/ Move ZCML from buildout.cfg to a separate file

Baiju M baiju.m.mail at gmail.com
Sun Mar 1 03:41:08 EST 2009


Log message for revision 97392:
  Move ZCML from buildout.cfg to a separate file
  

Changed:
  U   zwiki/trunk/buildout.cfg
  A   zwiki/trunk/src/zwiki/application.zcml
  U   zwiki/trunk/src/zwiki/browser/zwiki.txt
  U   zwiki/trunk/src/zwiki/ftesting.zcml

-=-
Modified: zwiki/trunk/buildout.cfg
===================================================================
--- zwiki/trunk/buildout.cfg	2009-03-01 08:24:29 UTC (rev 97391)
+++ zwiki/trunk/buildout.cfg	2009-03-01 08:41:08 UTC (rev 97392)
@@ -1,5 +1,5 @@
 [buildout]
-develop = . ../zope.app.publisher
+develop = .
 parts = zwikiapp instance test
 extends = versions.cfg
 versions = versions
@@ -9,64 +9,7 @@
 
 [zwikiapp]
 recipe = zc.zope3recipes:app
-site.zcml = <include package="zope.app.securitypolicy" file="meta.zcml" />
-            <include package="zope.sendmail" file="meta.zcml"/>
-
-            <include package="zope.app.zcmlfiles" />
-            <include package="zope.app.authentication" />
-            <include package="zope.app.securitypolicy" />
-            <include package="zope.app.twisted" />
-            <include package="zope.sendmail" />
-            <include package="zope.app.zptpage"/>
-            <include package="zope.app.renderer"/>
-            <include package="zope.app.zapi"/>
-            <include package="zope.formlib"/>
-            <include package="zwiki" />
-
-            <securityPolicy 
-              component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-
-            <role id="zope.Anonymous" title="Everybody"
-                 description="All users have this role implicitly" />
-            <role id="zope.Manager" title="Site Manager" />
-            <role id="zope.Member" title="Site Member" />
-
-            <!-- Replace the following directive if you don't want public access -->
-            <grant permission="zope.View"
-               role="zope.Anonymous" />
-            <grant permission="zope.app.dublincore.view"
-               role="zope.Anonymous" />
-
-            <grantAll role="zope.Manager" />
-
-            <unauthenticatedPrincipal
-              id="zope.anybody"
-              title="Unauthenticated User" />
-
-            <unauthenticatedGroup
-              id="zope.Anybody"
-              title="Unauthenticated Users" />
-
-            <authenticatedGroup
-              id="zope.Authenticated"
-              title="Authenticated Users" />
-
-            <everybodyGroup
-              id="zope.Everybody"
-              title="All Users" />
-
-           <principal
-              id="zope.manager"
-              title="Manager"
-              login="admin"
-              password_manager="Plain Text"
-              password="admin"
-             />
-
-          <grant
-             role="zope.Manager"
-             principal="zope.manager" />
-
+site.zcml = <include package="zwiki" file="application.zcml" />
 eggs = zwiki
 
 [instance]

Added: zwiki/trunk/src/zwiki/application.zcml
===================================================================
--- zwiki/trunk/src/zwiki/application.zcml	                        (rev 0)
+++ zwiki/trunk/src/zwiki/application.zcml	2009-03-01 08:41:08 UTC (rev 97392)
@@ -0,0 +1,65 @@
+<configure
+   xmlns="http://namespaces.zope.org/zope"
+   i18n_domain="zwiki"
+   package="zwiki"
+   >
+
+  <include package="zope.app.securitypolicy" file="meta.zcml" />
+  <include package="zope.sendmail" file="meta.zcml"/>
+
+  <include package="zope.app.zcmlfiles" />
+  <include package="zope.app.authentication" />
+  <include package="zope.app.securitypolicy" />
+  <include package="zope.app.twisted" />
+  <include package="zope.sendmail" />
+  <include package="zope.app.zptpage"/>
+  <include package="zope.app.renderer"/>
+  <include package="zope.app.zapi"/>
+  <include package="zope.formlib"/>
+  <include package="zwiki" />
+
+  <securityPolicy 
+     component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+
+  <role id="zope.Anonymous" title="Everybody"
+        description="All users have this role implicitly" />
+  <role id="zope.Manager" title="Site Manager" />
+  <role id="zope.Member" title="Site Member" />
+
+  <!-- Replace the following directive if you don't want public access -->
+  <grant permission="zope.View"
+         role="zope.Anonymous" />
+  <grant permission="zope.app.dublincore.view"
+         role="zope.Anonymous" />
+  
+  <grantAll role="zope.Manager" />
+
+  <unauthenticatedPrincipal
+     id="zope.anybody"
+     title="Unauthenticated User" />
+
+  <unauthenticatedGroup
+     id="zope.Anybody"
+     title="Unauthenticated Users" />
+
+  <authenticatedGroup
+     id="zope.Authenticated"
+     title="Authenticated Users" />
+
+  <everybodyGroup
+     id="zope.Everybody"
+     title="All Users" />
+
+  <principal
+     id="zope.manager"
+     title="Manager"
+     login="admin"
+     password_manager="Plain Text"
+     password="admin"
+     />
+
+  <grant
+     role="zope.Manager"
+     principal="zope.manager" />
+
+</configure>

Modified: zwiki/trunk/src/zwiki/browser/zwiki.txt
===================================================================
--- zwiki/trunk/src/zwiki/browser/zwiki.txt	2009-03-01 08:24:29 UTC (rev 97391)
+++ zwiki/trunk/src/zwiki/browser/zwiki.txt	2009-03-01 08:41:08 UTC (rev 97392)
@@ -6,7 +6,7 @@
 
   >>> from zope.testbrowser.testing import Browser
   >>> browser = Browser()
-  >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+  >>> browser.addHeader('Authorization', 'Basic admin:admin')
 
 Open wiki adding form and check url::
 

Modified: zwiki/trunk/src/zwiki/ftesting.zcml
===================================================================
--- zwiki/trunk/src/zwiki/ftesting.zcml	2009-03-01 08:24:29 UTC (rev 97391)
+++ zwiki/trunk/src/zwiki/ftesting.zcml	2009-03-01 08:41:08 UTC (rev 97392)
@@ -4,64 +4,6 @@
    package="zwiki"
    >
 
-  <!-- This file is the equivalent of site.zcml and it is -->
-  <!-- used for functional testing setup -->
+  <include package="zwiki" file="application.zcml"/>
 
-
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
-  <include package="zope.sendmail" file="meta.zcml"/>
-
-  <include package="zope.app.zcmlfiles" />
-  <include package="zope.app.authentication" />
-  <include package="zope.app.securitypolicy" />
-  <include package="zope.app.twisted" />
-  <include package="zope.sendmail" />
-  <include package="zope.app.zptpage"/>
-  <include package="zope.app.renderer"/>
-  <include package="zope.formlib"/>
-  <include package="zwiki" />
-
-  <securityPolicy 
-    component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-
-  <role id="zope.Anonymous" title="Everybody"
-       description="All users have this role implicitly" />
-  <role id="zope.Manager" title="Site Manager" />
-  <role id="zope.Member" title="Site Member" />
-
-  <!-- Replace the following directive if you don't want public access -->
-  <grant permission="zope.View"
-     role="zope.Anonymous" />
-  <grant permission="zope.app.dublincore.view"
-     role="zope.Anonymous" />
-
-  <grantAll role="zope.Manager" />
-
-  <unauthenticatedPrincipal
-    id="zope.anybody"
-    title="Unauthenticated User" />
-
-  <unauthenticatedGroup
-    id="zope.Anybody"
-    title="Unauthenticated Users" />
-
-  <authenticatedGroup
-    id="zope.Authenticated"
-    title="Authenticated Users" />
-
-  <everybodyGroup
-    id="zope.Everybody"
-    title="All Users" />
-
- <principal
-    id="zope.manager"
-    title="Manager"
-    login="mgr"
-    password="mgrpw"
-   />
-
- <grant
-   role="zope.Manager"
-   principal="zope.manager" />
-
 </configure>



More information about the Checkins mailing list